From 34f7911b6417056797888b2657ef7135ff264fe6 Mon Sep 17 00:00:00 2001 From: David Michael Date: Tue, 8 May 2018 16:06:14 -0400 Subject: [PATCH 01/21] bump(sys-libs/readline): sync with upstream --- .../md5-cache/sys-libs/readline-4.3_p5 | 13 +- .../md5-cache/sys-libs/readline-5.2_p14 | 15 +- .../md5-cache/sys-libs/readline-6.2_p5-r1 | 13 - .../md5-cache/sys-libs/readline-6.3_p8-r1 | 13 - ...{readline-6.3_p8-r2 => readline-6.3_p8-r3} | 10 +- .../md5-cache/sys-libs/readline-7.0_alpha | 12 - .../md5-cache/sys-libs/readline-7.0_p3 | 13 + .../md5-cache/sys-libs/readline-7.0_p3-r1 | 13 + .../sys-libs/readline/ChangeLog | 875 ------------------ .../portage-stable/sys-libs/readline/Manifest | 84 +- .../files/readline-5.0-no_rpath.patch | 4 +- .../readline-5.2-no-ignore-shlib-errors.patch | 24 - .../readline/files/readline-7.0-headers.patch | 24 + .../readline/files/readline-7.0-mingw.patch | 152 +++ .../readline-7.0-missing-echo-proto.patch | 14 + .../sys-libs/readline/metadata.xml | 11 +- .../sys-libs/readline/readline-4.3_p5.ebuild | 27 +- .../sys-libs/readline/readline-5.2_p14.ebuild | 39 +- .../readline/readline-6.2_p5-r1.ebuild | 153 --- ...p8-r2.ebuild => readline-6.3_p8-r3.ebuild} | 27 +- ...p8-r1.ebuild => readline-7.0_p3-r1.ebuild} | 91 +- ....0_alpha.ebuild => readline-7.0_p3.ebuild} | 26 +- 22 files changed, 387 insertions(+), 1266 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-libs/readline-6.2_p5-r1 delete mode 100644 sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-libs/readline-6.3_p8-r1 rename sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-libs/{readline-6.3_p8-r2 => readline-6.3_p8-r3} (70%) delete mode 100644 sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-libs/readline-7.0_alpha create mode 100644 sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-libs/readline-7.0_p3 create mode 100644 sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-libs/readline-7.0_p3-r1 delete mode 100644 sdk_container/src/third_party/portage-stable/sys-libs/readline/ChangeLog delete mode 100644 sdk_container/src/third_party/portage-stable/sys-libs/readline/files/readline-5.2-no-ignore-shlib-errors.patch create mode 100644 sdk_container/src/third_party/portage-stable/sys-libs/readline/files/readline-7.0-headers.patch create mode 100644 sdk_container/src/third_party/portage-stable/sys-libs/readline/files/readline-7.0-mingw.patch create mode 100644 sdk_container/src/third_party/portage-stable/sys-libs/readline/files/readline-7.0-missing-echo-proto.patch delete mode 100644 sdk_container/src/third_party/portage-stable/sys-libs/readline/readline-6.2_p5-r1.ebuild rename sdk_container/src/third_party/portage-stable/sys-libs/readline/{readline-6.3_p8-r2.ebuild => readline-6.3_p8-r3.ebuild} (87%) rename sdk_container/src/third_party/portage-stable/sys-libs/readline/{readline-6.3_p8-r1.ebuild => readline-7.0_p3-r1.ebuild} (62%) rename sdk_container/src/third_party/portage-stable/sys-libs/readline/{readline-7.0_alpha.ebuild => readline-7.0_p3.ebuild} (85%) diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-libs/readline-4.3_p5 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-libs/readline-4.3_p5 index 3649ab0bbc..e794d0453c 100644 --- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-libs/readline-4.3_p5 +++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-libs/readline-4.3_p5 @@ -1,12 +1,13 @@ -DEFINED_PHASES=compile install unpack -DEPEND=>=sys-libs/ncurses-5.2-r2 +DEFINED_PHASES=compile configure install prepare test +DEPEND=>=sys-libs/ncurses-5.2-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] DESCRIPTION=Another cute console display library -EAPI=0 +EAPI=5 HOMEPAGE=http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html +IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 LICENSE=GPL-2 -RDEPEND=>=sys-libs/ncurses-5.2-r2 +RDEPEND=>=sys-libs/ncurses-5.2-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] SLOT=4 SRC_URI=mirror://gnu/readline/readline-4.3.tar.gz ftp://ftp.cwru.edu/pub/bash/readline-4.3-patches/readline43-001 ftp://ftp.cwru.edu/pub/bash/readline-4.3-patches/readline43-002 ftp://ftp.cwru.edu/pub/bash/readline-4.3-patches/readline43-003 ftp://ftp.cwru.edu/pub/bash/readline-4.3-patches/readline43-004 ftp://ftp.cwru.edu/pub/bash/readline-4.3-patches/readline43-005 mirror://gnu/readline/readline-4.3-patches/readline43-001 mirror://gnu/readline/readline-4.3-patches/readline43-002 mirror://gnu/readline/readline-4.3-patches/readline43-003 mirror://gnu/readline/readline-4.3-patches/readline43-004 mirror://gnu/readline/readline-4.3-patches/readline43-005 -_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 flag-o-matic 2274fcc1e7ef6affaff5bcd636275417 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 185a06792159ca143528e7010368e8af -_md5_=e94af1cf3a5ee4f7f4a1e2d2d9d0cf87 +_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 flag-o-matic 2274fcc1e7ef6affaff5bcd636275417 ltprune 2770eed66a9b8ef944714cd0e968182e multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build eed53a6313267c9fbcd35fc384bd0087 multilib-minimal 9139c3a57e077cb8e0d0f73ceb080b89 toolchain-funcs 185a06792159ca143528e7010368e8af +_md5_=0ea8562958a6bdf3a85efa8856a94cac diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-libs/readline-5.2_p14 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-libs/readline-5.2_p14 index 4d086a736c..f9af67d797 100644 --- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-libs/readline-5.2_p14 +++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-libs/readline-5.2_p14 @@ -1,12 +1,13 @@ -DEFINED_PHASES=compile install unpack -DEPEND=>=sys-libs/ncurses-5.2-r2 +DEFINED_PHASES=compile configure install prepare test +DEPEND=>=sys-libs/ncurses-5.2-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] DESCRIPTION=Another cute console display library -EAPI=0 +EAPI=5 HOMEPAGE=http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html -KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd +IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 +KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd LICENSE=GPL-2 -RDEPEND=>=sys-libs/ncurses-5.2-r2 +RDEPEND=>=sys-libs/ncurses-5.2-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] SLOT=5 SRC_URI=mirror://gnu/readline/readline-5.2.tar.gz ftp://ftp.cwru.edu/pub/bash/readline-5.2-patches/readline52-001 ftp://ftp.cwru.edu/pub/bash/readline-5.2-patches/readline52-002 ftp://ftp.cwru.edu/pub/bash/readline-5.2-patches/readline52-003 ftp://ftp.cwru.edu/pub/bash/readline-5.2-patches/readline52-004 ftp://ftp.cwru.edu/pub/bash/readline-5.2-patches/readline52-005 ftp://ftp.cwru.edu/pub/bash/readline-5.2-patches/readline52-006 ftp://ftp.cwru.edu/pub/bash/readline-5.2-patches/readline52-007 ftp://ftp.cwru.edu/pub/bash/readline-5.2-patches/readline52-008 ftp://ftp.cwru.edu/pub/bash/readline-5.2-patches/readline52-009 ftp://ftp.cwru.edu/pub/bash/readline-5.2-patches/readline52-010 ftp://ftp.cwru.edu/pub/bash/readline-5.2-patches/readline52-011 ftp://ftp.cwru.edu/pub/bash/readline-5.2-patches/readline52-012 ftp://ftp.cwru.edu/pub/bash/readline-5.2-patches/readline52-013 ftp://ftp.cwru.edu/pub/bash/readline-5.2-patches/readline52-014 mirror://gnu/readline/readline-5.2-patches/readline52-001 mirror://gnu/readline/readline-5.2-patches/readline52-002 mirror://gnu/readline/readline-5.2-patches/readline52-003 mirror://gnu/readline/readline-5.2-patches/readline52-004 mirror://gnu/readline/readline-5.2-patches/readline52-005 mirror://gnu/readline/readline-5.2-patches/readline52-006 mirror://gnu/readline/readline-5.2-patches/readline52-007 mirror://gnu/readline/readline-5.2-patches/readline52-008 mirror://gnu/readline/readline-5.2-patches/readline52-009 mirror://gnu/readline/readline-5.2-patches/readline52-010 mirror://gnu/readline/readline-5.2-patches/readline52-011 mirror://gnu/readline/readline-5.2-patches/readline52-012 mirror://gnu/readline/readline-5.2-patches/readline52-013 mirror://gnu/readline/readline-5.2-patches/readline52-014 -_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 flag-o-matic 2274fcc1e7ef6affaff5bcd636275417 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 185a06792159ca143528e7010368e8af -_md5_=232c0142cbc465f913e15a151df9e645 +_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 flag-o-matic 2274fcc1e7ef6affaff5bcd636275417 ltprune 2770eed66a9b8ef944714cd0e968182e multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build eed53a6313267c9fbcd35fc384bd0087 multilib-minimal 9139c3a57e077cb8e0d0f73ceb080b89 toolchain-funcs 185a06792159ca143528e7010368e8af +_md5_=105081e8d23b3812f92139f59819017c diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-libs/readline-6.2_p5-r1 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-libs/readline-6.2_p5-r1 deleted file mode 100644 index edf19886a2..0000000000 --- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-libs/readline-6.2_p5-r1 +++ /dev/null @@ -1,13 +0,0 @@ -DEFINED_PHASES=compile configure install postinst preinst prepare test unpack -DEPEND=>=sys-libs/ncurses-5.9-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] abi_x86_32? ( !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] !<=app-emulation/emul-linux-x86-baselibs-20131008-r7 ) virtual/pkgconfig -DESCRIPTION=Another cute console display library -EAPI=4 -HOMEPAGE=http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html -IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 -KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux -LICENSE=GPL-3 -RDEPEND=>=sys-libs/ncurses-5.9-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] abi_x86_32? ( !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] !<=app-emulation/emul-linux-x86-baselibs-20131008-r7 ) -SLOT=0 -SRC_URI=mirror://gnu/readline/readline-6.2.tar.gz ftp://ftp.cwru.edu/pub/bash/readline-6.2-patches/readline62-001 ftp://ftp.cwru.edu/pub/bash/readline-6.2-patches/readline62-002 ftp://ftp.cwru.edu/pub/bash/readline-6.2-patches/readline62-003 ftp://ftp.cwru.edu/pub/bash/readline-6.2-patches/readline62-004 ftp://ftp.cwru.edu/pub/bash/readline-6.2-patches/readline62-005 mirror://gnu/readline/readline-6.2-patches/readline62-001 mirror://gnu/readline/readline-6.2-patches/readline62-002 mirror://gnu/readline/readline-6.2-patches/readline62-003 mirror://gnu/readline/readline-6.2-patches/readline62-004 mirror://gnu/readline/readline-6.2-patches/readline62-005 -_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 flag-o-matic 2274fcc1e7ef6affaff5bcd636275417 ltprune 2770eed66a9b8ef944714cd0e968182e multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build eed53a6313267c9fbcd35fc384bd0087 multilib-minimal 9139c3a57e077cb8e0d0f73ceb080b89 toolchain-funcs 185a06792159ca143528e7010368e8af -_md5_=fab39484798a7686ecad8bb7ef406e63 diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-libs/readline-6.3_p8-r1 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-libs/readline-6.3_p8-r1 deleted file mode 100644 index 423ee1a062..0000000000 --- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-libs/readline-6.3_p8-r1 +++ /dev/null @@ -1,13 +0,0 @@ -DEFINED_PHASES=compile configure install postinst preinst prepare test unpack -DEPEND=>=sys-libs/ncurses-5.9-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] abi_x86_32? ( !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] !<=app-emulation/emul-linux-x86-baselibs-20131008-r7 ) virtual/pkgconfig -DESCRIPTION=Another cute console display library -EAPI=4 -HOMEPAGE=http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html -IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 -KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux -LICENSE=GPL-3 -RDEPEND=>=sys-libs/ncurses-5.9-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] abi_x86_32? ( !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] !<=app-emulation/emul-linux-x86-baselibs-20131008-r7 ) -SLOT=0 -SRC_URI=mirror://gnu/readline/readline-6.3.tar.gz ftp://ftp.cwru.edu/pub/bash/readline-6.3-patches/readline63-001 ftp://ftp.cwru.edu/pub/bash/readline-6.3-patches/readline63-002 ftp://ftp.cwru.edu/pub/bash/readline-6.3-patches/readline63-003 ftp://ftp.cwru.edu/pub/bash/readline-6.3-patches/readline63-004 ftp://ftp.cwru.edu/pub/bash/readline-6.3-patches/readline63-005 ftp://ftp.cwru.edu/pub/bash/readline-6.3-patches/readline63-006 ftp://ftp.cwru.edu/pub/bash/readline-6.3-patches/readline63-007 ftp://ftp.cwru.edu/pub/bash/readline-6.3-patches/readline63-008 mirror://gnu/readline/readline-6.3-patches/readline63-001 mirror://gnu/readline/readline-6.3-patches/readline63-002 mirror://gnu/readline/readline-6.3-patches/readline63-003 mirror://gnu/readline/readline-6.3-patches/readline63-004 mirror://gnu/readline/readline-6.3-patches/readline63-005 mirror://gnu/readline/readline-6.3-patches/readline63-006 mirror://gnu/readline/readline-6.3-patches/readline63-007 mirror://gnu/readline/readline-6.3-patches/readline63-008 -_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 flag-o-matic 2274fcc1e7ef6affaff5bcd636275417 ltprune 2770eed66a9b8ef944714cd0e968182e multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build eed53a6313267c9fbcd35fc384bd0087 multilib-minimal 9139c3a57e077cb8e0d0f73ceb080b89 toolchain-funcs 185a06792159ca143528e7010368e8af -_md5_=eca30b4187e2163398a6cc48c4373d46 diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-libs/readline-6.3_p8-r2 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-libs/readline-6.3_p8-r3 similarity index 70% rename from sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-libs/readline-6.3_p8-r2 rename to sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-libs/readline-6.3_p8-r3 index 437f0b1ab3..2de969b7cb 100644 --- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-libs/readline-6.3_p8-r2 +++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-libs/readline-6.3_p8-r3 @@ -1,13 +1,13 @@ DEFINED_PHASES=compile configure install postinst preinst prepare test unpack -DEPEND=>=sys-libs/ncurses-5.9-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] abi_x86_32? ( !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] !<=app-emulation/emul-linux-x86-baselibs-20131008-r7 ) virtual/pkgconfig +DEPEND=>=sys-libs/ncurses-5.9-r3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/pkgconfig DESCRIPTION=Another cute console display library -EAPI=4 +EAPI=5 HOMEPAGE=http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html IUSE=static-libs utils abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 -KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux +KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux LICENSE=GPL-3 -RDEPEND=>=sys-libs/ncurses-5.9-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] abi_x86_32? ( !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] !<=app-emulation/emul-linux-x86-baselibs-20131008-r7 ) +RDEPEND=>=sys-libs/ncurses-5.9-r3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] SLOT=0 SRC_URI=mirror://gnu/readline/readline-6.3.tar.gz ftp://ftp.cwru.edu/pub/bash/readline-6.3-patches/readline63-001 ftp://ftp.cwru.edu/pub/bash/readline-6.3-patches/readline63-002 ftp://ftp.cwru.edu/pub/bash/readline-6.3-patches/readline63-003 ftp://ftp.cwru.edu/pub/bash/readline-6.3-patches/readline63-004 ftp://ftp.cwru.edu/pub/bash/readline-6.3-patches/readline63-005 ftp://ftp.cwru.edu/pub/bash/readline-6.3-patches/readline63-006 ftp://ftp.cwru.edu/pub/bash/readline-6.3-patches/readline63-007 ftp://ftp.cwru.edu/pub/bash/readline-6.3-patches/readline63-008 mirror://gnu/readline/readline-6.3-patches/readline63-001 mirror://gnu/readline/readline-6.3-patches/readline63-002 mirror://gnu/readline/readline-6.3-patches/readline63-003 mirror://gnu/readline/readline-6.3-patches/readline63-004 mirror://gnu/readline/readline-6.3-patches/readline63-005 mirror://gnu/readline/readline-6.3-patches/readline63-006 mirror://gnu/readline/readline-6.3-patches/readline63-007 mirror://gnu/readline/readline-6.3-patches/readline63-008 _eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 flag-o-matic 2274fcc1e7ef6affaff5bcd636275417 ltprune 2770eed66a9b8ef944714cd0e968182e multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build eed53a6313267c9fbcd35fc384bd0087 multilib-minimal 9139c3a57e077cb8e0d0f73ceb080b89 toolchain-funcs 185a06792159ca143528e7010368e8af -_md5_=4049b82ac116f906ee2aa0359501165b +_md5_=544e159bd139df14237e80eee78f7025 diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-libs/readline-7.0_alpha b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-libs/readline-7.0_alpha deleted file mode 100644 index 7a4dad73f1..0000000000 --- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-libs/readline-7.0_alpha +++ /dev/null @@ -1,12 +0,0 @@ -DEFINED_PHASES=compile configure install postinst preinst prepare test unpack -DEPEND=>=sys-libs/ncurses-5.9-r3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] abi_x86_32? ( !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] !<=app-emulation/emul-linux-x86-baselibs-20131008-r7 ) virtual/pkgconfig -DESCRIPTION=Another cute console display library -EAPI=5 -HOMEPAGE=http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html -IUSE=static-libs utils abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 -LICENSE=GPL-3 -RDEPEND=>=sys-libs/ncurses-5.9-r3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] abi_x86_32? ( !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] !<=app-emulation/emul-linux-x86-baselibs-20131008-r7 ) -SLOT=0/7 -SRC_URI=ftp://ftp.cwru.edu/pub/bash/readline-7.0-alpha.tar.gz -_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 flag-o-matic 2274fcc1e7ef6affaff5bcd636275417 ltprune 2770eed66a9b8ef944714cd0e968182e multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build eed53a6313267c9fbcd35fc384bd0087 multilib-minimal 9139c3a57e077cb8e0d0f73ceb080b89 toolchain-funcs 185a06792159ca143528e7010368e8af -_md5_=cddf26803f123ee5fd27b184b97b17c3 diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-libs/readline-7.0_p3 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-libs/readline-7.0_p3 new file mode 100644 index 0000000000..d72346c420 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-libs/readline-7.0_p3 @@ -0,0 +1,13 @@ +DEFINED_PHASES=compile configure install postinst preinst prepare test unpack +DEPEND=>=sys-libs/ncurses-5.9-r3:0=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/pkgconfig +DESCRIPTION=Another cute console display library +EAPI=5 +HOMEPAGE=http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html +IUSE=static-libs utils abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 +KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux +LICENSE=GPL-3 +RDEPEND=>=sys-libs/ncurses-5.9-r3:0=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] +SLOT=0/7 +SRC_URI=mirror://gnu/readline/readline-7.0.tar.gz ftp://ftp.cwru.edu/pub/bash/readline-7.0-patches/readline70-001 ftp://ftp.cwru.edu/pub/bash/readline-7.0-patches/readline70-002 ftp://ftp.cwru.edu/pub/bash/readline-7.0-patches/readline70-003 mirror://gnu/readline/readline-7.0-patches/readline70-001 mirror://gnu/readline/readline-7.0-patches/readline70-002 mirror://gnu/readline/readline-7.0-patches/readline70-003 +_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 flag-o-matic 2274fcc1e7ef6affaff5bcd636275417 ltprune 2770eed66a9b8ef944714cd0e968182e multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build eed53a6313267c9fbcd35fc384bd0087 multilib-minimal 9139c3a57e077cb8e0d0f73ceb080b89 toolchain-funcs 185a06792159ca143528e7010368e8af +_md5_=5fd6c80b4fb7e13958ac9f18f59232ba diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-libs/readline-7.0_p3-r1 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-libs/readline-7.0_p3-r1 new file mode 100644 index 0000000000..667417ef29 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-libs/readline-7.0_p3-r1 @@ -0,0 +1,13 @@ +DEFINED_PHASES=compile configure install postinst preinst prepare test unpack +DEPEND=>=sys-libs/ncurses-5.9-r3:0=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/pkgconfig +DESCRIPTION=Another cute console display library +EAPI=6 +HOMEPAGE=http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html +IUSE=static-libs utils abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 +KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux +LICENSE=GPL-3 +RDEPEND=>=sys-libs/ncurses-5.9-r3:0=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] +SLOT=0/7 +SRC_URI=mirror://gnu/readline/readline-7.0.tar.gz ftp://ftp.cwru.edu/pub/bash/readline-7.0-patches/readline70-001 ftp://ftp.cwru.edu/pub/bash/readline-7.0-patches/readline70-002 ftp://ftp.cwru.edu/pub/bash/readline-7.0-patches/readline70-003 mirror://gnu/readline/readline-7.0-patches/readline70-001 mirror://gnu/readline/readline-7.0-patches/readline70-002 mirror://gnu/readline/readline-7.0-patches/readline70-003 +_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 flag-o-matic 2274fcc1e7ef6affaff5bcd636275417 ltprune 2770eed66a9b8ef944714cd0e968182e multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build eed53a6313267c9fbcd35fc384bd0087 multilib-minimal 9139c3a57e077cb8e0d0f73ceb080b89 toolchain-funcs 185a06792159ca143528e7010368e8af +_md5_=7e3b2c20b8306860e27368afcec0ad32 diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/readline/ChangeLog b/sdk_container/src/third_party/portage-stable/sys-libs/readline/ChangeLog deleted file mode 100644 index 293be86adc..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-libs/readline/ChangeLog +++ /dev/null @@ -1,875 +0,0 @@ -# ChangeLog for sys-libs/readline -# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/readline/ChangeLog,v 1.231 2015/07/13 07:18:09 vapier Exp $ - - 13 Jul 2015; Mike Frysinger readline-6.3_p8-r2.ebuild: - Mark sparc stable #548756. - -*readline-7.0_alpha (13 Jul 2015) - - 13 Jul 2015; Mike Frysinger +readline-7.0_alpha.ebuild: - Version bump. - - 30 May 2015; Mikle Kolyada readline-6.3_p8-r2.ebuild: - ppc stable wrt bug #548756 - - 27 May 2015; Jeroen Roovers readline-6.3_p8-r2.ebuild: - Stable for PPC64 (bug #548756). - - 27 May 2015; Jeroen Roovers readline-6.3_p8-r2.ebuild: - Stable for HPPA (bug #548756). - - 26 May 2015; Mike Frysinger metadata.xml, - readline-6.3_p8-r2.ebuild: - Add USE=utils to control install of rlfe util. - - 23 May 2015; Mikle Kolyada readline-6.3_p8-r2.ebuild: - ia64 stable wrt bug #548756 - - 22 May 2015; Mikle Kolyada readline-6.3_p8-r2.ebuild: - arm stable wrt bug #548756 - - 22 May 2015; Mikle Kolyada readline-6.3_p8-r2.ebuild: - x86 stable wrt bug #548756 - - 21 May 2015; Mikle Kolyada readline-6.3_p8-r2.ebuild: - amd64 stable wrt bug #548756 - - 21 May 2015; Matt Turner readline-6.3_p8-r2.ebuild: - alpha stable, bug 548756. - -*readline-6.3_p8-r2 (21 Jan 2015) - - 21 Jan 2015; Lars Wendler - +readline-6.3_p8-r2.ebuild, +files/readline-6.3-read-eof.patch: - Added a fix from upstream. - - 29 Dec 2014; Lars Wendler -readline-6.2_p1.ebuild, - -readline-6.3_p8.ebuild, readline-6.3_p8-r1.ebuild: - Fixed installation location for documents (bug #533770 by Chris Mayo). - Removed old versions. - - 27 Oct 2014; Mike Frysinger readline-6.2_p5-r1.ebuild: - Mark m68k/s390/sh stable. - - 15 Sep 2014; Agostino Sarubbo readline-6.2_p5-r1.ebuild: - Stable for sparc, wrt bug #512012 - -*readline-6.3_p8-r1 (30 Aug 2014) - - 30 Aug 2014; Lars Wendler - -readline-6.3_p6-r1.ebuild, +readline-6.3_p8-r1.ebuild, - +files/readline-6.3-fix-long-prompt-vi-search.patch, - -files/readline-6.3-horizontal-redisplay.patch, - -files/readline-6.3-readline-sigint-cleanup.patch, - -files/readline-6.3-revert-all-at-newline-history-segfault.patch: - Revbump to fix very long prompts in vi mode. Removed old. - - 23 Aug 2014; Agostino Sarubbo readline-6.2_p5-r1.ebuild: - Stable for ia64, wrt bug #512012 - - 21 Aug 2014; Agostino Sarubbo readline-6.2_p5-r1.ebuild: - Stable for ppc64, wrt bug #518006 - -*readline-6.3_p8 (12 Aug 2014) - - 12 Aug 2014; Lars Wendler -readline-6.3_p6.ebuild, - +readline-6.3_p8.ebuild: - Version bump. Removed old. - - 28 Jul 2014; Agostino Sarubbo readline-6.2_p5-r1.ebuild: - Stable for ppc, wrt bug #512012 - - 18 Jul 2014; Pacho Ramos readline-6.2_p5-r1.ebuild: - x86 stable, bug #513802 - - 18 Jul 2014; Matt Turner readline-6.2_p5-r1.ebuild: - alpha stable, bug 513802. - - 11 Jul 2014; Mikle Kolyada readline-6.2_p5-r1.ebuild: - Mark arm64 stable - - 11 Jul 2014; Markus Meier readline-6.2_p5-r1.ebuild: - arm stable, bug #513802 - -*readline-6.3_p6-r1 (08 Jul 2014) - - 08 Jul 2014; Lars Wendler - -readline-6.3_p5-r1.ebuild, +readline-6.3_p6-r1.ebuild, - +files/readline-6.3-revert-all-at-newline-history-segfault.patch: - Revbump to fix a segfault with revert-all-at-newline. Removed old. - - 06 Jul 2014; Mikle Kolyada readline-6.2_p5-r1.ebuild: - amd64 stable wrt bug #513802 - - 06 Jul 2014; Jeroen Roovers readline-6.2_p5-r1.ebuild: - Stable for HPPA (bug #513802). - - 18 Jun 2014; Michał Górny readline-6.2_p5-r1.ebuild, - readline-6.3_p5-r1.ebuild, readline-6.3_p6.ebuild: - Update dependencies to require guaranteed EAPI=5 or multilib ebuilds, bug - #513718. - -*readline-6.3_p6 (18 May 2014) - - 18 May 2014; Lars Wendler -readline-6.3_p5.ebuild, - +readline-6.3_p6.ebuild: - Version bump. Removed old. - - 28 Apr 2014; Michał Górny readline-6.2_p5-r1.ebuild, - readline-6.3_p5-r1.ebuild, readline-6.3_p5.ebuild: - Replace multilib_build_binaries with multilib_is_native_abi, in order to put - an end to the confusion introduced by having two functions, the proper one - suggesting it is just for binaries. - -*readline-6.3_p5-r1 (22 Apr 2014) - - 22 Apr 2014; Lars Wendler -readline-6.3_p3.ebuild, - +readline-6.3_p5-r1.ebuild, +files/readline-6.3-horizontal-redisplay.patch: - Added upstream fix. Removed old. - -*readline-6.3_p5 (16 Apr 2014) - - 16 Apr 2014; Lars Wendler +readline-6.3_p5.ebuild: - Version bump. - -*readline-6.3_p3 (31 Mar 2014) - - 31 Mar 2014; Lars Wendler -readline-6.3-r4.ebuild, - +readline-6.3_p3.ebuild, -files/readline-6.3-dispatch-multikey.patch, - -files/readline-6.3-vi-last.patch: - Bump to latest official patch release. - -*readline-6.3-r4 (28 Mar 2014) - - 28 Mar 2014; Mike Frysinger +readline-6.3-r4.ebuild, - -readline-6.3-r3.ebuild, files/readline-6.3-dispatch-multikey.patch: - Update multikey patch from upstream #504440#8 by Martin von Gagern. - -*readline-6.3-r3 (28 Mar 2014) - - 28 Mar 2014; Mike Frysinger - +files/readline-6.3-readline-sigint-cleanup.patch, +readline-6.3-r3.ebuild, - -readline-6.3-r2.ebuild: - Add fix from upstream for CTRL+C display. - -*readline-6.3-r2 (13 Mar 2014) - - 13 Mar 2014; Mike Frysinger - +files/readline-6.3-dispatch-multikey.patch, +readline-6.3-r2.ebuild, - -readline-6.3-r1.ebuild: - Add fix from upstream for some crashes #504440 by Seemant Kulleen. - -*readline-6.3-r1 (10 Mar 2014) - - 10 Mar 2014; Mike Frysinger - +files/readline-6.3-vi-last.patch, +readline-6.3-r1.ebuild, - -readline-6.3.ebuild: - Force some cross-compile tests to the right answer #503312 by Hristo Venev. - Add fix from upstream for vi mode. - - 28 Feb 2014; Mike Frysinger readline-6.3.ebuild: - Unmask for all. - -*readline-6.3 (27 Feb 2014) - - 27 Feb 2014; Lars Wendler +readline-6.3.ebuild: - Version bump. - - 20 Jan 2014; Mike Frysinger readline-6.2_p5-r1.ebuild: - Depend on virtual/pkgconfig for ncurses needs #498586 by palme3000. - - 18 Jan 2014; Mike Frysinger readline-6.2_p1.ebuild, - readline-6.2_p5-r1.ebuild: - Add arm64 love. - - 07 Jan 2014; Lars Wendler -readline-6.1.ebuild, - -readline-6.1_p2.ebuild, -readline-6.2.ebuild, -readline-6.2_p1-r1.ebuild, - -readline-6.2_p4.ebuild, -readline-6.2_p5.ebuild, - -files/readline-6.1-rlfe-freebsd.patch: - Removed old versions and files. - - 30 Dec 2013; Mike Frysinger readline-6.2_p5-r1.ebuild: - tweak rlfe sed a bit #457558 - - 30 Dec 2013; Alexis Ballier readline-6.2_p5-r1.ebuild: - update blocker on emul-linux - - 29 Dec 2013; Mike Frysinger readline-6.2_p5-r1.ebuild: - Update rlfe helper to use ncurses info via pkg-config #457558 by Travis - Hansen. - -*readline-6.2_p5-r1 (27 Dec 2013) - - 27 Dec 2013; Michał Górny +readline-6.2_p5-r1.ebuild: - Add multilib support, bug #496006. - - 25 Dec 2013; Mike Frysinger readline-6.2_p5.ebuild: - update dodoc line - -*readline-6.2_p5 (25 Dec 2013) - - 25 Dec 2013; Mike Frysinger - +files/readline-6.2-rlfe-tgoto.patch, +readline-6.2_p5.ebuild: - Version bump. Fix tgoto test in rlfe example #385091 by Agostino Sarubbo. - Use pkg-config to get ncurses linking info #457558 by Travis Hansen. Export - AR ourselves to use a better default #484866 by Agostino Sarubbo. - - 17 Feb 2013; Zac Medico readline-6.2_p4.ebuild: - Add ~arm-linux keyword. - -*readline-6.2_p4 (03 Jan 2013) - - 03 Jan 2013; Mike Frysinger +readline-6.2_p4.ebuild: - Version bump #449810 by Lars Wendler. - - 30 Apr 2012; Mike Frysinger readline-6.2_p1-r1.ebuild: - Create a config.cache with first configure and re-use it with the rlfe subdir - for a slight speedup. - - 26 Apr 2012; Alexis Ballier readline-6.2_p1-r1.ebuild: - keyword ~amd64-fbsd - - 14 Apr 2012; Zac Medico readline-6.2_p1-r1.ebuild: - Add ~amd64-linux and ~x86-linux keywords. - - 28 Mar 2012; Mike Frysinger readline-6.2_p1.ebuild: - Drop ancient bash depend in stable ebuild too. - -*readline-6.2_p1-r1 (10 Mar 2012) - - 10 Mar 2012; Mike Frysinger +readline-6.2_p1-r1.ebuild: - Add USE=static-libs support #378299 by Agostino Sarubbo. - - 06 Jan 2012; Mark Loeser readline-6.2_p1.ebuild: - Stable for ppc64; bug #384463 - - 23 Oct 2011; nixnut readline-6.2_p1.ebuild: - ppc stable #384463 - - 12 Oct 2011; Raúl Porcel readline-6.2_p1.ebuild: - alpha/ia64/m68k/s390/sh/sparc stable wrt #384463 - - 09 Oct 2011; Jeroen Roovers readline-6.2_p1.ebuild: - Stable for HPPA (bug #384463). - - 08 Oct 2011; Markus Meier readline-6.2_p1.ebuild: - arm stable, bug #384463 - - 01 Oct 2011; Pawel Hajdan jr readline-6.2_p1.ebuild: - x86 stable wrt bug #384463 - - 26 Sep 2011; Tony Vroon readline-6.2_p1.ebuild: - Marked stable on AMD64 based on arch testing by Agostino "ago" Sarubbo & - Elijah "Armageddon" El Lazkani in bug #384463. - - 26 Sep 2011; Mike Frysinger readline-6.1.ebuild, - readline-6.1_p2.ebuild, readline-6.2.ebuild, readline-6.2_p1.ebuild: - Drop unused autotools include #384463#1 by Agostino Sarubbo. - -*readline-6.2_p1 (01 Mar 2011) - - 01 Mar 2011; Mike Frysinger +readline-6.2_p1.ebuild: - Version bump. - - 01 Mar 2011; Brent Baude readline-6.1_p2.ebuild: - stable ppc64, bug 354939 - - 26 Feb 2011; Raúl Porcel readline-6.1_p2.ebuild: - alpha/arm/ia64/m68k/s390/sh/sparc stable wrt #354939 - - 22 Feb 2011; nixnut readline-6.1_p2.ebuild: - ppc stable #354939 - - 21 Feb 2011; Jeroen Roovers readline-6.1_p2.ebuild: - Stable for HPPA (bug #354939). - - 20 Feb 2011; Pawel Hajdan jr - readline-6.1_p2.ebuild: - x86 stable wrt bug #354939 - - 16 Feb 2011; Markos Chandras readline-6.1_p2.ebuild: - Stable on amd64 wrt bug #354939 - -*readline-6.2 (15 Feb 2011) - - 15 Feb 2011; Mike Frysinger +readline-6.2.ebuild: - Version bump. - - 09 May 2010; Raúl Porcel readline-6.1.ebuild: - alpha stable wrt #310819 - - 09 Apr 2010; Markos Chandras readline-6.1.ebuild: - Stable on amd64 wrt bug #310819 - - 07 Apr 2010; Mike Frysinger readline-6.1.ebuild: - Mark arm/ia64/s390/sh stable #310819. - - 01 Apr 2010; Jeroen Roovers readline-6.1.ebuild: - Stable for HPPA (bug #310819). - - 30 Mar 2010; Christian Faulhammer readline-6.1.ebuild: - stable x86, bug 310819 - - 27 Mar 2010; Tiago Cunha readline-6.1.ebuild: - stable sparc, bug 310819 - - 24 Mar 2010; Javier Villavicencio - readline-6.1_p2.ebuild, +files/readline-6.1-rlfe-freebsd.patch: - Fix for bug 301508, rlfe build on FreeBSD. - - 23 Mar 2010; Brent Baude readline-6.1.ebuild: - stable ppc, bug 310819 - - 23 Mar 2010; Brent Baude readline-6.1.ebuild: - Marking readline-6.1 ppc64 for bug 310819 - -*readline-6.1_p2 (23 Mar 2010) - - 23 Mar 2010; Mike Frysinger +readline-6.1_p2.ebuild: - Version bump. - - 12 Mar 2010; Samuli Suominen - readline-6.0_p4.ebuild, readline-6.1.ebuild: - Fix license from GPL-2 to GPL-3 wrt #308829 by Thomas Kahle. - - 24 Jan 2010; Tobias Klausmann - readline-6.0_p4.ebuild: - Stable on alpha, bug #297906 - - 06 Jan 2010; Markus Meier readline-6.0_p4.ebuild: - amd64 stable, bug #297906 - -*readline-6.1 (05 Jan 2010) - - 05 Jan 2010; Mike Frysinger +readline-6.1.ebuild: - Version bump. - - 05 Jan 2010; Mike Frysinger readline-5.2_p14.ebuild: - Stabilize old ABI SLOT version. - - 29 Dec 2009; Christian Faulhammer - readline-6.0_p4.ebuild: - stable x86, bug 297906 - - 28 Dec 2009; nixnut readline-6.0_p4.ebuild: - ppc stable #297906 - - 28 Dec 2009; Tiago Cunha readline-6.0_p4.ebuild: - stable sparc, bug 297906 - - 26 Dec 2009; Brent Baude readline-6.0_p4.ebuild: - Marking readline-6.0_p4 ppc64 for bug 297906 - - 24 Dec 2009; Jeroen Roovers readline-6.0_p4.ebuild: - Stable for HPPA (bug #297906). - - 05 Oct 2009; Raúl Porcel readline-6.0_p3.ebuild: - ia64/m68k/s390/sh/sparc stable wrt #283155 - -*readline-5.2_p14 (03 Oct 2009) - - 03 Oct 2009; Mike Frysinger +readline-5.2_p14.ebuild: - New version for .5 SONAME only. - - 30 Sep 2009; Mike Frysinger readline-6.0_p4.ebuild: - Restore readline symlink to find local headers. - - 27 Sep 2009; Mike Frysinger readline-6.0_p4.ebuild: - Link rlfe dynamically against readline #284568 by Jonathan Callen. - - 19 Sep 2009; nixnut readline-6.0_p3.ebuild: - ppc stable #283155 - - 13 Sep 2009; Markus Meier readline-6.0_p3.ebuild: - arm stable, bug #283155 - - 09 Sep 2009; Markus Meier readline-6.0_p3.ebuild: - amd64/x86 stable, bug #283155 - - 07 Sep 2009; Tobias Klausmann - readline-6.0_p3.ebuild: - Stable on alpha, bug #283155 - - 07 Sep 2009; Tobias Klausmann - readline-6.0_p3.ebuild: - Stable on alpha, bug #283155 - - 07 Sep 2009; Jeroen Roovers readline-6.0_p3.ebuild: - Stable for HPPA (bug #283155). - - 31 Aug 2009; Brent Baude readline-6.0_p3.ebuild: - stable ppc64, bug 283155 - -*readline-6.0_p4 (29 Aug 2009) - - 29 Aug 2009; Mike Frysinger +readline-6.0_p4.ebuild: - Version bump #283138 by Arfrever Frehtes Taifersar Arahesis. - - 18 May 2009; Diego E. Pettenò - readline-6.0_p3.ebuild: - Fix build on Gentoo/FreeBSD by removing references do objformat. - -*readline-6.0_p3 (17 May 2009) - - 17 May 2009; Mike Frysinger +readline-6.0_p3.ebuild: - Version bump #270170 by Lars Wendler. - - 24 Feb 2009; Joshua Kinard readline-6.0.ebuild: - Skip the rlfe bits if doing cross-compiling. - -*readline-4.3_p5 (23 Feb 2009) - - 23 Feb 2009; Mike Frysinger +readline-4.3_p5.ebuild: - Add a readline-4.x ebuild for the ABI lib only. - -*readline-6.0 (21 Feb 2009) - - 21 Feb 2009; Mike Frysinger - +files/readline-6.0-rlfe-build.patch, +readline-6.0.ebuild: - Version bump #259830 by Lars (Polynomial-C). - - 21 Feb 2009; Ferris McCormick readline-5.2_p13.ebuild: - Sparc really stable this time --- Bug #255707. - - 15 Feb 2009; Brent Baude readline-5.2_p13.ebuild: - stable ppc, bug 255707 - - 07 Feb 2009; Raúl Porcel readline-5.2_p13.ebuild: - arm/ia64/s390/sh/sparc stable wrt #255707 - - 26 Jan 2009; Tobias Klausmann - readline-5.2_p13.ebuild: - Stable on alpha, bug #255707 - - 24 Jan 2009; Jeroen Roovers readline-5.2_p13.ebuild: - Stable for HPPA (bug #255707). - - 24 Jan 2009; Markus Meier readline-5.2_p13.ebuild: - amd64/x86 stable, bug #255707 - - 23 Jan 2009; Brent Baude readline-5.2_p13.ebuild: - stable ppc64, bug 255707 - -*readline-5.2_p13 (23 Nov 2008) - - 23 Nov 2008; Mike Frysinger +readline-5.2_p13.ebuild: - Version bump #247646 by Lars (Polynomial-C). - - 08 Apr 2008; Mike Frysinger - +files/readline-5.2-no-ignore-shlib-errors.patch, - readline-5.2_p12-r1.ebuild: - Dont ignore errors in the shlib subdir #216952 by Markus Ullmann. - - 26 Feb 2008; Santiago M. Mola - readline-5.2_p12-r1.ebuild: - amd64 stable wrt bug #211332 - - 26 Feb 2008; Brent Baude readline-5.2_p12-r1.ebuild: - stable ppc, bug 211332 - - 26 Feb 2008; Brent Baude readline-5.2_p12-r1.ebuild: - stable ppc64, bug 211332 - - 25 Feb 2008; Jeroen Roovers readline-5.2_p12-r1.ebuild: - Stable for HPPA (bug #211332). - - 07 Feb 2008; Raúl Porcel readline-5.2_p12-r1.ebuild: - alpha/ia64/sparc/x86 stable - -*readline-5.2_p12-r1 (02 Jan 2008) - - 02 Jan 2008; Mike Frysinger - +readline-5.2_p12-r1.ebuild: - Make sure we continue to always link against ncurses as reported by welp. - -*readline-5.2_p12 (02 Jan 2008) - - 02 Jan 2008; Mike Frysinger +readline-5.2_p12.ebuild: - Version bump. - - 29 Sep 2007; Jeroen Roovers readline-5.2_p7.ebuild: - Stable for HPPA (bug #194013). - - 28 Sep 2007; nixnut readline-5.2_p7.ebuild: - Stable on ppc wrt bug 194013 - - 28 Sep 2007; Raúl Porcel readline-5.2_p7.ebuild: - alpha/ia64/x86 stable wrt #194013 - - 28 Sep 2007; Ferris McCormick readline-5.2_p7.ebuild: - Sparc stable --- Bug #194013 - - 28 Sep 2007; Christoph Mende readline-5.2_p7.ebuild: - Stable on amd64 wrt bug #194013 - - 28 Sep 2007; Joshua Kinard readline-5.2_p7.ebuild: - Stable on mips, per #194013. - - 27 Sep 2007; Brent Baude readline-5.2_p7.ebuild: - Marking readline-5.2_p7 ppc64 for 194013 - -*readline-5.2_p7 (24 Aug 2007) - - 24 Aug 2007; Mike Frysinger +readline-5.2_p7.ebuild: - Version bump. - - 30 Jul 2007; Markus Rothe readline-5.2_p4.ebuild: - Stable on ppc64; bug #186286 - - 25 Jul 2007; Jeroen Roovers readline-5.2_p4.ebuild: - Stable for HPPA (bug #186286). - - 24 Jul 2007; Steve Dibb readline-5.2_p4.ebuild: - amd64 stable, bug 186286 - - 23 Jul 2007; Raúl Porcel readline-5.2_p4.ebuild: - alpha stable wrt #186286 - - 23 Jul 2007; nixnut readline-5.2_p4.ebuild: - Stable on ppc wrt bug 186286 - - 23 Jul 2007; Joshua Kinard readline-5.2_p4.ebuild: - Stable on mips, per #186286. - - 23 Jul 2007; Gustavo Zacarias - readline-5.2_p4.ebuild: - Stable on sparc wrt #186286 - - 30 Jun 2007; Raúl Porcel readline-5.2_p4.ebuild: - ia64/x86 stable - - 12 May 2007; Joshua Kinard readline-5.2_p2.ebuild: - Stable on mips. - -*readline-5.2_p4 (02 May 2007) - - 02 May 2007; Mike Frysinger +readline-5.2_p4.ebuild: - Version bump. - - 24 Apr 2007; Raúl Porcel readline-5.2_p2.ebuild: - ia64 + x86 stable - -*readline-5.2_p2 (22 Mar 2007) - - 22 Mar 2007; Mike Frysinger +readline-5.2_p2.ebuild: - Version bump. - - 13 Jan 2007; Mike Frysinger readline-4.3-r5.ebuild, - readline-5.0-r2.ebuild, readline-5.1_p4.ebuild, readline-5.2.ebuild, - readline-5.2_p1.ebuild: - Switch to using preserve_old_lib(). - - 04 Jan 2007; Diego Pettenò readline-4.3-r5.ebuild: - Remove gnuconfig usage. - -*readline-5.2_p1 (16 Dec 2006) - - 16 Dec 2006; Mike Frysinger +readline-5.2_p1.ebuild: - Version bump. - - 17 Oct 2006; Roy Marples readline-5.1_p4.ebuild, - readline-5.2.ebuild: - Added ~sparc-fbsd keyword. - - 13 Oct 2006; Mike Frysinger - +files/readline-5.2-rlfe-build.patch, readline-5.2.ebuild: - Link against the local readline #151174 by Javier Armendariz. - - 13 Oct 2006; Roy Marples - +files/readline-5.1-fbsd-pic.patch, readline-5.1_p4.ebuild, - readline-5.2.ebuild: - Always build with -fPIC on FreeBSD. - -*readline-5.2 (12 Oct 2006) - - 12 Oct 2006; Mike Frysinger +readline-5.2.ebuild: - Version bump. - - 19 Aug 2006; Fabian Groffen readline-5.1_p4.ebuild: - Marked ppc-macos stable for progressive users (bug #129885) - - 27 Apr 2006; Alec Warner - files/digest-readline-4.3-r5, files/digest-readline-4.3-r6, - files/digest-readline-5.0-r2, Manifest: - Fixing SHA256 digest, pass four - - 29 Apr 2006; Joshua Kinard readline-5.1_p4.ebuild: - Marked stable on mips. - - 18 Apr 2006; Gustavo Zacarias - readline-5.1_p4.ebuild: - Stable on sparc wrt #129885 - - 17 Apr 2006; Markus Rothe readline-5.1_p4.ebuild: - Stable on ppc64; bug #129885 - - 16 Apr 2006; Bryan Østergaard readline-5.1_p4.ebuild: - Marked stable on amd64, bug 129885. - - 15 Apr 2006; readline-5.1_p4.ebuild: - Stable on ppc. Bug #129885 - - 15 Apr 2006; Mark Loeser readline-5.1_p4.ebuild: - Stable on x86; bug #129885 - - 30 Mar 2006; Diego Pettenò readline-5.1_p4.ebuild: - Add ~x86-fbsd keyword. - -*readline-5.1_p4 (21 Mar 2006) - - 21 Mar 2006; Mike Frysinger +readline-5.1_p4.ebuild: - Version bump. - -*readline-5.1_p2 (17 Mar 2006) - - 17 Mar 2006; Mike Frysinger +readline-5.1_p3.ebuild: - Version bump. - - 09 Feb 2006; Mike Frysinger - files/readline-5.1-rlfe-uclibc.patch: - Make sys/stropts.h a proper configure check/include and pull in more headers - to silence warnings #117060 by Benigno B. Junior. - -*readline-5.1_p2 (04 Feb 2006) - - 04 Feb 2006; Mike Frysinger +readline-5.1_p2.ebuild: - Version bump. - - 05 Jan 2006; Diego Pettenò - +files/readline-5.1-rlfe-libutil.patch, readline-5.1-r2.ebuild: - Add patch to complete rlfe linking when openpty() is in libutil. - - 27 Dec 2005; Joel Martin readline-5.1-r2.ebuild: - Cross-compile fix was partially backed out, put it back in. - - 24 Dec 2005; +files/readline-5.1-rlfe-uclibc.patch, - readline-5.1-r2.ebuild: - - uclibc does not contain a stropts.h so we exclude it from rlfe - - 24 Dec 2005; Mike Frysinger - +files/readline-5.1-rlfe-build.patch, readline-5.1-r2.ebuild: - Make sure rlfe builds against the local version of readline #116483. - - 23 Dec 2005; Joel Martin readline-5.1-r2.ebuild: - rlfe does not cross-compile, don't build it when cross-compiling - - 22 Dec 2005; Mike Frysinger - -files/readline-5.1-callback-segv.patch, readline-5.1-r2.ebuild: - Update to use the official readline patch. - -*readline-5.1-r2 (21 Dec 2005) - - 21 Dec 2005; Aron Griffis +readline-5.1-r2.ebuild: - Install rlfe from the examples directory - -*readline-5.1-r1 (20 Dec 2005) - - 20 Dec 2005; Mike Frysinger - +files/readline-5.1-callback-segv.patch, - +files/readline-5.1-cleanups.patch, +readline-5.1-r1.ebuild: - Grab patch from SuSe for segfault #115326 by Seemant Kulleen. - -*readline-5.1 (10 Dec 2005) - - 10 Dec 2005; Mike Frysinger +readline-5.1.ebuild: - Version bump. - - 10 Sep 2005; Kito readline-5.0-r2.ebuild: - ~ppc-macos keyword. Keep shlibs in /usr/lib and skip gen_usr_ldscript on - Darwin userland. - - 16 Jul 2005; Mike Frysinger - +files/readline-5.0-darwin.patch, readline-5.0-r2.ebuild: - Fix support for Darwin8. Patch by Kito #99143. - - 27 Jun 2005; Aron Griffis - +files/readline-5.0-parallel.patch, readline-5.0-r2.ebuild: - Fix parallel build - - 09 Jun 2005; Mike Frysinger readline-5.0-r2.ebuild: - Stabilize for all arches. - - 14 Feb 2005; Michael Sterrett readline-4.3-r6.ebuild: - macos went away - -*readline-5.0-r2 (12 Feb 2005) - - 12 Feb 2005; Mike Frysinger - +files/readline-5.0-del-backspace-policy.patch, - +files/readline-5.0-no_rpath.patch, +files/readline-5.0-self-insert.patch, - +files/readline-5.0-solaris.patch, +readline-5.0-r2.ebuild: - Add some patches from Debian/Fedora fixing #74807 by Ivan Todoroski in the - process. - - 11 Feb 2005; Mike Frysinger +files/5.0-solaris.patch, - readline-5.0-r1.ebuild: - Add patch by Sunil to fix solaris linking #81058. - - 03 Jan 2005; Ciaran McCreesh : - Change encoding to UTF-8 for GLEP 31 compliance - - 24 Nov 2004; Mike Frysinger readline-5.0-r1.ebuild: - Force ncurses linking #71420. - - 30 Sep 2004; Gustavo Zacarias readline-4.3-r5.ebuild: - Stable on sparc - -*readline-5.0-r1 (29 Sep 2004) - - 29 Sep 2004; Mike Frysinger - +files/bash-3.0-etc-inputrc.patch, +readline-5.0-r1.ebuild: - Add more patches from upstream and add support for /etc/inputrc #38955. - - 29 Sep 2004; Lina Pezzella readline-4.3-r6.ebuild: - Fixed collisions with history(3) on macos. - - 02 Sep 2004; Jeremy Huddleston readline-5.0.ebuild: - get_libdir fixups for backwards compatibility with readline-4. - - 26 Aug 2004; Travis Tilley readline-4.3-r5.ebuild, - readline-4.3-r6.ebuild, readline-5.0.ebuild: - readline failed to install correctly when lib64 was a directory, CONF_LIBDIR - wasnt set, and when using portage 2.0.50. to fix this i've converted the - ebuilds to using the new get_libdir function, set - --libdir=/usr/$(get_libdir), and changed einstall to make DESTDIR=${D} - install (since the version in 2.0.50 doesnt set libdir, breaking sandbox) - - 24 Aug 2004; Sven Wegener readline-4.1-r5.ebuild, - readline-4.3-r4.ebuild, readline-4.3-r5.ebuild, readline-4.3-r6.ebuild, - readline-5.0.ebuild: - Changed SRC_URI to use mirror:// syntax. Don't assign default to S and added - missing IUSE. - - 14 Aug 2004; Travis Tilley readline-4.3-r5.ebuild, - readline-4.3-r6.ebuild, readline-5.0.ebuild: - added CONF_LIBDIR support and changed make install to einstall to avoid a - sandbox violation that occurs when CONF_LIBDIR is set - -*readline-5.0 (28 Jul 2004) - - 28 Jul 2004; Mike Frysinger readline-4.3-r4.ebuild, - readline-4.3-r5.ebuild, readline-4.3-r6.ebuild, +readline-5.0.ebuild: - Version bump #58648. Also add in support for upgrading from previous - incompatible versions #29865. - - 02 Jul 2004; Jeremy Huddleston - readline-4.1-r5.ebuild, readline-4.2a-r1.ebuild, readline-4.2a-r2.ebuild: - virtual/glibc -> virtual/libc - - 11 Jun 2004; Bryan Østergaard readline-4.3-r5.ebuild: - Stable on alpha. - - 21 Mar 2004; Joshua Kinard readline-4.3-r5.ebuild: - Added gnuconfig support for mips - - 21 Feb 2004; Brad House readline-4.3-r5.ebuild: - stable on amd64 for 2004.0 release - -*readline-4.3-r5 (28 Sep 2003) - - 28 Sep 2003; Martin Schlemmer readline-4.3-r5.ebuild: - Update to use official patches, which also have the multi-byte stuff. - - 17 Sep 2003; Jon Portnoy readline-4.3-r4.ebuild : - ia64 keywords. - - 24 Jun 2003; Aron Griffis readline-4.3-r4.ebuild: - Mark stable on alpha - - 15 Mar 2003; Martin Schlemmer readline-4.3-r4.ebuild : - Remove /lib/*.old files, closing bug #16731. Mark stable for x86. - - 13 Mar 2003; Olivier Reisch readline-4.2a-r2.ebuild: - Marked ppc stable. - -*readline-4.2a-r2 (13 Mar 2003) - - 13 Mar 2003; Seemant Kulleen readline-4.2a-r2.ebuild: - force upgrade to install the proper header - - 20 Feb 2003; Zach Welch readline-4.3-r4.ebuild : - Added arm to keywords. - - 07 Feb 2003; Guy Martin readline-4.3-r4.ebuild : - Added hppa to keywords. - - 12 Dec 2002; Jan Seidel readline-4.2a-r1.ebuild : - - Added mips to keywords. - -*readline-4.3-r4 (09 Dec 2002) - - 28 Mar 2003; Christian Birchinger readline-4.3-r4.ebuild: - Added sparc stable keyword - - 24 Feb 2003; Nicholas Wourms readline-4.3-r4.ebuild : - Marked as stable for mips. - - 09 Dec 2002; Jon Portnoy readline-4.3-r4.ebuild : - - Added a patch from upstream maintainer to fix bug: - - http://bugs.gentoo.org/show_bug.cgi?id=11762 - - (Python segfaults when using latin-1 chars in interactive mode) - - 06 Dec 2002; Rodney Rees : changed sparc ~sparc keywords - -*readline-4.1-r5 (26 Oct 2002) -*readline-4.2a-r1 (26 Oct 2002) - - 05 Mar 2003; Seemant Kulleen readline-4.2a-r1.ebuild: - fixed a problem with a broken include in the tilde.h file - -*readline-4.3-r3 (26 Oct 2002) - - 24 Feb 2003; Nicholas Wourms readline-4.3-r3.ebuild : - Marked as stable for mips. - - 26 Oct 2002; Martin Schlemmer readline*.ebuild : - Add linker scripts in /usr/lib to fix bug #4411. - -*readline-4.3-r2 (20 Oct 2002) - - 20 Oct 2002; Martin Schlemmer readline-4.3-r2.ebuild : - Add some official patches. - -*readline-4.3-r1 (1 Sep 2002) - - 1 Sep 2002; Martin Schlemmer readline-4.3-r1.ebuild : - Depend on bash that always link against internal readline, else bash - may break on readline update. - -*readline-4.3 (30 Aug 2002) - - 30 Aug 2002; Mark Guertin readline-4.3.ebuild : - set -ppc, inplace upgrade completely broke system - - 30 Aug 2002; Seemant Kulleen readline-4.3.ebuild - files/digest-readline-4.3 : - - Version bump -- required by bash-2.05b (USE dependent, of course) - -*readline-4.1-r4 (21 Mar 2002) - - 15 Jul 2002; Mark Guertin - Added ppc to keywords - - 21 Mar 2002; Seemant Kulleen readline-4.1-r4.ebuild : - - stefan@mdy.univie.ac.at discovered that html documentation was getting - gzipped. This fixes that. - -*readline-4.1-r3 (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/sdk_container/src/third_party/portage-stable/sys-libs/readline/Manifest b/sdk_container/src/third_party/portage-stable/sys-libs/readline/Manifest index 117564ef30..5b65646b1a 100644 --- a/sdk_container/src/third_party/portage-stable/sys-libs/readline/Manifest +++ b/sdk_container/src/third_party/portage-stable/sys-libs/readline/Manifest @@ -1,50 +1,34 @@ -AUX readline-5.0-no_rpath.patch 363 SHA256 59df6107772d1a93550bacc267a2c00f9dfd6d5380b8497d8fd756a7191b9e4b SHA512 c0344c5b831433ad3a8499a91d36615e849a9b520f8ca35cd9cae6d5bc55729adbf97d003e335d210cb3806b2f39af273b4b5f98380dac371dc184053e245bb2 WHIRLPOOL c0d2fe9d1d1f36cf89279f315c373a7385d255ebbeab8ebf1ede7b99196660611499c7db85554b036ad3df4f0b4375558b1d1ce7cbae5f5731172181f7d167ac -AUX readline-5.2-no-ignore-shlib-errors.patch 688 SHA256 2c585c4e2d69d6b91157f378a3dd11cb49beefab808eef3350cf1b8357b2efc6 SHA512 23f88aee11a9ebe15406293695f3de2a7a6c52b8b138c199c64f9dbb9b59d9063f12f8693656e61611e72f6298f7d919016cd240434e78ea2232876690a8b738 WHIRLPOOL ae87d544fa32dbd2b6f27f164dd4e6d0e8a3f399d4a9bde81bcb631985c6e69db11705dc372c21a4f9d3a26cf4279023aeae97fd0d243ca8e1c0e547b59084a4 -AUX readline-6.2-rlfe-tgoto.patch 379 SHA256 6bd5db93cba1cdf751b424a25a1f08c87bae2b42ff59c6c0aa34d659115cbfc1 SHA512 1d2c3aafc949d92fdf6abbee60a60c80f0327f81694d5d8f3a166f1c24d37346caca3e72c9971106b96b2758a9a01269346954fe20bc381eb9da2e6a2737fc3c WHIRLPOOL daab79312136fa728ea77839d6ad663554055e2acd7acff036b8d168f4a0791d57503aa196be4f834caf32ba72ec73c3125adb9b11b5d6898bb796016e83175a -AUX readline-6.3-fix-long-prompt-vi-search.patch 736 SHA256 42177ae7f747eeac432c60d67d31d6903edb919d0fd6bf31137ff4459061d99e SHA512 ad5bb44ba00f6f5e355b95078209e2e51f8d8ba9a924d00ef6aa3286e09c15fe0024efa0817f9e6d86b7aecb73150fcd69d0051a0f7fb37475921478f62ce0e0 WHIRLPOOL 117e007fa59669f73c69dd9acb02896231fb58524feab8bfeded9538dc9d4106ac678279e31c48cccb41a14c281aee9a94f5943d540fdddd99f768d53ee24a67 -AUX readline-6.3-read-eof.patch 1913 SHA256 508323403e752296a63619e9a3fe4fdcd233f368f0f9944ccdc2c6bd69eebc2c SHA512 99728e35d64b466e2bea570412eec719c70841d205a5190c0000bcae55cf3ac2d659ae18e57b4c332525261d83e160054800cd89f4009ce3c76d1c3b4ac27223 WHIRLPOOL beda5876ea05f69f0b2e8005c60dca8290cc7943475352b6c26ab656273290d06a07ae62f28e3fc21c3c31ae628c744a6e5a8ebbc5328fa896f215d419dea270 -DIST readline-4.3.tar.gz 961662 SHA256 eeaf6f050b9f515b0636e5b4f2c153f9ef78e9061ee5dd74f612fab54c77bf88 SHA512 4dbc4d9f16a453f8cf6adefb5723b0f35ef79b8db7dcdfcdd2d6465cb62ca961035e5e9547bfa46d4cb1370d738b042e0e10f9233c3751925c6bccab41e7d182 WHIRLPOOL bad0852f5a97b747c79923bbef29dc48bb7730b96ba86dd444f63d9ee78fe0dda3edd249607dbaf98b3a8932b69cbcf0f79592cfc3757887791e38673dccb352 -DIST readline-5.2.tar.gz 2037705 SHA256 12e88d96aee2cd1192500356f0535540db499282ca7f76339fb4228c31249f45 SHA512 74318b32c56e888716bda2507228ecc374a24e85b2faeec4778227a9f04eb19de1fc8468c78746954c84f9e616a06dd0f8a4332ba4b438fefb7e222699baa379 WHIRLPOOL 8641abf42316ab278207c0a25d9155d4d4fddaf0e704255b40708875b9f31bd3e6caf903550783c15b160bd2b86ffc129b2eb7a1fb4a641d8d58edc3b53145c3 -DIST readline-6.2.tar.gz 2277926 SHA256 79a696070a058c233c72dd6ac697021cc64abd5ed51e59db867d66d196a89381 SHA512 fa5b4f1b6f81bc0b3be0739adb06dab0668603ff256fe62b59ebfe21d5a9e340a758a8eef569df8c4c4ecb86cdd9698a6dabc2ee8c70a769de2bd5930c32ff59 WHIRLPOOL 5d92645085f253206c16533e3cb35bb382d6fe616bf2144feb06f9ffb9b4d7cc25ceaa846b98f17aa442552a0e80642a62d57fe20982e0ed8fdefb75c2f9bbf0 -DIST readline-6.3.tar.gz 2468560 SHA256 56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43 SHA512 f70efaf46d570b85c7637172b0ee2eb9a4aa73ba38a62bb45075e665929d9701b96fba0aea6c767fd9a2a0d39dfe8e70ab06da08f8524aee76a7c502f370a401 WHIRLPOOL 7c68627559890dbebf1394b911cfd4675ec8862b84d4e067a207dd37a0a94482c8d92216195df2873bcdf03a0a86150663a9604cd65a0d78363376bc8ee4cfda -DIST readline-7.0-alpha.tar.gz 2929686 SHA256 415d6769f2b93db61f01ed3cdb34ba1878e19c69320570546f16ef543cb79632 SHA512 a3240668c2b31e4f171b034341bac7e0e0348869c9d59179724e036bb4cee57675c4aced2da53d7bca2d32ae710f0f6528bbc0af9fb6e3d1943031ee12cf5614 WHIRLPOOL e051293f8147e0c1882ae958b7c8b84dd1ffb2cf68dcb38a349c794f788d4691e8152dc56d5243ce34da52e2685bed71d674070a40db51ddd14d115a0ad5da39 -DIST readline43-001 1126 SHA256 787244afefceeaf8bfbdc95eef0c4d163ab05ecf178bb631fff287354df0d955 SHA512 1bfcaf9fd36d154230682ef66a9561281822f09629f9923acfbacbaafd650974b4d94267e1bf74ab4a66f0e2da95e64894c78373c82bee593bd9afbae4af58bc WHIRLPOOL 080c0cffb0637bba2f6819524291c8efd1832b42b7ca619fda551b00ed82558d9c03a6f739b350b8a1de2c32e6ab92fd86137a9620473439c5b6ced6d3a06f91 -DIST readline43-002 738 SHA256 3fd4694c4043b61010c44778ed61581073ac5ddee53436b0e4e1ad2bbe4da226 SHA512 546a7bfab27dd0b77f8b0683b82358a295d47e4e249e01d2e49612a2f113c18580c8276b17451e1edab61a26ddcff0267457a804120d5e0052dfe8e88632ddd2 WHIRLPOOL d3b43145a4ed207f353c5b95b52bdb81be31bd5b077ad60152799333ca582c7524c5587a4e0d9a0fc9246a114552f0c26933d2bc8f60e9de2536a8b6ec9f2cda -DIST readline43-003 2202 SHA256 346120970e3860c776e3cf5fd78e4f09b0d326a3b633a508f35f3f0b56f4412b SHA512 fbabbe5a11c2a17dd0cb47adfb40940c860069f0e99b1478546b0351471663094d032c8049e1a2ca060f4b51835bb6a824276e1864a627711e0805268386cb8e WHIRLPOOL 076d101812e7a98d445fd447d816fd0b15c9690869f4a567d76287c495c257f85e4e79f11f7e6e8354093613ca1c0a758514672cec98d303279daf597dee2577 -DIST readline43-004 3140 SHA256 82ede838829d2f39109851eddf2dc0144885d9fdeec4e07e0814f3465320edfd SHA512 8bc87915f5340f7f88266af0bb3aa976b40d8636373def11ec23dc412d112bc314eeac5ee2832be7993a03f2d0e38643964e838d69321c7d3e2e9ea1c606df79 WHIRLPOOL aa9e8152c600f891f2b2f40d3c3b986969eb787906cf78bd305cac5d4ab97cb47cf4e0f7fe868f62abc72f254e2e562ea4caa6fde0c0fecf7de859561abe324e -DIST readline43-005 1056 SHA256 7a06494282519d47cd7a0c13447f93d9178de43548a645a9808017cfa9bdb233 SHA512 853fcb9cacce7a9ad0d29abe979a60291253fcb3fcae1fc067718a75d123ceb16e60d11a31583c8b5bd217d5f2460ebc77d8d2c89487a7331627348d5901281c WHIRLPOOL 68e67ae313cca750d50eea0291be11cf9c69732481a5ecc75dbbc72b2ade3202fcc610f5b511bfa7a13c82103aef3a53d97b43e5966feeceab22b676ba5dff6d -DIST readline52-001 874 SHA256 eac304c369154059f93049ada328739faaf40338d3cb1fb4b544c93d5ce3f8d5 SHA512 65b92b5e03c20566eb3c7626e3ee9631e2b26932c34f2f95d88ae731df2805bcf63fc1215b97c97a2948e83b9373e3985ca1f64a598d84f1457bb33b605e5d9c WHIRLPOOL a11176d2bd2e02c5d81dc2791946251e89133d74d8621874db638a3854415e184934589b9c04d066035ca83f00b0de5e06876fddc7d6ca8e33203559b1eeda9c -DIST readline52-002 1433 SHA256 9deacaef25507a0c2ae0b661bf9342559b59a2954d66ea3c5f5bcd900fdfcf78 SHA512 9d5b5549c355e80608d76b532bdf358a4e26dac0b62f7c51055bb15ea831a74ad2ef25391ddc2b1615bff8974a2e89a8045567fb0c6d2726dde37aa02a0e6b31 WHIRLPOOL f45f3641984fbb519344f8be6cffb863ee9dd07dd4a59c83d8a722770e84d35be8722970e87afa47b7db6c568bf45cea8904136a92dcfab85e0c5f6b04591077 -DIST readline52-003 1204 SHA256 2a55d2ecb1c9b0147aeb193a6323616ab31c1c525a83b2db3a994b15594ba934 SHA512 7f1722adea9bb9a94277cfbc66d47f600654a0d43bce7def1405e1bb925e5fb324615dd588d1ff2555e6bdebbe3b4609237ba7f52d80689a45f80935e440a37c WHIRLPOOL ad2bf92f7bcdd50f1bf2cacf917339590a9614237712f55f6432f0f6b7354b1a4c336be7784689749809d91b8f9e1b8e518642d315f84ee2a2fb4ff3235d1ad9 -DIST readline52-004 2192 SHA256 a03b65633781efa7c3aae5d57162985e7b7a3c10acf0f2621be610e16f27e5f2 SHA512 e0c0f87ca14a3d473aa31627385f1cb9c2daaf685d8bc0c25bfb2214d5665077a74c4589e3ff5bbc6d0e8b5321ac7fe0c4f7620761d46bbdca787a751e6dbd02 WHIRLPOOL c4f95b2bdc4d2e87983f307d484276cac5e8cd1a14fdef316cba91f53e274a87928f5b7701e098d6d8e9e522320925b086786513f70599cc749dd010e27f9638 -DIST readline52-005 8029 SHA256 06001896514148a757ea6edbbd40c4fc4331dc653847244386c37b138b150f64 SHA512 bd7af4e71f1572811b37bccb68d5ebc20f2e7c21850d9ec55bc48fdf756f9ebaac888b0fc6d83b70e94e335056646e5021ec86b26100a976883ff72ee6d8d521 WHIRLPOOL 6fed5902600d880b181cde7962d0d8eb8f1552770cddf7e80fa2547da7f8f1b8da4dda06d1875510974c897136cfe36079c80aaa83ce81aafab5af39675f393b -DIST readline52-006 2820 SHA256 dfef3e982c0adf8bb5a9b7d0468ec8f5f18138b325e28759437464de5be71013 SHA512 3523800517b24fa512f3bc8750ecb83be73d57c7d48636ac3aa6b681ee185b6460ce8461a046734b64d78834f89d18d4c9c1de92d1eee94294eeae7e2911ce93 WHIRLPOOL b85c88d1bba3ac13d7379a6018d1d2a8c5fde78af37b28eeaf18e2ce3257e220b7ed36e106b649bd35f45b83703e7d5749a7ebe7e606857a8c774f4197a5f648 -DIST readline52-007 1523 SHA256 775b028c7b761397ac6ae1bdfbac7e896dc3b9b3adc2f91312499180ca13bdd1 SHA512 fe9471b237713ef7ce53fd0cf7bbb5a60720c64ec3df9dc58146d9c187511f0a6f480ae3f3b65168723e416ba4f08c67a2add0b01ede1149f72e7fc2ef21050f WHIRLPOOL 0a737ca595dcf8ce11f22e07b0927ba35f76981b7dcab38931536f38f9f94cf57882a555f3d0993b3b9d986156deaa8742db5ad50767beb7b68bda4cd067d3ba -DIST readline52-008 2277 SHA256 a21b4e0bf0530b878bad24d5be23d18a9e03a75a31ae30844dc0933bb3d77ecd SHA512 a864e970006146533dac885b00f53dcf1471f95d6143d8874fe8c8e056477d6c237cf2814625bf2031844285484757fa0ccf66d064ac2065ac62a21384d67c93 WHIRLPOOL 2ec34f16bb51f2def75d6ba70a99073a8164157000bc2cdd84590060e7192c7c5aaedb67a89fa8602b02c5db3636262f6bd6d49321ca1130b9571d6d5c6285b4 -DIST readline52-009 1332 SHA256 138d5e0f0709a47a2d1621295a3dd5e3cc73b63b5cc28dab03abc4e94fe95ecf SHA512 a19ca5b5875208f8ea4804461c1ba1b0e27feabb0a2a0db1fe9ea94b8d84e366e754688f5d8840f48c6bc22a02b0abcbaf35dd3361784b7db4e9e83629d840be WHIRLPOOL 707c8bbe7492f7744d43b8c90e4ae83a44fae0932bb7007725d6e75c0748cac4bb3a6b20823cb546760d1c0009c31ebaac6088e6e3a71b0ffc5bf8329538301f -DIST readline52-010 1543 SHA256 83f8c1aadb86b1a2fad8821a9c6be72a8de5afd7fd9fde58a30b3b57d939693e SHA512 851b7ee9fa3ab84e570723d445ade084fbb5af17fd4131520650f53000e93cb7c799c56cb00e8f906b230524b2fdda60970e72a44d1673d9bcd2c4de7ae400f8 WHIRLPOOL c491a42ac29463172c56408362ac3f3787b5f18e7050a72e73ed1191519c0093591b1ff095b8ec056af001016b47f654d4db46df86fd02b643b9ff3e8ee8ecee -DIST readline52-011 886 SHA256 08ad3384ab0906e6fa4cc417eb8c43ff59375bcead15fd5c8e31730f0413b3d6 SHA512 b4d813c3aa9c1f35962ea8ca6ad1abb34f4ed3ab91dd31eb1fc5e9b9e54da032e6fbfea583e472cc6d8c6baa4f2ad8f63efc22c749fd713e0704474aad74f0ae WHIRLPOOL 4d3b05ed68601a96d2046a917051f87263ee60b5a4f5e44211f8f6d4dd26cd55e88f119ef0fd1c92dace7de88e981155dbfc64e595f2d59d2af430585f70adad -DIST readline52-012 3870 SHA256 20f0243be2299c23213492cc2c19cfd15cc528d2b566a76a2de58306bb9e4c9e SHA512 2964c1c3a234223216ca3a099c42d8ee7de94fa7bee73ac346cc9991b9a11ad0406d3f9d785548f15170bf803714f4ffb0c2dfad19bb633358805c9b2e2873d3 WHIRLPOOL fa4bb64304b266dc24565ca4c5396aec8a5192998bb2322906be45e40389ef10141f0bdf243a33438384508d74387b4fb645b9189264742ae6a10e5600a57af3 -DIST readline52-013 5147 SHA256 0cc649516a5bdfa61c5e56937407570288b6972d75aa1bd060ad30ebe98144d5 SHA512 6c9addc3b130d5f034488cc9506f22bd183794fd1a8ac820c674b39761c8c47df1b69dc41c8be60054a068b2ae5fb63a76268b977ea07b33a8fcc4a829b55a8f WHIRLPOOL 17a956bb00d99819067f81dbe73ab1e573f0079b0c328ecede4082b98a03b20ff2d5629daf639abc1ff19b3b9d13e3c8d23a5bfa85b4712337611ef3a4d91aff -DIST readline52-014 1244 SHA256 6f1a68320d01522ca1ea5a737124ecc8739f3dcbfea2dee21e3ccf839a21a817 SHA512 d262861e67b79059de3967ba820ce02a7d28eff33175ecb30b748d24c08f3a151da3c53430fc2d26da5934f198075c55d2f616b93fabd297d60b9c82bae17cf0 WHIRLPOOL ff137bf6e56989e24a378dfc15c1831a7f0f458442781bffe07c429e04f21d674993ab523198341918a1cd540d2bd8806ec0c9283f879d7346f0c26b920eeca8 -DIST readline62-001 1388 SHA256 38a86c417437692db01069c8ab40a9a8f548e67ad9af0390221b024b1c39b4e3 SHA512 e505161a9ab28f6c1086a6a4ecc5a82da9001d79e4c2b7c44cd82e86dca90bc726ee2387a31e8b4c6893b240877a766fdd913ee7294389722214e6281c518478 WHIRLPOOL 28c63b09a62fa1b64902b04a3c5607da742f7f308648262736240138fa7c957f21856556c8dd2dc08749acf143c271907c69124a978191a5ddb21a6dcf9ee70a -DIST readline62-002 1714 SHA256 1e6349128cb573172063ea007c67af79256889c809973002ca66c5dfc503c7d4 SHA512 e86cb15b4df7b2a4cf68148a3e2414b48f70ad23d9685764627906164a74f31967ba8247510229aa19dfb7f6e8e92ff89164896e79b2d7320d3a62187a9173f5 WHIRLPOOL 444fa6eaa6b3e13728224f49a012f969f736d9b448d4c7da6cf0fdd3cfb33d24ca7566801d0ffa5a642fa581571c485e3c913b4a057a096a665735a84d9fbfe8 -DIST readline62-003 1911 SHA256 cb2131ff352d6e5f82edc09755191f74220b15f026bdb6c52624931c79622374 SHA512 863a4f0725df357fdd4a2ea738a8b81d850f36652705a45a415762a643fcf32f71ecb29f9faf9acd84d0b4b67580329adc491ab3562f0ad6f4b808768539301e WHIRLPOOL 86d10b4c23eef4c64ece0a4537f13cf68198888cfdd83eb38124da8610b971e87dfcdbd64c52fd21ca6d3753298b6582ce15378112d575944ff7d9b68baea3a6 -DIST readline62-004 3335 SHA256 09bd342479ea5bb8b6411bfdf7d302fab2e521d1d241bcb8344d3bad5d9f5476 SHA512 d5c80fb49748b586867a4df0900a73257a2973653c00e1403b9ba4eb5b265cdf6b32b6432f10c23482051f173fe63c18f2b569940b9a609ee29da60ce0ae38b2 WHIRLPOOL 471ace4d86d241d11fb494e885b6e6f78a5938bcbd7f438250e0410849ed2c94ae6743162576412d7d2b7125c2151b009d97295578a716327d8a9cd003543884 -DIST readline62-005 2143 SHA256 ef02905e4d544a5a511142e8b8282e325411200c7eaca4287f413f3ea85cc1f4 SHA512 8717df6034b64cc185e006cd0a00ba80b2cc06406420fb4e080affc4bfe2d4bab07b4d0c8fdd1f5b95692ee6b572199731daeaa64c17a0d799853e132d130e90 WHIRLPOOL 5469407cbc196bfffff890d288ac8dc1a11c34a9ac87baba615587617a3e540331cf54db89de861c8fcc126a443afc91af108d9e94f6234ec80c1ade219b51a0 -DIST readline63-001 1366 SHA256 1a79bbb6eaee750e0d6f7f3d059b30a45fc54e8e388a8e05e9c3ae598590146f SHA512 e70f89ca52a4eae7e1cddd70de6a7162252231ee029c89bb3fcb0f6c8c8b46c666be910c8b2eee72e96983ec2f1a23663694dc222f67228d82e8e4684f1504a2 WHIRLPOOL ed0b0ce066ab4764851d81e44d708cc9e2f3fe36ac4788243c81b3e25aa0995d054c1caf0a788c25969c7cdc6b2bad55a9c9c64286f485194b4e76bc453edf74 -DIST readline63-002 1297 SHA256 39e304c7a526888f9e112e733848215736fb7b9d540729b9e31f3347b7a1e0a5 SHA512 4e23bd67433577e6e361d10a6c32768ea9e13b10e77493e565b870f56069b673fbcb0b860225f79fa9931845fc91d35c9a82c1385c23f8b757ebfd59f27851f4 WHIRLPOOL ca878e614ee233748f7017f5606fe2e96bb8374b33e4a571c5901594d7f329fd19b217abcf9cb844fa96374bff9e044712ed1017d6d99936f700da030202231d -DIST readline63-003 985 SHA256 ec41bdd8b00fd884e847708513df41d51b1243cecb680189e31b7173d01ca52f SHA512 6bfb84a5b980091b995e2b96bdf5680f97fe670e6cac1b8606d2d75a1ef922ff5bd4e73f029f7af98a115006b7ab7828146f2cd6986287543d8a29987c91dc12 WHIRLPOOL 3615b462024e836f0854c2ffaf1282b42462a0da90c8ce248a47e9ea5a0ce00892135c1b725f9fb8ef1fafb1e88e02649c664373ba41683ca2457aafdd12ac93 -DIST readline63-004 1363 SHA256 4547b906fb2570866c21887807de5dee19838a60a1afb66385b272155e4355cc SHA512 6b683e9fe28831885135391b5a23bc580cacf0ffe720951a80f545574eda4eb064fe189801d44329b2eb2d3577db5a90f9e5ad9ed131e7e8a8ae349511632721 WHIRLPOOL 49deb89325cb582538027855169067c4224504d8aa944f8c6f34c07afd0bab30690e01a573ab67279d851b75c6e33e236f19a9fc9eb0271cd1f10d9b91fd0203 -DIST readline63-005 1664 SHA256 877788f9228d1a9907a4bcfe3d6dd0439c08d728949458b41208d9bf9060274b SHA512 b0332d7f999376788155341319d138a899a2278c338a6faaac89ecf3ed1e2248a07413dd810a76996bf25f211de787182b55f34ab3d7d31eb7519d7a48ebed32 WHIRLPOOL d10a4a6a9ea20e2e9bb9180e0a0511796ea0ca247bec17f2357ee8a759ac5adc877f5f838c3d1f45157014d88306f1b1dc7e9633c2bbd4a7125b9b8df5c0c0e8 -DIST readline63-006 1982 SHA256 5c237ab3c6c97c23cf52b2a118adc265b7fb411b57c93a5f7c221d50fafbe556 SHA512 e9fbfa38d7b03ab2aff2e9e48918b85b4b67a729862ee47d1cc8e0aeb90c3224394a79f68829951e1377cae65742aa5385eae865f75e9c0b2e2abde42889431c WHIRLPOOL 7b88ad9fcad9eee0762d881307d2f865c66a9ee246bc1a648d6203677fc307759ca7ee216fb632114d3da76ca27a67222aefd830bcf99ee9a96d1ba2f2105290 -DIST readline63-007 1428 SHA256 4d79b5a2adec3c2e8114cbd3d63c1771f7c6cf64035368624903d257014f5bea SHA512 abee331894846b360203a521d9a66fa02c03214120d5cafbd1cb4d680bd7bbef14321ae845dd67f7b5e8c87322801fd96fc9a5fd0ae026b41d98dc24a8949854 WHIRLPOOL fc9d866a6e0f0c2a2f752c65e6fcae56a1b0e1b5cef45154ff51b5d1b49fc75ffaa30bdf90c221fb6493381b9d67eb20168bdfd273fa0dd89602f18680bb3e5f -DIST readline63-008 1452 SHA256 3bc093cf526ceac23eb80256b0ec87fa1735540d659742107b6284d635c43787 SHA512 8e30bbca3aa5cea8c2ee511abe0ec8f131608d74fe5ab24d68bcf452267f0f97446ed6e7cd482360876ce6c027280e4f4450cae05eb18f56046240f4c224841c WHIRLPOOL 94d9371e6ca35e72565c1990e0ec8bedf8a141f0a3d061e4928f6184c3ef4a4b472f4278d443b990a53977ad6f3f7bdbf41e51a999202b48414df3a946bb9796 -EBUILD readline-4.3_p5.ebuild 1483 SHA256 36cf6e303de607dd8742e9342494271e474aca0e4b3cbc8270e64f0bb6116d38 SHA512 7c7535161e5b459a607caea228aa3e46cc950ee48a1eb4efd38d73486e2050122315db69f5b49962b5bd3b311e5c2dfb15d87b0be7095b6fda7b4d69d70b9062 WHIRLPOOL 5a75f91f7af6944fb5e1df02d1089a68a3e5a83c1f562584b2f3c46db5dd7f45d23022595da17ebfeee111fd59053a4db61574b387d5720802a00fbb26f28538 -EBUILD readline-5.2_p14.ebuild 1796 SHA256 fc8834104b6607d53fc83e720a440e0b490d908f21bce93c0530ca8b94344fe5 SHA512 8a2278b6d10e329fbc60b95a02823c0cba7a41bc0e1c2a089c9d72f23cfb71330f2659733bd7ab3329b2d921d7fb977ed1abcb154b23538aee7cbc04f5739055 WHIRLPOOL 29b5955fa13814643ef779ea31976fb40ca80e619dfc6fcd9d47684c6d1075c03139bd2f8800d3a9254eb246c0ba710c18aadbe6dbf9237f616b41bff3fed689 -EBUILD readline-6.2_p5-r1.ebuild 4027 SHA256 da9d848f39cba97da60a4e2d108cab1e477f5ea0888a7bcc593e7dc25de73fd3 SHA512 f2f796258fd00277ab3fd26457de30d9a7077da62c5f70ad3ef76237983c5aec4b2499e80efad18274656eb8daf7059bf8b10098af9d344286545718fc522e59 WHIRLPOOL 280c25116139fb33e12ef5de78d5d10dd5d74ece567916a9860ac41722930f995a0bc7140063504dca09d854b36c853674ae0f5c6f4319a5a48c59466b961752 -EBUILD readline-6.3_p8-r1.ebuild 4446 SHA256 d73939cde41967752bcb95c22d9fbf80342a3aa4e7467e177df2a32a47201123 SHA512 ba592cef45f737b97d888bd34b3848474abcedf95cb513713bda2e4dae14b6c028e6b2277152a1581dafa3cc2812501461d0f5a5019c3ecdd62f5fbe6dd5147e WHIRLPOOL 4f678688c7f39158457f4a3b0b55a64065e7e4d61a2c1bcec2de3b749dd579b0a4863992ce9651869f7c0a26096cf17f3ffc27000b72ce5dc70c6aa0e920ce93 -EBUILD readline-6.3_p8-r2.ebuild 4525 SHA256 cfd6a88954892a0cab7c7d41fc9045e61e8b3d6c3651d30dc5242f40b0cd57b2 SHA512 3c2b89e952e62242d56453da1e3046045bb30dbf357d1011a7361817bb456c1edf16f41b342279dafd18d48eaa3f8302c0c31032bc6ea60aceca7ee23031664b WHIRLPOOL ec07c935f5dcd883f20acaf80dcf61dcfc2531393b54c87e167cd1caaf7e58e0c3802654d501a5bfa2a7ef7ec75894463531b232440f2ce44f0a3e5d6a133049 -EBUILD readline-7.0_alpha.ebuild 4566 SHA256 2a47fcea88b7d5aa27aad7aa378477918e29ddb2bff228bffb59e8c37b0bfdde SHA512 0f7c233f093a4291ba3849370ca3e9d772cca990c345dfbbecdc03cbe5af71e97f7351b7c5bee161ebb3e7133960f4513091015e88f05588d2a95eb65e297bd1 WHIRLPOOL 247a6dc58e65a26286496ee4e923b29379271ef0b4832253de5a92251a2120537cbe881fe85ab61ba34dfee6105ec5f8a9ba1994e38a57b30c47cbb4c0878790 -MISC ChangeLog 30949 SHA256 c5b14aa54438b8a51d21198b6e9d57759cc88d5be3724e8e70cb472707dd8541 SHA512 d6d1fd54d62e4b69742153c23d8bf7026644daa30f4f405ee6fd2766528bbd530ebfe77778d14c7aa6a79ca1edefac5edf6be9e2f0e641a7dfac7a8d9ced5bf2 WHIRLPOOL 3cb3cd7617334cb3dd169960ab4ad9a456fe0dc9b12610e387ee21c5b5e6ff2902afa429957433e2724b9e2709bf9c8dd910d0c706fdc43007c5af043675901c -MISC metadata.xml 309 SHA256 7c83ec0354dd516ee3f52b82272ad328db98053fb70455f54de9f5156693c745 SHA512 78531c577a53db9540f4b037d1172d4704ad2b34d34b60f5d64f9ca7af5cb371e0cbddbc8a5626d55d13c7e4468aa2c71dde69ac697d6e6f664d2bd5c58f4e40 WHIRLPOOL 069f2d74eb4dab1ea79c69799a6f0030711f146134cb9fedff975b18fefd45a611d8c24e2c8424acbcc117be28a324aa7c571d74c17683408eac1d91115c0678 +DIST readline-4.3.tar.gz 961662 BLAKE2B a7267200b79c8010d08f8aaa4e0ed357eaddb970287b262404074a1e50b0d7865bcee5492730808dc998799a1b64685d3bd91fb7098d1da778e40a2364f16126 SHA512 4dbc4d9f16a453f8cf6adefb5723b0f35ef79b8db7dcdfcdd2d6465cb62ca961035e5e9547bfa46d4cb1370d738b042e0e10f9233c3751925c6bccab41e7d182 +DIST readline-5.2.tar.gz 2037705 BLAKE2B df1012925f7cac8aa5d513097de97fa55c801993fbcf651e64468c0255cb27f7a2357613f8ab67791ab7799def57bde34376d3c41e65285689318f4b9cbedf84 SHA512 74318b32c56e888716bda2507228ecc374a24e85b2faeec4778227a9f04eb19de1fc8468c78746954c84f9e616a06dd0f8a4332ba4b438fefb7e222699baa379 +DIST readline-6.3.tar.gz 2468560 BLAKE2B 24488ec141734c050ba985a93423692396f105619bae3ce5b109bc68a4f43862bcf3a6fb8d82fec1145d665cdb408765e179379bb35f008d09c441fa2e5739df SHA512 f70efaf46d570b85c7637172b0ee2eb9a4aa73ba38a62bb45075e665929d9701b96fba0aea6c767fd9a2a0d39dfe8e70ab06da08f8524aee76a7c502f370a401 +DIST readline-7.0.tar.gz 2910016 BLAKE2B 679b8aa7ce003017b729e6d8d4cb69d0f991578441a3e69005090079e61f6aa48b7ad4d0b1f34b6041528cf33254a1bf3ddb05b60db53a06e443d7922d49d0d4 SHA512 18243189d39bf0d4c8a76cddcce75243c1bae8824c686e9b6ba352667607e5b10c5feb79372a1093c1c388d821841670702e940df12eae94bcebdeed90047870 +DIST readline43-001 1126 BLAKE2B 42e7637b71936b59334dae72589b8b44256af7d3c79bec28490e13fa1fea954ce42afc1f51bb1d592da14c403d0c64565fa8823874d305ad385962b462536b5f SHA512 1bfcaf9fd36d154230682ef66a9561281822f09629f9923acfbacbaafd650974b4d94267e1bf74ab4a66f0e2da95e64894c78373c82bee593bd9afbae4af58bc +DIST readline43-002 738 BLAKE2B b4aca8deb8e32c94228c41e6a1e9dd2865e01662b6a8e28307e64b260f4a614d17949cab68aea0c4d2c9ca32a888f11a753cf6849a0a95fc5e9b315ea7e20a1d SHA512 546a7bfab27dd0b77f8b0683b82358a295d47e4e249e01d2e49612a2f113c18580c8276b17451e1edab61a26ddcff0267457a804120d5e0052dfe8e88632ddd2 +DIST readline43-003 2202 BLAKE2B 435bf8c01a2c8419e97550c421945e11ad0d6f3326181c2e9e9c66d8baf12b4dc30894bad590532f917bbf30568e93439b49054c7b023179d5dd95aa309a8f8d SHA512 fbabbe5a11c2a17dd0cb47adfb40940c860069f0e99b1478546b0351471663094d032c8049e1a2ca060f4b51835bb6a824276e1864a627711e0805268386cb8e +DIST readline43-004 3140 BLAKE2B 1032175956801dbf7435a2a162066c69b73d6c066bab7a1e80277c6190f6f81fc30ae002df7e32c98d6a43c11313de97937168fb149c323785a46747102cb4ed SHA512 8bc87915f5340f7f88266af0bb3aa976b40d8636373def11ec23dc412d112bc314eeac5ee2832be7993a03f2d0e38643964e838d69321c7d3e2e9ea1c606df79 +DIST readline43-005 1056 BLAKE2B 67905f87ec2042cc403cc1f8de2efccd74273aeddb4f32109ee226915f816a24f55102a130e66cb1b216115b619a3642901a892311e100f7ee95a39bcfcc725d SHA512 853fcb9cacce7a9ad0d29abe979a60291253fcb3fcae1fc067718a75d123ceb16e60d11a31583c8b5bd217d5f2460ebc77d8d2c89487a7331627348d5901281c +DIST readline52-001 874 BLAKE2B c1ad1cc90dadcc01fa14a3315eb6317ad7640d1503d0d31309d912a19d295ad7eef1d8155a619c61728f78e5455b3e12d0d52cfef5aa7a2c06fecc9b5fe806d2 SHA512 65b92b5e03c20566eb3c7626e3ee9631e2b26932c34f2f95d88ae731df2805bcf63fc1215b97c97a2948e83b9373e3985ca1f64a598d84f1457bb33b605e5d9c +DIST readline52-002 1433 BLAKE2B 90ff0d1cff96d3f06e33d25570519aff602fc71f65ae508dc565586a0d729674011619ad973a321b2ebc84a184b6eb487a0eceff02c1cbbf641759136ddcd8c0 SHA512 9d5b5549c355e80608d76b532bdf358a4e26dac0b62f7c51055bb15ea831a74ad2ef25391ddc2b1615bff8974a2e89a8045567fb0c6d2726dde37aa02a0e6b31 +DIST readline52-003 1204 BLAKE2B c6327edd4c483ba122fa68cb5a06825e8bd0df83ff87294347a1fd923111b5dc7c309c9b6f9fbd9a53ba36a4a53e57d00fdbfec441012be37298bba2fec0d0be SHA512 7f1722adea9bb9a94277cfbc66d47f600654a0d43bce7def1405e1bb925e5fb324615dd588d1ff2555e6bdebbe3b4609237ba7f52d80689a45f80935e440a37c +DIST readline52-004 2192 BLAKE2B 0bd5fba77facfe4a445b19394b1de5186fe976d038283342a9f0d068a2e69e55127fdfd7c7fe67c3549b16f8d3d807d61b9bebdbc23c5adbd188ab8969621298 SHA512 e0c0f87ca14a3d473aa31627385f1cb9c2daaf685d8bc0c25bfb2214d5665077a74c4589e3ff5bbc6d0e8b5321ac7fe0c4f7620761d46bbdca787a751e6dbd02 +DIST readline52-005 8029 BLAKE2B 16c9208e451630566595c668b3f69d49257186543dd82e70d34d422c9e59cc57b6d5b0ed2be0c0afb769021c832915c3f9cfb3889e7ebcfb4a653658dbf26ea8 SHA512 bd7af4e71f1572811b37bccb68d5ebc20f2e7c21850d9ec55bc48fdf756f9ebaac888b0fc6d83b70e94e335056646e5021ec86b26100a976883ff72ee6d8d521 +DIST readline52-006 2820 BLAKE2B 4b6dbd3ad093f31deaeee388854e471d38859252ad127e319dc65de42ae98746cd2d1783df09cbd7f1379d8d4171b74f31da07f9560c2bb882bd374502d08dc9 SHA512 3523800517b24fa512f3bc8750ecb83be73d57c7d48636ac3aa6b681ee185b6460ce8461a046734b64d78834f89d18d4c9c1de92d1eee94294eeae7e2911ce93 +DIST readline52-007 1523 BLAKE2B 8a7a47bf5647b162f36c32c5572481803f3bc6f203db55780f706aed2881ee1a21f4be8f47677ce3d6609ff8d4128e0a068c32d765fc6ed64239673ce7c12b21 SHA512 fe9471b237713ef7ce53fd0cf7bbb5a60720c64ec3df9dc58146d9c187511f0a6f480ae3f3b65168723e416ba4f08c67a2add0b01ede1149f72e7fc2ef21050f +DIST readline52-008 2277 BLAKE2B c03d7f8f7d4e1b6215552dd9c11f0766d9c413633a052ee2364f007767bb0ac323727320f84292eb2d4cece5c696bbce32b59bf74daa7b8f05d8ff864a8a87ad SHA512 a864e970006146533dac885b00f53dcf1471f95d6143d8874fe8c8e056477d6c237cf2814625bf2031844285484757fa0ccf66d064ac2065ac62a21384d67c93 +DIST readline52-009 1332 BLAKE2B 79a59ff0b88c243abc1772ebd2ac20db02e714193c0db173d449df45d7da043e3641cfa8ee21a7e4d1682bb380364ae9bfd80699b35af79f9213fd6a93ae65c5 SHA512 a19ca5b5875208f8ea4804461c1ba1b0e27feabb0a2a0db1fe9ea94b8d84e366e754688f5d8840f48c6bc22a02b0abcbaf35dd3361784b7db4e9e83629d840be +DIST readline52-010 1543 BLAKE2B 72d41d913e89ade35d5771090e6ed138b52cc405bf81924aaf42e6e99587d38dd5b9678f3f98a47019663295f619a5323a8e177c33c84d02235e6d7013d53c02 SHA512 851b7ee9fa3ab84e570723d445ade084fbb5af17fd4131520650f53000e93cb7c799c56cb00e8f906b230524b2fdda60970e72a44d1673d9bcd2c4de7ae400f8 +DIST readline52-011 886 BLAKE2B d1c308f766e25e7f8105264ace08a6e979b4b7781ff39ac2b2fb63ef98e35971c012a69a4cb037fb9d984531aa6f50d530f40853d535127eb188ae3876002a6f SHA512 b4d813c3aa9c1f35962ea8ca6ad1abb34f4ed3ab91dd31eb1fc5e9b9e54da032e6fbfea583e472cc6d8c6baa4f2ad8f63efc22c749fd713e0704474aad74f0ae +DIST readline52-012 3870 BLAKE2B d448fd35898a182aec77fda4db392d308bbbd2f3619318c13362c5ccb9c62271ddfd843420deedb85a7bbcd3ac8b1380c15f5c535c157a5a164564ec97e681a8 SHA512 2964c1c3a234223216ca3a099c42d8ee7de94fa7bee73ac346cc9991b9a11ad0406d3f9d785548f15170bf803714f4ffb0c2dfad19bb633358805c9b2e2873d3 +DIST readline52-013 5147 BLAKE2B e111ac594922d5cb095b33bdca3e0a1255db597f68c577df85ea9675a003763f7572ad31f094249be3d643ec6f8277509a09c2dcff8fbb980e516a9ecfef672e SHA512 6c9addc3b130d5f034488cc9506f22bd183794fd1a8ac820c674b39761c8c47df1b69dc41c8be60054a068b2ae5fb63a76268b977ea07b33a8fcc4a829b55a8f +DIST readline52-014 1244 BLAKE2B 421af06b92cfc59b2ec0fa9ae59c99e91a26542210f258667d5a44a8b1a119da7b58d2a0410f7690eeb5ace98a2797bddabaabf28175d650cb48c974f522ae59 SHA512 d262861e67b79059de3967ba820ce02a7d28eff33175ecb30b748d24c08f3a151da3c53430fc2d26da5934f198075c55d2f616b93fabd297d60b9c82bae17cf0 +DIST readline63-001 1366 BLAKE2B 82af5be99597719329db3f1d6049e75a5654ccf6597cf557c71ad7ada0ac03be87381a7738931eb78716de65902ae87498f574b84150a69eae9cc308c4bfffdd SHA512 e70f89ca52a4eae7e1cddd70de6a7162252231ee029c89bb3fcb0f6c8c8b46c666be910c8b2eee72e96983ec2f1a23663694dc222f67228d82e8e4684f1504a2 +DIST readline63-002 1297 BLAKE2B 5ace4a81381910ee48dee8cdbb2ca95a1bef2d1f8acca6d39a910c078c86de10a0fc29486939b336110ecb0281b3edb16e4b985f41e7ee161904728f289fff04 SHA512 4e23bd67433577e6e361d10a6c32768ea9e13b10e77493e565b870f56069b673fbcb0b860225f79fa9931845fc91d35c9a82c1385c23f8b757ebfd59f27851f4 +DIST readline63-003 985 BLAKE2B cf2cda505b100d5f820d8bfc99eed6b50e65c92b6a495073352fc7385c6456478594e5c2dc293ce556b66853dff705050fb97982aa25fce452ae53d2cb272cf4 SHA512 6bfb84a5b980091b995e2b96bdf5680f97fe670e6cac1b8606d2d75a1ef922ff5bd4e73f029f7af98a115006b7ab7828146f2cd6986287543d8a29987c91dc12 +DIST readline63-004 1363 BLAKE2B c1aec93f1e23acd51b36068d3aac31b93ffd9c1039be2c45ff4e6479135f153888030c68cf19c5ced950f6fbbb38ee7fa644d5a737f3f8ed511e97bf342940f5 SHA512 6b683e9fe28831885135391b5a23bc580cacf0ffe720951a80f545574eda4eb064fe189801d44329b2eb2d3577db5a90f9e5ad9ed131e7e8a8ae349511632721 +DIST readline63-005 1664 BLAKE2B f98f62be8676aca81b91d919bc4eccfe40c382a8baab0e64b1659b714f0d72424e29b709cc5e226fd73daf67eef264a17e07982d2553ce80f5e5f39fad70610b SHA512 b0332d7f999376788155341319d138a899a2278c338a6faaac89ecf3ed1e2248a07413dd810a76996bf25f211de787182b55f34ab3d7d31eb7519d7a48ebed32 +DIST readline63-006 1982 BLAKE2B ad6d16ff769eb8e367cf961ffe152c04778b046a04e4a62e0ce21d08fa16b0eca3d278dbdc274b082d24fa2ec959ffb62168ea7693b4de94b59a4526b1f0c4a2 SHA512 e9fbfa38d7b03ab2aff2e9e48918b85b4b67a729862ee47d1cc8e0aeb90c3224394a79f68829951e1377cae65742aa5385eae865f75e9c0b2e2abde42889431c +DIST readline63-007 1428 BLAKE2B 60e64c2dd36457e3992cfbfbbcc261337e515be360a37d71b9de236c62c781f10f0ec37e4e196b4634e5d547edebbf915370091ca42fff873b78cd80cfe3a7f2 SHA512 abee331894846b360203a521d9a66fa02c03214120d5cafbd1cb4d680bd7bbef14321ae845dd67f7b5e8c87322801fd96fc9a5fd0ae026b41d98dc24a8949854 +DIST readline63-008 1452 BLAKE2B 4e41c45be1479fba9f74bf9cedb8d1f6237e650962d5b45ea1a61cc48a8323a0fa60d76f68c011b6e7c73a1078b5ff80f9966e983b994f814d471d0efd9efde6 SHA512 8e30bbca3aa5cea8c2ee511abe0ec8f131608d74fe5ab24d68bcf452267f0f97446ed6e7cd482360876ce6c027280e4f4450cae05eb18f56046240f4c224841c +DIST readline70-001 1777 BLAKE2B ab217bd9d27f30351397db2b745cb33ac7e0ce18bbc00112bb87570da0f62ee0e8d182395c97e4ecc21af51e7e1e580ba48076de1095c556f0744475e4019821 SHA512 4402186905af8cd42c609d640c2e13b9ad61c7778e5a3fd2c2d9da301f0deab05b04d7836f31527262f44f406517823dbb18cb07f2c73931186c806b494699ec +DIST readline70-002 2953 BLAKE2B 47d729b1babe904855fe5d4f780a5b2153a743def527479c3cb82759cdee5bb4260be722e1050be680f5c0dd6dec8ca25c4c1ff557415abae6b3fac2bd481f0b SHA512 13d1489578508d4d2c3a1618024198a709dbce74a6bbf0f6d7ec67d2419c55bfec9f0ca9de0ed93f129d21d5c3a94307ccdc49408455bbb301c5e3a772b03185 +DIST readline70-003 1294 BLAKE2B 9473e18b582fba69cea83e3f5b9fa278dd8b0544325439307d2b4053cbeca8d2f008104bee181ae5d9405d702e6d3bcf26379c4d46e269906474c8544367b780 SHA512 eaf962a1480eb3870519017b81ecc5cef171e4c41fcf8c17da61ccbfd0379ed6bca85c17b03e2207ae4d51509f33fd010294c75f4bd0433a52118015d4160385 diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/readline/files/readline-5.0-no_rpath.patch b/sdk_container/src/third_party/portage-stable/sys-libs/readline/files/readline-5.0-no_rpath.patch index 624b2d7dea..befad63e42 100644 --- a/sdk_container/src/third_party/portage-stable/sys-libs/readline/files/readline-5.0-no_rpath.patch +++ b/sdk_container/src/third_party/portage-stable/sys-libs/readline/files/readline-5.0-no_rpath.patch @@ -1,7 +1,7 @@ ripped from Fedora ---- support/shobj-conf -+++ support/shobj-conf +--- a/support/shobj-conf ++++ b/support/shobj-conf @@ -102,7 +102,7 @@ SHOBJ_LD='${CC}' SHOBJ_LDFLAGS='-shared -Wl,-soname,$@' diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/readline/files/readline-5.2-no-ignore-shlib-errors.patch b/sdk_container/src/third_party/portage-stable/sys-libs/readline/files/readline-5.2-no-ignore-shlib-errors.patch deleted file mode 100644 index fc63491131..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-libs/readline/files/readline-5.2-no-ignore-shlib-errors.patch +++ /dev/null @@ -1,24 +0,0 @@ -dont ignore errors in the shlib subdir - -http://bugs.gentoo.org/216952 - ---- Makefile.in -+++ Makefile.in -@@ -194,7 +194,7 @@ - - shared: force - -test -d shlib || mkdir shlib -- -( cd shlib ; ${MAKE} ${MFLAGS} all ) -+ ( cd shlib ; ${MAKE} ${MFLAGS} all ) - - documentation: force - -test -d doc || mkdir doc -@@ -238,7 +238,7 @@ - -( cd shlib; ${MAKE} ${MFLAGS} DESTDIR=${DESTDIR} uninstall ) - - install-shared: installdirs install-headers shared install-doc -- -( cd shlib ; ${MAKE} ${MFLAGS} DESTDIR=${DESTDIR} install ) -+ ( cd shlib ; ${MAKE} ${MFLAGS} DESTDIR=${DESTDIR} install ) - - uninstall-shared: maybe-uninstall-headers - -( cd shlib; ${MAKE} ${MFLAGS} DESTDIR=${DESTDIR} uninstall ) diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/readline/files/readline-7.0-headers.patch b/sdk_container/src/third_party/portage-stable/sys-libs/readline/files/readline-7.0-headers.patch new file mode 100644 index 0000000000..892ec21f51 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-libs/readline/files/readline-7.0-headers.patch @@ -0,0 +1,24 @@ +From 4bc0aa68aff12a59628dd3c99a53360a9aa1ce93 Mon Sep 17 00:00:00 2001 +From: Mike Frysinger +Date: Thu, 11 Aug 2016 17:49:27 +0800 +Subject: [PATCH] include ctype.h for isdigit usage + +--- + lib/readline/histexpand.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/lib/readline/histexpand.c b/lib/readline/histexpand.c +index 46a99aa62e30..13248db83048 100644 +--- a/histexpand.c ++++ b/histexpand.c +@@ -26,6 +26,7 @@ + #endif + + #include ++#include + + #if defined (HAVE_STDLIB_H) + # include +-- +2.9.0 + diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/readline/files/readline-7.0-mingw.patch b/sdk_container/src/third_party/portage-stable/sys-libs/readline/files/readline-7.0-mingw.patch new file mode 100644 index 0000000000..f003038d2c --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-libs/readline/files/readline-7.0-mingw.patch @@ -0,0 +1,152 @@ +--- a/colors.c ++++ b/colors.c +@@ -37,6 +37,10 @@ + #include "posixstat.h" // stat related macros (S_ISREG, ...) + #include // S_ISUID + ++#ifndef S_ISDIR ++#define S_ISDIR(m) (((m) & S_IFMT) == S_IFDIR) ++#endif ++ + // strlen() + #if defined (HAVE_STRING_H) + # include +@@ -182,12 +186,17 @@ _rl_print_color_indicator (const char *f + if (S_ISREG (mode)) + { + colored_filetype = C_FILE; +- ++#ifdef S_ISUID + if ((mode & S_ISUID) != 0 && is_colored (C_SETUID)) + colored_filetype = C_SETUID; +- else if ((mode & S_ISGID) != 0 && is_colored (C_SETGID)) ++ else ++#endif ++#ifdef S_ISGID ++ if ((mode & S_ISGID) != 0 && is_colored (C_SETGID)) + colored_filetype = C_SETGID; +- else if (is_colored (C_CAP) && 0) //f->has_capability) ++ else ++#endif ++ if (is_colored (C_CAP) && 0) //f->has_capability) + colored_filetype = C_CAP; + else if ((mode & S_IXUGO) != 0 && is_colored (C_EXEC)) + colored_filetype = C_EXEC; +@@ -211,12 +220,16 @@ _rl_print_color_indicator (const char *f + colored_filetype = C_STICKY; + #endif + } ++#if defined (S_ISLNK) + else if (S_ISLNK (mode)) + colored_filetype = C_LINK; ++#endif + else if (S_ISFIFO (mode)) + colored_filetype = C_FIFO; ++#if defined (S_ISSOCK) + else if (S_ISSOCK (mode)) + colored_filetype = C_SOCK; ++#endif + else if (S_ISBLK (mode)) + colored_filetype = C_BLK; + else if (S_ISCHR (mode)) +--- a/histfile.c ++++ b/histfile.c +@@ -606,12 +606,14 @@ history_truncate_file (fname, lines) + history_lines_written_to_file = 0; + } + ++#if defined (HAVE_CHOWN) + /* Make sure the new filename is owned by the same user as the old. If one + user is running this, it's a no-op. If the shell is running after sudo + with a shared history file, we don't want to leave the history file + owned by root. */ + if (rv == 0 && exists) + r = chown (filename, finfo.st_uid, finfo.st_gid); ++#endif + + xfree (filename); + FREE (tempname); +@@ -753,12 +755,14 @@ mmap_error: + history_lines_written_to_file = 0; + } + ++#if defined (HAVE_CHOWN) + /* Make sure the new filename is owned by the same user as the old. If one + user is running this, it's a no-op. If the shell is running after sudo + with a shared history file, we don't want to leave the history file + owned by root. */ + if (rv == 0 && exists) + mode = chown (histname, finfo.st_uid, finfo.st_gid); ++#endif + + FREE (histname); + FREE (tempname); +--- a/input.c ++++ b/input.c +@@ -71,6 +71,10 @@ extern int errno; + #include "rlshell.h" + #include "xmalloc.h" + ++#if defined (__MINGW32__) ++#include ++#endif ++ + /* What kind of non-blocking I/O do we have? */ + #if !defined (O_NDELAY) && defined (O_NONBLOCK) + # define O_NDELAY O_NONBLOCK /* Posix style */ +--- a/posixstat.h ++++ b/posixstat.h +@@ -78,30 +78,44 @@ + + #if defined (S_IFBLK) && !defined (S_ISBLK) + #define S_ISBLK(m) (((m)&S_IFMT) == S_IFBLK) /* block device */ ++#elif !defined (S_IFBLK) ++#define S_ISBLK(m) 0 + #endif + + #if defined (S_IFCHR) && !defined (S_ISCHR) + #define S_ISCHR(m) (((m)&S_IFMT) == S_IFCHR) /* character device */ ++#elif !defined (S_IFCHR) ++#define S_ISCHR(m) 0 + #endif + + #if defined (S_IFDIR) && !defined (S_ISDIR) + #define S_ISDIR(m) (((m)&S_IFMT) == S_IFDIR) /* directory */ ++#elif !defined (S_IFDIR) ++#define S_ISDIR(m) 0 + #endif + + #if defined (S_IFREG) && !defined (S_ISREG) + #define S_ISREG(m) (((m)&S_IFMT) == S_IFREG) /* file */ ++#elif !defined (S_IFREG) ++#define S_ISREG(m) 0 + #endif + + #if defined (S_IFIFO) && !defined (S_ISFIFO) + #define S_ISFIFO(m) (((m)&S_IFMT) == S_IFIFO) /* fifo - named pipe */ ++#elif !defined (S_IFIFO) ++#define S_ISFIFO(m) 0 + #endif + + #if defined (S_IFLNK) && !defined (S_ISLNK) + #define S_ISLNK(m) (((m)&S_IFMT) == S_IFLNK) /* symbolic link */ ++#elif !defined (S_IFLNK) ++#define S_ISLNK(m) 0 + #endif + + #if defined (S_IFSOCK) && !defined (S_ISSOCK) + #define S_ISSOCK(m) (((m)&S_IFMT) == S_IFSOCK) /* socket */ ++#elif !defined (S_IFSOCK) ++#define S_ISSOCK(m) 0 + #endif + + /* +@@ -137,6 +151,8 @@ + /* These are non-standard, but are used in builtins.c$symbolic_umask() */ + #define S_IRUGO (S_IRUSR | S_IRGRP | S_IROTH) + #define S_IWUGO (S_IWUSR | S_IWGRP | S_IWOTH) ++#if defined(S_IXUSR) && defined(S_IXOTH) + #define S_IXUGO (S_IXUSR | S_IXGRP | S_IXOTH) ++#endif + + #endif /* _POSIXSTAT_H_ */ diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/readline/files/readline-7.0-missing-echo-proto.patch b/sdk_container/src/third_party/portage-stable/sys-libs/readline/files/readline-7.0-missing-echo-proto.patch new file mode 100644 index 0000000000..cad3c8ca2c --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-libs/readline/files/readline-7.0-missing-echo-proto.patch @@ -0,0 +1,14 @@ +https://lists.gnu.org/archive/html/bug-readline/2016-11/msg00000.html + +fix from upstream + +--- a/readline.h ++++ b/readline.h +@@ -413,6 +413,7 @@ + extern void rl_tty_set_default_bindings PARAMS((Keymap)); + extern void rl_tty_unset_default_bindings PARAMS((Keymap)); + ++extern int rl_tty_set_echoing PARAMS((int)); + extern int rl_reset_terminal PARAMS((const char *)); + extern void rl_resize_terminal PARAMS((void)); + extern void rl_set_screen_size PARAMS((int, int)); diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/readline/metadata.xml b/sdk_container/src/third_party/portage-stable/sys-libs/readline/metadata.xml index 6172776f3e..49d63436c4 100644 --- a/sdk_container/src/third_party/portage-stable/sys-libs/readline/metadata.xml +++ b/sdk_container/src/third_party/portage-stable/sys-libs/readline/metadata.xml @@ -1,8 +1,11 @@ - base-system - - Install rlfe (ReadLine Front-End) helper tool -- a wrapper program for making any stdin use readline - + + base-system@gentoo.org + Gentoo Base System + + + Install rlfe (ReadLine Front-End) helper tool -- a wrapper program for making any stdin use readline + diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/readline/readline-4.3_p5.ebuild b/sdk_container/src/third_party/portage-stable/sys-libs/readline/readline-4.3_p5.ebuild index 986d7449da..27cc5342b1 100644 --- a/sdk_container/src/third_party/portage-stable/sys-libs/readline/readline-4.3_p5.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-libs/readline/readline-4.3_p5.ebuild @@ -1,10 +1,11 @@ -# Copyright 1999-2009 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Id$ # This version is just for the ABI .4 library -inherit eutils flag-o-matic +EAPI="5" + +inherit eutils multilib-minimal flag-o-matic # Official patches # See ftp://ftp.cwru.edu/pub/bash/readline-4.3-patches/ @@ -36,26 +37,28 @@ SLOT="${PV:0:1}" KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86" IUSE="" -RDEPEND=">=sys-libs/ncurses-5.2-r2" +RDEPEND=">=sys-libs/ncurses-5.2-r2:0=[${MULTILIB_USEDEP}]" DEPEND="${RDEPEND}" S=${WORKDIR}/${MY_P} -src_unpack() { - unpack ${MY_P}.tar.gz - cd "${S}" +src_prepare() { [[ ${PLEVEL} -gt 0 ]] && epatch $(patches -s) # force ncurses linking #71420 sed -i -e 's:^SHLIB_LIBS=:SHLIB_LIBS=-lncurses:' support/shobj-conf || die "sed" } -src_compile() { +multilib_src_configure() { append-cppflags -D_GNU_SOURCE - econf --with-curses --disable-static || die - emake -C shlib || die + ECONF_SOURCE=${S} \ + econf --with-curses --disable-static } -src_install() { - emake -C shlib DESTDIR="${D}" install || die +multilib_src_compile() { + emake -C shlib +} + +multilib_src_install() { + emake -C shlib DESTDIR="${D}" install rm -f "${D}"/usr/lib*/*.so } diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/readline/readline-5.2_p14.ebuild b/sdk_container/src/third_party/portage-stable/sys-libs/readline/readline-5.2_p14.ebuild index 89f18029e8..822cdc1105 100644 --- a/sdk_container/src/third_party/portage-stable/sys-libs/readline/readline-5.2_p14.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-libs/readline/readline-5.2_p14.ebuild @@ -1,10 +1,11 @@ -# Copyright 1999-2010 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Id$ # This version is just for the ABI .5 library -inherit eutils multilib flag-o-matic +EAPI="5" + +inherit eutils multilib-minimal flag-o-matic # Official patches # See ftp://ftp.cwru.edu/pub/bash/readline-5.1-patches/ @@ -33,38 +34,32 @@ SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz $(patches)" LICENSE="GPL-2" SLOT="${PV:0:1}" -KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd" +KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd" IUSE="" -RDEPEND=">=sys-libs/ncurses-5.2-r2" +RDEPEND=">=sys-libs/ncurses-5.2-r2:0=[${MULTILIB_USEDEP}]" DEPEND="${RDEPEND}" S=${WORKDIR}/${MY_P} -src_unpack() { - unpack ${MY_P}.tar.gz - cd "${S}" +src_prepare() { [[ ${PLEVEL} -gt 0 ]] && epatch $(patches -s) epatch "${FILESDIR}"/${PN}-5.0-no_rpath.patch # force ncurses linking #71420 sed -i -e 's:^SHLIB_LIBS=:SHLIB_LIBS=-lncurses:' support/shobj-conf || die "sed" } -src_compile() { - append-flags -D_GNU_SOURCE - - # the --libdir= is needed because if lib64 is a directory, it will default - # to using that... even if CONF_LIBDIR isnt set or we're using a version - # of portage without CONF_LIBDIR support. - econf \ - --with-curses \ - --disable-static \ - --libdir=/usr/$(get_libdir) \ - || die - emake -C shlib || die +multilib_src_configure() { + append-cppflags -D_GNU_SOURCE + ECONF_SOURCE=${S} \ + econf --with-curses --disable-static } -src_install() { - emake -C shlib DESTDIR="${D}" install || die +multilib_src_compile() { + emake -C shlib +} + +multilib_src_install() { + emake -C shlib DESTDIR="${D}" install rm -f "${D}"/usr/lib*/*.so } diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/readline/readline-6.2_p5-r1.ebuild b/sdk_container/src/third_party/portage-stable/sys-libs/readline/readline-6.2_p5-r1.ebuild deleted file mode 100644 index 36ffdf456f..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-libs/readline/readline-6.2_p5-r1.ebuild +++ /dev/null @@ -1,153 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="4" - -inherit eutils multilib toolchain-funcs flag-o-matic multilib-minimal - -# Official patches -# See ftp://ftp.cwru.edu/pub/bash/readline-6.2-patches/ -PLEVEL=${PV##*_p} -MY_PV=${PV/_p*} -MY_PV=${MY_PV/_/-} -MY_P=${PN}-${MY_PV} -[[ ${PV} != *_p* ]] && PLEVEL=0 -patches() { - [[ ${PLEVEL} -eq 0 ]] && return 1 - local opt=$1 - eval set -- {1..${PLEVEL}} - set -- $(printf "${PN}${MY_PV/\.}-%03d " "$@") - if [[ ${opt} == -s ]] ; then - echo "${@/#/${DISTDIR}/}" - else - local u - for u in ftp://ftp.cwru.edu/pub/bash mirror://gnu/${PN} ; do - printf "${u}/${PN}-${MY_PV}-patches/%s " "$@" - done - fi -} - -DESCRIPTION="Another cute console display library" -HOMEPAGE="http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html" -SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz $(patches)" - -LICENSE="GPL-3" -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 ~arm-linux ~x86-linux" -IUSE="static-libs" - -RDEPEND=">=sys-libs/ncurses-5.9-r3[${MULTILIB_USEDEP}] - abi_x86_32? ( - !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] - !<=app-emulation/emul-linux-x86-baselibs-20131008-r7 - )" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -S=${WORKDIR}/${MY_P} - -src_unpack() { - unpack ${MY_P}.tar.gz -} - -src_prepare() { - [[ ${PLEVEL} -gt 0 ]] && epatch $(patches -s) - epatch "${FILESDIR}"/${PN}-5.0-no_rpath.patch - epatch "${FILESDIR}"/${PN}-5.2-no-ignore-shlib-errors.patch #216952 - epatch "${FILESDIR}"/${PN}-6.2-rlfe-tgoto.patch #385091 - - # Force ncurses linking. #71420 - # Use pkg-config to get the right values. #457558 - local ncurses_libs=$($(tc-getPKG_CONFIG) ncurses --libs) - sed -i \ - -e "/^SHLIB_LIBS=/s:=.*:='${ncurses_libs}':" \ - support/shobj-conf || die - sed -i \ - -e "/^[[:space:]]*LIBS=.-lncurses/s:-lncurses:${ncurses_libs}:" \ - examples/rlfe/configure || die - - # fix building under Gentoo/FreeBSD; upstream FreeBSD deprecated - # objformat for years, so we don't want to rely on that. - sed -i -e '/objformat/s:if .*; then:if true; then:' support/shobj-conf || die - - ln -s ../.. examples/rlfe/readline # for local readline headers -} - -src_configure() { - # fix implicit decls with widechar funcs - append-cppflags -D_GNU_SOURCE - # https://lists.gnu.org/archive/html/bug-readline/2010-07/msg00013.html - append-cppflags -Dxrealloc=_rl_realloc -Dxmalloc=_rl_malloc -Dxfree=_rl_free - - # Make sure configure picks a better ar than `ar`. #484866 - export ac_cv_prog_AR=$(tc-getAR) - - # Force the test since we used sed above to force it. - export bash_cv_termcap_lib=ncurses - - # This is for rlfe, but we need to make sure LDFLAGS doesn't change - # so we can re-use the config cache file between the two. - append-ldflags -L. - - multilib-minimal_src_configure -} - -multilib_src_configure() { - ECONF_SOURCE=${S} \ - econf \ - --cache-file="${BUILD_DIR}"/config.cache \ - --with-curses \ - $(use_enable static-libs static) - - if multilib_is_native_abi && ! tc-is-cross-compiler ; then - # code is full of AC_TRY_RUN() - mkdir -p examples/rlfe || die - cd examples/rlfe || die - ECONF_SOURCE=${S}/examples/rlfe \ - econf --cache-file="${BUILD_DIR}"/config.cache - fi -} - -multilib_src_compile() { - emake - - if multilib_is_native_abi && ! tc-is-cross-compiler ; then - # code is full of AC_TRY_RUN() - cd examples/rlfe || die - local l - for l in readline history ; do - ln -s ../../shlib/lib${l}$(get_libname)* lib${l}$(get_libname) - ln -sf ../../lib${l}.a lib${l}.a - done - emake - fi -} - -multilib_src_install() { - default - - if multilib_is_native_abi ; then - gen_usr_ldscript -a readline history #4411 - - if ! tc-is-cross-compiler; then - dobin examples/rlfe/rlfe - fi - fi -} - -multilib_src_install_all() { - einstalldocs - dodoc USAGE - dohtml -r doc/. - docinto ps - dodoc doc/*.ps -} - -pkg_preinst() { - preserve_old_lib /$(get_libdir)/lib{history,readline}.so.{4,5} #29865 -} - -pkg_postinst() { - preserve_old_lib_notify /$(get_libdir)/lib{history,readline}.so.{4,5} -} diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/readline/readline-6.3_p8-r2.ebuild b/sdk_container/src/third_party/portage-stable/sys-libs/readline/readline-6.3_p8-r3.ebuild similarity index 87% rename from sdk_container/src/third_party/portage-stable/sys-libs/readline/readline-6.3_p8-r2.ebuild rename to sdk_container/src/third_party/portage-stable/sys-libs/readline/readline-6.3_p8-r3.ebuild index ad21882af2..1142505f87 100644 --- a/sdk_container/src/third_party/portage-stable/sys-libs/readline/readline-6.3_p8-r2.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-libs/readline/readline-6.3_p8-r3.ebuild @@ -1,8 +1,7 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Id$ -EAPI=4 +EAPI=5 inherit eutils multilib toolchain-funcs flag-o-matic multilib-minimal @@ -34,29 +33,29 @@ SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz $(patches)" LICENSE="GPL-3" 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 ~arm-linux ~x86-linux" +KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux" IUSE="static-libs utils" -RDEPEND=">=sys-libs/ncurses-5.9-r3[${MULTILIB_USEDEP}] - abi_x86_32? ( - !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] - !<=app-emulation/emul-linux-x86-baselibs-20131008-r7 - )" +RDEPEND=">=sys-libs/ncurses-5.9-r3:0=[${MULTILIB_USEDEP}]" DEPEND="${RDEPEND} virtual/pkgconfig" S=${WORKDIR}/${MY_P} +PATCHES=( + "${FILESDIR}"/${PN}-5.0-no_rpath.patch + "${FILESDIR}"/${PN}-6.2-rlfe-tgoto.patch #385091 + "${FILESDIR}"/${PN}-6.3-fix-long-prompt-vi-search.patch + "${FILESDIR}"/${PN}-6.3-read-eof.patch +) + src_unpack() { unpack ${MY_P}.tar.gz } src_prepare() { [[ ${PLEVEL} -gt 0 ]] && epatch $(patches -s) - epatch "${FILESDIR}"/${PN}-5.0-no_rpath.patch - epatch "${FILESDIR}"/${PN}-6.2-rlfe-tgoto.patch #385091 - epatch "${FILESDIR}"/${PN}-6.3-fix-long-prompt-vi-search.patch - epatch "${FILESDIR}"/${PN}-6.3-read-eof.patch + epatch "${PATCHES[@]}" # Force ncurses linking. #71420 # Use pkg-config to get the right values. #457558 @@ -107,7 +106,7 @@ multilib_src_configure() { ECONF_SOURCE=${S} \ econf \ --cache-file="${BUILD_DIR}"/config.cache \ - --docdir=/usr/share/doc/${PF} \ + --docdir='$(datarootdir)'/doc/${PF} \ --with-curses \ $(use_enable static-libs static) diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/readline/readline-6.3_p8-r1.ebuild b/sdk_container/src/third_party/portage-stable/sys-libs/readline/readline-7.0_p3-r1.ebuild similarity index 62% rename from sdk_container/src/third_party/portage-stable/sys-libs/readline/readline-6.3_p8-r1.ebuild rename to sdk_container/src/third_party/portage-stable/sys-libs/readline/readline-7.0_p3-r1.ebuild index 98588d90f9..ceeb39505b 100644 --- a/sdk_container/src/third_party/portage-stable/sys-libs/readline/readline-6.3_p8-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-libs/readline/readline-7.0_p3-r1.ebuild @@ -1,17 +1,16 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Id$ -EAPI=4 +EAPI=6 -inherit eutils multilib toolchain-funcs flag-o-matic multilib-minimal +inherit flag-o-matic multilib-minimal toolchain-funcs # Official patches -# See ftp://ftp.cwru.edu/pub/bash/readline-6.3-patches/ -PLEVEL=${PV##*_p} -MY_PV=${PV/_p*} -MY_PV=${MY_PV/_/-} -MY_P=${PN}-${MY_PV} +# See ftp://ftp.cwru.edu/pub/bash/readline-7.0-patches/ +PLEVEL="${PV##*_p}" +MY_PV="${PV/_p*}" +MY_PV="${MY_PV/_/-}" +MY_P="${PN}-${MY_PV}" [[ ${PV} != *_p* ]] && PLEVEL=0 patches() { [[ ${PLEVEL} -eq 0 ]] && return 1 @@ -30,32 +29,44 @@ patches() { DESCRIPTION="Another cute console display library" HOMEPAGE="http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html" -SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz $(patches)" + +case ${PV} in + *_alpha*|*_beta*|*_rc*) + SRC_URI+=" ftp://ftp.cwru.edu/pub/bash/${MY_P}.tar.gz" + ;; + *) + SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz $(patches)" + ;; +esac LICENSE="GPL-3" -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 ~arm-linux ~x86-linux" -IUSE="static-libs" +SLOT="0/7" # subslot matches SONAME major +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux" +IUSE="static-libs utils" -RDEPEND=">=sys-libs/ncurses-5.9-r3[${MULTILIB_USEDEP}] - abi_x86_32? ( - !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] - !<=app-emulation/emul-linux-x86-baselibs-20131008-r7 - )" +RDEPEND=">=sys-libs/ncurses-5.9-r3:0=[static-libs?,${MULTILIB_USEDEP}]" DEPEND="${RDEPEND} virtual/pkgconfig" S=${WORKDIR}/${MY_P} +PATCHES=( + "${FILESDIR}"/${PN}-5.0-no_rpath.patch + "${FILESDIR}"/${PN}-6.2-rlfe-tgoto.patch #385091 + "${FILESDIR}"/${PN}-7.0-headers.patch + "${FILESDIR}"/${PN}-7.0-missing-echo-proto.patch + "${FILESDIR}"/${PN}-7.0-mingw.patch +) + +# Needed because we don't want the patches being unpacked +# (which emits annoying and useless error messages) src_unpack() { unpack ${MY_P}.tar.gz } src_prepare() { - [[ ${PLEVEL} -gt 0 ]] && epatch $(patches -s) - epatch "${FILESDIR}"/${PN}-5.0-no_rpath.patch - epatch "${FILESDIR}"/${PN}-6.2-rlfe-tgoto.patch #385091 - epatch "${FILESDIR}"/${PN}-6.3-fix-long-prompt-vi-search.patch + [[ ${PLEVEL} -gt 0 ]] && eapply -p0 $(patches -s) + default # Force ncurses linking. #71420 # Use pkg-config to get the right values. #457558 @@ -71,7 +82,7 @@ src_prepare() { # objformat for years, so we don't want to rely on that. sed -i -e '/objformat/s:if .*; then:if true; then:' support/shobj-conf || die - ln -s ../.. examples/rlfe/readline # for local readline headers + ln -s ../.. examples/rlfe/readline || die # for local readline headers } src_configure() { @@ -90,7 +101,7 @@ src_configure() { # In cases where the C library doesn't support wide characters, readline # itself won't work correctly, so forcing the answer below should be OK. if tc-is-cross-compiler ; then - export bash_cv_func_sigsetjmp='present' + use kernel_Winnt || export bash_cv_func_sigsetjmp='present' export bash_cv_func_ctype_nonascii='yes' export bash_cv_wcwidth_broken='no' #503312 fi @@ -103,18 +114,18 @@ src_configure() { } multilib_src_configure() { - ECONF_SOURCE=${S} \ - econf \ - --cache-file="${BUILD_DIR}"/config.cache \ - --docdir=/usr/share/doc/${PF} \ - --with-curses \ + local myeconfargs=( + --cache-file="${BUILD_DIR}"/config.cache + --with-curses $(use_enable static-libs static) + ) + ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" - if multilib_is_native_abi && ! tc-is-cross-compiler ; then + if use utils && multilib_is_native_abi && ! tc-is-cross-compiler ; then # code is full of AC_TRY_RUN() mkdir -p examples/rlfe || die cd examples/rlfe || die - ECONF_SOURCE=${S}/examples/rlfe \ + ECONF_SOURCE="${S}"/examples/rlfe \ econf --cache-file="${BUILD_DIR}"/config.cache fi } @@ -122,13 +133,13 @@ multilib_src_configure() { multilib_src_compile() { emake - if multilib_is_native_abi && ! tc-is-cross-compiler ; then + if use utils && multilib_is_native_abi && ! tc-is-cross-compiler ; then # code is full of AC_TRY_RUN() cd examples/rlfe || die local l for l in readline history ; do - ln -s ../../shlib/lib${l}$(get_libname)* lib${l}$(get_libname) - ln -sf ../../lib${l}.a lib${l}.a + ln -s ../../shlib/lib${l}$(get_libname)* lib${l}$(get_libname) || die + ln -s ../../lib${l}.a lib${l}.a || die done emake fi @@ -140,24 +151,24 @@ multilib_src_install() { if multilib_is_native_abi ; then gen_usr_ldscript -a readline history #4411 - if ! tc-is-cross-compiler; then + if use utils && ! tc-is-cross-compiler; then dobin examples/rlfe/rlfe fi fi } multilib_src_install_all() { - einstalldocs + HTML_DOCS="doc/history.html doc/readline.html doc/rluserman.html" einstalldocs dodoc USAGE - dohtml -r doc/. docinto ps dodoc doc/*.ps } - pkg_preinst() { - preserve_old_lib /$(get_libdir)/lib{history,readline}.so.{4,5} #29865 + # bug #29865 + # Reappeared in #595324 with paludis so keeping this for now... + preserve_old_lib /$(get_libdir)/lib{history,readline}.so.{4,5,6} } pkg_postinst() { - preserve_old_lib_notify /$(get_libdir)/lib{history,readline}.so.{4,5} + preserve_old_lib_notify /$(get_libdir)/lib{history,readline}.so.{4,5,6} } diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/readline/readline-7.0_alpha.ebuild b/sdk_container/src/third_party/portage-stable/sys-libs/readline/readline-7.0_p3.ebuild similarity index 85% rename from sdk_container/src/third_party/portage-stable/sys-libs/readline/readline-7.0_alpha.ebuild rename to sdk_container/src/third_party/portage-stable/sys-libs/readline/readline-7.0_p3.ebuild index d57eb81b4c..d36d5cc934 100644 --- a/sdk_container/src/third_party/portage-stable/sys-libs/readline/readline-7.0_alpha.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-libs/readline/readline-7.0_p3.ebuild @@ -1,13 +1,12 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Id$ EAPI="5" inherit eutils multilib toolchain-funcs flag-o-matic multilib-minimal # Official patches -# See ftp://ftp.cwru.edu/pub/bash/readline-6.3-patches/ +# See ftp://ftp.cwru.edu/pub/bash/readline-7.0-patches/ PLEVEL=${PV##*_p} MY_PV=${PV/_p*} MY_PV=${MY_PV/_/-} @@ -31,20 +30,16 @@ patches() { DESCRIPTION="Another cute console display library" HOMEPAGE="http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html" case ${PV} in -*_alpha*|*_rc*) SRC_URI+=" ftp://ftp.cwru.edu/pub/bash/${MY_P}.tar.gz" ;; +*_alpha*|*_beta*|*_rc*) SRC_URI+=" ftp://ftp.cwru.edu/pub/bash/${MY_P}.tar.gz" ;; *) SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz $(patches)" ;; esac LICENSE="GPL-3" SLOT="0/7" # subslot matches SONAME major -#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux" +KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux" IUSE="static-libs utils" -RDEPEND=">=sys-libs/ncurses-5.9-r3:0=[${MULTILIB_USEDEP}] - abi_x86_32? ( - !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] - !<=app-emulation/emul-linux-x86-baselibs-20131008-r7 - )" +RDEPEND=">=sys-libs/ncurses-5.9-r3:0=[static-libs?,${MULTILIB_USEDEP}]" DEPEND="${RDEPEND} virtual/pkgconfig" @@ -58,6 +53,8 @@ src_prepare() { [[ ${PLEVEL} -gt 0 ]] && epatch $(patches -s) epatch "${FILESDIR}"/${PN}-5.0-no_rpath.patch epatch "${FILESDIR}"/${PN}-6.2-rlfe-tgoto.patch #385091 + epatch "${FILESDIR}"/${PN}-7.0-headers.patch + epatch "${FILESDIR}"/${PN}-7.0-missing-echo-proto.patch # Force ncurses linking. #71420 # Use pkg-config to get the right values. #457558 @@ -108,7 +105,7 @@ multilib_src_configure() { ECONF_SOURCE=${S} \ econf \ --cache-file="${BUILD_DIR}"/config.cache \ - --docdir=/usr/share/doc/${PF} \ + --docdir='$(datarootdir)'/doc/${PF} \ --with-curses \ $(use_enable static-libs static) @@ -155,11 +152,12 @@ multilib_src_install_all() { docinto ps dodoc doc/*.ps } - pkg_preinst() { - preserve_old_lib /$(get_libdir)/lib{history,readline}.so.{4,5} #29865 + # bug #29865 + # Reappeared in #595324 with paludis so keeping this for now... + preserve_old_lib /$(get_libdir)/lib{history,readline}.so.{4,5,6} } pkg_postinst() { - preserve_old_lib_notify /$(get_libdir)/lib{history,readline}.so.{4,5} + preserve_old_lib_notify /$(get_libdir)/lib{history,readline}.so.{4,5,6} } From 50569e6d4a1d21ad2c11258a61155dd4a5614528 Mon Sep 17 00:00:00 2001 From: David Michael Date: Fri, 11 May 2018 18:26:05 -0400 Subject: [PATCH 02/21] app-emulation/qemu: Drop package being used in the overlay --- .../app-emulation/qemu/Manifest | 3 - .../app-emulation/qemu/files/65-kvm.rules-r1 | 2 - .../app-emulation/qemu/files/bridge.conf | 14 - .../qemu/files/qemu-2.11.0-glibc-2.27.patch | 54 -- .../qemu-2.11.1-capstone_include_path.patch | 11 - .../qemu/files/qemu-2.5.0-cflags.patch | 13 - .../qemu/files/qemu-2.5.0-sysmacros.patch | 15 - .../qemu/files/qemu-binfmt.initd.head | 64 -- .../qemu/files/qemu-binfmt.initd.tail | 14 - .../app-emulation/qemu/metadata.xml | 57 -- .../app-emulation/qemu/qemu-2.11.1-r2.ebuild | 805 ------------------ .../app-emulation/qemu/qemu-2.11.1-r53.ebuild | 805 ------------------ .../app-emulation/qemu/qemu-9999.ebuild | 801 ----------------- .../md5-cache/app-emulation/qemu-2.11.1-r2 | 14 - .../md5-cache/app-emulation/qemu-2.11.1-r53 | 14 - .../md5-cache/app-emulation/qemu-9999 | 12 - 16 files changed, 2698 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/app-emulation/qemu/Manifest delete mode 100644 sdk_container/src/third_party/portage-stable/app-emulation/qemu/files/65-kvm.rules-r1 delete mode 100644 sdk_container/src/third_party/portage-stable/app-emulation/qemu/files/bridge.conf delete mode 100644 sdk_container/src/third_party/portage-stable/app-emulation/qemu/files/qemu-2.11.0-glibc-2.27.patch delete mode 100644 sdk_container/src/third_party/portage-stable/app-emulation/qemu/files/qemu-2.11.1-capstone_include_path.patch delete mode 100644 sdk_container/src/third_party/portage-stable/app-emulation/qemu/files/qemu-2.5.0-cflags.patch delete mode 100644 sdk_container/src/third_party/portage-stable/app-emulation/qemu/files/qemu-2.5.0-sysmacros.patch delete mode 100644 sdk_container/src/third_party/portage-stable/app-emulation/qemu/files/qemu-binfmt.initd.head delete mode 100644 sdk_container/src/third_party/portage-stable/app-emulation/qemu/files/qemu-binfmt.initd.tail delete mode 100644 sdk_container/src/third_party/portage-stable/app-emulation/qemu/metadata.xml delete mode 100644 sdk_container/src/third_party/portage-stable/app-emulation/qemu/qemu-2.11.1-r2.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/app-emulation/qemu/qemu-2.11.1-r53.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/app-emulation/qemu/qemu-9999.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-emulation/qemu-2.11.1-r2 delete mode 100644 sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-emulation/qemu-2.11.1-r53 delete mode 100644 sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-emulation/qemu-9999 diff --git a/sdk_container/src/third_party/portage-stable/app-emulation/qemu/Manifest b/sdk_container/src/third_party/portage-stable/app-emulation/qemu/Manifest deleted file mode 100644 index e58946d549..0000000000 --- a/sdk_container/src/third_party/portage-stable/app-emulation/qemu/Manifest +++ /dev/null @@ -1,3 +0,0 @@ -DIST qemu-2.11.1-patches-r1.tar.xz 2064 BLAKE2B 533c916b01c014bcfa6c733b76aa6da1f12cdf5f0d4ae33136453705a8aca9fdfeef998747cfdc72d19e08fa40ea97e2fd4c21412c030af314605059282f49ef SHA512 12de7b4777ec98871d0786291534f61b37534feef64b556caeab72e020ff14d61fe19d24cb151ebfdb912df2a7ba72c0d882566b368d88d02c9f1354c2adae4a -DIST qemu-2.11.1-patches-r2.tar.xz 3652 BLAKE2B 4c3bf7503a838c2a978bcc973ee7d8909d662980aa2ccb71f3bff69a7aa79cc2ed405ed4648914808c64a538c0ceeef2904380cae38ee6c94176a11c9ebdbed3 SHA512 35d3aaeffe7655e739cd6d7c420692fcc6d2d76e49a8fd288f09bec81146075485675d1f912a7fc531ac8497977bcd259e97c260b61a7e854c378f6b9b2d4a79 -DIST qemu-2.11.1.tar.bz2 32819412 BLAKE2B 6b6d4e7b8dcf33aeedb0b33bad267da07ad17c2eeeb5fbd2c038d760bc03224e55ba0f03eb248c62bc0e8636c2c660ea76b367eaea96bee16388053f82c8b8a9 SHA512 1b692bbdfc3dc785738c7192aa2a3f9cf53d9f5bf3b3f49fa8692050dc50f7056c8a4d1b527d48ffb2a674a0fd3a46d87addd1eaaa758f35eec1ab5adfe32354 diff --git a/sdk_container/src/third_party/portage-stable/app-emulation/qemu/files/65-kvm.rules-r1 b/sdk_container/src/third_party/portage-stable/app-emulation/qemu/files/65-kvm.rules-r1 deleted file mode 100644 index ab3776ac29..0000000000 --- a/sdk_container/src/third_party/portage-stable/app-emulation/qemu/files/65-kvm.rules-r1 +++ /dev/null @@ -1,2 +0,0 @@ -KERNEL=="kvm", GROUP="kvm", MODE="0660" -KERNEL=="vhost-net", GROUP="kvm", MODE="0660", OPTIONS+="static_node=vhost-net" diff --git a/sdk_container/src/third_party/portage-stable/app-emulation/qemu/files/bridge.conf b/sdk_container/src/third_party/portage-stable/app-emulation/qemu/files/bridge.conf deleted file mode 100644 index 2bde37e2ef..0000000000 --- a/sdk_container/src/third_party/portage-stable/app-emulation/qemu/files/bridge.conf +++ /dev/null @@ -1,14 +0,0 @@ -# This should have the following permissions: root:qemu 0640 - -# allow br0 -# Uncommenting the above would allow users in the 'qemu' group -# to add devices to 'br0' - -# allow virbr0 -# Uncommenting the above would allow users in the 'qemu' group -# to add devices to 'virbr0' - -# include /etc/qemu/bob.conf -# Uncommenting the above would allow users in the 'bob' group -# to have permissions defined in it, iff it has the following -# permissions: root:bob 0640 diff --git a/sdk_container/src/third_party/portage-stable/app-emulation/qemu/files/qemu-2.11.0-glibc-2.27.patch b/sdk_container/src/third_party/portage-stable/app-emulation/qemu/files/qemu-2.11.0-glibc-2.27.patch deleted file mode 100644 index 1562bb3c64..0000000000 --- a/sdk_container/src/third_party/portage-stable/app-emulation/qemu/files/qemu-2.11.0-glibc-2.27.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 75e5b70e6b5dcc4f2219992d7cffa462aa406af0 Mon Sep 17 00:00:00 2001 -From: Paolo Bonzini -Date: Tue, 28 Nov 2017 11:51:27 +0100 -Subject: [PATCH] memfd: fix configure test -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Recent glibc added memfd_create in sys/mman.h. This conflicts with -the definition in util/memfd.c: - - /builddir/build/BUILD/qemu-2.11.0-rc1/util/memfd.c:40:12: error: static declaration of memfd_create follows non-static declaration - -Fix the configure test, and remove the sys/memfd.h inclusion since the -file actually does not exist---it is a typo in the memfd_create(2) man -page. - -Cc: Marc-André Lureau -Signed-off-by: Paolo Bonzini ---- - configure | 2 +- - util/memfd.c | 4 +--- - 2 files changed, 2 insertions(+), 4 deletions(-) - -diff --git a/configure b/configure -index 9c8aa5a98b..99ccc1725a 100755 ---- a/configure -+++ b/configure -@@ -3923,7 +3923,7 @@ fi - # check if memfd is supported - memfd=no - cat > $TMPC << EOF --#include -+#include - - int main(void) - { -diff --git a/util/memfd.c b/util/memfd.c -index 4571d1aba8..412e94a405 100644 ---- a/util/memfd.c -+++ b/util/memfd.c -@@ -31,9 +31,7 @@ - - #include "qemu/memfd.h" - --#ifdef CONFIG_MEMFD --#include --#elif defined CONFIG_LINUX -+#if defined CONFIG_LINUX && !defined CONFIG_MEMFD - #include - #include - --- -2.11.0 diff --git a/sdk_container/src/third_party/portage-stable/app-emulation/qemu/files/qemu-2.11.1-capstone_include_path.patch b/sdk_container/src/third_party/portage-stable/app-emulation/qemu/files/qemu-2.11.1-capstone_include_path.patch deleted file mode 100644 index d79570ebb8..0000000000 --- a/sdk_container/src/third_party/portage-stable/app-emulation/qemu/files/qemu-2.11.1-capstone_include_path.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- qemu-2.11.1/include/disas/capstone.h 2018-02-14 22:53:22.000000000 +0100 -+++ qemu-2.11.1/include/disas/capstone.h 2018-02-17 20:12:12.754703951 +0100 -@@ -3,7 +3,7 @@ - - #ifdef CONFIG_CAPSTONE - --#include -+#include - - #else - diff --git a/sdk_container/src/third_party/portage-stable/app-emulation/qemu/files/qemu-2.5.0-cflags.patch b/sdk_container/src/third_party/portage-stable/app-emulation/qemu/files/qemu-2.5.0-cflags.patch deleted file mode 100644 index 173394fd02..0000000000 --- a/sdk_container/src/third_party/portage-stable/app-emulation/qemu/files/qemu-2.5.0-cflags.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/configure -+++ b/configure -@@ -4468,10 +4468,6 @@ fi - if test "$gcov" = "yes" ; then - CFLAGS="-fprofile-arcs -ftest-coverage -g $CFLAGS" - LDFLAGS="-fprofile-arcs -ftest-coverage $LDFLAGS" --elif test "$fortify_source" = "yes" ; then -- CFLAGS="-O2 -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 $CFLAGS" --elif test "$debug" = "no"; then -- CFLAGS="-O2 $CFLAGS" - fi - - ########################################## diff --git a/sdk_container/src/third_party/portage-stable/app-emulation/qemu/files/qemu-2.5.0-sysmacros.patch b/sdk_container/src/third_party/portage-stable/app-emulation/qemu/files/qemu-2.5.0-sysmacros.patch deleted file mode 100644 index f2e766dc1c..0000000000 --- a/sdk_container/src/third_party/portage-stable/app-emulation/qemu/files/qemu-2.5.0-sysmacros.patch +++ /dev/null @@ -1,15 +0,0 @@ -Linux C libs are moving away from implicit header pollution with sys/types.h - ---- a/include/qemu/osdep.h -+++ b/include/qemu/osdep.h -@@ -78,6 +78,10 @@ extern int daemon(int, int); - #include - #include - -+#ifdef __linux__ -+#include -+#endif -+ - #ifdef __OpenBSD__ - #include - #endif diff --git a/sdk_container/src/third_party/portage-stable/app-emulation/qemu/files/qemu-binfmt.initd.head b/sdk_container/src/third_party/portage-stable/app-emulation/qemu/files/qemu-binfmt.initd.head deleted file mode 100644 index 858d5d7453..0000000000 --- a/sdk_container/src/third_party/portage-stable/app-emulation/qemu/files/qemu-binfmt.initd.head +++ /dev/null @@ -1,64 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -# Enable automatic non-native program execution by the kernel. - -# Defaulting to OC should be safe because it comes down to: -# - do we trust the interp itself to not be malicious? yes; we built it. -# - do we trust the programs we're running? ish; same permission as native -# binaries apply. so if user can do bad stuff natively, cross isn't worse. -: ${QEMU_BINFMT_FLAGS:=OC} - -depend() { - after procfs -} - -start() { - ebegin "Registering qemu-user binaries (flags: ${QEMU_BINFMT_FLAGS})" - - if [ ! -d /proc/sys/fs/binfmt_misc ] ; then - modprobe -q binfmt_misc - fi - - if [ ! -d /proc/sys/fs/binfmt_misc ] ; then - eend 1 "You need support for 'misc binaries' in your kernel!" - return - fi - - if [ ! -f /proc/sys/fs/binfmt_misc/register ] ; then - mount -t binfmt_misc -o nodev,noexec,nosuid \ - binfmt_misc /proc/sys/fs/binfmt_misc >/dev/null 2>&1 - eend $? || return - fi - - # Probe the native cpu type so we don't try registering them. - local cpu="$(uname -m)" - case "${cpu}" in - armv[4-9]*) - cpu="arm" - ;; - i386|i486|i586|i686|i86pc|BePC|x86_64) - cpu="i386" - ;; - m68k) - cpu="m68k" - ;; - mips*) - cpu="mips" - ;; - "Power Macintosh"|ppc|ppc64) - cpu="ppc" - ;; - s390*) - cpu="s390" - ;; - sh*) - cpu="sh" - ;; - sparc*) - cpu="sparc" - ;; - esac - - # Register the interpreter for each cpu except for the native one. diff --git a/sdk_container/src/third_party/portage-stable/app-emulation/qemu/files/qemu-binfmt.initd.tail b/sdk_container/src/third_party/portage-stable/app-emulation/qemu/files/qemu-binfmt.initd.tail deleted file mode 100644 index 7679481929..0000000000 --- a/sdk_container/src/third_party/portage-stable/app-emulation/qemu/files/qemu-binfmt.initd.tail +++ /dev/null @@ -1,14 +0,0 @@ - eend 0 -} - -stop() { - # We unregister everything in the "qemu-xxx" namespace. - ebegin "Unregistering qemu-user binaries" - local f - for f in /proc/sys/fs/binfmt_misc/qemu-* ; do - if [ -f "${f}" ] ; then - echo '-1' > "${f}" - fi - done - eend 0 -} diff --git a/sdk_container/src/third_party/portage-stable/app-emulation/qemu/metadata.xml b/sdk_container/src/third_party/portage-stable/app-emulation/qemu/metadata.xml deleted file mode 100644 index 61c159a658..0000000000 --- a/sdk_container/src/third_party/portage-stable/app-emulation/qemu/metadata.xml +++ /dev/null @@ -1,57 +0,0 @@ - - - - - qemu@gentoo.org - Gentoo QEMU Project - - - Adds support for braille displays using brltty - Enables support for Linux's Async IO - Enable alsa output for sound emulation - Enable disassembly support with dev-libs/capstone - Support ISOs / -cdrom directives vis HTTP or HTTPS. - Enables firmware device tree support - Enables GlusterFS cluster fileystem via - sys-cluster/glusterfs - Enable TLS support for the VNC console server. - For 1.4 and newer this also enables WebSocket support. - For 2.0 through 2.3 also enables disk quorum support. - Use gtk-2 instead of gtk-3 - Enable direct iSCSI support via - net-libs/libiscsi instead of indirectly via the Linux - block layer that sys-block/open-iscsi does. - Enable the ncurses-based console - Enable NFS support - Enable NUMA support - Pin the versions of BIOS firmware to the version included in the upstream release. - This is needed to sanely support migration/suspend/resume/snapshotting/etc... of instances. - When the blobs are different, random corruption/bugs/crashes/etc... may be observed. - Enable pulseaudio output for sound emulation - Enable rados block device backend support, see http://ceph.newdream.net/wiki/QEMU-RBD - Enable the SDL-based console - Use libsdl2 instead of libsdl - Enable Spice protocol support via app-emulation/spice - Enable SSH based block device support via net-libs/libssh2 - Build the User targets as static binaries - Build the User and Software MMU (system) targets as well as tools as static binaries - Enable support for snappy compression - Enable SystemTAP/DTrace tracing - Enable the TCG Interpreter which can speed up or slowdown workloads depending on the host and guest CPUs being emulated. In the future it will be a runtime option but for now its compile time. - Enable jpeg image support for the VNC console server - Enable png image support for the VNC console server - Enable USB passthrough via dev-libs/libusb - Use sys-apps/usbredir to redirect USB devices to another machine over TCP - Enable VDE-based networking - Enable accelerated networking using vhost-net, see http://www.linux-kvm.org/page/VhostNet - Enable experimental Virgil 3d (virtual software GPU) - Enable VirtFS via virtio-9p-pci / fsdev. See http://wiki.qemu.org/Documentation/9psetup - Enable terminal support (x11-libs/vte) in the GTK+ interface - Add support for getting and setting POSIX extended attributes, through - sys-apps/attr. Requisite for the virtfs backend. - - Enables support for Xen backends - Support xfsctl() notification and syncing for XFS backed - virtual disks. - - diff --git a/sdk_container/src/third_party/portage-stable/app-emulation/qemu/qemu-2.11.1-r2.ebuild b/sdk_container/src/third_party/portage-stable/app-emulation/qemu/qemu-2.11.1-r2.ebuild deleted file mode 100644 index 8922d6793f..0000000000 --- a/sdk_container/src/third_party/portage-stable/app-emulation/qemu/qemu-2.11.1-r2.ebuild +++ /dev/null @@ -1,805 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -PYTHON_COMPAT=( python2_7 ) -PYTHON_REQ_USE="ncurses,readline" - -PLOCALES="bg de_DE fr_FR hu it tr zh_CN" - -FIRMWARE_ABI_VERSION="2.9.0-r52" - -inherit eutils flag-o-matic linux-info toolchain-funcs multilib python-r1 \ - user udev fcaps readme.gentoo-r1 pax-utils l10n - -if [[ ${PV} = *9999* ]]; then - EGIT_REPO_URI="git://git.qemu.org/qemu.git" - inherit git-r3 - SRC_URI="" -else - SRC_URI="http://wiki.qemu-project.org/download/${P}.tar.bz2" - KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 x86 ~x86-fbsd" - - # Gentoo specific patchsets: - SRC_URI+=" https://dev.gentoo.org/~tamiko/distfiles/${P}-patches-r1.tar.xz" -fi - -DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools" -HOMEPAGE="http://www.qemu.org http://www.linux-kvm.org" - -LICENSE="GPL-2 LGPL-2 BSD-2" -SLOT="0" -IUSE="accessibility +aio alsa bluetooth bzip2 +caps +curl debug +fdt - glusterfs gnutls gtk gtk2 infiniband iscsi +jpeg kernel_linux - kernel_FreeBSD lzo ncurses nfs nls numa opengl +pin-upstream-blobs +png - pulseaudio python rbd sasl +seccomp sdl sdl2 selinux smartcard snappy - spice ssh static static-user systemtap tci test usb usbredir vde - +vhost-net virgl virtfs +vnc vte xattr xen xfs" - -COMMON_TARGETS="aarch64 alpha arm cris i386 m68k microblaze microblazeel - mips mips64 mips64el mipsel nios2 or1k ppc ppc64 s390x sh4 sh4eb sparc - sparc64 x86_64" -IUSE_SOFTMMU_TARGETS="${COMMON_TARGETS} - lm32 moxie ppcemb tricore unicore32 xtensa xtensaeb" -IUSE_USER_TARGETS="${COMMON_TARGETS} - armeb hppa mipsn32 mipsn32el ppc64abi32 ppc64le sparc32plus tilegx" - -use_softmmu_targets=$(printf ' qemu_softmmu_targets_%s' ${IUSE_SOFTMMU_TARGETS}) -use_user_targets=$(printf ' qemu_user_targets_%s' ${IUSE_USER_TARGETS}) -IUSE+=" ${use_softmmu_targets} ${use_user_targets}" - -# Allow no targets to be built so that people can get a tools-only build. -# Block USE flag configurations known to not work. -REQUIRED_USE="${PYTHON_REQUIRED_USE} - gtk2? ( gtk ) - qemu_softmmu_targets_arm? ( fdt ) - qemu_softmmu_targets_microblaze? ( fdt ) - qemu_softmmu_targets_mips64el? ( fdt ) - qemu_softmmu_targets_ppc? ( fdt ) - qemu_softmmu_targets_ppc64? ( fdt ) - sdl2? ( sdl ) - static? ( static-user !alsa !bluetooth !gtk !gtk2 !opengl !pulseaudio !snappy ) - virtfs? ( xattr ) - vte? ( gtk )" - -# Dependencies required for qemu tools (qemu-nbd, qemu-img, qemu-io, ...) -# and user/softmmu targets (qemu-*, qemu-system-*). -# -# Yep, you need both libcap and libcap-ng since virtfs only uses libcap. -# -# The attr lib isn't always linked in (although the USE flag is always -# respected). This is because qemu supports using the C library's API -# when available rather than always using the extranl library. -ALL_DEPEND=" - >=dev-libs/glib-2.0[static-libs(+)] - sys-libs/zlib[static-libs(+)] - python? ( ${PYTHON_DEPS} ) - systemtap? ( dev-util/systemtap ) - xattr? ( sys-apps/attr[static-libs(+)] )" - -# Dependencies required for qemu tools (qemu-nbd, qemu-img, qemu-io, ...) -# softmmu targets (qemu-system-*). -SOFTMMU_TOOLS_DEPEND=" - >=x11-libs/pixman-0.28.0[static-libs(+)] - accessibility? ( - app-accessibility/brltty[api] - app-accessibility/brltty[static-libs(+)] - ) - aio? ( dev-libs/libaio[static-libs(+)] ) - alsa? ( >=media-libs/alsa-lib-1.0.13 ) - bluetooth? ( net-wireless/bluez ) - bzip2? ( app-arch/bzip2[static-libs(+)] ) - caps? ( sys-libs/libcap-ng[static-libs(+)] ) - curl? ( >=net-misc/curl-7.15.4[static-libs(+)] ) - fdt? ( >=sys-apps/dtc-1.4.2[static-libs(+)] ) - glusterfs? ( >=sys-cluster/glusterfs-3.4.0[static-libs(+)] ) - gnutls? ( - dev-libs/nettle:=[static-libs(+)] - >=net-libs/gnutls-3.0:=[static-libs(+)] - ) - gtk? ( - gtk2? ( - x11-libs/gtk+:2 - vte? ( x11-libs/vte:0 ) - ) - !gtk2? ( - x11-libs/gtk+:3 - vte? ( x11-libs/vte:2.91 ) - ) - ) - infiniband? ( sys-fabric/librdmacm:=[static-libs(+)] ) - iscsi? ( net-libs/libiscsi ) - jpeg? ( virtual/jpeg:0=[static-libs(+)] ) - lzo? ( dev-libs/lzo:2[static-libs(+)] ) - ncurses? ( - sys-libs/ncurses:0=[unicode] - sys-libs/ncurses:0=[static-libs(+)] - ) - nfs? ( >=net-fs/libnfs-1.9.3:=[static-libs(+)] ) - numa? ( sys-process/numactl[static-libs(+)] ) - opengl? ( - virtual/opengl - media-libs/libepoxy[static-libs(+)] - media-libs/mesa[static-libs(+)] - media-libs/mesa[egl,gbm] - ) - png? ( media-libs/libpng:0=[static-libs(+)] ) - pulseaudio? ( media-sound/pulseaudio ) - rbd? ( sys-cluster/ceph[static-libs(+)] ) - sasl? ( dev-libs/cyrus-sasl[static-libs(+)] ) - sdl? ( - !sdl2? ( - media-libs/libsdl[X] - >=media-libs/libsdl-1.2.11[static-libs(+)] - ) - sdl2? ( - media-libs/libsdl2[X] - media-libs/libsdl2[static-libs(+)] - ) - ) - seccomp? ( >=sys-libs/libseccomp-2.1.0[static-libs(+)] ) - smartcard? ( >=app-emulation/libcacard-2.5.0[static-libs(+)] ) - snappy? ( app-arch/snappy:= ) - spice? ( - >=app-emulation/spice-protocol-0.12.3 - >=app-emulation/spice-0.12.0[static-libs(+)] - ) - ssh? ( >=net-libs/libssh2-1.2.8[static-libs(+)] ) - usb? ( >=virtual/libusb-1-r2[static-libs(+)] ) - usbredir? ( >=sys-apps/usbredir-0.6[static-libs(+)] ) - vde? ( net-misc/vde[static-libs(+)] ) - virgl? ( media-libs/virglrenderer[static-libs(+)] ) - virtfs? ( sys-libs/libcap ) - xen? ( app-emulation/xen-tools:= ) - xfs? ( sys-fs/xfsprogs[static-libs(+)] )" - -X86_FIRMWARE_DEPEND=" - pin-upstream-blobs? ( - ~sys-firmware/edk2-ovmf-2017_pre20170505[binary] - ~sys-firmware/ipxe-1.0.0_p20160620 - ~sys-firmware/seabios-1.10.2[binary,seavgabios] - ~sys-firmware/sgabios-0.1_pre8 - ) - !pin-upstream-blobs? ( - sys-firmware/edk2-ovmf - sys-firmware/ipxe - >=sys-firmware/seabios-1.10.2[seavgabios] - sys-firmware/sgabios - )" -PPC64_FIRMWARE_DEPEND=" - pin-upstream-blobs? ( - ~sys-firmware/seabios-1.10.2[binary,seavgabios] - ) - !pin-upstream-blobs? ( - >=sys-firmware/seabios-1.10.2[seavgabios] - ) -" - -CDEPEND=" - !static? ( - ${ALL_DEPEND//\[static-libs(+)]} - ${SOFTMMU_TOOLS_DEPEND//\[static-libs(+)]} - ) - qemu_softmmu_targets_i386? ( ${X86_FIRMWARE_DEPEND} ) - qemu_softmmu_targets_x86_64? ( ${X86_FIRMWARE_DEPEND} ) - qemu_softmmu_targets_ppc64? ( ${PPC64_FIRMWARE_DEPEND} ) -" -DEPEND="${CDEPEND} - dev-lang/perl - =dev-lang/python-2* - sys-apps/texinfo - virtual/pkgconfig - kernel_linux? ( >=sys-kernel/linux-headers-2.6.35 ) - gtk? ( nls? ( sys-devel/gettext ) ) - static? ( - ${ALL_DEPEND} - ${SOFTMMU_TOOLS_DEPEND} - ) - static-user? ( ${ALL_DEPEND} ) - test? ( - dev-libs/glib[utils] - sys-devel/bc - )" -RDEPEND="${CDEPEND} - selinux? ( sec-policy/selinux-qemu )" - -PATCHES=( - "${FILESDIR}"/${PN}-2.5.0-cflags.patch - "${FILESDIR}"/${PN}-2.5.0-sysmacros.patch - "${FILESDIR}"/${PN}-2.11.0-glibc-2.27.patch - "${WORKDIR}"/patches -) - -STRIP_MASK="/usr/share/qemu/palcode-clipper" - -QA_PREBUILT=" - usr/share/qemu/openbios-ppc - usr/share/qemu/openbios-sparc64 - usr/share/qemu/openbios-sparc32 - usr/share/qemu/palcode-clipper - usr/share/qemu/s390-ccw.img - usr/share/qemu/s390-netboot.img - usr/share/qemu/u-boot.e500" - -QA_WX_LOAD="usr/bin/qemu-i386 - usr/bin/qemu-x86_64 - usr/bin/qemu-alpha - usr/bin/qemu-arm - usr/bin/qemu-cris - usr/bin/qemu-m68k - usr/bin/qemu-microblaze - usr/bin/qemu-microblazeel - usr/bin/qemu-mips - usr/bin/qemu-mipsel - usr/bin/qemu-or1k - usr/bin/qemu-ppc - usr/bin/qemu-ppc64 - usr/bin/qemu-ppc64abi32 - usr/bin/qemu-sh4 - usr/bin/qemu-sh4eb - usr/bin/qemu-sparc - usr/bin/qemu-sparc64 - usr/bin/qemu-armeb - usr/bin/qemu-sparc32plus - usr/bin/qemu-s390x - usr/bin/qemu-unicore32" - -DOC_CONTENTS="If you don't have kvm compiled into the kernel, make sure you have the -kernel module loaded before running kvm. The easiest way to ensure that the -kernel module is loaded is to load it on boot. - For AMD CPUs the module is called 'kvm-amd'. - For Intel CPUs the module is called 'kvm-intel'. -Please review /etc/conf.d/modules for how to load these. - -Make sure your user is in the 'kvm' group. Just run - $ gpasswd -a kvm -then have re-login. - -For brand new installs, the default permissions on /dev/kvm might not let -you access it. You can tell udev to reset ownership/perms: - $ udevadm trigger -c add /dev/kvm - -If you want to register binfmt handlers for qemu user targets: -For openrc: - # rc-update add qemu-binfmt -For systemd: - # ln -s /usr/share/qemu/binfmt.d/qemu.conf /etc/binfmt.d/qemu.conf" - -pkg_pretend() { - if use kernel_linux && kernel_is lt 2 6 25; then - eerror "This version of KVM requres a host kernel of 2.6.25 or higher." - elif use kernel_linux; then - if ! linux_config_exists; then - eerror "Unable to check your kernel for KVM support" - else - CONFIG_CHECK="~KVM ~TUN ~BRIDGE" - ERROR_KVM="You must enable KVM in your kernel to continue" - ERROR_KVM_AMD="If you have an AMD CPU, you must enable KVM_AMD in" - ERROR_KVM_AMD+=" your kernel configuration." - ERROR_KVM_INTEL="If you have an Intel CPU, you must enable" - ERROR_KVM_INTEL+=" KVM_INTEL in your kernel configuration." - ERROR_TUN="You will need the Universal TUN/TAP driver compiled" - ERROR_TUN+=" into your kernel or loaded as a module to use the" - ERROR_TUN+=" virtual network device if using -net tap." - ERROR_BRIDGE="You will also need support for 802.1d" - ERROR_BRIDGE+=" Ethernet Bridging for some network configurations." - use vhost-net && CONFIG_CHECK+=" ~VHOST_NET" - ERROR_VHOST_NET="You must enable VHOST_NET to have vhost-net" - ERROR_VHOST_NET+=" support" - - if use amd64 || use x86 || use amd64-linux || use x86-linux; then - if grep -q AuthenticAMD /proc/cpuinfo; then - CONFIG_CHECK+=" ~KVM_AMD" - elif grep -q GenuineIntel /proc/cpuinfo; then - CONFIG_CHECK+=" ~KVM_INTEL" - fi - fi - - use python && CONFIG_CHECK+=" ~DEBUG_FS" - ERROR_DEBUG_FS="debugFS support required for kvm_stat" - - # Now do the actual checks setup above - check_extra_config - fi - fi - - if grep -qs '/usr/bin/qemu-kvm' "${EROOT}"/etc/libvirt/qemu/*.xml; then - eerror "The kvm/qemu-kvm wrappers no longer exist, but your libvirt" - eerror "instances are still pointing to it. Please update your" - eerror "configs in /etc/libvirt/qemu/ to use the -enable-kvm flag" - eerror "and the right system binary (e.g. qemu-system-x86_64)." - die "update your virt configs to not use qemu-kvm" - fi -} - -pkg_setup() { - enewgroup kvm 78 -} - -# Sanity check to make sure target lists are kept up-to-date. -check_targets() { - local var=$1 mak=$2 - local detected sorted - - pushd "${S}"/default-configs >/dev/null || die - - # Force C locale until glibc is updated. #564936 - detected=$(echo $(printf '%s\n' *-${mak}.mak | sed "s:-${mak}.mak::" | LC_COLLATE=C sort -u)) - sorted=$(echo $(printf '%s\n' ${!var} | LC_COLLATE=C sort -u)) - if [[ ${sorted} != "${detected}" ]] ; then - eerror "The ebuild needs to be kept in sync." - eerror "${var}: ${sorted}" - eerror "$(printf '%-*s' ${#var} configure): ${detected}" - die "sync ${var} to the list of targets" - fi - - popd >/dev/null -} - -handle_locales() { - # Make sure locale list is kept up-to-date. - local detected sorted - detected=$(echo $(cd po && printf '%s\n' *.po | grep -v messages.po | sed 's:.po$::' | sort -u)) - sorted=$(echo $(printf '%s\n' ${PLOCALES} | sort -u)) - if [[ ${sorted} != "${detected}" ]] ; then - eerror "The ebuild needs to be kept in sync." - eerror "PLOCALES: ${sorted}" - eerror " po/*.po: ${detected}" - die "sync PLOCALES" - fi - - # Deal with selective install of locales. - if use nls ; then - # Delete locales the user does not want. #577814 - rm_loc() { rm po/$1.po || die; } - l10n_for_each_disabled_locale_do rm_loc - else - # Cheap hack to disable gettext .mo generation. - rm -f po/*.po - fi -} - -src_prepare() { - check_targets IUSE_SOFTMMU_TARGETS softmmu - check_targets IUSE_USER_TARGETS linux-user - - # Alter target makefiles to accept CFLAGS set via flag-o - sed -i -r \ - -e 's/^(C|OP_C|HELPER_C)FLAGS=/\1FLAGS+=/' \ - Makefile Makefile.target || die - - default - - # Fix ld and objcopy being called directly - tc-export AR LD OBJCOPY - - # Verbose builds - MAKEOPTS+=" V=1" - - # Run after we've applied all patches. - handle_locales - - # Remove bundled copy of libfdt - rm -r dtc || die -} - -## -# configures qemu based on the build directory and the build type -# we are using. -# -qemu_src_configure() { - debug-print-function ${FUNCNAME} "$@" - - local buildtype=$1 - local builddir="${S}/${buildtype}-build" - - mkdir "${builddir}" - - local conf_opts=( - --prefix=/usr - --sysconfdir=/etc - --libdir=/usr/$(get_libdir) - --docdir=/usr/share/doc/${PF}/html - --disable-bsd-user - --disable-guest-agent - --disable-strip - --disable-werror - # We support gnutls/nettle for crypto operations. It is possible - # to use gcrypt when gnutls/nettle are disabled (but not when they - # are enabled), but it's not really worth the hassle. Disable it - # all the time to avoid automatically detecting it. #568856 - --disable-gcrypt - --python="${PYTHON}" - --cc="$(tc-getCC)" - --cxx="$(tc-getCXX)" - --host-cc="$(tc-getBUILD_CC)" - $(use_enable debug debug-info) - $(use_enable debug debug-tcg) - --enable-docs - $(use_enable tci tcg-interpreter) - $(use_enable xattr attr) - ) - - # Disable options not used by user targets. This simplifies building - # static user targets (USE=static-user) considerably. - conf_notuser() { - if [[ ${buildtype} == "user" ]] ; then - echo "--disable-${2:-$1}" - else - use_enable "$@" - fi - } - conf_opts+=( - $(conf_notuser accessibility brlapi) - $(conf_notuser aio linux-aio) - $(conf_notuser bzip2) - $(conf_notuser bluetooth bluez) - $(conf_notuser caps cap-ng) - $(conf_notuser curl) - $(conf_notuser fdt) - $(conf_notuser glusterfs) - $(conf_notuser gnutls) - $(conf_notuser gnutls nettle) - $(conf_notuser gtk) - $(conf_notuser infiniband rdma) - $(conf_notuser iscsi libiscsi) - $(conf_notuser jpeg vnc-jpeg) - $(conf_notuser kernel_linux kvm) - $(conf_notuser lzo) - $(conf_notuser ncurses curses) - $(conf_notuser nfs libnfs) - $(conf_notuser numa) - $(conf_notuser opengl) - $(conf_notuser png vnc-png) - $(conf_notuser rbd) - $(conf_notuser sasl vnc-sasl) - $(conf_notuser sdl) - $(conf_notuser seccomp) - $(conf_notuser smartcard) - $(conf_notuser snappy) - $(conf_notuser spice) - $(conf_notuser ssh libssh2) - $(conf_notuser usb libusb) - $(conf_notuser usbredir usb-redir) - $(conf_notuser vde) - $(conf_notuser vhost-net) - $(conf_notuser virgl virglrenderer) - $(conf_notuser virtfs) - $(conf_notuser vnc) - $(conf_notuser vte) - $(conf_notuser xen) - $(conf_notuser xen xen-pci-passthrough) - $(conf_notuser xfs xfsctl) - ) - - if [[ ! ${buildtype} == "user" ]] ; then - # audio options - local audio_opts="oss" - use alsa && audio_opts="alsa,${audio_opts}" - use sdl && audio_opts="sdl,${audio_opts}" - use pulseaudio && audio_opts="pa,${audio_opts}" - conf_opts+=( - --audio-drv-list="${audio_opts}" - ) - use gtk && conf_opts+=( --with-gtkabi=$(usex gtk2 2.0 3.0) ) - use sdl && conf_opts+=( --with-sdlabi=$(usex sdl2 2.0 1.2) ) - fi - - case ${buildtype} in - user) - conf_opts+=( - --enable-linux-user - --disable-system - --disable-blobs - --disable-tools - ) - local static_flag="static-user" - ;; - softmmu) - conf_opts+=( - --disable-linux-user - --enable-system - --disable-tools - ) - local static_flag="static" - ;; - tools) - conf_opts+=( - --disable-linux-user - --disable-system - --disable-blobs - --enable-tools - ) - local static_flag="static" - ;; - esac - - local targets="${buildtype}_targets" - [[ -n ${targets} ]] && conf_opts+=( --target-list="${!targets}" ) - - # Add support for SystemTAP - use systemtap && conf_opts+=( --enable-trace-backend=dtrace ) - - # We always want to attempt to build with PIE support as it results - # in a more secure binary. But it doesn't work with static or if - # the current GCC doesn't have PIE support. - if use ${static_flag}; then - conf_opts+=( --static --disable-pie ) - else - tc-enables-pie && conf_opts+=( --enable-pie ) - fi - - #bug #647570 - conf_opts+=( --disable-capstone ) - - echo "../configure ${conf_opts[*]}" - cd "${builddir}" - ../configure "${conf_opts[@]}" || die "configure failed" - - # FreeBSD's kernel does not support QEMU assigning/grabbing - # host USB devices yet - use kernel_FreeBSD && \ - sed -i -E -e "s|^(HOST_USB=)bsd|\1stub|" "${S}"/config-host.mak -} - -src_configure() { - local target - - python_setup - - softmmu_targets= softmmu_bins=() - user_targets= user_bins=() - - for target in ${IUSE_SOFTMMU_TARGETS} ; do - if use "qemu_softmmu_targets_${target}"; then - softmmu_targets+=",${target}-softmmu" - softmmu_bins+=( "qemu-system-${target}" ) - fi - done - - for target in ${IUSE_USER_TARGETS} ; do - if use "qemu_user_targets_${target}"; then - user_targets+=",${target}-linux-user" - user_bins+=( "qemu-${target}" ) - fi - done - - softmmu_targets=${softmmu_targets#,} - user_targets=${user_targets#,} - - [[ -n ${softmmu_targets} ]] && qemu_src_configure "softmmu" - [[ -n ${user_targets} ]] && qemu_src_configure "user" - qemu_src_configure "tools" -} - -src_compile() { - if [[ -n ${user_targets} ]]; then - cd "${S}/user-build" - default - fi - - if [[ -n ${softmmu_targets} ]]; then - cd "${S}/softmmu-build" - default - fi - - cd "${S}/tools-build" - default -} - -src_test() { - if [[ -n ${softmmu_targets} ]]; then - cd "${S}/softmmu-build" - pax-mark m */qemu-system-* #515550 - emake -j1 check - emake -j1 check-report.html - fi -} - -qemu_python_install() { - python_domodule "${S}/scripts/qmp/qmp.py" - - python_doscript "${S}/scripts/kvm/vmxcap" - python_doscript "${S}/scripts/qmp/qmp-shell" - python_doscript "${S}/scripts/qmp/qemu-ga-client" -} - -# Generate binfmt support files. -# - /etc/init.d/qemu-binfmt script which registers the user handlers (openrc) -# - /usr/share/qemu/binfmt.d/qemu.conf (for use with systemd-binfmt) -generate_initd() { - local out="${T}/qemu-binfmt" - local out_systemd="${T}/qemu.conf" - local d="${T}/binfmt.d" - - einfo "Generating qemu binfmt scripts and configuration files" - - # Generate the debian fragments first. - mkdir -p "${d}" - "${S}"/scripts/qemu-binfmt-conf.sh \ - --debian \ - --exportdir "${d}" \ - --qemu-path "${EPREFIX}/usr/bin" \ - || die - # Then turn the fragments into a shell script we can source. - sed -E -i \ - -e 's:^([^ ]+) (.*)$:\1="\2":' \ - "${d}"/* || die - - # Generate the init.d script by assembling the fragments from above. - local f qcpu package interpreter magic mask - cat "${FILESDIR}"/qemu-binfmt.initd.head >"${out}" || die - for f in "${d}"/qemu-* ; do - source "${f}" - - # Normalize the cpu logic like we do in the init.d for the native cpu. - qcpu=${package#qemu-} - case ${qcpu} in - arm*) qcpu="arm";; - mips*) qcpu="mips";; - ppc*) qcpu="ppc";; - s390*) qcpu="s390";; - sh*) qcpu="sh";; - sparc*) qcpu="sparc";; - esac - - cat <>"${out}" - if [ "\${cpu}" != "${qcpu}" -a -x "${interpreter}" ] ; then - echo ':${package}:M::${magic}:${mask}:${interpreter}:'"\${QEMU_BINFMT_FLAGS}" >/proc/sys/fs/binfmt_misc/register - fi -EOF - - echo ":${package}:M::${magic}:${mask}:${interpreter}:OC" >>"${out_systemd}" - - done - cat "${FILESDIR}"/qemu-binfmt.initd.tail >>"${out}" || die -} - -src_install() { - if [[ -n ${user_targets} ]]; then - cd "${S}/user-build" - emake DESTDIR="${ED}" install - - # Install binfmt handler init script for user targets. - generate_initd - doinitd "${T}/qemu-binfmt" - - # Install binfmt/qemu.conf. - insinto "/usr/share/qemu/binfmt.d" - doins "${T}/qemu.conf" - fi - - if [[ -n ${softmmu_targets} ]]; then - cd "${S}/softmmu-build" - emake DESTDIR="${ED}" install - - # This might not exist if the test failed. #512010 - [[ -e check-report.html ]] && dohtml check-report.html - - if use kernel_linux; then - udev_newrules "${FILESDIR}"/65-kvm.rules-r1 65-kvm.rules - fi - - if use python; then - python_foreach_impl qemu_python_install - fi - fi - - cd "${S}/tools-build" - emake DESTDIR="${ED}" install - - # Disable mprotect on the qemu binaries as they use JITs to be fast #459348 - pushd "${ED}"/usr/bin >/dev/null - pax-mark mr "${softmmu_bins[@]}" "${user_bins[@]}" # bug 575594 - popd >/dev/null - - # Install config file example for qemu-bridge-helper - insinto "/etc/qemu" - doins "${FILESDIR}/bridge.conf" - - cd "${S}" - dodoc Changelog MAINTAINERS docs/specs/pci-ids.txt - newdoc pc-bios/README README.pc-bios - - if [[ -n ${softmmu_targets} ]]; then - # Remove SeaBIOS since we're using the SeaBIOS packaged one - rm "${ED}/usr/share/qemu/bios.bin" - rm "${ED}/usr/share/qemu/bios-256k.bin" - if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then - dosym ../seabios/bios.bin /usr/share/qemu/bios.bin - dosym ../seabios/bios-256k.bin /usr/share/qemu/bios-256k.bin - fi - - # Remove vgabios since we're using the seavgabios packaged one - rm "${ED}/usr/share/qemu/vgabios.bin" - rm "${ED}/usr/share/qemu/vgabios-cirrus.bin" - rm "${ED}/usr/share/qemu/vgabios-qxl.bin" - rm "${ED}/usr/share/qemu/vgabios-stdvga.bin" - rm "${ED}/usr/share/qemu/vgabios-virtio.bin" - rm "${ED}/usr/share/qemu/vgabios-vmware.bin" - # PPC64 loads vgabios-stdvga - if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386 || use qemu_softmmu_targets_ppc64; then - dosym ../seavgabios/vgabios-isavga.bin /usr/share/qemu/vgabios.bin - dosym ../seavgabios/vgabios-cirrus.bin /usr/share/qemu/vgabios-cirrus.bin - dosym ../seavgabios/vgabios-qxl.bin /usr/share/qemu/vgabios-qxl.bin - dosym ../seavgabios/vgabios-stdvga.bin /usr/share/qemu/vgabios-stdvga.bin - dosym ../seavgabios/vgabios-virtio.bin /usr/share/qemu/vgabios-virtio.bin - dosym ../seavgabios/vgabios-vmware.bin /usr/share/qemu/vgabios-vmware.bin - fi - - # Remove sgabios since we're using the sgabios packaged one - rm "${ED}/usr/share/qemu/sgabios.bin" - if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then - dosym ../sgabios/sgabios.bin /usr/share/qemu/sgabios.bin - fi - - # Remove iPXE since we're using the iPXE packaged one - rm "${ED}"/usr/share/qemu/pxe-*.rom - if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then - dosym ../ipxe/8086100e.rom /usr/share/qemu/pxe-e1000.rom - dosym ../ipxe/80861209.rom /usr/share/qemu/pxe-eepro100.rom - dosym ../ipxe/10500940.rom /usr/share/qemu/pxe-ne2k_pci.rom - dosym ../ipxe/10222000.rom /usr/share/qemu/pxe-pcnet.rom - dosym ../ipxe/10ec8139.rom /usr/share/qemu/pxe-rtl8139.rom - dosym ../ipxe/1af41000.rom /usr/share/qemu/pxe-virtio.rom - fi - fi - - DISABLE_AUTOFORMATTING=true - readme.gentoo_create_doc -} - -firmware_abi_change() { - local pv - for pv in ${REPLACING_VERSIONS}; do - if ! version_is_at_least ${FIRMWARE_ABI_VERSION} ${pv}; then - return 0 - fi - done - return 1 -} - -pkg_postinst() { - if [[ -n ${softmmu_targets} ]] && use kernel_linux; then - udev_reload - fi - - fcaps cap_net_admin /usr/libexec/qemu-bridge-helper - - DISABLE_AUTOFORMATTING=true - readme.gentoo_print_elog - - if use pin-upstream-blobs && firmware_abi_change; then - ewarn "This version of qemu pins new versions of firmware blobs:" - ewarn " $(best_version sys-firmware/edk2-ovmf)" - ewarn " $(best_version sys-firmware/ipxe)" - ewarn " $(best_version sys-firmware/seabios)" - ewarn " $(best_version sys-firmware/sgabios)" - ewarn "This might break resume of hibernated guests (started with a different" - ewarn "firmware version) and live migration to/from qemu versions with different" - ewarn "firmware. Please (cold) restart all running guests. For functional" - ewarn "guest migration ensure that all" - ewarn "hosts run at least" - ewarn " app-emulation/qemu-${FIRMWARE_ABI_VERSION}." - fi -} - -pkg_info() { - echo "Using:" - echo " $(best_version app-emulation/spice-protocol)" - echo " $(best_version sys-firmware/edk2-ovmf)" - if has_version 'sys-firmware/edk2-ovmf[binary]'; then - echo " USE=binary" - else - echo " USE=''" - fi - echo " $(best_version sys-firmware/ipxe)" - echo " $(best_version sys-firmware/seabios)" - if has_version 'sys-firmware/seabios[binary]'; then - echo " USE=binary" - else - echo " USE=''" - fi - echo " $(best_version sys-firmware/sgabios)" -} diff --git a/sdk_container/src/third_party/portage-stable/app-emulation/qemu/qemu-2.11.1-r53.ebuild b/sdk_container/src/third_party/portage-stable/app-emulation/qemu/qemu-2.11.1-r53.ebuild deleted file mode 100644 index 0fd3347455..0000000000 --- a/sdk_container/src/third_party/portage-stable/app-emulation/qemu/qemu-2.11.1-r53.ebuild +++ /dev/null @@ -1,805 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -PYTHON_COMPAT=( python2_7 ) -PYTHON_REQ_USE="ncurses,readline" - -PLOCALES="bg de_DE fr_FR hu it tr zh_CN" - -FIRMWARE_ABI_VERSION="2.11.1-r50" - -inherit eutils flag-o-matic linux-info toolchain-funcs multilib python-r1 \ - user udev fcaps readme.gentoo-r1 pax-utils l10n - -if [[ ${PV} = *9999* ]]; then - EGIT_REPO_URI="git://git.qemu.org/qemu.git" - inherit git-r3 - SRC_URI="" -else - SRC_URI="http://wiki.qemu-project.org/download/${P}.tar.bz2" - KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~x86-fbsd" - - # Gentoo specific patchsets: - SRC_URI+=" https://dev.gentoo.org/~tamiko/distfiles/${P}-patches-r2.tar.xz" -fi - -DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools" -HOMEPAGE="http://www.qemu.org http://www.linux-kvm.org" - -LICENSE="GPL-2 LGPL-2 BSD-2" -SLOT="0" -IUSE="accessibility +aio alsa bluetooth bzip2 capstone +caps +curl debug - +fdt glusterfs gnutls gtk gtk2 infiniband iscsi +jpeg kernel_linux - kernel_FreeBSD lzo ncurses nfs nls numa opengl +pin-upstream-blobs +png - pulseaudio python rbd sasl +seccomp sdl sdl2 selinux smartcard snappy - spice ssh static static-user systemtap tci test usb usbredir vde - +vhost-net virgl virtfs +vnc vte xattr xen xfs" - -COMMON_TARGETS="aarch64 alpha arm cris i386 m68k microblaze microblazeel - mips mips64 mips64el mipsel nios2 or1k ppc ppc64 s390x sh4 sh4eb sparc - sparc64 x86_64" -IUSE_SOFTMMU_TARGETS="${COMMON_TARGETS} - lm32 moxie ppcemb tricore unicore32 xtensa xtensaeb" -IUSE_USER_TARGETS="${COMMON_TARGETS} - armeb hppa mipsn32 mipsn32el ppc64abi32 ppc64le sparc32plus tilegx" - -use_softmmu_targets=$(printf ' qemu_softmmu_targets_%s' ${IUSE_SOFTMMU_TARGETS}) -use_user_targets=$(printf ' qemu_user_targets_%s' ${IUSE_USER_TARGETS}) -IUSE+=" ${use_softmmu_targets} ${use_user_targets}" - -# Allow no targets to be built so that people can get a tools-only build. -# Block USE flag configurations known to not work. -REQUIRED_USE="${PYTHON_REQUIRED_USE} - gtk2? ( gtk ) - qemu_softmmu_targets_arm? ( fdt ) - qemu_softmmu_targets_microblaze? ( fdt ) - qemu_softmmu_targets_mips64el? ( fdt ) - qemu_softmmu_targets_ppc? ( fdt ) - qemu_softmmu_targets_ppc64? ( fdt ) - sdl2? ( sdl ) - static? ( static-user !alsa !bluetooth !gtk !gtk2 !opengl !pulseaudio !snappy ) - virtfs? ( xattr ) - vte? ( gtk )" - -# Dependencies required for qemu tools (qemu-nbd, qemu-img, qemu-io, ...) -# and user/softmmu targets (qemu-*, qemu-system-*). -# -# Yep, you need both libcap and libcap-ng since virtfs only uses libcap. -# -# The attr lib isn't always linked in (although the USE flag is always -# respected). This is because qemu supports using the C library's API -# when available rather than always using the external library. -ALL_DEPEND=" - >=dev-libs/glib-2.0[static-libs(+)] - sys-libs/zlib[static-libs(+)] - python? ( ${PYTHON_DEPS} ) - systemtap? ( dev-util/systemtap ) - xattr? ( sys-apps/attr[static-libs(+)] )" - -# Dependencies required for qemu tools (qemu-nbd, qemu-img, qemu-io, ...) -# softmmu targets (qemu-system-*). -SOFTMMU_TOOLS_DEPEND=" - >=x11-libs/pixman-0.28.0[static-libs(+)] - accessibility? ( - app-accessibility/brltty[api] - app-accessibility/brltty[static-libs(+)] - ) - aio? ( dev-libs/libaio[static-libs(+)] ) - alsa? ( >=media-libs/alsa-lib-1.0.13 ) - bluetooth? ( net-wireless/bluez ) - bzip2? ( app-arch/bzip2[static-libs(+)] ) - capstone? ( dev-libs/capstone ) - caps? ( sys-libs/libcap-ng[static-libs(+)] ) - curl? ( >=net-misc/curl-7.15.4[static-libs(+)] ) - fdt? ( >=sys-apps/dtc-1.4.2[static-libs(+)] ) - glusterfs? ( >=sys-cluster/glusterfs-3.4.0[static-libs(+)] ) - gnutls? ( - dev-libs/nettle:=[static-libs(+)] - >=net-libs/gnutls-3.0:=[static-libs(+)] - ) - gtk? ( - gtk2? ( - x11-libs/gtk+:2 - vte? ( x11-libs/vte:0 ) - ) - !gtk2? ( - x11-libs/gtk+:3 - vte? ( x11-libs/vte:2.91 ) - ) - ) - infiniband? ( sys-fabric/librdmacm:=[static-libs(+)] ) - iscsi? ( net-libs/libiscsi ) - jpeg? ( virtual/jpeg:0=[static-libs(+)] ) - lzo? ( dev-libs/lzo:2[static-libs(+)] ) - ncurses? ( - sys-libs/ncurses:0=[unicode] - sys-libs/ncurses:0=[static-libs(+)] - ) - nfs? ( >=net-fs/libnfs-1.9.3:=[static-libs(+)] ) - numa? ( sys-process/numactl[static-libs(+)] ) - opengl? ( - virtual/opengl - media-libs/libepoxy[static-libs(+)] - media-libs/mesa[static-libs(+)] - media-libs/mesa[egl,gbm] - ) - png? ( media-libs/libpng:0=[static-libs(+)] ) - pulseaudio? ( media-sound/pulseaudio ) - rbd? ( sys-cluster/ceph[static-libs(+)] ) - sasl? ( dev-libs/cyrus-sasl[static-libs(+)] ) - sdl? ( - !sdl2? ( - media-libs/libsdl[X] - >=media-libs/libsdl-1.2.11[static-libs(+)] - ) - sdl2? ( - media-libs/libsdl2[X] - media-libs/libsdl2[static-libs(+)] - ) - ) - seccomp? ( >=sys-libs/libseccomp-2.1.0[static-libs(+)] ) - smartcard? ( >=app-emulation/libcacard-2.5.0[static-libs(+)] ) - snappy? ( app-arch/snappy:= ) - spice? ( - >=app-emulation/spice-protocol-0.12.3 - >=app-emulation/spice-0.12.0[static-libs(+)] - ) - ssh? ( >=net-libs/libssh2-1.2.8[static-libs(+)] ) - usb? ( >=virtual/libusb-1-r2[static-libs(+)] ) - usbredir? ( >=sys-apps/usbredir-0.6[static-libs(+)] ) - vde? ( net-misc/vde[static-libs(+)] ) - virgl? ( media-libs/virglrenderer[static-libs(+)] ) - virtfs? ( sys-libs/libcap ) - xen? ( app-emulation/xen-tools:= ) - xfs? ( sys-fs/xfsprogs[static-libs(+)] )" - -X86_FIRMWARE_DEPEND=" - pin-upstream-blobs? ( - ~sys-firmware/edk2-ovmf-2017_p20180211[binary] - ~sys-firmware/ipxe-1.0.0_p20180211[binary] - ~sys-firmware/seabios-1.11.0[binary,seavgabios] - ~sys-firmware/sgabios-0.1_pre8[binary] - ) - !pin-upstream-blobs? ( - sys-firmware/edk2-ovmf - sys-firmware/ipxe - >=sys-firmware/seabios-1.10.2[seavgabios] - sys-firmware/sgabios - )" -PPC64_FIRMWARE_DEPEND=" - pin-upstream-blobs? ( - ~sys-firmware/seabios-1.11.0[binary,seavgabios] - ) - !pin-upstream-blobs? ( - >=sys-firmware/seabios-1.10.2[seavgabios] - ) -" - -CDEPEND=" - !static? ( - ${ALL_DEPEND//\[static-libs(+)]} - ${SOFTMMU_TOOLS_DEPEND//\[static-libs(+)]} - ) - qemu_softmmu_targets_i386? ( ${X86_FIRMWARE_DEPEND} ) - qemu_softmmu_targets_x86_64? ( ${X86_FIRMWARE_DEPEND} ) - qemu_softmmu_targets_ppc64? ( ${PPC64_FIRMWARE_DEPEND} ) -" -DEPEND="${CDEPEND} - dev-lang/perl - =dev-lang/python-2* - sys-apps/texinfo - virtual/pkgconfig - kernel_linux? ( >=sys-kernel/linux-headers-2.6.35 ) - gtk? ( nls? ( sys-devel/gettext ) ) - static? ( - ${ALL_DEPEND} - ${SOFTMMU_TOOLS_DEPEND} - ) - static-user? ( ${ALL_DEPEND} ) - test? ( - dev-libs/glib[utils] - sys-devel/bc - )" -RDEPEND="${CDEPEND} - selinux? ( sec-policy/selinux-qemu )" - -PATCHES=( - "${FILESDIR}"/${PN}-2.5.0-cflags.patch - "${FILESDIR}"/${PN}-2.5.0-sysmacros.patch - "${FILESDIR}"/${PN}-2.11.0-glibc-2.27.patch - "${FILESDIR}"/${PN}-2.11.1-capstone_include_path.patch - "${WORKDIR}"/patches -) - -STRIP_MASK="/usr/share/qemu/palcode-clipper" - -QA_PREBUILT=" - usr/share/qemu/openbios-ppc - usr/share/qemu/openbios-sparc64 - usr/share/qemu/openbios-sparc32 - usr/share/qemu/palcode-clipper - usr/share/qemu/s390-ccw.img - usr/share/qemu/s390-netboot.img - usr/share/qemu/u-boot.e500" - -QA_WX_LOAD="usr/bin/qemu-i386 - usr/bin/qemu-x86_64 - usr/bin/qemu-alpha - usr/bin/qemu-arm - usr/bin/qemu-cris - usr/bin/qemu-m68k - usr/bin/qemu-microblaze - usr/bin/qemu-microblazeel - usr/bin/qemu-mips - usr/bin/qemu-mipsel - usr/bin/qemu-or1k - usr/bin/qemu-ppc - usr/bin/qemu-ppc64 - usr/bin/qemu-ppc64abi32 - usr/bin/qemu-sh4 - usr/bin/qemu-sh4eb - usr/bin/qemu-sparc - usr/bin/qemu-sparc64 - usr/bin/qemu-armeb - usr/bin/qemu-sparc32plus - usr/bin/qemu-s390x - usr/bin/qemu-unicore32" - -DOC_CONTENTS="If you don't have kvm compiled into the kernel, make sure you have the -kernel module loaded before running kvm. The easiest way to ensure that the -kernel module is loaded is to load it on boot. - For AMD CPUs the module is called 'kvm-amd'. - For Intel CPUs the module is called 'kvm-intel'. -Please review /etc/conf.d/modules for how to load these. - -Make sure your user is in the 'kvm' group. Just run - $ gpasswd -a kvm -then have re-login. - -For brand new installs, the default permissions on /dev/kvm might not let -you access it. You can tell udev to reset ownership/perms: - $ udevadm trigger -c add /dev/kvm - -If you want to register binfmt handlers for qemu user targets: -For openrc: - # rc-update add qemu-binfmt -For systemd: - # ln -s /usr/share/qemu/binfmt.d/qemu.conf /etc/binfmt.d/qemu.conf" - -pkg_pretend() { - if use kernel_linux && kernel_is lt 2 6 25; then - eerror "This version of KVM requres a host kernel of 2.6.25 or higher." - elif use kernel_linux; then - if ! linux_config_exists; then - eerror "Unable to check your kernel for KVM support" - else - CONFIG_CHECK="~KVM ~TUN ~BRIDGE" - ERROR_KVM="You must enable KVM in your kernel to continue" - ERROR_KVM_AMD="If you have an AMD CPU, you must enable KVM_AMD in" - ERROR_KVM_AMD+=" your kernel configuration." - ERROR_KVM_INTEL="If you have an Intel CPU, you must enable" - ERROR_KVM_INTEL+=" KVM_INTEL in your kernel configuration." - ERROR_TUN="You will need the Universal TUN/TAP driver compiled" - ERROR_TUN+=" into your kernel or loaded as a module to use the" - ERROR_TUN+=" virtual network device if using -net tap." - ERROR_BRIDGE="You will also need support for 802.1d" - ERROR_BRIDGE+=" Ethernet Bridging for some network configurations." - use vhost-net && CONFIG_CHECK+=" ~VHOST_NET" - ERROR_VHOST_NET="You must enable VHOST_NET to have vhost-net" - ERROR_VHOST_NET+=" support" - - if use amd64 || use x86 || use amd64-linux || use x86-linux; then - if grep -q AuthenticAMD /proc/cpuinfo; then - CONFIG_CHECK+=" ~KVM_AMD" - elif grep -q GenuineIntel /proc/cpuinfo; then - CONFIG_CHECK+=" ~KVM_INTEL" - fi - fi - - use python && CONFIG_CHECK+=" ~DEBUG_FS" - ERROR_DEBUG_FS="debugFS support required for kvm_stat" - - # Now do the actual checks setup above - check_extra_config - fi - fi - - if grep -qs '/usr/bin/qemu-kvm' "${EROOT}"/etc/libvirt/qemu/*.xml; then - eerror "The kvm/qemu-kvm wrappers no longer exist, but your libvirt" - eerror "instances are still pointing to it. Please update your" - eerror "configs in /etc/libvirt/qemu/ to use the -enable-kvm flag" - eerror "and the right system binary (e.g. qemu-system-x86_64)." - die "update your virt configs to not use qemu-kvm" - fi -} - -pkg_setup() { - enewgroup kvm 78 -} - -# Sanity check to make sure target lists are kept up-to-date. -check_targets() { - local var=$1 mak=$2 - local detected sorted - - pushd "${S}"/default-configs >/dev/null || die - - # Force C locale until glibc is updated. #564936 - detected=$(echo $(printf '%s\n' *-${mak}.mak | sed "s:-${mak}.mak::" | LC_COLLATE=C sort -u)) - sorted=$(echo $(printf '%s\n' ${!var} | LC_COLLATE=C sort -u)) - if [[ ${sorted} != "${detected}" ]] ; then - eerror "The ebuild needs to be kept in sync." - eerror "${var}: ${sorted}" - eerror "$(printf '%-*s' ${#var} configure): ${detected}" - die "sync ${var} to the list of targets" - fi - - popd >/dev/null -} - -handle_locales() { - # Make sure locale list is kept up-to-date. - local detected sorted - detected=$(echo $(cd po && printf '%s\n' *.po | grep -v messages.po | sed 's:.po$::' | sort -u)) - sorted=$(echo $(printf '%s\n' ${PLOCALES} | sort -u)) - if [[ ${sorted} != "${detected}" ]] ; then - eerror "The ebuild needs to be kept in sync." - eerror "PLOCALES: ${sorted}" - eerror " po/*.po: ${detected}" - die "sync PLOCALES" - fi - - # Deal with selective install of locales. - if use nls ; then - # Delete locales the user does not want. #577814 - rm_loc() { rm po/$1.po || die; } - l10n_for_each_disabled_locale_do rm_loc - else - # Cheap hack to disable gettext .mo generation. - rm -f po/*.po - fi -} - -src_prepare() { - check_targets IUSE_SOFTMMU_TARGETS softmmu - check_targets IUSE_USER_TARGETS linux-user - - # Alter target makefiles to accept CFLAGS set via flag-o - sed -i -r \ - -e 's/^(C|OP_C|HELPER_C)FLAGS=/\1FLAGS+=/' \ - Makefile Makefile.target || die - - default - - # Fix ld and objcopy being called directly - tc-export AR LD OBJCOPY - - # Verbose builds - MAKEOPTS+=" V=1" - - # Run after we've applied all patches. - handle_locales - - # Remove bundled copy of libfdt - rm -r dtc || die -} - -## -# configures qemu based on the build directory and the build type -# we are using. -# -qemu_src_configure() { - debug-print-function ${FUNCNAME} "$@" - - local buildtype=$1 - local builddir="${S}/${buildtype}-build" - - mkdir "${builddir}" - - local conf_opts=( - --prefix=/usr - --sysconfdir=/etc - --libdir=/usr/$(get_libdir) - --docdir=/usr/share/doc/${PF}/html - --disable-bsd-user - --disable-guest-agent - --disable-strip - --disable-werror - # We support gnutls/nettle for crypto operations. It is possible - # to use gcrypt when gnutls/nettle are disabled (but not when they - # are enabled), but it's not really worth the hassle. Disable it - # all the time to avoid automatically detecting it. #568856 - --disable-gcrypt - --python="${PYTHON}" - --cc="$(tc-getCC)" - --cxx="$(tc-getCXX)" - --host-cc="$(tc-getBUILD_CC)" - $(use_enable debug debug-info) - $(use_enable debug debug-tcg) - --enable-docs - $(use_enable tci tcg-interpreter) - $(use_enable xattr attr) - ) - - # Disable options not used by user targets. This simplifies building - # static user targets (USE=static-user) considerably. - conf_notuser() { - if [[ ${buildtype} == "user" ]] ; then - echo "--disable-${2:-$1}" - else - use_enable "$@" - fi - } - conf_opts+=( - $(conf_notuser accessibility brlapi) - $(conf_notuser aio linux-aio) - $(conf_notuser bzip2) - $(conf_notuser bluetooth bluez) - $(conf_notuser capstone) - $(conf_notuser caps cap-ng) - $(conf_notuser curl) - $(conf_notuser fdt) - $(conf_notuser glusterfs) - $(conf_notuser gnutls) - $(conf_notuser gnutls nettle) - $(conf_notuser gtk) - $(conf_notuser infiniband rdma) - $(conf_notuser iscsi libiscsi) - $(conf_notuser jpeg vnc-jpeg) - $(conf_notuser kernel_linux kvm) - $(conf_notuser lzo) - $(conf_notuser ncurses curses) - $(conf_notuser nfs libnfs) - $(conf_notuser numa) - $(conf_notuser opengl) - $(conf_notuser png vnc-png) - $(conf_notuser rbd) - $(conf_notuser sasl vnc-sasl) - $(conf_notuser sdl) - $(conf_notuser seccomp) - $(conf_notuser smartcard) - $(conf_notuser snappy) - $(conf_notuser spice) - $(conf_notuser ssh libssh2) - $(conf_notuser usb libusb) - $(conf_notuser usbredir usb-redir) - $(conf_notuser vde) - $(conf_notuser vhost-net) - $(conf_notuser virgl virglrenderer) - $(conf_notuser virtfs) - $(conf_notuser vnc) - $(conf_notuser vte) - $(conf_notuser xen) - $(conf_notuser xen xen-pci-passthrough) - $(conf_notuser xfs xfsctl) - ) - - if [[ ! ${buildtype} == "user" ]] ; then - # audio options - local audio_opts="oss" - use alsa && audio_opts="alsa,${audio_opts}" - use sdl && audio_opts="sdl,${audio_opts}" - use pulseaudio && audio_opts="pa,${audio_opts}" - conf_opts+=( - --audio-drv-list="${audio_opts}" - ) - use gtk && conf_opts+=( --with-gtkabi=$(usex gtk2 2.0 3.0) ) - use sdl && conf_opts+=( --with-sdlabi=$(usex sdl2 2.0 1.2) ) - fi - - case ${buildtype} in - user) - conf_opts+=( - --enable-linux-user - --disable-system - --disable-blobs - --disable-tools - ) - local static_flag="static-user" - ;; - softmmu) - conf_opts+=( - --disable-linux-user - --enable-system - --disable-tools - ) - local static_flag="static" - ;; - tools) - conf_opts+=( - --disable-linux-user - --disable-system - --disable-blobs - --enable-tools - ) - local static_flag="static" - ;; - esac - - local targets="${buildtype}_targets" - [[ -n ${targets} ]] && conf_opts+=( --target-list="${!targets}" ) - - # Add support for SystemTAP - use systemtap && conf_opts+=( --enable-trace-backend=dtrace ) - - # We always want to attempt to build with PIE support as it results - # in a more secure binary. But it doesn't work with static or if - # the current GCC doesn't have PIE support. - if use ${static_flag}; then - conf_opts+=( --static --disable-pie ) - else - tc-enables-pie && conf_opts+=( --enable-pie ) - fi - - echo "../configure ${conf_opts[*]}" - cd "${builddir}" - ../configure "${conf_opts[@]}" || die "configure failed" - - # FreeBSD's kernel does not support QEMU assigning/grabbing - # host USB devices yet - use kernel_FreeBSD && \ - sed -i -E -e "s|^(HOST_USB=)bsd|\1stub|" "${S}"/config-host.mak -} - -src_configure() { - local target - - python_setup - - softmmu_targets= softmmu_bins=() - user_targets= user_bins=() - - for target in ${IUSE_SOFTMMU_TARGETS} ; do - if use "qemu_softmmu_targets_${target}"; then - softmmu_targets+=",${target}-softmmu" - softmmu_bins+=( "qemu-system-${target}" ) - fi - done - - for target in ${IUSE_USER_TARGETS} ; do - if use "qemu_user_targets_${target}"; then - user_targets+=",${target}-linux-user" - user_bins+=( "qemu-${target}" ) - fi - done - - softmmu_targets=${softmmu_targets#,} - user_targets=${user_targets#,} - - [[ -n ${softmmu_targets} ]] && qemu_src_configure "softmmu" - [[ -n ${user_targets} ]] && qemu_src_configure "user" - qemu_src_configure "tools" -} - -src_compile() { - if [[ -n ${user_targets} ]]; then - cd "${S}/user-build" - default - fi - - if [[ -n ${softmmu_targets} ]]; then - cd "${S}/softmmu-build" - default - fi - - cd "${S}/tools-build" - default -} - -src_test() { - if [[ -n ${softmmu_targets} ]]; then - cd "${S}/softmmu-build" - pax-mark m */qemu-system-* #515550 - emake -j1 check - emake -j1 check-report.html - fi -} - -qemu_python_install() { - python_domodule "${S}/scripts/qmp/qmp.py" - - python_doscript "${S}/scripts/kvm/vmxcap" - python_doscript "${S}/scripts/qmp/qmp-shell" - python_doscript "${S}/scripts/qmp/qemu-ga-client" -} - -# Generate binfmt support files. -# - /etc/init.d/qemu-binfmt script which registers the user handlers (openrc) -# - /usr/share/qemu/binfmt.d/qemu.conf (for use with systemd-binfmt) -generate_initd() { - local out="${T}/qemu-binfmt" - local out_systemd="${T}/qemu.conf" - local d="${T}/binfmt.d" - - einfo "Generating qemu binfmt scripts and configuration files" - - # Generate the debian fragments first. - mkdir -p "${d}" - "${S}"/scripts/qemu-binfmt-conf.sh \ - --debian \ - --exportdir "${d}" \ - --qemu-path "${EPREFIX}/usr/bin" \ - || die - # Then turn the fragments into a shell script we can source. - sed -E -i \ - -e 's:^([^ ]+) (.*)$:\1="\2":' \ - "${d}"/* || die - - # Generate the init.d script by assembling the fragments from above. - local f qcpu package interpreter magic mask - cat "${FILESDIR}"/qemu-binfmt.initd.head >"${out}" || die - for f in "${d}"/qemu-* ; do - source "${f}" - - # Normalize the cpu logic like we do in the init.d for the native cpu. - qcpu=${package#qemu-} - case ${qcpu} in - arm*) qcpu="arm";; - mips*) qcpu="mips";; - ppc*) qcpu="ppc";; - s390*) qcpu="s390";; - sh*) qcpu="sh";; - sparc*) qcpu="sparc";; - esac - - cat <>"${out}" - if [ "\${cpu}" != "${qcpu}" -a -x "${interpreter}" ] ; then - echo ':${package}:M::${magic}:${mask}:${interpreter}:'"\${QEMU_BINFMT_FLAGS}" >/proc/sys/fs/binfmt_misc/register - fi -EOF - - echo ":${package}:M::${magic}:${mask}:${interpreter}:OC" >>"${out_systemd}" - - done - cat "${FILESDIR}"/qemu-binfmt.initd.tail >>"${out}" || die -} - -src_install() { - if [[ -n ${user_targets} ]]; then - cd "${S}/user-build" - emake DESTDIR="${ED}" install - - # Install binfmt handler init script for user targets. - generate_initd - doinitd "${T}/qemu-binfmt" - - # Install binfmt/qemu.conf. - insinto "/usr/share/qemu/binfmt.d" - doins "${T}/qemu.conf" - fi - - if [[ -n ${softmmu_targets} ]]; then - cd "${S}/softmmu-build" - emake DESTDIR="${ED}" install - - # This might not exist if the test failed. #512010 - [[ -e check-report.html ]] && dohtml check-report.html - - if use kernel_linux; then - udev_newrules "${FILESDIR}"/65-kvm.rules-r1 65-kvm.rules - fi - - if use python; then - python_foreach_impl qemu_python_install - fi - fi - - cd "${S}/tools-build" - emake DESTDIR="${ED}" install - - # Disable mprotect on the qemu binaries as they use JITs to be fast #459348 - pushd "${ED}"/usr/bin >/dev/null - pax-mark mr "${softmmu_bins[@]}" "${user_bins[@]}" # bug 575594 - popd >/dev/null - - # Install config file example for qemu-bridge-helper - insinto "/etc/qemu" - doins "${FILESDIR}/bridge.conf" - - cd "${S}" - dodoc Changelog MAINTAINERS docs/specs/pci-ids.txt - newdoc pc-bios/README README.pc-bios - - if [[ -n ${softmmu_targets} ]]; then - # Remove SeaBIOS since we're using the SeaBIOS packaged one - rm "${ED}/usr/share/qemu/bios.bin" - rm "${ED}/usr/share/qemu/bios-256k.bin" - if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then - dosym ../seabios/bios.bin /usr/share/qemu/bios.bin - dosym ../seabios/bios-256k.bin /usr/share/qemu/bios-256k.bin - fi - - # Remove vgabios since we're using the seavgabios packaged one - rm "${ED}/usr/share/qemu/vgabios.bin" - rm "${ED}/usr/share/qemu/vgabios-cirrus.bin" - rm "${ED}/usr/share/qemu/vgabios-qxl.bin" - rm "${ED}/usr/share/qemu/vgabios-stdvga.bin" - rm "${ED}/usr/share/qemu/vgabios-virtio.bin" - rm "${ED}/usr/share/qemu/vgabios-vmware.bin" - # PPC64 loads vgabios-stdvga - if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386 || use qemu_softmmu_targets_ppc64; then - dosym ../seavgabios/vgabios-isavga.bin /usr/share/qemu/vgabios.bin - dosym ../seavgabios/vgabios-cirrus.bin /usr/share/qemu/vgabios-cirrus.bin - dosym ../seavgabios/vgabios-qxl.bin /usr/share/qemu/vgabios-qxl.bin - dosym ../seavgabios/vgabios-stdvga.bin /usr/share/qemu/vgabios-stdvga.bin - dosym ../seavgabios/vgabios-virtio.bin /usr/share/qemu/vgabios-virtio.bin - dosym ../seavgabios/vgabios-vmware.bin /usr/share/qemu/vgabios-vmware.bin - fi - - # Remove sgabios since we're using the sgabios packaged one - rm "${ED}/usr/share/qemu/sgabios.bin" - if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then - dosym ../sgabios/sgabios.bin /usr/share/qemu/sgabios.bin - fi - - # Remove iPXE since we're using the iPXE packaged one - rm "${ED}"/usr/share/qemu/pxe-*.rom - if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then - dosym ../ipxe/8086100e.rom /usr/share/qemu/pxe-e1000.rom - dosym ../ipxe/80861209.rom /usr/share/qemu/pxe-eepro100.rom - dosym ../ipxe/10500940.rom /usr/share/qemu/pxe-ne2k_pci.rom - dosym ../ipxe/10222000.rom /usr/share/qemu/pxe-pcnet.rom - dosym ../ipxe/10ec8139.rom /usr/share/qemu/pxe-rtl8139.rom - dosym ../ipxe/1af41000.rom /usr/share/qemu/pxe-virtio.rom - fi - fi - - DISABLE_AUTOFORMATTING=true - readme.gentoo_create_doc -} - -firmware_abi_change() { - local pv - for pv in ${REPLACING_VERSIONS}; do - if ! version_is_at_least ${FIRMWARE_ABI_VERSION} ${pv}; then - return 0 - fi - done - return 1 -} - -pkg_postinst() { - if [[ -n ${softmmu_targets} ]] && use kernel_linux; then - udev_reload - fi - - fcaps cap_net_admin /usr/libexec/qemu-bridge-helper - - DISABLE_AUTOFORMATTING=true - readme.gentoo_print_elog - - if use pin-upstream-blobs && firmware_abi_change; then - ewarn "This version of qemu pins new versions of firmware blobs:" - ewarn " $(best_version sys-firmware/edk2-ovmf)" - ewarn " $(best_version sys-firmware/ipxe)" - ewarn " $(best_version sys-firmware/seabios)" - ewarn " $(best_version sys-firmware/sgabios)" - ewarn "This might break resume of hibernated guests (started with a different" - ewarn "firmware version) and live migration to/from qemu versions with different" - ewarn "firmware. Please (cold) restart all running guests. For functional" - ewarn "guest migration ensure that all" - ewarn "hosts run at least" - ewarn " app-emulation/qemu-${FIRMWARE_ABI_VERSION}." - fi -} - -pkg_info() { - echo "Using:" - echo " $(best_version app-emulation/spice-protocol)" - echo " $(best_version sys-firmware/edk2-ovmf)" - if has_version 'sys-firmware/edk2-ovmf[binary]'; then - echo " USE=binary" - else - echo " USE=''" - fi - echo " $(best_version sys-firmware/ipxe)" - echo " $(best_version sys-firmware/seabios)" - if has_version 'sys-firmware/seabios[binary]'; then - echo " USE=binary" - else - echo " USE=''" - fi - echo " $(best_version sys-firmware/sgabios)" -} diff --git a/sdk_container/src/third_party/portage-stable/app-emulation/qemu/qemu-9999.ebuild b/sdk_container/src/third_party/portage-stable/app-emulation/qemu/qemu-9999.ebuild deleted file mode 100644 index 2df4a751f8..0000000000 --- a/sdk_container/src/third_party/portage-stable/app-emulation/qemu/qemu-9999.ebuild +++ /dev/null @@ -1,801 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -PYTHON_COMPAT=( python2_7 ) -PYTHON_REQ_USE="ncurses,readline" - -PLOCALES="bg de_DE fr_FR hu it tr zh_CN" - -FIRMWARE_ABI_VERSION="2.11.1-r50" - -inherit eutils flag-o-matic linux-info toolchain-funcs multilib python-r1 \ - user udev fcaps readme.gentoo-r1 pax-utils l10n - -if [[ ${PV} = *9999* ]]; then - EGIT_REPO_URI="git://git.qemu.org/qemu.git" - inherit git-r3 - SRC_URI="" -else - SRC_URI="http://wiki.qemu-project.org/download/${P}.tar.bz2" - KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~x86-fbsd" -fi - -DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools" -HOMEPAGE="http://www.qemu.org http://www.linux-kvm.org" - -LICENSE="GPL-2 LGPL-2 BSD-2" -SLOT="0" -IUSE="accessibility +aio alsa bluetooth bzip2 capstone +caps +curl debug - +fdt glusterfs gnutls gtk gtk2 infiniband iscsi +jpeg kernel_linux - kernel_FreeBSD lzo ncurses nfs nls numa opengl +pin-upstream-blobs +png - pulseaudio python rbd sasl +seccomp sdl sdl2 selinux smartcard snappy - spice ssh static static-user systemtap tci test usb usbredir vde - +vhost-net virgl virtfs +vnc vte xattr xen xfs" - -COMMON_TARGETS="aarch64 alpha arm cris hppa i386 m68k microblaze microblazeel - mips mips64 mips64el mipsel nios2 or1k ppc ppc64 riscv32 riscv64 s390x - sh4 sh4eb sparc sparc64 x86_64 xtensa xtensaeb" -IUSE_SOFTMMU_TARGETS="${COMMON_TARGETS} - lm32 moxie ppcemb tricore unicore32" -IUSE_USER_TARGETS="${COMMON_TARGETS} - aarch64_be armeb mipsn32 mipsn32el ppc64abi32 ppc64le sparc32plus - tilegx" - -use_softmmu_targets=$(printf ' qemu_softmmu_targets_%s' ${IUSE_SOFTMMU_TARGETS}) -use_user_targets=$(printf ' qemu_user_targets_%s' ${IUSE_USER_TARGETS}) -IUSE+=" ${use_softmmu_targets} ${use_user_targets}" - -# Allow no targets to be built so that people can get a tools-only build. -# Block USE flag configurations known to not work. -REQUIRED_USE="${PYTHON_REQUIRED_USE} - gtk2? ( gtk ) - qemu_softmmu_targets_arm? ( fdt ) - qemu_softmmu_targets_microblaze? ( fdt ) - qemu_softmmu_targets_mips64el? ( fdt ) - qemu_softmmu_targets_ppc? ( fdt ) - qemu_softmmu_targets_ppc64? ( fdt ) - sdl2? ( sdl ) - static? ( static-user !alsa !bluetooth !gtk !gtk2 !opengl !pulseaudio !snappy ) - virtfs? ( xattr ) - vte? ( gtk )" - -# Dependencies required for qemu tools (qemu-nbd, qemu-img, qemu-io, ...) -# and user/softmmu targets (qemu-*, qemu-system-*). -# -# Yep, you need both libcap and libcap-ng since virtfs only uses libcap. -# -# The attr lib isn't always linked in (although the USE flag is always -# respected). This is because qemu supports using the C library's API -# when available rather than always using the external library. -ALL_DEPEND=" - >=dev-libs/glib-2.0[static-libs(+)] - sys-libs/zlib[static-libs(+)] - python? ( ${PYTHON_DEPS} ) - systemtap? ( dev-util/systemtap ) - xattr? ( sys-apps/attr[static-libs(+)] )" - -# Dependencies required for qemu tools (qemu-nbd, qemu-img, qemu-io, ...) -# softmmu targets (qemu-system-*). -SOFTMMU_TOOLS_DEPEND=" - >=x11-libs/pixman-0.28.0[static-libs(+)] - accessibility? ( - app-accessibility/brltty[api] - app-accessibility/brltty[static-libs(+)] - ) - aio? ( dev-libs/libaio[static-libs(+)] ) - alsa? ( >=media-libs/alsa-lib-1.0.13 ) - bluetooth? ( net-wireless/bluez ) - bzip2? ( app-arch/bzip2[static-libs(+)] ) - capstone? ( dev-libs/capstone ) - caps? ( sys-libs/libcap-ng[static-libs(+)] ) - curl? ( >=net-misc/curl-7.15.4[static-libs(+)] ) - fdt? ( >=sys-apps/dtc-1.4.2[static-libs(+)] ) - glusterfs? ( >=sys-cluster/glusterfs-3.4.0[static-libs(+)] ) - gnutls? ( - dev-libs/nettle:=[static-libs(+)] - >=net-libs/gnutls-3.0:=[static-libs(+)] - ) - gtk? ( - gtk2? ( - x11-libs/gtk+:2 - vte? ( x11-libs/vte:0 ) - ) - !gtk2? ( - x11-libs/gtk+:3 - vte? ( x11-libs/vte:2.91 ) - ) - ) - infiniband? ( sys-fabric/librdmacm:=[static-libs(+)] ) - iscsi? ( net-libs/libiscsi ) - jpeg? ( virtual/jpeg:0=[static-libs(+)] ) - lzo? ( dev-libs/lzo:2[static-libs(+)] ) - ncurses? ( - sys-libs/ncurses:0=[unicode] - sys-libs/ncurses:0=[static-libs(+)] - ) - nfs? ( >=net-fs/libnfs-1.9.3:=[static-libs(+)] ) - numa? ( sys-process/numactl[static-libs(+)] ) - opengl? ( - virtual/opengl - media-libs/libepoxy[static-libs(+)] - media-libs/mesa[static-libs(+)] - media-libs/mesa[egl,gbm] - ) - png? ( media-libs/libpng:0=[static-libs(+)] ) - pulseaudio? ( media-sound/pulseaudio ) - rbd? ( sys-cluster/ceph[static-libs(+)] ) - sasl? ( dev-libs/cyrus-sasl[static-libs(+)] ) - sdl? ( - !sdl2? ( - media-libs/libsdl[X] - >=media-libs/libsdl-1.2.11[static-libs(+)] - ) - sdl2? ( - media-libs/libsdl2[X] - media-libs/libsdl2[static-libs(+)] - ) - ) - seccomp? ( >=sys-libs/libseccomp-2.1.0[static-libs(+)] ) - smartcard? ( >=app-emulation/libcacard-2.5.0[static-libs(+)] ) - snappy? ( app-arch/snappy ) - spice? ( - >=app-emulation/spice-protocol-0.12.3 - >=app-emulation/spice-0.12.0[static-libs(+)] - ) - ssh? ( >=net-libs/libssh2-1.2.8[static-libs(+)] ) - usb? ( >=virtual/libusb-1-r2[static-libs(+)] ) - usbredir? ( >=sys-apps/usbredir-0.6[static-libs(+)] ) - vde? ( net-misc/vde[static-libs(+)] ) - virgl? ( media-libs/virglrenderer[static-libs(+)] ) - virtfs? ( sys-libs/libcap ) - xen? ( app-emulation/xen-tools:= ) - xfs? ( sys-fs/xfsprogs[static-libs(+)] )" - -X86_FIRMWARE_DEPEND=" - pin-upstream-blobs? ( - ~sys-firmware/edk2-ovmf-2017_p20180211[binary] - ~sys-firmware/ipxe-1.0.0_p20180211[binary] - ~sys-firmware/seabios-1.11.0[binary,seavgabios] - ~sys-firmware/sgabios-0.1_pre8[binary] - ) - !pin-upstream-blobs? ( - sys-firmware/edk2-ovmf - sys-firmware/ipxe - >=sys-firmware/seabios-1.10.2[seavgabios] - sys-firmware/sgabios - )" -PPC64_FIRMWARE_DEPEND=" - pin-upstream-blobs? ( - ~sys-firmware/seabios-1.11.0[binary,seavgabios] - ) - !pin-upstream-blobs? ( - >=sys-firmware/seabios-1.10.2[seavgabios] - ) -" - -CDEPEND=" - !static? ( - ${ALL_DEPEND//\[static-libs(+)]} - ${SOFTMMU_TOOLS_DEPEND//\[static-libs(+)]} - ) - qemu_softmmu_targets_i386? ( ${X86_FIRMWARE_DEPEND} ) - qemu_softmmu_targets_x86_64? ( ${X86_FIRMWARE_DEPEND} ) - qemu_softmmu_targets_ppc64? ( ${PPC64_FIRMWARE_DEPEND} ) -" -DEPEND="${CDEPEND} - dev-lang/perl - =dev-lang/python-2* - sys-apps/texinfo - virtual/pkgconfig - kernel_linux? ( >=sys-kernel/linux-headers-2.6.35 ) - gtk? ( nls? ( sys-devel/gettext ) ) - static? ( - ${ALL_DEPEND} - ${SOFTMMU_TOOLS_DEPEND} - ) - static-user? ( ${ALL_DEPEND} ) - test? ( - dev-libs/glib[utils] - sys-devel/bc - )" -RDEPEND="${CDEPEND} - selinux? ( sec-policy/selinux-qemu )" - -PATCHES=( - "${FILESDIR}"/${PN}-2.5.0-cflags.patch - "${FILESDIR}"/${PN}-2.5.0-sysmacros.patch - "${FILESDIR}"/${PN}-2.11.1-capstone_include_path.patch -) - -STRIP_MASK="/usr/share/qemu/palcode-clipper" - -QA_PREBUILT=" - usr/share/qemu/openbios-ppc - usr/share/qemu/openbios-sparc64 - usr/share/qemu/openbios-sparc32 - usr/share/qemu/palcode-clipper - usr/share/qemu/s390-ccw.img - usr/share/qemu/s390-netboot.img - usr/share/qemu/u-boot.e500" - -QA_WX_LOAD="usr/bin/qemu-i386 - usr/bin/qemu-x86_64 - usr/bin/qemu-alpha - usr/bin/qemu-arm - usr/bin/qemu-cris - usr/bin/qemu-m68k - usr/bin/qemu-microblaze - usr/bin/qemu-microblazeel - usr/bin/qemu-mips - usr/bin/qemu-mipsel - usr/bin/qemu-or1k - usr/bin/qemu-ppc - usr/bin/qemu-ppc64 - usr/bin/qemu-ppc64abi32 - usr/bin/qemu-sh4 - usr/bin/qemu-sh4eb - usr/bin/qemu-sparc - usr/bin/qemu-sparc64 - usr/bin/qemu-armeb - usr/bin/qemu-sparc32plus - usr/bin/qemu-s390x - usr/bin/qemu-unicore32" - -DOC_CONTENTS="If you don't have kvm compiled into the kernel, make sure you have the -kernel module loaded before running kvm. The easiest way to ensure that the -kernel module is loaded is to load it on boot. - For AMD CPUs the module is called 'kvm-amd'. - For Intel CPUs the module is called 'kvm-intel'. -Please review /etc/conf.d/modules for how to load these. - -Make sure your user is in the 'kvm' group. Just run - $ gpasswd -a kvm -then have re-login. - -For brand new installs, the default permissions on /dev/kvm might not let -you access it. You can tell udev to reset ownership/perms: - $ udevadm trigger -c add /dev/kvm - -If you want to register binfmt handlers for qemu user targets: -For openrc: - # rc-update add qemu-binfmt -For systemd: - # ln -s /usr/share/qemu/binfmt.d/qemu.conf /etc/binfmt.d/qemu.conf" - -pkg_pretend() { - if use kernel_linux && kernel_is lt 2 6 25; then - eerror "This version of KVM requres a host kernel of 2.6.25 or higher." - elif use kernel_linux; then - if ! linux_config_exists; then - eerror "Unable to check your kernel for KVM support" - else - CONFIG_CHECK="~KVM ~TUN ~BRIDGE" - ERROR_KVM="You must enable KVM in your kernel to continue" - ERROR_KVM_AMD="If you have an AMD CPU, you must enable KVM_AMD in" - ERROR_KVM_AMD+=" your kernel configuration." - ERROR_KVM_INTEL="If you have an Intel CPU, you must enable" - ERROR_KVM_INTEL+=" KVM_INTEL in your kernel configuration." - ERROR_TUN="You will need the Universal TUN/TAP driver compiled" - ERROR_TUN+=" into your kernel or loaded as a module to use the" - ERROR_TUN+=" virtual network device if using -net tap." - ERROR_BRIDGE="You will also need support for 802.1d" - ERROR_BRIDGE+=" Ethernet Bridging for some network configurations." - use vhost-net && CONFIG_CHECK+=" ~VHOST_NET" - ERROR_VHOST_NET="You must enable VHOST_NET to have vhost-net" - ERROR_VHOST_NET+=" support" - - if use amd64 || use x86 || use amd64-linux || use x86-linux; then - if grep -q AuthenticAMD /proc/cpuinfo; then - CONFIG_CHECK+=" ~KVM_AMD" - elif grep -q GenuineIntel /proc/cpuinfo; then - CONFIG_CHECK+=" ~KVM_INTEL" - fi - fi - - use python && CONFIG_CHECK+=" ~DEBUG_FS" - ERROR_DEBUG_FS="debugFS support required for kvm_stat" - - # Now do the actual checks setup above - check_extra_config - fi - fi - - if grep -qs '/usr/bin/qemu-kvm' "${EROOT}"/etc/libvirt/qemu/*.xml; then - eerror "The kvm/qemu-kvm wrappers no longer exist, but your libvirt" - eerror "instances are still pointing to it. Please update your" - eerror "configs in /etc/libvirt/qemu/ to use the -enable-kvm flag" - eerror "and the right system binary (e.g. qemu-system-x86_64)." - die "update your virt configs to not use qemu-kvm" - fi -} - -pkg_setup() { - enewgroup kvm 78 -} - -# Sanity check to make sure target lists are kept up-to-date. -check_targets() { - local var=$1 mak=$2 - local detected sorted - - pushd "${S}"/default-configs >/dev/null || die - - # Force C locale until glibc is updated. #564936 - detected=$(echo $(printf '%s\n' *-${mak}.mak | sed "s:-${mak}.mak::" | LC_COLLATE=C sort -u)) - sorted=$(echo $(printf '%s\n' ${!var} | LC_COLLATE=C sort -u)) - if [[ ${sorted} != "${detected}" ]] ; then - eerror "The ebuild needs to be kept in sync." - eerror "${var}: ${sorted}" - eerror "$(printf '%-*s' ${#var} configure): ${detected}" - die "sync ${var} to the list of targets" - fi - - popd >/dev/null -} - -handle_locales() { - # Make sure locale list is kept up-to-date. - local detected sorted - detected=$(echo $(cd po && printf '%s\n' *.po | grep -v messages.po | sed 's:.po$::' | sort -u)) - sorted=$(echo $(printf '%s\n' ${PLOCALES} | sort -u)) - if [[ ${sorted} != "${detected}" ]] ; then - eerror "The ebuild needs to be kept in sync." - eerror "PLOCALES: ${sorted}" - eerror " po/*.po: ${detected}" - die "sync PLOCALES" - fi - - # Deal with selective install of locales. - if use nls ; then - # Delete locales the user does not want. #577814 - rm_loc() { rm po/$1.po || die; } - l10n_for_each_disabled_locale_do rm_loc - else - # Cheap hack to disable gettext .mo generation. - rm -f po/*.po - fi -} - -src_prepare() { - check_targets IUSE_SOFTMMU_TARGETS softmmu - check_targets IUSE_USER_TARGETS linux-user - - # Alter target makefiles to accept CFLAGS set via flag-o - sed -i -r \ - -e 's/^(C|OP_C|HELPER_C)FLAGS=/\1FLAGS+=/' \ - Makefile Makefile.target || die - - default - - # Fix ld and objcopy being called directly - tc-export AR LD OBJCOPY - - # Verbose builds - MAKEOPTS+=" V=1" - - # Run after we've applied all patches. - handle_locales - - # Remove bundled copy of libfdt - rm -r dtc || die -} - -## -# configures qemu based on the build directory and the build type -# we are using. -# -qemu_src_configure() { - debug-print-function ${FUNCNAME} "$@" - - local buildtype=$1 - local builddir="${S}/${buildtype}-build" - - mkdir "${builddir}" - - local conf_opts=( - --prefix=/usr - --sysconfdir=/etc - --libdir=/usr/$(get_libdir) - --docdir=/usr/share/doc/${PF}/html - --disable-bsd-user - --disable-guest-agent - --disable-strip - --disable-werror - # We support gnutls/nettle for crypto operations. It is possible - # to use gcrypt when gnutls/nettle are disabled (but not when they - # are enabled), but it's not really worth the hassle. Disable it - # all the time to avoid automatically detecting it. #568856 - --disable-gcrypt - --python="${PYTHON}" - --cc="$(tc-getCC)" - --cxx="$(tc-getCXX)" - --host-cc="$(tc-getBUILD_CC)" - $(use_enable debug debug-info) - $(use_enable debug debug-tcg) - --enable-docs - $(use_enable tci tcg-interpreter) - $(use_enable xattr attr) - ) - - # Disable options not used by user targets. This simplifies building - # static user targets (USE=static-user) considerably. - conf_notuser() { - if [[ ${buildtype} == "user" ]] ; then - echo "--disable-${2:-$1}" - else - use_enable "$@" - fi - } - conf_opts+=( - $(conf_notuser accessibility brlapi) - $(conf_notuser aio linux-aio) - $(conf_notuser bzip2) - $(conf_notuser bluetooth bluez) - $(conf_notuser capstone) - $(conf_notuser caps cap-ng) - $(conf_notuser curl) - $(conf_notuser fdt) - $(conf_notuser glusterfs) - $(conf_notuser gnutls) - $(conf_notuser gnutls nettle) - $(conf_notuser gtk) - $(conf_notuser infiniband rdma) - $(conf_notuser iscsi libiscsi) - $(conf_notuser jpeg vnc-jpeg) - $(conf_notuser kernel_linux kvm) - $(conf_notuser lzo) - $(conf_notuser ncurses curses) - $(conf_notuser nfs libnfs) - $(conf_notuser numa) - $(conf_notuser opengl) - $(conf_notuser png vnc-png) - $(conf_notuser rbd) - $(conf_notuser sasl vnc-sasl) - $(conf_notuser sdl) - $(conf_notuser seccomp) - $(conf_notuser smartcard) - $(conf_notuser snappy) - $(conf_notuser spice) - $(conf_notuser ssh libssh2) - $(conf_notuser usb libusb) - $(conf_notuser usbredir usb-redir) - $(conf_notuser vde) - $(conf_notuser vhost-net) - $(conf_notuser virgl virglrenderer) - $(conf_notuser virtfs) - $(conf_notuser vnc) - $(conf_notuser vte) - $(conf_notuser xen) - $(conf_notuser xen xen-pci-passthrough) - $(conf_notuser xfs xfsctl) - ) - - if [[ ! ${buildtype} == "user" ]] ; then - # audio options - local audio_opts="oss" - use alsa && audio_opts="alsa,${audio_opts}" - use sdl && audio_opts="sdl,${audio_opts}" - use pulseaudio && audio_opts="pa,${audio_opts}" - conf_opts+=( - --audio-drv-list="${audio_opts}" - ) - use gtk && conf_opts+=( --with-gtkabi=$(usex gtk2 2.0 3.0) ) - use sdl && conf_opts+=( --with-sdlabi=$(usex sdl2 2.0 1.2) ) - fi - - case ${buildtype} in - user) - conf_opts+=( - --enable-linux-user - --disable-system - --disable-blobs - --disable-tools - ) - local static_flag="static-user" - ;; - softmmu) - conf_opts+=( - --disable-linux-user - --enable-system - --disable-tools - ) - local static_flag="static" - ;; - tools) - conf_opts+=( - --disable-linux-user - --disable-system - --disable-blobs - --enable-tools - ) - local static_flag="static" - ;; - esac - - local targets="${buildtype}_targets" - [[ -n ${targets} ]] && conf_opts+=( --target-list="${!targets}" ) - - # Add support for SystemTAP - use systemtap && conf_opts+=( --enable-trace-backend=dtrace ) - - # We always want to attempt to build with PIE support as it results - # in a more secure binary. But it doesn't work with static or if - # the current GCC doesn't have PIE support. - if use ${static_flag}; then - conf_opts+=( --static --disable-pie ) - else - tc-enables-pie && conf_opts+=( --enable-pie ) - fi - - echo "../configure ${conf_opts[*]}" - cd "${builddir}" - ../configure "${conf_opts[@]}" || die "configure failed" - - # FreeBSD's kernel does not support QEMU assigning/grabbing - # host USB devices yet - use kernel_FreeBSD && \ - sed -i -E -e "s|^(HOST_USB=)bsd|\1stub|" "${S}"/config-host.mak -} - -src_configure() { - local target - - python_setup - - softmmu_targets= softmmu_bins=() - user_targets= user_bins=() - - for target in ${IUSE_SOFTMMU_TARGETS} ; do - if use "qemu_softmmu_targets_${target}"; then - softmmu_targets+=",${target}-softmmu" - softmmu_bins+=( "qemu-system-${target}" ) - fi - done - - for target in ${IUSE_USER_TARGETS} ; do - if use "qemu_user_targets_${target}"; then - user_targets+=",${target}-linux-user" - user_bins+=( "qemu-${target}" ) - fi - done - - softmmu_targets=${softmmu_targets#,} - user_targets=${user_targets#,} - - [[ -n ${softmmu_targets} ]] && qemu_src_configure "softmmu" - [[ -n ${user_targets} ]] && qemu_src_configure "user" - qemu_src_configure "tools" -} - -src_compile() { - if [[ -n ${user_targets} ]]; then - cd "${S}/user-build" - default - fi - - if [[ -n ${softmmu_targets} ]]; then - cd "${S}/softmmu-build" - default - fi - - cd "${S}/tools-build" - default -} - -src_test() { - if [[ -n ${softmmu_targets} ]]; then - cd "${S}/softmmu-build" - pax-mark m */qemu-system-* #515550 - emake -j1 check - emake -j1 check-report.html - fi -} - -qemu_python_install() { - python_domodule "${S}/scripts/qmp/qmp.py" - - python_doscript "${S}/scripts/kvm/vmxcap" - python_doscript "${S}/scripts/qmp/qmp-shell" - python_doscript "${S}/scripts/qmp/qemu-ga-client" -} - -# Generate binfmt support files. -# - /etc/init.d/qemu-binfmt script which registers the user handlers (openrc) -# - /usr/share/qemu/binfmt.d/qemu.conf (for use with systemd-binfmt) -generate_initd() { - local out="${T}/qemu-binfmt" - local out_systemd="${T}/qemu.conf" - local d="${T}/binfmt.d" - - einfo "Generating qemu binfmt scripts and configuration files" - - # Generate the debian fragments first. - mkdir -p "${d}" - "${S}"/scripts/qemu-binfmt-conf.sh \ - --debian \ - --exportdir "${d}" \ - --qemu-path "${EPREFIX}/usr/bin" \ - || die - # Then turn the fragments into a shell script we can source. - sed -E -i \ - -e 's:^([^ ]+) (.*)$:\1="\2":' \ - "${d}"/* || die - - # Generate the init.d script by assembling the fragments from above. - local f qcpu package interpreter magic mask - cat "${FILESDIR}"/qemu-binfmt.initd.head >"${out}" || die - for f in "${d}"/qemu-* ; do - source "${f}" - - # Normalize the cpu logic like we do in the init.d for the native cpu. - qcpu=${package#qemu-} - case ${qcpu} in - arm*) qcpu="arm";; - mips*) qcpu="mips";; - ppc*) qcpu="ppc";; - s390*) qcpu="s390";; - sh*) qcpu="sh";; - sparc*) qcpu="sparc";; - esac - - cat <>"${out}" - if [ "\${cpu}" != "${qcpu}" -a -x "${interpreter}" ] ; then - echo ':${package}:M::${magic}:${mask}:${interpreter}:'"\${QEMU_BINFMT_FLAGS}" >/proc/sys/fs/binfmt_misc/register - fi -EOF - - echo ":${package}:M::${magic}:${mask}:${interpreter}:OC" >>"${out_systemd}" - - done - cat "${FILESDIR}"/qemu-binfmt.initd.tail >>"${out}" || die -} - -src_install() { - if [[ -n ${user_targets} ]]; then - cd "${S}/user-build" - emake DESTDIR="${ED}" install - - # Install binfmt handler init script for user targets. - generate_initd - doinitd "${T}/qemu-binfmt" - - # Install binfmt/qemu.conf. - insinto "/usr/share/qemu/binfmt.d" - doins "${T}/qemu.conf" - fi - - if [[ -n ${softmmu_targets} ]]; then - cd "${S}/softmmu-build" - emake DESTDIR="${ED}" install - - # This might not exist if the test failed. #512010 - [[ -e check-report.html ]] && dohtml check-report.html - - if use kernel_linux; then - udev_newrules "${FILESDIR}"/65-kvm.rules-r1 65-kvm.rules - fi - - if use python; then - python_foreach_impl qemu_python_install - fi - fi - - cd "${S}/tools-build" - emake DESTDIR="${ED}" install - - # Disable mprotect on the qemu binaries as they use JITs to be fast #459348 - pushd "${ED}"/usr/bin >/dev/null - pax-mark mr "${softmmu_bins[@]}" "${user_bins[@]}" # bug 575594 - popd >/dev/null - - # Install config file example for qemu-bridge-helper - insinto "/etc/qemu" - doins "${FILESDIR}/bridge.conf" - - cd "${S}" - dodoc Changelog MAINTAINERS docs/specs/pci-ids.txt - newdoc pc-bios/README README.pc-bios - - if [[ -n ${softmmu_targets} ]]; then - # Remove SeaBIOS since we're using the SeaBIOS packaged one - rm "${ED}/usr/share/qemu/bios.bin" - rm "${ED}/usr/share/qemu/bios-256k.bin" - if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then - dosym ../seabios/bios.bin /usr/share/qemu/bios.bin - dosym ../seabios/bios-256k.bin /usr/share/qemu/bios-256k.bin - fi - - # Remove vgabios since we're using the seavgabios packaged one - rm "${ED}/usr/share/qemu/vgabios.bin" - rm "${ED}/usr/share/qemu/vgabios-cirrus.bin" - rm "${ED}/usr/share/qemu/vgabios-qxl.bin" - rm "${ED}/usr/share/qemu/vgabios-stdvga.bin" - rm "${ED}/usr/share/qemu/vgabios-virtio.bin" - rm "${ED}/usr/share/qemu/vgabios-vmware.bin" - # PPC64 loads vgabios-stdvga - if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386 || use qemu_softmmu_targets_ppc64; then - dosym ../seavgabios/vgabios-isavga.bin /usr/share/qemu/vgabios.bin - dosym ../seavgabios/vgabios-cirrus.bin /usr/share/qemu/vgabios-cirrus.bin - dosym ../seavgabios/vgabios-qxl.bin /usr/share/qemu/vgabios-qxl.bin - dosym ../seavgabios/vgabios-stdvga.bin /usr/share/qemu/vgabios-stdvga.bin - dosym ../seavgabios/vgabios-virtio.bin /usr/share/qemu/vgabios-virtio.bin - dosym ../seavgabios/vgabios-vmware.bin /usr/share/qemu/vgabios-vmware.bin - fi - - # Remove sgabios since we're using the sgabios packaged one - rm "${ED}/usr/share/qemu/sgabios.bin" - if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then - dosym ../sgabios/sgabios.bin /usr/share/qemu/sgabios.bin - fi - - # Remove iPXE since we're using the iPXE packaged one - rm "${ED}"/usr/share/qemu/pxe-*.rom - if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then - dosym ../ipxe/8086100e.rom /usr/share/qemu/pxe-e1000.rom - dosym ../ipxe/80861209.rom /usr/share/qemu/pxe-eepro100.rom - dosym ../ipxe/10500940.rom /usr/share/qemu/pxe-ne2k_pci.rom - dosym ../ipxe/10222000.rom /usr/share/qemu/pxe-pcnet.rom - dosym ../ipxe/10ec8139.rom /usr/share/qemu/pxe-rtl8139.rom - dosym ../ipxe/1af41000.rom /usr/share/qemu/pxe-virtio.rom - fi - fi - - DISABLE_AUTOFORMATTING=true - readme.gentoo_create_doc -} - -firmware_abi_change() { - local pv - for pv in ${REPLACING_VERSIONS}; do - if ! version_is_at_least ${FIRMWARE_ABI_VERSION} ${pv}; then - return 0 - fi - done - return 1 -} - -pkg_postinst() { - if [[ -n ${softmmu_targets} ]] && use kernel_linux; then - udev_reload - fi - - fcaps cap_net_admin /usr/libexec/qemu-bridge-helper - - DISABLE_AUTOFORMATTING=true - readme.gentoo_print_elog - - if use pin-upstream-blobs && firmware_abi_change; then - ewarn "This version of qemu pins new versions of firmware blobs:" - ewarn " $(best_version sys-firmware/edk2-ovmf)" - ewarn " $(best_version sys-firmware/ipxe)" - ewarn " $(best_version sys-firmware/seabios)" - ewarn " $(best_version sys-firmware/sgabios)" - ewarn "This might break resume of hibernated guests (started with a different" - ewarn "firmware version) and live migration to/from qemu versions with different" - ewarn "firmware. Please (cold) restart all running guests. For functional" - ewarn "guest migration ensure that all" - ewarn "hosts run at least" - ewarn " app-emulation/qemu-${FIRMWARE_ABI_VERSION}." - fi -} - -pkg_info() { - echo "Using:" - echo " $(best_version app-emulation/spice-protocol)" - echo " $(best_version sys-firmware/edk2-ovmf)" - if has_version 'sys-firmware/edk2-ovmf[binary]'; then - echo " USE=binary" - else - echo " USE=''" - fi - echo " $(best_version sys-firmware/ipxe)" - echo " $(best_version sys-firmware/seabios)" - if has_version 'sys-firmware/seabios[binary]'; then - echo " USE=binary" - else - echo " USE=''" - fi - echo " $(best_version sys-firmware/sgabios)" -} diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-emulation/qemu-2.11.1-r2 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-emulation/qemu-2.11.1-r2 deleted file mode 100644 index e70f97f90b..0000000000 --- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-emulation/qemu-2.11.1-r2 +++ /dev/null @@ -1,14 +0,0 @@ -DEFINED_PHASES=compile configure info install postinst prepare pretend setup test -DEPEND=!static? ( >=dev-libs/glib-2.0 sys-libs/zlib python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses,readline] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) systemtap? ( dev-util/systemtap ) xattr? ( sys-apps/attr ) >=x11-libs/pixman-0.28.0 accessibility? ( app-accessibility/brltty[api] app-accessibility/brltty ) aio? ( dev-libs/libaio ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bluetooth? ( net-wireless/bluez ) bzip2? ( app-arch/bzip2 ) caps? ( sys-libs/libcap-ng ) curl? ( >=net-misc/curl-7.15.4 ) fdt? ( >=sys-apps/dtc-1.4.2 ) glusterfs? ( >=sys-cluster/glusterfs-3.4.0 ) gnutls? ( dev-libs/nettle:= >=net-libs/gnutls-3.0:= ) gtk? ( gtk2? ( x11-libs/gtk+:2 vte? ( x11-libs/vte:0 ) ) !gtk2? ( x11-libs/gtk+:3 vte? ( x11-libs/vte:2.91 ) ) ) infiniband? ( sys-fabric/librdmacm:= ) iscsi? ( net-libs/libiscsi ) jpeg? ( virtual/jpeg:0= ) lzo? ( dev-libs/lzo:2 ) ncurses? ( sys-libs/ncurses:0=[unicode] sys-libs/ncurses:0= ) nfs? ( >=net-fs/libnfs-1.9.3:= ) numa? ( sys-process/numactl ) opengl? ( virtual/opengl media-libs/libepoxy media-libs/mesa media-libs/mesa[egl,gbm] ) png? ( media-libs/libpng:0= ) pulseaudio? ( media-sound/pulseaudio ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) sdl? ( !sdl2? ( media-libs/libsdl[X] >=media-libs/libsdl-1.2.11 ) sdl2? ( media-libs/libsdl2[X] media-libs/libsdl2 ) ) seccomp? ( >=sys-libs/libseccomp-2.1.0 ) smartcard? ( >=app-emulation/libcacard-2.5.0 ) snappy? ( app-arch/snappy:= ) spice? ( >=app-emulation/spice-protocol-0.12.3 >=app-emulation/spice-0.12.0 ) ssh? ( >=net-libs/libssh2-1.2.8 ) usb? ( >=virtual/libusb-1-r2 ) usbredir? ( >=sys-apps/usbredir-0.6 ) vde? ( net-misc/vde ) virgl? ( media-libs/virglrenderer ) virtfs? ( sys-libs/libcap ) xen? ( app-emulation/xen-tools:= ) xfs? ( sys-fs/xfsprogs ) ) qemu_softmmu_targets_i386? ( pin-upstream-blobs? ( ~sys-firmware/edk2-ovmf-2017_pre20170505[binary] ~sys-firmware/ipxe-1.0.0_p20160620 ~sys-firmware/seabios-1.10.2[binary,seavgabios] ~sys-firmware/sgabios-0.1_pre8 ) !pin-upstream-blobs? ( sys-firmware/edk2-ovmf sys-firmware/ipxe >=sys-firmware/seabios-1.10.2[seavgabios] sys-firmware/sgabios ) ) qemu_softmmu_targets_x86_64? ( pin-upstream-blobs? ( ~sys-firmware/edk2-ovmf-2017_pre20170505[binary] ~sys-firmware/ipxe-1.0.0_p20160620 ~sys-firmware/seabios-1.10.2[binary,seavgabios] ~sys-firmware/sgabios-0.1_pre8 ) !pin-upstream-blobs? ( sys-firmware/edk2-ovmf sys-firmware/ipxe >=sys-firmware/seabios-1.10.2[seavgabios] sys-firmware/sgabios ) ) qemu_softmmu_targets_ppc64? ( pin-upstream-blobs? ( ~sys-firmware/seabios-1.10.2[binary,seavgabios] ) !pin-upstream-blobs? ( >=sys-firmware/seabios-1.10.2[seavgabios] ) ) dev-lang/perl =dev-lang/python-2* sys-apps/texinfo virtual/pkgconfig kernel_linux? ( >=sys-kernel/linux-headers-2.6.35 ) gtk? ( nls? ( sys-devel/gettext ) ) static? ( >=dev-libs/glib-2.0[static-libs(+)] sys-libs/zlib[static-libs(+)] python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses,readline] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) systemtap? ( dev-util/systemtap ) xattr? ( sys-apps/attr[static-libs(+)] ) >=x11-libs/pixman-0.28.0[static-libs(+)] accessibility? ( app-accessibility/brltty[api] app-accessibility/brltty[static-libs(+)] ) aio? ( dev-libs/libaio[static-libs(+)] ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bluetooth? ( net-wireless/bluez ) bzip2? ( app-arch/bzip2[static-libs(+)] ) caps? ( sys-libs/libcap-ng[static-libs(+)] ) curl? ( >=net-misc/curl-7.15.4[static-libs(+)] ) fdt? ( >=sys-apps/dtc-1.4.2[static-libs(+)] ) glusterfs? ( >=sys-cluster/glusterfs-3.4.0[static-libs(+)] ) gnutls? ( dev-libs/nettle:=[static-libs(+)] >=net-libs/gnutls-3.0:=[static-libs(+)] ) gtk? ( gtk2? ( x11-libs/gtk+:2 vte? ( x11-libs/vte:0 ) ) !gtk2? ( x11-libs/gtk+:3 vte? ( x11-libs/vte:2.91 ) ) ) infiniband? ( sys-fabric/librdmacm:=[static-libs(+)] ) iscsi? ( net-libs/libiscsi ) jpeg? ( virtual/jpeg:0=[static-libs(+)] ) lzo? ( dev-libs/lzo:2[static-libs(+)] ) ncurses? ( sys-libs/ncurses:0=[unicode] sys-libs/ncurses:0=[static-libs(+)] ) nfs? ( >=net-fs/libnfs-1.9.3:=[static-libs(+)] ) numa? ( sys-process/numactl[static-libs(+)] ) opengl? ( virtual/opengl media-libs/libepoxy[static-libs(+)] media-libs/mesa[static-libs(+)] media-libs/mesa[egl,gbm] ) png? ( media-libs/libpng:0=[static-libs(+)] ) pulseaudio? ( media-sound/pulseaudio ) rbd? ( sys-cluster/ceph[static-libs(+)] ) sasl? ( dev-libs/cyrus-sasl[static-libs(+)] ) sdl? ( !sdl2? ( media-libs/libsdl[X] >=media-libs/libsdl-1.2.11[static-libs(+)] ) sdl2? ( media-libs/libsdl2[X] media-libs/libsdl2[static-libs(+)] ) ) seccomp? ( >=sys-libs/libseccomp-2.1.0[static-libs(+)] ) smartcard? ( >=app-emulation/libcacard-2.5.0[static-libs(+)] ) snappy? ( app-arch/snappy:= ) spice? ( >=app-emulation/spice-protocol-0.12.3 >=app-emulation/spice-0.12.0[static-libs(+)] ) ssh? ( >=net-libs/libssh2-1.2.8[static-libs(+)] ) usb? ( >=virtual/libusb-1-r2[static-libs(+)] ) usbredir? ( >=sys-apps/usbredir-0.6[static-libs(+)] ) vde? ( net-misc/vde[static-libs(+)] ) virgl? ( media-libs/virglrenderer[static-libs(+)] ) virtfs? ( sys-libs/libcap ) xen? ( app-emulation/xen-tools:= ) xfs? ( sys-fs/xfsprogs[static-libs(+)] ) ) static-user? ( >=dev-libs/glib-2.0[static-libs(+)] sys-libs/zlib[static-libs(+)] python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses,readline] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) systemtap? ( dev-util/systemtap ) xattr? ( sys-apps/attr[static-libs(+)] ) ) test? ( dev-libs/glib[utils] sys-devel/bc ) virtual/pkgconfig filecaps? ( sys-libs/libcap ) -DESCRIPTION=QEMU + Kernel-based Virtual Machine userland tools -EAPI=6 -HOMEPAGE=http://www.qemu.org http://www.linux-kvm.org -IUSE=accessibility +aio alsa bluetooth bzip2 +caps +curl debug +fdt glusterfs gnutls gtk gtk2 infiniband iscsi +jpeg kernel_linux kernel_FreeBSD lzo ncurses nfs nls numa opengl +pin-upstream-blobs +png pulseaudio python rbd sasl +seccomp sdl sdl2 selinux smartcard snappy spice ssh static static-user systemtap tci test usb usbredir vde +vhost-net virgl virtfs +vnc vte xattr xen xfs qemu_softmmu_targets_aarch64 qemu_softmmu_targets_alpha qemu_softmmu_targets_arm qemu_softmmu_targets_cris qemu_softmmu_targets_i386 qemu_softmmu_targets_m68k qemu_softmmu_targets_microblaze qemu_softmmu_targets_microblazeel qemu_softmmu_targets_mips qemu_softmmu_targets_mips64 qemu_softmmu_targets_mips64el qemu_softmmu_targets_mipsel qemu_softmmu_targets_nios2 qemu_softmmu_targets_or1k qemu_softmmu_targets_ppc qemu_softmmu_targets_ppc64 qemu_softmmu_targets_s390x qemu_softmmu_targets_sh4 qemu_softmmu_targets_sh4eb qemu_softmmu_targets_sparc qemu_softmmu_targets_sparc64 qemu_softmmu_targets_x86_64 qemu_softmmu_targets_lm32 qemu_softmmu_targets_moxie qemu_softmmu_targets_ppcemb qemu_softmmu_targets_tricore qemu_softmmu_targets_unicore32 qemu_softmmu_targets_xtensa qemu_softmmu_targets_xtensaeb qemu_user_targets_aarch64 qemu_user_targets_alpha qemu_user_targets_arm qemu_user_targets_cris qemu_user_targets_i386 qemu_user_targets_m68k qemu_user_targets_microblaze qemu_user_targets_microblazeel qemu_user_targets_mips qemu_user_targets_mips64 qemu_user_targets_mips64el qemu_user_targets_mipsel qemu_user_targets_nios2 qemu_user_targets_or1k qemu_user_targets_ppc qemu_user_targets_ppc64 qemu_user_targets_s390x qemu_user_targets_sh4 qemu_user_targets_sh4eb qemu_user_targets_sparc qemu_user_targets_sparc64 qemu_user_targets_x86_64 qemu_user_targets_armeb qemu_user_targets_hppa qemu_user_targets_mipsn32 qemu_user_targets_mipsn32el qemu_user_targets_ppc64abi32 qemu_user_targets_ppc64le qemu_user_targets_sparc32plus qemu_user_targets_tilegx python_targets_python2_7 +filecaps linguas_bg linguas_de_DE linguas_fr_FR linguas_hu linguas_it linguas_tr linguas_zh_CN -KEYWORDS=amd64 ~arm64 ~ppc ~ppc64 x86 ~x86-fbsd -LICENSE=GPL-2 LGPL-2 BSD-2 -RDEPEND=!static? ( >=dev-libs/glib-2.0 sys-libs/zlib python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses,readline] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) systemtap? ( dev-util/systemtap ) xattr? ( sys-apps/attr ) >=x11-libs/pixman-0.28.0 accessibility? ( app-accessibility/brltty[api] app-accessibility/brltty ) aio? ( dev-libs/libaio ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bluetooth? ( net-wireless/bluez ) bzip2? ( app-arch/bzip2 ) caps? ( sys-libs/libcap-ng ) curl? ( >=net-misc/curl-7.15.4 ) fdt? ( >=sys-apps/dtc-1.4.2 ) glusterfs? ( >=sys-cluster/glusterfs-3.4.0 ) gnutls? ( dev-libs/nettle:= >=net-libs/gnutls-3.0:= ) gtk? ( gtk2? ( x11-libs/gtk+:2 vte? ( x11-libs/vte:0 ) ) !gtk2? ( x11-libs/gtk+:3 vte? ( x11-libs/vte:2.91 ) ) ) infiniband? ( sys-fabric/librdmacm:= ) iscsi? ( net-libs/libiscsi ) jpeg? ( virtual/jpeg:0= ) lzo? ( dev-libs/lzo:2 ) ncurses? ( sys-libs/ncurses:0=[unicode] sys-libs/ncurses:0= ) nfs? ( >=net-fs/libnfs-1.9.3:= ) numa? ( sys-process/numactl ) opengl? ( virtual/opengl media-libs/libepoxy media-libs/mesa media-libs/mesa[egl,gbm] ) png? ( media-libs/libpng:0= ) pulseaudio? ( media-sound/pulseaudio ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) sdl? ( !sdl2? ( media-libs/libsdl[X] >=media-libs/libsdl-1.2.11 ) sdl2? ( media-libs/libsdl2[X] media-libs/libsdl2 ) ) seccomp? ( >=sys-libs/libseccomp-2.1.0 ) smartcard? ( >=app-emulation/libcacard-2.5.0 ) snappy? ( app-arch/snappy:= ) spice? ( >=app-emulation/spice-protocol-0.12.3 >=app-emulation/spice-0.12.0 ) ssh? ( >=net-libs/libssh2-1.2.8 ) usb? ( >=virtual/libusb-1-r2 ) usbredir? ( >=sys-apps/usbredir-0.6 ) vde? ( net-misc/vde ) virgl? ( media-libs/virglrenderer ) virtfs? ( sys-libs/libcap ) xen? ( app-emulation/xen-tools:= ) xfs? ( sys-fs/xfsprogs ) ) qemu_softmmu_targets_i386? ( pin-upstream-blobs? ( ~sys-firmware/edk2-ovmf-2017_pre20170505[binary] ~sys-firmware/ipxe-1.0.0_p20160620 ~sys-firmware/seabios-1.10.2[binary,seavgabios] ~sys-firmware/sgabios-0.1_pre8 ) !pin-upstream-blobs? ( sys-firmware/edk2-ovmf sys-firmware/ipxe >=sys-firmware/seabios-1.10.2[seavgabios] sys-firmware/sgabios ) ) qemu_softmmu_targets_x86_64? ( pin-upstream-blobs? ( ~sys-firmware/edk2-ovmf-2017_pre20170505[binary] ~sys-firmware/ipxe-1.0.0_p20160620 ~sys-firmware/seabios-1.10.2[binary,seavgabios] ~sys-firmware/sgabios-0.1_pre8 ) !pin-upstream-blobs? ( sys-firmware/edk2-ovmf sys-firmware/ipxe >=sys-firmware/seabios-1.10.2[seavgabios] sys-firmware/sgabios ) ) qemu_softmmu_targets_ppc64? ( pin-upstream-blobs? ( ~sys-firmware/seabios-1.10.2[binary,seavgabios] ) !pin-upstream-blobs? ( >=sys-firmware/seabios-1.10.2[seavgabios] ) ) selinux? ( sec-policy/selinux-qemu ) -REQUIRED_USE=|| ( python_targets_python2_7 ) gtk2? ( gtk ) qemu_softmmu_targets_arm? ( fdt ) qemu_softmmu_targets_microblaze? ( fdt ) qemu_softmmu_targets_mips64el? ( fdt ) qemu_softmmu_targets_ppc? ( fdt ) qemu_softmmu_targets_ppc64? ( fdt ) sdl2? ( sdl ) static? ( static-user !alsa !bluetooth !gtk !gtk2 !opengl !pulseaudio !snappy ) virtfs? ( xattr ) vte? ( gtk ) -SLOT=0 -SRC_URI=http://wiki.qemu-project.org/download/qemu-2.11.1.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/qemu-2.11.1-patches-r1.tar.xz -_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 fcaps e80204189039ecc03f24151c518375f0 flag-o-matic 2274fcc1e7ef6affaff5bcd636275417 l10n 2c2e15383ba891d642f51896a7f0ecfe linux-info ca370deef9d44125d829f2eb6ebc83e0 ltprune 2770eed66a9b8ef944714cd0e968182e multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e pax-utils 4f95120230a315c8caaabeb2307b7eee python-r1 e9350ec46bb5c9f3504b4fbe8b8d8987 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d readme.gentoo-r1 6f03e110529650f57fc7d1fb908b8986 toolchain-funcs 185a06792159ca143528e7010368e8af udev d91cac2c73b94629cad2daea66e0d182 user e4b567c44272a719fabf53f0f885d3f7 versionator c80ccf29e90adea7c5cae94b42eb76d0 -_md5_=e27eb18af8c87347174df1727f0ea84e diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-emulation/qemu-2.11.1-r53 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-emulation/qemu-2.11.1-r53 deleted file mode 100644 index 21be54665d..0000000000 --- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-emulation/qemu-2.11.1-r53 +++ /dev/null @@ -1,14 +0,0 @@ -DEFINED_PHASES=compile configure info install postinst prepare pretend setup test -DEPEND=!static? ( >=dev-libs/glib-2.0 sys-libs/zlib python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses,readline] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) systemtap? ( dev-util/systemtap ) xattr? ( sys-apps/attr ) >=x11-libs/pixman-0.28.0 accessibility? ( app-accessibility/brltty[api] app-accessibility/brltty ) aio? ( dev-libs/libaio ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bluetooth? ( net-wireless/bluez ) bzip2? ( app-arch/bzip2 ) capstone? ( dev-libs/capstone ) caps? ( sys-libs/libcap-ng ) curl? ( >=net-misc/curl-7.15.4 ) fdt? ( >=sys-apps/dtc-1.4.2 ) glusterfs? ( >=sys-cluster/glusterfs-3.4.0 ) gnutls? ( dev-libs/nettle:= >=net-libs/gnutls-3.0:= ) gtk? ( gtk2? ( x11-libs/gtk+:2 vte? ( x11-libs/vte:0 ) ) !gtk2? ( x11-libs/gtk+:3 vte? ( x11-libs/vte:2.91 ) ) ) infiniband? ( sys-fabric/librdmacm:= ) iscsi? ( net-libs/libiscsi ) jpeg? ( virtual/jpeg:0= ) lzo? ( dev-libs/lzo:2 ) ncurses? ( sys-libs/ncurses:0=[unicode] sys-libs/ncurses:0= ) nfs? ( >=net-fs/libnfs-1.9.3:= ) numa? ( sys-process/numactl ) opengl? ( virtual/opengl media-libs/libepoxy media-libs/mesa media-libs/mesa[egl,gbm] ) png? ( media-libs/libpng:0= ) pulseaudio? ( media-sound/pulseaudio ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) sdl? ( !sdl2? ( media-libs/libsdl[X] >=media-libs/libsdl-1.2.11 ) sdl2? ( media-libs/libsdl2[X] media-libs/libsdl2 ) ) seccomp? ( >=sys-libs/libseccomp-2.1.0 ) smartcard? ( >=app-emulation/libcacard-2.5.0 ) snappy? ( app-arch/snappy:= ) spice? ( >=app-emulation/spice-protocol-0.12.3 >=app-emulation/spice-0.12.0 ) ssh? ( >=net-libs/libssh2-1.2.8 ) usb? ( >=virtual/libusb-1-r2 ) usbredir? ( >=sys-apps/usbredir-0.6 ) vde? ( net-misc/vde ) virgl? ( media-libs/virglrenderer ) virtfs? ( sys-libs/libcap ) xen? ( app-emulation/xen-tools:= ) xfs? ( sys-fs/xfsprogs ) ) qemu_softmmu_targets_i386? ( pin-upstream-blobs? ( ~sys-firmware/edk2-ovmf-2017_p20180211[binary] ~sys-firmware/ipxe-1.0.0_p20180211[binary] ~sys-firmware/seabios-1.11.0[binary,seavgabios] ~sys-firmware/sgabios-0.1_pre8[binary] ) !pin-upstream-blobs? ( sys-firmware/edk2-ovmf sys-firmware/ipxe >=sys-firmware/seabios-1.10.2[seavgabios] sys-firmware/sgabios ) ) qemu_softmmu_targets_x86_64? ( pin-upstream-blobs? ( ~sys-firmware/edk2-ovmf-2017_p20180211[binary] ~sys-firmware/ipxe-1.0.0_p20180211[binary] ~sys-firmware/seabios-1.11.0[binary,seavgabios] ~sys-firmware/sgabios-0.1_pre8[binary] ) !pin-upstream-blobs? ( sys-firmware/edk2-ovmf sys-firmware/ipxe >=sys-firmware/seabios-1.10.2[seavgabios] sys-firmware/sgabios ) ) qemu_softmmu_targets_ppc64? ( pin-upstream-blobs? ( ~sys-firmware/seabios-1.11.0[binary,seavgabios] ) !pin-upstream-blobs? ( >=sys-firmware/seabios-1.10.2[seavgabios] ) ) dev-lang/perl =dev-lang/python-2* sys-apps/texinfo virtual/pkgconfig kernel_linux? ( >=sys-kernel/linux-headers-2.6.35 ) gtk? ( nls? ( sys-devel/gettext ) ) static? ( >=dev-libs/glib-2.0[static-libs(+)] sys-libs/zlib[static-libs(+)] python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses,readline] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) systemtap? ( dev-util/systemtap ) xattr? ( sys-apps/attr[static-libs(+)] ) >=x11-libs/pixman-0.28.0[static-libs(+)] accessibility? ( app-accessibility/brltty[api] app-accessibility/brltty[static-libs(+)] ) aio? ( dev-libs/libaio[static-libs(+)] ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bluetooth? ( net-wireless/bluez ) bzip2? ( app-arch/bzip2[static-libs(+)] ) capstone? ( dev-libs/capstone ) caps? ( sys-libs/libcap-ng[static-libs(+)] ) curl? ( >=net-misc/curl-7.15.4[static-libs(+)] ) fdt? ( >=sys-apps/dtc-1.4.2[static-libs(+)] ) glusterfs? ( >=sys-cluster/glusterfs-3.4.0[static-libs(+)] ) gnutls? ( dev-libs/nettle:=[static-libs(+)] >=net-libs/gnutls-3.0:=[static-libs(+)] ) gtk? ( gtk2? ( x11-libs/gtk+:2 vte? ( x11-libs/vte:0 ) ) !gtk2? ( x11-libs/gtk+:3 vte? ( x11-libs/vte:2.91 ) ) ) infiniband? ( sys-fabric/librdmacm:=[static-libs(+)] ) iscsi? ( net-libs/libiscsi ) jpeg? ( virtual/jpeg:0=[static-libs(+)] ) lzo? ( dev-libs/lzo:2[static-libs(+)] ) ncurses? ( sys-libs/ncurses:0=[unicode] sys-libs/ncurses:0=[static-libs(+)] ) nfs? ( >=net-fs/libnfs-1.9.3:=[static-libs(+)] ) numa? ( sys-process/numactl[static-libs(+)] ) opengl? ( virtual/opengl media-libs/libepoxy[static-libs(+)] media-libs/mesa[static-libs(+)] media-libs/mesa[egl,gbm] ) png? ( media-libs/libpng:0=[static-libs(+)] ) pulseaudio? ( media-sound/pulseaudio ) rbd? ( sys-cluster/ceph[static-libs(+)] ) sasl? ( dev-libs/cyrus-sasl[static-libs(+)] ) sdl? ( !sdl2? ( media-libs/libsdl[X] >=media-libs/libsdl-1.2.11[static-libs(+)] ) sdl2? ( media-libs/libsdl2[X] media-libs/libsdl2[static-libs(+)] ) ) seccomp? ( >=sys-libs/libseccomp-2.1.0[static-libs(+)] ) smartcard? ( >=app-emulation/libcacard-2.5.0[static-libs(+)] ) snappy? ( app-arch/snappy:= ) spice? ( >=app-emulation/spice-protocol-0.12.3 >=app-emulation/spice-0.12.0[static-libs(+)] ) ssh? ( >=net-libs/libssh2-1.2.8[static-libs(+)] ) usb? ( >=virtual/libusb-1-r2[static-libs(+)] ) usbredir? ( >=sys-apps/usbredir-0.6[static-libs(+)] ) vde? ( net-misc/vde[static-libs(+)] ) virgl? ( media-libs/virglrenderer[static-libs(+)] ) virtfs? ( sys-libs/libcap ) xen? ( app-emulation/xen-tools:= ) xfs? ( sys-fs/xfsprogs[static-libs(+)] ) ) static-user? ( >=dev-libs/glib-2.0[static-libs(+)] sys-libs/zlib[static-libs(+)] python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses,readline] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) systemtap? ( dev-util/systemtap ) xattr? ( sys-apps/attr[static-libs(+)] ) ) test? ( dev-libs/glib[utils] sys-devel/bc ) virtual/pkgconfig filecaps? ( sys-libs/libcap ) -DESCRIPTION=QEMU + Kernel-based Virtual Machine userland tools -EAPI=6 -HOMEPAGE=http://www.qemu.org http://www.linux-kvm.org -IUSE=accessibility +aio alsa bluetooth bzip2 capstone +caps +curl debug +fdt glusterfs gnutls gtk gtk2 infiniband iscsi +jpeg kernel_linux kernel_FreeBSD lzo ncurses nfs nls numa opengl +pin-upstream-blobs +png pulseaudio python rbd sasl +seccomp sdl sdl2 selinux smartcard snappy spice ssh static static-user systemtap tci test usb usbredir vde +vhost-net virgl virtfs +vnc vte xattr xen xfs qemu_softmmu_targets_aarch64 qemu_softmmu_targets_alpha qemu_softmmu_targets_arm qemu_softmmu_targets_cris qemu_softmmu_targets_i386 qemu_softmmu_targets_m68k qemu_softmmu_targets_microblaze qemu_softmmu_targets_microblazeel qemu_softmmu_targets_mips qemu_softmmu_targets_mips64 qemu_softmmu_targets_mips64el qemu_softmmu_targets_mipsel qemu_softmmu_targets_nios2 qemu_softmmu_targets_or1k qemu_softmmu_targets_ppc qemu_softmmu_targets_ppc64 qemu_softmmu_targets_s390x qemu_softmmu_targets_sh4 qemu_softmmu_targets_sh4eb qemu_softmmu_targets_sparc qemu_softmmu_targets_sparc64 qemu_softmmu_targets_x86_64 qemu_softmmu_targets_lm32 qemu_softmmu_targets_moxie qemu_softmmu_targets_ppcemb qemu_softmmu_targets_tricore qemu_softmmu_targets_unicore32 qemu_softmmu_targets_xtensa qemu_softmmu_targets_xtensaeb qemu_user_targets_aarch64 qemu_user_targets_alpha qemu_user_targets_arm qemu_user_targets_cris qemu_user_targets_i386 qemu_user_targets_m68k qemu_user_targets_microblaze qemu_user_targets_microblazeel qemu_user_targets_mips qemu_user_targets_mips64 qemu_user_targets_mips64el qemu_user_targets_mipsel qemu_user_targets_nios2 qemu_user_targets_or1k qemu_user_targets_ppc qemu_user_targets_ppc64 qemu_user_targets_s390x qemu_user_targets_sh4 qemu_user_targets_sh4eb qemu_user_targets_sparc qemu_user_targets_sparc64 qemu_user_targets_x86_64 qemu_user_targets_armeb qemu_user_targets_hppa qemu_user_targets_mipsn32 qemu_user_targets_mipsn32el qemu_user_targets_ppc64abi32 qemu_user_targets_ppc64le qemu_user_targets_sparc32plus qemu_user_targets_tilegx python_targets_python2_7 +filecaps linguas_bg linguas_de_DE linguas_fr_FR linguas_hu linguas_it linguas_tr linguas_zh_CN -KEYWORDS=~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~x86-fbsd -LICENSE=GPL-2 LGPL-2 BSD-2 -RDEPEND=!static? ( >=dev-libs/glib-2.0 sys-libs/zlib python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses,readline] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) systemtap? ( dev-util/systemtap ) xattr? ( sys-apps/attr ) >=x11-libs/pixman-0.28.0 accessibility? ( app-accessibility/brltty[api] app-accessibility/brltty ) aio? ( dev-libs/libaio ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bluetooth? ( net-wireless/bluez ) bzip2? ( app-arch/bzip2 ) capstone? ( dev-libs/capstone ) caps? ( sys-libs/libcap-ng ) curl? ( >=net-misc/curl-7.15.4 ) fdt? ( >=sys-apps/dtc-1.4.2 ) glusterfs? ( >=sys-cluster/glusterfs-3.4.0 ) gnutls? ( dev-libs/nettle:= >=net-libs/gnutls-3.0:= ) gtk? ( gtk2? ( x11-libs/gtk+:2 vte? ( x11-libs/vte:0 ) ) !gtk2? ( x11-libs/gtk+:3 vte? ( x11-libs/vte:2.91 ) ) ) infiniband? ( sys-fabric/librdmacm:= ) iscsi? ( net-libs/libiscsi ) jpeg? ( virtual/jpeg:0= ) lzo? ( dev-libs/lzo:2 ) ncurses? ( sys-libs/ncurses:0=[unicode] sys-libs/ncurses:0= ) nfs? ( >=net-fs/libnfs-1.9.3:= ) numa? ( sys-process/numactl ) opengl? ( virtual/opengl media-libs/libepoxy media-libs/mesa media-libs/mesa[egl,gbm] ) png? ( media-libs/libpng:0= ) pulseaudio? ( media-sound/pulseaudio ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) sdl? ( !sdl2? ( media-libs/libsdl[X] >=media-libs/libsdl-1.2.11 ) sdl2? ( media-libs/libsdl2[X] media-libs/libsdl2 ) ) seccomp? ( >=sys-libs/libseccomp-2.1.0 ) smartcard? ( >=app-emulation/libcacard-2.5.0 ) snappy? ( app-arch/snappy:= ) spice? ( >=app-emulation/spice-protocol-0.12.3 >=app-emulation/spice-0.12.0 ) ssh? ( >=net-libs/libssh2-1.2.8 ) usb? ( >=virtual/libusb-1-r2 ) usbredir? ( >=sys-apps/usbredir-0.6 ) vde? ( net-misc/vde ) virgl? ( media-libs/virglrenderer ) virtfs? ( sys-libs/libcap ) xen? ( app-emulation/xen-tools:= ) xfs? ( sys-fs/xfsprogs ) ) qemu_softmmu_targets_i386? ( pin-upstream-blobs? ( ~sys-firmware/edk2-ovmf-2017_p20180211[binary] ~sys-firmware/ipxe-1.0.0_p20180211[binary] ~sys-firmware/seabios-1.11.0[binary,seavgabios] ~sys-firmware/sgabios-0.1_pre8[binary] ) !pin-upstream-blobs? ( sys-firmware/edk2-ovmf sys-firmware/ipxe >=sys-firmware/seabios-1.10.2[seavgabios] sys-firmware/sgabios ) ) qemu_softmmu_targets_x86_64? ( pin-upstream-blobs? ( ~sys-firmware/edk2-ovmf-2017_p20180211[binary] ~sys-firmware/ipxe-1.0.0_p20180211[binary] ~sys-firmware/seabios-1.11.0[binary,seavgabios] ~sys-firmware/sgabios-0.1_pre8[binary] ) !pin-upstream-blobs? ( sys-firmware/edk2-ovmf sys-firmware/ipxe >=sys-firmware/seabios-1.10.2[seavgabios] sys-firmware/sgabios ) ) qemu_softmmu_targets_ppc64? ( pin-upstream-blobs? ( ~sys-firmware/seabios-1.11.0[binary,seavgabios] ) !pin-upstream-blobs? ( >=sys-firmware/seabios-1.10.2[seavgabios] ) ) selinux? ( sec-policy/selinux-qemu ) -REQUIRED_USE=|| ( python_targets_python2_7 ) gtk2? ( gtk ) qemu_softmmu_targets_arm? ( fdt ) qemu_softmmu_targets_microblaze? ( fdt ) qemu_softmmu_targets_mips64el? ( fdt ) qemu_softmmu_targets_ppc? ( fdt ) qemu_softmmu_targets_ppc64? ( fdt ) sdl2? ( sdl ) static? ( static-user !alsa !bluetooth !gtk !gtk2 !opengl !pulseaudio !snappy ) virtfs? ( xattr ) vte? ( gtk ) -SLOT=0 -SRC_URI=http://wiki.qemu-project.org/download/qemu-2.11.1.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/qemu-2.11.1-patches-r2.tar.xz -_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 fcaps e80204189039ecc03f24151c518375f0 flag-o-matic 2274fcc1e7ef6affaff5bcd636275417 l10n 2c2e15383ba891d642f51896a7f0ecfe linux-info ca370deef9d44125d829f2eb6ebc83e0 ltprune 2770eed66a9b8ef944714cd0e968182e multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e pax-utils 4f95120230a315c8caaabeb2307b7eee python-r1 e9350ec46bb5c9f3504b4fbe8b8d8987 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d readme.gentoo-r1 6f03e110529650f57fc7d1fb908b8986 toolchain-funcs 185a06792159ca143528e7010368e8af udev d91cac2c73b94629cad2daea66e0d182 user e4b567c44272a719fabf53f0f885d3f7 versionator c80ccf29e90adea7c5cae94b42eb76d0 -_md5_=cdfc923025c95ac02570632aef70079c diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-emulation/qemu-9999 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-emulation/qemu-9999 deleted file mode 100644 index e67ce1aaa2..0000000000 --- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-emulation/qemu-9999 +++ /dev/null @@ -1,12 +0,0 @@ -DEFINED_PHASES=compile configure info install postinst prepare pretend setup test unpack -DEPEND=!static? ( >=dev-libs/glib-2.0 sys-libs/zlib python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses,readline] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) systemtap? ( dev-util/systemtap ) xattr? ( sys-apps/attr ) >=x11-libs/pixman-0.28.0 accessibility? ( app-accessibility/brltty[api] app-accessibility/brltty ) aio? ( dev-libs/libaio ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bluetooth? ( net-wireless/bluez ) bzip2? ( app-arch/bzip2 ) capstone? ( dev-libs/capstone ) caps? ( sys-libs/libcap-ng ) curl? ( >=net-misc/curl-7.15.4 ) fdt? ( >=sys-apps/dtc-1.4.2 ) glusterfs? ( >=sys-cluster/glusterfs-3.4.0 ) gnutls? ( dev-libs/nettle:= >=net-libs/gnutls-3.0:= ) gtk? ( gtk2? ( x11-libs/gtk+:2 vte? ( x11-libs/vte:0 ) ) !gtk2? ( x11-libs/gtk+:3 vte? ( x11-libs/vte:2.91 ) ) ) infiniband? ( sys-fabric/librdmacm:= ) iscsi? ( net-libs/libiscsi ) jpeg? ( virtual/jpeg:0= ) lzo? ( dev-libs/lzo:2 ) ncurses? ( sys-libs/ncurses:0=[unicode] sys-libs/ncurses:0= ) nfs? ( >=net-fs/libnfs-1.9.3:= ) numa? ( sys-process/numactl ) opengl? ( virtual/opengl media-libs/libepoxy media-libs/mesa media-libs/mesa[egl,gbm] ) png? ( media-libs/libpng:0= ) pulseaudio? ( media-sound/pulseaudio ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) sdl? ( !sdl2? ( media-libs/libsdl[X] >=media-libs/libsdl-1.2.11 ) sdl2? ( media-libs/libsdl2[X] media-libs/libsdl2 ) ) seccomp? ( >=sys-libs/libseccomp-2.1.0 ) smartcard? ( >=app-emulation/libcacard-2.5.0 ) snappy? ( app-arch/snappy ) spice? ( >=app-emulation/spice-protocol-0.12.3 >=app-emulation/spice-0.12.0 ) ssh? ( >=net-libs/libssh2-1.2.8 ) usb? ( >=virtual/libusb-1-r2 ) usbredir? ( >=sys-apps/usbredir-0.6 ) vde? ( net-misc/vde ) virgl? ( media-libs/virglrenderer ) virtfs? ( sys-libs/libcap ) xen? ( app-emulation/xen-tools:= ) xfs? ( sys-fs/xfsprogs ) ) qemu_softmmu_targets_i386? ( pin-upstream-blobs? ( ~sys-firmware/edk2-ovmf-2017_p20180211[binary] ~sys-firmware/ipxe-1.0.0_p20180211[binary] ~sys-firmware/seabios-1.11.0[binary,seavgabios] ~sys-firmware/sgabios-0.1_pre8[binary] ) !pin-upstream-blobs? ( sys-firmware/edk2-ovmf sys-firmware/ipxe >=sys-firmware/seabios-1.10.2[seavgabios] sys-firmware/sgabios ) ) qemu_softmmu_targets_x86_64? ( pin-upstream-blobs? ( ~sys-firmware/edk2-ovmf-2017_p20180211[binary] ~sys-firmware/ipxe-1.0.0_p20180211[binary] ~sys-firmware/seabios-1.11.0[binary,seavgabios] ~sys-firmware/sgabios-0.1_pre8[binary] ) !pin-upstream-blobs? ( sys-firmware/edk2-ovmf sys-firmware/ipxe >=sys-firmware/seabios-1.10.2[seavgabios] sys-firmware/sgabios ) ) qemu_softmmu_targets_ppc64? ( pin-upstream-blobs? ( ~sys-firmware/seabios-1.11.0[binary,seavgabios] ) !pin-upstream-blobs? ( >=sys-firmware/seabios-1.10.2[seavgabios] ) ) dev-lang/perl =dev-lang/python-2* sys-apps/texinfo virtual/pkgconfig kernel_linux? ( >=sys-kernel/linux-headers-2.6.35 ) gtk? ( nls? ( sys-devel/gettext ) ) static? ( >=dev-libs/glib-2.0[static-libs(+)] sys-libs/zlib[static-libs(+)] python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses,readline] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) systemtap? ( dev-util/systemtap ) xattr? ( sys-apps/attr[static-libs(+)] ) >=x11-libs/pixman-0.28.0[static-libs(+)] accessibility? ( app-accessibility/brltty[api] app-accessibility/brltty[static-libs(+)] ) aio? ( dev-libs/libaio[static-libs(+)] ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bluetooth? ( net-wireless/bluez ) bzip2? ( app-arch/bzip2[static-libs(+)] ) capstone? ( dev-libs/capstone ) caps? ( sys-libs/libcap-ng[static-libs(+)] ) curl? ( >=net-misc/curl-7.15.4[static-libs(+)] ) fdt? ( >=sys-apps/dtc-1.4.2[static-libs(+)] ) glusterfs? ( >=sys-cluster/glusterfs-3.4.0[static-libs(+)] ) gnutls? ( dev-libs/nettle:=[static-libs(+)] >=net-libs/gnutls-3.0:=[static-libs(+)] ) gtk? ( gtk2? ( x11-libs/gtk+:2 vte? ( x11-libs/vte:0 ) ) !gtk2? ( x11-libs/gtk+:3 vte? ( x11-libs/vte:2.91 ) ) ) infiniband? ( sys-fabric/librdmacm:=[static-libs(+)] ) iscsi? ( net-libs/libiscsi ) jpeg? ( virtual/jpeg:0=[static-libs(+)] ) lzo? ( dev-libs/lzo:2[static-libs(+)] ) ncurses? ( sys-libs/ncurses:0=[unicode] sys-libs/ncurses:0=[static-libs(+)] ) nfs? ( >=net-fs/libnfs-1.9.3:=[static-libs(+)] ) numa? ( sys-process/numactl[static-libs(+)] ) opengl? ( virtual/opengl media-libs/libepoxy[static-libs(+)] media-libs/mesa[static-libs(+)] media-libs/mesa[egl,gbm] ) png? ( media-libs/libpng:0=[static-libs(+)] ) pulseaudio? ( media-sound/pulseaudio ) rbd? ( sys-cluster/ceph[static-libs(+)] ) sasl? ( dev-libs/cyrus-sasl[static-libs(+)] ) sdl? ( !sdl2? ( media-libs/libsdl[X] >=media-libs/libsdl-1.2.11[static-libs(+)] ) sdl2? ( media-libs/libsdl2[X] media-libs/libsdl2[static-libs(+)] ) ) seccomp? ( >=sys-libs/libseccomp-2.1.0[static-libs(+)] ) smartcard? ( >=app-emulation/libcacard-2.5.0[static-libs(+)] ) snappy? ( app-arch/snappy ) spice? ( >=app-emulation/spice-protocol-0.12.3 >=app-emulation/spice-0.12.0[static-libs(+)] ) ssh? ( >=net-libs/libssh2-1.2.8[static-libs(+)] ) usb? ( >=virtual/libusb-1-r2[static-libs(+)] ) usbredir? ( >=sys-apps/usbredir-0.6[static-libs(+)] ) vde? ( net-misc/vde[static-libs(+)] ) virgl? ( media-libs/virglrenderer[static-libs(+)] ) virtfs? ( sys-libs/libcap ) xen? ( app-emulation/xen-tools:= ) xfs? ( sys-fs/xfsprogs[static-libs(+)] ) ) static-user? ( >=dev-libs/glib-2.0[static-libs(+)] sys-libs/zlib[static-libs(+)] python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses,readline] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) systemtap? ( dev-util/systemtap ) xattr? ( sys-apps/attr[static-libs(+)] ) ) test? ( dev-libs/glib[utils] sys-devel/bc ) virtual/pkgconfig filecaps? ( sys-libs/libcap ) >=dev-vcs/git-1.8.2.1 -DESCRIPTION=QEMU + Kernel-based Virtual Machine userland tools -EAPI=6 -HOMEPAGE=http://www.qemu.org http://www.linux-kvm.org -IUSE=accessibility +aio alsa bluetooth bzip2 capstone +caps +curl debug +fdt glusterfs gnutls gtk gtk2 infiniband iscsi +jpeg kernel_linux kernel_FreeBSD lzo ncurses nfs nls numa opengl +pin-upstream-blobs +png pulseaudio python rbd sasl +seccomp sdl sdl2 selinux smartcard snappy spice ssh static static-user systemtap tci test usb usbredir vde +vhost-net virgl virtfs +vnc vte xattr xen xfs qemu_softmmu_targets_aarch64 qemu_softmmu_targets_alpha qemu_softmmu_targets_arm qemu_softmmu_targets_cris qemu_softmmu_targets_hppa qemu_softmmu_targets_i386 qemu_softmmu_targets_m68k qemu_softmmu_targets_microblaze qemu_softmmu_targets_microblazeel qemu_softmmu_targets_mips qemu_softmmu_targets_mips64 qemu_softmmu_targets_mips64el qemu_softmmu_targets_mipsel qemu_softmmu_targets_nios2 qemu_softmmu_targets_or1k qemu_softmmu_targets_ppc qemu_softmmu_targets_ppc64 qemu_softmmu_targets_riscv32 qemu_softmmu_targets_riscv64 qemu_softmmu_targets_s390x qemu_softmmu_targets_sh4 qemu_softmmu_targets_sh4eb qemu_softmmu_targets_sparc qemu_softmmu_targets_sparc64 qemu_softmmu_targets_x86_64 qemu_softmmu_targets_xtensa qemu_softmmu_targets_xtensaeb qemu_softmmu_targets_lm32 qemu_softmmu_targets_moxie qemu_softmmu_targets_ppcemb qemu_softmmu_targets_tricore qemu_softmmu_targets_unicore32 qemu_user_targets_aarch64 qemu_user_targets_alpha qemu_user_targets_arm qemu_user_targets_cris qemu_user_targets_hppa qemu_user_targets_i386 qemu_user_targets_m68k qemu_user_targets_microblaze qemu_user_targets_microblazeel qemu_user_targets_mips qemu_user_targets_mips64 qemu_user_targets_mips64el qemu_user_targets_mipsel qemu_user_targets_nios2 qemu_user_targets_or1k qemu_user_targets_ppc qemu_user_targets_ppc64 qemu_user_targets_riscv32 qemu_user_targets_riscv64 qemu_user_targets_s390x qemu_user_targets_sh4 qemu_user_targets_sh4eb qemu_user_targets_sparc qemu_user_targets_sparc64 qemu_user_targets_x86_64 qemu_user_targets_xtensa qemu_user_targets_xtensaeb qemu_user_targets_aarch64_be qemu_user_targets_armeb qemu_user_targets_mipsn32 qemu_user_targets_mipsn32el qemu_user_targets_ppc64abi32 qemu_user_targets_ppc64le qemu_user_targets_sparc32plus qemu_user_targets_tilegx python_targets_python2_7 +filecaps linguas_bg linguas_de_DE linguas_fr_FR linguas_hu linguas_it linguas_tr linguas_zh_CN -LICENSE=GPL-2 LGPL-2 BSD-2 -RDEPEND=!static? ( >=dev-libs/glib-2.0 sys-libs/zlib python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses,readline] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) systemtap? ( dev-util/systemtap ) xattr? ( sys-apps/attr ) >=x11-libs/pixman-0.28.0 accessibility? ( app-accessibility/brltty[api] app-accessibility/brltty ) aio? ( dev-libs/libaio ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bluetooth? ( net-wireless/bluez ) bzip2? ( app-arch/bzip2 ) capstone? ( dev-libs/capstone ) caps? ( sys-libs/libcap-ng ) curl? ( >=net-misc/curl-7.15.4 ) fdt? ( >=sys-apps/dtc-1.4.2 ) glusterfs? ( >=sys-cluster/glusterfs-3.4.0 ) gnutls? ( dev-libs/nettle:= >=net-libs/gnutls-3.0:= ) gtk? ( gtk2? ( x11-libs/gtk+:2 vte? ( x11-libs/vte:0 ) ) !gtk2? ( x11-libs/gtk+:3 vte? ( x11-libs/vte:2.91 ) ) ) infiniband? ( sys-fabric/librdmacm:= ) iscsi? ( net-libs/libiscsi ) jpeg? ( virtual/jpeg:0= ) lzo? ( dev-libs/lzo:2 ) ncurses? ( sys-libs/ncurses:0=[unicode] sys-libs/ncurses:0= ) nfs? ( >=net-fs/libnfs-1.9.3:= ) numa? ( sys-process/numactl ) opengl? ( virtual/opengl media-libs/libepoxy media-libs/mesa media-libs/mesa[egl,gbm] ) png? ( media-libs/libpng:0= ) pulseaudio? ( media-sound/pulseaudio ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) sdl? ( !sdl2? ( media-libs/libsdl[X] >=media-libs/libsdl-1.2.11 ) sdl2? ( media-libs/libsdl2[X] media-libs/libsdl2 ) ) seccomp? ( >=sys-libs/libseccomp-2.1.0 ) smartcard? ( >=app-emulation/libcacard-2.5.0 ) snappy? ( app-arch/snappy ) spice? ( >=app-emulation/spice-protocol-0.12.3 >=app-emulation/spice-0.12.0 ) ssh? ( >=net-libs/libssh2-1.2.8 ) usb? ( >=virtual/libusb-1-r2 ) usbredir? ( >=sys-apps/usbredir-0.6 ) vde? ( net-misc/vde ) virgl? ( media-libs/virglrenderer ) virtfs? ( sys-libs/libcap ) xen? ( app-emulation/xen-tools:= ) xfs? ( sys-fs/xfsprogs ) ) qemu_softmmu_targets_i386? ( pin-upstream-blobs? ( ~sys-firmware/edk2-ovmf-2017_p20180211[binary] ~sys-firmware/ipxe-1.0.0_p20180211[binary] ~sys-firmware/seabios-1.11.0[binary,seavgabios] ~sys-firmware/sgabios-0.1_pre8[binary] ) !pin-upstream-blobs? ( sys-firmware/edk2-ovmf sys-firmware/ipxe >=sys-firmware/seabios-1.10.2[seavgabios] sys-firmware/sgabios ) ) qemu_softmmu_targets_x86_64? ( pin-upstream-blobs? ( ~sys-firmware/edk2-ovmf-2017_p20180211[binary] ~sys-firmware/ipxe-1.0.0_p20180211[binary] ~sys-firmware/seabios-1.11.0[binary,seavgabios] ~sys-firmware/sgabios-0.1_pre8[binary] ) !pin-upstream-blobs? ( sys-firmware/edk2-ovmf sys-firmware/ipxe >=sys-firmware/seabios-1.10.2[seavgabios] sys-firmware/sgabios ) ) qemu_softmmu_targets_ppc64? ( pin-upstream-blobs? ( ~sys-firmware/seabios-1.11.0[binary,seavgabios] ) !pin-upstream-blobs? ( >=sys-firmware/seabios-1.10.2[seavgabios] ) ) selinux? ( sec-policy/selinux-qemu ) -REQUIRED_USE=|| ( python_targets_python2_7 ) gtk2? ( gtk ) qemu_softmmu_targets_arm? ( fdt ) qemu_softmmu_targets_microblaze? ( fdt ) qemu_softmmu_targets_mips64el? ( fdt ) qemu_softmmu_targets_ppc? ( fdt ) qemu_softmmu_targets_ppc64? ( fdt ) sdl2? ( sdl ) static? ( static-user !alsa !bluetooth !gtk !gtk2 !opengl !pulseaudio !snappy ) virtfs? ( xattr ) vte? ( gtk ) -SLOT=0 -_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 fcaps e80204189039ecc03f24151c518375f0 flag-o-matic 2274fcc1e7ef6affaff5bcd636275417 git-r3 52a888802d25387c2c74cb845d1219bc l10n 2c2e15383ba891d642f51896a7f0ecfe linux-info ca370deef9d44125d829f2eb6ebc83e0 ltprune 2770eed66a9b8ef944714cd0e968182e multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e pax-utils 4f95120230a315c8caaabeb2307b7eee python-r1 e9350ec46bb5c9f3504b4fbe8b8d8987 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d readme.gentoo-r1 6f03e110529650f57fc7d1fb908b8986 toolchain-funcs 185a06792159ca143528e7010368e8af udev d91cac2c73b94629cad2daea66e0d182 user e4b567c44272a719fabf53f0f885d3f7 versionator c80ccf29e90adea7c5cae94b42eb76d0 -_md5_=28a8aea4cbdb90c619f919fa9655b4aa From ecf746dd4cc96e1339bdff901f8b74c36d6e6da6 Mon Sep 17 00:00:00 2001 From: David Michael Date: Fri, 11 May 2018 18:28:51 -0400 Subject: [PATCH 03/21] bump(app-crypt/gnupg): sync with upstream --- .../portage-stable/app-crypt/gnupg/Manifest | 6 +- .../app-crypt/gnupg/gnupg-2.2.0.ebuild | 123 ----------------- .../app-crypt/gnupg/gnupg-2.2.1.ebuild | 129 ------------------ .../app-crypt/gnupg/gnupg-2.2.3.ebuild | 129 ------------------ .../app-crypt/gnupg/gnupg-2.2.4-r2.ebuild | 2 +- ...upg-2.2.4-r1.ebuild => gnupg-2.2.6.ebuild} | 1 + ...upg-2.2.5-r1.ebuild => gnupg-2.2.7.ebuild} | 1 - .../metadata/md5-cache/app-crypt/gnupg-2.2.0 | 13 -- .../metadata/md5-cache/app-crypt/gnupg-2.2.1 | 13 -- .../metadata/md5-cache/app-crypt/gnupg-2.2.3 | 13 -- .../md5-cache/app-crypt/gnupg-2.2.4-r2 | 4 +- .../app-crypt/{gnupg-2.2.5-r1 => gnupg-2.2.6} | 4 +- .../app-crypt/{gnupg-2.2.4-r1 => gnupg-2.2.7} | 8 +- 13 files changed, 12 insertions(+), 434 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/app-crypt/gnupg/gnupg-2.2.0.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/app-crypt/gnupg/gnupg-2.2.1.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/app-crypt/gnupg/gnupg-2.2.3.ebuild rename sdk_container/src/third_party/portage-stable/app-crypt/gnupg/{gnupg-2.2.4-r1.ebuild => gnupg-2.2.6.ebuild} (99%) rename sdk_container/src/third_party/portage-stable/app-crypt/gnupg/{gnupg-2.2.5-r1.ebuild => gnupg-2.2.7.ebuild} (97%) delete mode 100644 sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-crypt/gnupg-2.2.0 delete mode 100644 sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-crypt/gnupg-2.2.1 delete mode 100644 sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-crypt/gnupg-2.2.3 rename sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-crypt/{gnupg-2.2.5-r1 => gnupg-2.2.6} (94%) rename sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-crypt/{gnupg-2.2.4-r1 => gnupg-2.2.7} (76%) diff --git a/sdk_container/src/third_party/portage-stable/app-crypt/gnupg/Manifest b/sdk_container/src/third_party/portage-stable/app-crypt/gnupg/Manifest index bbe662863d..b23429653f 100644 --- a/sdk_container/src/third_party/portage-stable/app-crypt/gnupg/Manifest +++ b/sdk_container/src/third_party/portage-stable/app-crypt/gnupg/Manifest @@ -1,8 +1,6 @@ DIST gnupg-1.4.21.tar.bz2 3689305 BLAKE2B 0c26c9c3aeae2bf2eafa858bc3bd15cc2702bce12a8a90938565322c34e2eeb8e5432932f5c9344a76aa4528b66051141536c062d9923a79d12a0767421bb017 SHA512 619e0fbc10310c7e55d129027e2945791fe91a0884b1d6f53acb4b2e380d1c6e71d1a516a59876182c5c70a4227d44a74ceda018c343b5291fa9a5d6de77c984 DIST gnupg-2.1.15.tar.bz2 5723689 BLAKE2B 48889c0a5445b5b76b027debd6a4711930694e7440b76c06a7da1db5e7989eeae791e4c7a29e60a9d0b862c167374016d908aaa54165a44268f072075cdd9690 SHA512 69c943e853e1a37e8b17b3bc34e1503f14bc8f189fa9f3ac6644bcc98ccce6eaef64da20ff9dd1c8de3a7789ea577167984ccf3ac286cac50752e6f7c2f42ab1 DIST gnupg-2.1.20.tar.bz2 6456128 BLAKE2B 009a8b8163701f5f5e269caea315a81f4c90c32ec19d501e9fd180bdd3a21454956549b433eb81e98c7a22c4c551eed666d9f3e59ea8e55ed2545ddf49334151 SHA512 14a9890bc64e143f87cff121dd298d490d78dbd34e36883e0f25763ff9064e5706a7632893d7c5d0e8e9b8cf9cdb0d378b4ce1715348729f0fc080455b61eca9 -DIST gnupg-2.2.0.tar.bz2 6532475 BLAKE2B 284ef4ce5ebb7e3d49ca3e73461b3f017eb07d23ee5cd9902ba1637be060246c0caf223fd2ba77d84ddf03e4b65964553b8adff9682d83e7d4f099ed99b841a7 SHA512 8ab7c4183d2ec2e6b62066e3cbcba95babaa0ae22da47feab716698792d26495f072d50e8ec612b8d26147636bb316320c78940184373b3f4cb6ec411933361b -DIST gnupg-2.2.1.tar.bz2 6537959 BLAKE2B 4ec500110358a9e5c7d01157e3e9b29a6c7084266b59a9b412d76a793245e0dc5ab94c5cff34eec5169f6fa226ffe2005ccafc4ba3fedb6761e2c4a2d9fd3234 SHA512 fcda7ea360d9928bf9e410afe3806ee0692dd533443b0c0e050605a9e2e37ec16f3c60a30b30ab137155327bc1f5d2107f1e792582e3ad245b47bf39a1a61a8f -DIST gnupg-2.2.3.tar.bz2 6547069 BLAKE2B a5ac44f696cce2ffbac72b80f0efcd19fe09934fe00d3fe90c0a5be5618b40b686fa9fe3e78a451e72835342afa75f4316b7ea34d3ff9fe602e621111876cc4b SHA512 c73df3c6f7ce65bd9867a39d10f93548496bf596ba0901737fc0063b370fd2d834c0b912e5aa07ff31067bc9c1263acc9d314c6bfaf7c889b72c8d46087810cb DIST gnupg-2.2.4.tar.bz2 6571487 BLAKE2B ec678470e574fdc9f057cc727cbb902ce525f76adae740722731e318032707d0f72873628024c2070a72c21321f2b8da16153edeafcb4ddeba72de59ff5c73bd SHA512 3d5c93b7662433103e9549d066a6b1a0c09d595851fab712d2ee844a55157e952a8a2dd5deff70fa8dd6817481f81c3fe5135603bca03206857310d04c1067a8 -DIST gnupg-2.2.5.tar.bz2 6584756 BLAKE2B d19358caf65627243c37afbf348acb2ea91f785272f318aed9e95e097c34cf3b3b1a223919a86e3ff09c045cb0b56d8aed7c746ed1223dd6a6aa072d24c44bce SHA512 675d2acc2ba95d14b14f4c83364663d88c982332fb4c35a4cf32af19a6bd4453ad89905c80d45007adb50c01816247df84d1f525e94bb668b962a84815e49bf1 +DIST gnupg-2.2.6.tar.bz2 6605028 BLAKE2B 2de6f8d32e551a8af5c41b7e6220a43645472b3b7f25b168a54343c4279f412d5d8f7a5142451504192259b3fe4a3e3242d12520dadc385f466dd701a803073a SHA512 ad0861c86c1886f701ae05e7cd439449cf0684a7bf461ca2b729c5e93833ee36f8438cd4d7f73a4c60e57060f3d8f4890a809b2bbc31b083f9f61d2f66ccacc4 +DIST gnupg-2.2.7.tar.bz2 6631100 BLAKE2B 81a66a8f738fc2b42d923ccda7d6cbfffc8e938970c04fe02c0146202f2e97fa88d5263aee2f3051e141169f4f02f72ccc53ac831bb57d42740130e3122fa454 SHA512 f858b275876d38b9d3a60e5428574f1008a73a948f67a2fa43bcf1970a5dbb60ec3f0e2b2271243229465eb9b22124e216894f0b3d72004acf3ed0c3481da33d diff --git a/sdk_container/src/third_party/portage-stable/app-crypt/gnupg/gnupg-2.2.0.ebuild b/sdk_container/src/third_party/portage-stable/app-crypt/gnupg/gnupg-2.2.0.ebuild deleted file mode 100644 index d4d043c3d2..0000000000 --- a/sdk_container/src/third_party/portage-stable/app-crypt/gnupg/gnupg-2.2.0.ebuild +++ /dev/null @@ -1,123 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -inherit systemd toolchain-funcs - -MY_P="${P/_/-}" - -DESCRIPTION="The GNU Privacy Guard, a GPL OpenPGP implementation" -HOMEPAGE="http://www.gnupg.org/" -SRC_URI="mirror://gnupg/gnupg/${MY_P}.tar.bz2" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="bzip2 doc +gnutls ldap nls readline selinux +smartcard tofu tools usb wks-server" - -COMMON_DEPEND_LIBS=" - >=dev-libs/npth-1.2 - >=dev-libs/libassuan-2.4.3 - >=dev-libs/libgcrypt-1.7.3 - >=dev-libs/libgpg-error-1.24 - >=dev-libs/libksba-1.3.4 - >=net-misc/curl-7.10 - gnutls? ( >=net-libs/gnutls-3.0:0= ) - sys-libs/zlib - ldap? ( net-nds/openldap ) - bzip2? ( app-arch/bzip2 ) - readline? ( sys-libs/readline:0= ) - smartcard? ( usb? ( virtual/libusb:0 ) ) - tofu? ( >=dev-db/sqlite-3.7 ) - " -COMMON_DEPEND_BINS="app-crypt/pinentry - !app-crypt/dirmngr" - -# Existence of executables is checked during configuration. -DEPEND="${COMMON_DEPEND_LIBS} - ${COMMON_DEPEND_BINS} - nls? ( sys-devel/gettext ) - doc? ( sys-apps/texinfo )" - -RDEPEND="${COMMON_DEPEND_LIBS} - ${COMMON_DEPEND_BINS} - selinux? ( sec-policy/selinux-gpg ) - nls? ( virtual/libintl )" - -S="${WORKDIR}/${MY_P}" - -DOCS=( - ChangeLog NEWS README THANKS TODO VERSION - doc/FAQ doc/DETAILS doc/HACKING doc/TRANSLATE doc/OpenPGP doc/KEYSERVER -) - -PATCHES=( - "${FILESDIR}/${PN}-2.1.20-gpgscm-Use-shorter-socket-path-lengts-to-improve-tes.patch" -) - -src_configure() { - local myconf=() - - if use smartcard; then - myconf+=( - --enable-scdaemon - $(use_enable usb ccid-driver) - ) - else - myconf+=( --disable-scdaemon ) - fi - - if use elibc_SunOS || use elibc_AIX; then - myconf+=( --disable-symcryptrun ) - else - myconf+=( --enable-symcryptrun ) - fi - - # glib fails and picks up clang's internal stdint.h causing weird errors - [[ ${CC} == *clang ]] && \ - export gl_cv_absolute_stdint_h=/usr/include/stdint.h - - econf \ - "${myconf[@]}" \ - $(use_enable bzip2) \ - $(use_enable gnutls) \ - $(use_enable nls) \ - $(use_enable tofu) \ - $(use_enable wks-server wks-tools) \ - $(use_with ldap) \ - $(use_with readline) \ - --enable-gpg \ - --enable-gpgsm \ - --enable-large-secmem \ - --enable-all-tests \ - CC_FOR_BUILD="$(tc-getBUILD_CC)" -} - -src_compile() { - default - - use doc && emake -C doc html -} - -src_install() { - default - - use tools && - dobin \ - tools/{convert-from-106,gpg-check-pattern} \ - tools/{gpg-zip,gpgconf,gpgsplit,lspgpot,mail-signed-keys} \ - tools/make-dns-cert - - dosym gpg /usr/bin/gpg2 - dosym gpgv /usr/bin/gpgv2 - echo ".so man1/gpg.1" > "${ED}"/usr/share/man/man1/gpg2.1 || die - echo ".so man1/gpgv.1" > "${ED}"/usr/share/man/man1/gpgv2.1 || die - - dodir /etc/env.d - echo "CONFIG_PROTECT=/usr/share/gnupg/qualified.txt" >> "${ED}"/etc/env.d/30gnupg || die - - use doc && dodoc doc/gnupg.html/* doc/*.png - - systemd_douserunit doc/examples/systemd-user/*.{service,socket} -} diff --git a/sdk_container/src/third_party/portage-stable/app-crypt/gnupg/gnupg-2.2.1.ebuild b/sdk_container/src/third_party/portage-stable/app-crypt/gnupg/gnupg-2.2.1.ebuild deleted file mode 100644 index 0cdc74c459..0000000000 --- a/sdk_container/src/third_party/portage-stable/app-crypt/gnupg/gnupg-2.2.1.ebuild +++ /dev/null @@ -1,129 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -inherit systemd toolchain-funcs - -MY_P="${P/_/-}" - -DESCRIPTION="The GNU Privacy Guard, a GPL OpenPGP implementation" -HOMEPAGE="http://www.gnupg.org/" -SRC_URI="mirror://gnupg/gnupg/${MY_P}.tar.bz2" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="bzip2 doc +gnutls ldap nls readline selinux +smartcard tofu tools usb wks-server" - -COMMON_DEPEND_LIBS=" - >=dev-libs/npth-1.2 - >=dev-libs/libassuan-2.4.3 - >=dev-libs/libgcrypt-1.7.3 - >=dev-libs/libgpg-error-1.24 - >=dev-libs/libksba-1.3.4 - >=net-misc/curl-7.10 - gnutls? ( >=net-libs/gnutls-3.0:0= ) - sys-libs/zlib - ldap? ( net-nds/openldap ) - bzip2? ( app-arch/bzip2 ) - readline? ( sys-libs/readline:0= ) - smartcard? ( usb? ( virtual/libusb:0 ) ) - tofu? ( >=dev-db/sqlite-3.7 ) - " -COMMON_DEPEND_BINS="app-crypt/pinentry - !app-crypt/dirmngr" - -# Existence of executables is checked during configuration. -DEPEND="${COMMON_DEPEND_LIBS} - ${COMMON_DEPEND_BINS} - nls? ( sys-devel/gettext ) - doc? ( sys-apps/texinfo )" - -RDEPEND="${COMMON_DEPEND_LIBS} - ${COMMON_DEPEND_BINS} - selinux? ( sec-policy/selinux-gpg ) - nls? ( virtual/libintl )" - -S="${WORKDIR}/${MY_P}" - -DOCS=( - ChangeLog NEWS README THANKS TODO VERSION - doc/FAQ doc/DETAILS doc/HACKING doc/TRANSLATE doc/OpenPGP doc/KEYSERVER -) - -PATCHES=( - "${FILESDIR}/${PN}-2.1.20-gpgscm-Use-shorter-socket-path-lengts-to-improve-tes.patch" - "${FILESDIR}/${P}-fix-gnupg-wait.patch" -) - -src_configure() { - local myconf=() - - if use smartcard; then - myconf+=( - --enable-scdaemon - $(use_enable usb ccid-driver) - ) - else - myconf+=( --disable-scdaemon ) - fi - - if use elibc_SunOS || use elibc_AIX; then - myconf+=( --disable-symcryptrun ) - else - myconf+=( --enable-symcryptrun ) - fi - - # glib fails and picks up clang's internal stdint.h causing weird errors - [[ ${CC} == *clang ]] && \ - export gl_cv_absolute_stdint_h=/usr/include/stdint.h - - econf \ - "${myconf[@]}" \ - $(use_enable bzip2) \ - $(use_enable gnutls) \ - $(use_enable nls) \ - $(use_enable tofu) \ - $(use_enable wks-server wks-tools) \ - $(use_with ldap) \ - $(use_with readline) \ - --enable-gpg \ - --enable-gpgsm \ - --enable-large-secmem \ - --enable-all-tests \ - CC_FOR_BUILD="$(tc-getBUILD_CC)" -} - -src_compile() { - default - - use doc && emake -C doc html -} - -src_test() { - export TESTFLAGS=--parallel - default -} - -src_install() { - default - - use tools && - dobin \ - tools/{convert-from-106,gpg-check-pattern} \ - tools/{gpg-zip,gpgconf,gpgsplit,lspgpot,mail-signed-keys} \ - tools/make-dns-cert - - dosym gpg /usr/bin/gpg2 - dosym gpgv /usr/bin/gpgv2 - echo ".so man1/gpg.1" > "${ED}"/usr/share/man/man1/gpg2.1 || die - echo ".so man1/gpgv.1" > "${ED}"/usr/share/man/man1/gpgv2.1 || die - - dodir /etc/env.d - echo "CONFIG_PROTECT=/usr/share/gnupg/qualified.txt" >> "${ED}"/etc/env.d/30gnupg || die - - use doc && dodoc doc/gnupg.html/* doc/*.png - - systemd_douserunit doc/examples/systemd-user/*.{service,socket} -} diff --git a/sdk_container/src/third_party/portage-stable/app-crypt/gnupg/gnupg-2.2.3.ebuild b/sdk_container/src/third_party/portage-stable/app-crypt/gnupg/gnupg-2.2.3.ebuild deleted file mode 100644 index feedaac04f..0000000000 --- a/sdk_container/src/third_party/portage-stable/app-crypt/gnupg/gnupg-2.2.3.ebuild +++ /dev/null @@ -1,129 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -inherit systemd toolchain-funcs - -MY_P="${P/_/-}" - -DESCRIPTION="The GNU Privacy Guard, a GPL OpenPGP implementation" -HOMEPAGE="http://www.gnupg.org/" -SRC_URI="mirror://gnupg/gnupg/${MY_P}.tar.bz2" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="bzip2 doc +gnutls ldap nls readline selinux +smartcard tofu tools usb wks-server" - -COMMON_DEPEND_LIBS=" - >=dev-libs/npth-1.2 - >=dev-libs/libassuan-2.4.3 - >=dev-libs/libgcrypt-1.7.3 - >=dev-libs/libgpg-error-1.24 - >=dev-libs/libksba-1.3.4 - >=net-misc/curl-7.10 - gnutls? ( >=net-libs/gnutls-3.0:0= ) - sys-libs/zlib - ldap? ( net-nds/openldap ) - bzip2? ( app-arch/bzip2 ) - readline? ( sys-libs/readline:0= ) - smartcard? ( usb? ( virtual/libusb:0 ) ) - tofu? ( >=dev-db/sqlite-3.7 ) - " -COMMON_DEPEND_BINS="app-crypt/pinentry - !app-crypt/dirmngr" - -# Existence of executables is checked during configuration. -DEPEND="${COMMON_DEPEND_LIBS} - ${COMMON_DEPEND_BINS} - nls? ( sys-devel/gettext ) - doc? ( sys-apps/texinfo )" - -RDEPEND="${COMMON_DEPEND_LIBS} - ${COMMON_DEPEND_BINS} - selinux? ( sec-policy/selinux-gpg ) - nls? ( virtual/libintl )" - -S="${WORKDIR}/${MY_P}" - -DOCS=( - ChangeLog NEWS README THANKS TODO VERSION - doc/FAQ doc/DETAILS doc/HACKING doc/TRANSLATE doc/OpenPGP doc/KEYSERVER -) - -PATCHES=( - "${FILESDIR}/${PN}-2.1.20-gpgscm-Use-shorter-socket-path-lengts-to-improve-tes.patch" -) - -src_configure() { - local myconf=() - - if use smartcard; then - myconf+=( - --enable-scdaemon - $(use_enable usb ccid-driver) - ) - else - myconf+=( --disable-scdaemon ) - fi - - if use elibc_SunOS || use elibc_AIX; then - myconf+=( --disable-symcryptrun ) - else - myconf+=( --enable-symcryptrun ) - fi - - # glib fails and picks up clang's internal stdint.h causing weird errors - [[ ${CC} == *clang ]] && \ - export gl_cv_absolute_stdint_h=/usr/include/stdint.h - - econf \ - "${myconf[@]}" \ - $(use_enable bzip2) \ - $(use_enable gnutls) \ - $(use_enable nls) \ - $(use_enable tofu) \ - $(use_enable wks-server wks-tools) \ - $(use_with ldap) \ - $(use_with readline) \ - --enable-gpg \ - --enable-gpgsm \ - --enable-large-secmem \ - --enable-all-tests \ - CC_FOR_BUILD="$(tc-getBUILD_CC)" -} - -src_compile() { - default - - use doc && emake -C doc html -} - -src_test() { - #Bug: 638574 - use tofu && export TESTFLAGS=--parallel - default -} - -src_install() { - default - - use tools && - dobin \ - tools/{convert-from-106,gpg-check-pattern} \ - tools/{gpg-zip,gpgconf,gpgsplit,lspgpot,mail-signed-keys} \ - tools/make-dns-cert - - dosym gpg /usr/bin/gpg2 - dosym gpgv /usr/bin/gpgv2 - echo ".so man1/gpg.1" > "${ED}"/usr/share/man/man1/gpg2.1 || die - echo ".so man1/gpgv.1" > "${ED}"/usr/share/man/man1/gpgv2.1 || die - - dodir /etc/env.d - echo "CONFIG_PROTECT=/usr/share/gnupg/qualified.txt" >> "${ED}"/etc/env.d/30gnupg || die - - use doc && dodoc doc/gnupg.html/* doc/*.png - - systemd_douserunit doc/examples/systemd-user/*.{service,socket} -} diff --git a/sdk_container/src/third_party/portage-stable/app-crypt/gnupg/gnupg-2.2.4-r2.ebuild b/sdk_container/src/third_party/portage-stable/app-crypt/gnupg/gnupg-2.2.4-r2.ebuild index b7cd856592..2f16527b85 100644 --- a/sdk_container/src/third_party/portage-stable/app-crypt/gnupg/gnupg-2.2.4-r2.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-crypt/gnupg/gnupg-2.2.4-r2.ebuild @@ -13,7 +13,7 @@ SRC_URI="mirror://gnupg/gnupg/${MY_P}.tar.bz2" LICENSE="GPL-3" SLOT="0" -KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="bzip2 doc ldap nls readline selinux +smartcard ssl tofu tools usb wks-server" COMMON_DEPEND_LIBS=" diff --git a/sdk_container/src/third_party/portage-stable/app-crypt/gnupg/gnupg-2.2.4-r1.ebuild b/sdk_container/src/third_party/portage-stable/app-crypt/gnupg/gnupg-2.2.6.ebuild similarity index 99% rename from sdk_container/src/third_party/portage-stable/app-crypt/gnupg/gnupg-2.2.4-r1.ebuild rename to sdk_container/src/third_party/portage-stable/app-crypt/gnupg/gnupg-2.2.6.ebuild index 90eea8ab85..badbebb051 100644 --- a/sdk_container/src/third_party/portage-stable/app-crypt/gnupg/gnupg-2.2.4-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-crypt/gnupg/gnupg-2.2.6.ebuild @@ -30,6 +30,7 @@ COMMON_DEPEND_LIBS=" readline? ( sys-libs/readline:0= ) smartcard? ( usb? ( virtual/libusb:0 ) ) tofu? ( >=dev-db/sqlite-3.7 ) + virtual/mta " COMMON_DEPEND_BINS="app-crypt/pinentry !app-crypt/dirmngr" diff --git a/sdk_container/src/third_party/portage-stable/app-crypt/gnupg/gnupg-2.2.5-r1.ebuild b/sdk_container/src/third_party/portage-stable/app-crypt/gnupg/gnupg-2.2.7.ebuild similarity index 97% rename from sdk_container/src/third_party/portage-stable/app-crypt/gnupg/gnupg-2.2.5-r1.ebuild rename to sdk_container/src/third_party/portage-stable/app-crypt/gnupg/gnupg-2.2.7.ebuild index 8adf8b70a7..badbebb051 100644 --- a/sdk_container/src/third_party/portage-stable/app-crypt/gnupg/gnupg-2.2.5-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-crypt/gnupg/gnupg-2.2.7.ebuild @@ -55,7 +55,6 @@ DOCS=( PATCHES=( "${FILESDIR}/${PN}-2.1.20-gpgscm-Use-shorter-socket-path-lengts-to-improve-tes.patch" - "${FILESDIR}/${PN}-2.2.4-dirmngr-Handle-failures-related-to-missing-IPv6.patch" ) src_configure() { diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-crypt/gnupg-2.2.0 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-crypt/gnupg-2.2.0 deleted file mode 100644 index 3ef83fe8e2..0000000000 --- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-crypt/gnupg-2.2.0 +++ /dev/null @@ -1,13 +0,0 @@ -DEFINED_PHASES=compile configure install -DEPEND=>=dev-libs/npth-1.2 >=dev-libs/libassuan-2.4.3 >=dev-libs/libgcrypt-1.7.3 >=dev-libs/libgpg-error-1.24 >=dev-libs/libksba-1.3.4 >=net-misc/curl-7.10 gnutls? ( >=net-libs/gnutls-3.0:0= ) sys-libs/zlib ldap? ( net-nds/openldap ) bzip2? ( app-arch/bzip2 ) readline? ( sys-libs/readline:0= ) smartcard? ( usb? ( virtual/libusb:0 ) ) tofu? ( >=dev-db/sqlite-3.7 ) app-crypt/pinentry !app-crypt/dirmngr nls? ( sys-devel/gettext ) doc? ( sys-apps/texinfo ) virtual/pkgconfig -DESCRIPTION=The GNU Privacy Guard, a GPL OpenPGP implementation -EAPI=6 -HOMEPAGE=http://www.gnupg.org/ -IUSE=bzip2 doc +gnutls ldap nls readline selinux +smartcard tofu tools usb wks-server -KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris -LICENSE=GPL-3 -RDEPEND=>=dev-libs/npth-1.2 >=dev-libs/libassuan-2.4.3 >=dev-libs/libgcrypt-1.7.3 >=dev-libs/libgpg-error-1.24 >=dev-libs/libksba-1.3.4 >=net-misc/curl-7.10 gnutls? ( >=net-libs/gnutls-3.0:0= ) sys-libs/zlib ldap? ( net-nds/openldap ) bzip2? ( app-arch/bzip2 ) readline? ( sys-libs/readline:0= ) smartcard? ( usb? ( virtual/libusb:0 ) ) tofu? ( >=dev-db/sqlite-3.7 ) app-crypt/pinentry !app-crypt/dirmngr selinux? ( sec-policy/selinux-gpg ) nls? ( virtual/libintl ) -SLOT=0 -SRC_URI=mirror://gnupg/gnupg/gnupg-2.2.0.tar.bz2 -_eclasses_=multilib 97f470f374f2e94ccab04a2fb21d811e systemd 34815d3b76e745c5ca33eec9f95074c2 toolchain-funcs 185a06792159ca143528e7010368e8af -_md5_=1e4ac20e59fe711f76b50dc2a575f045 diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-crypt/gnupg-2.2.1 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-crypt/gnupg-2.2.1 deleted file mode 100644 index 37dd4f9a5c..0000000000 --- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-crypt/gnupg-2.2.1 +++ /dev/null @@ -1,13 +0,0 @@ -DEFINED_PHASES=compile configure install test -DEPEND=>=dev-libs/npth-1.2 >=dev-libs/libassuan-2.4.3 >=dev-libs/libgcrypt-1.7.3 >=dev-libs/libgpg-error-1.24 >=dev-libs/libksba-1.3.4 >=net-misc/curl-7.10 gnutls? ( >=net-libs/gnutls-3.0:0= ) sys-libs/zlib ldap? ( net-nds/openldap ) bzip2? ( app-arch/bzip2 ) readline? ( sys-libs/readline:0= ) smartcard? ( usb? ( virtual/libusb:0 ) ) tofu? ( >=dev-db/sqlite-3.7 ) app-crypt/pinentry !app-crypt/dirmngr nls? ( sys-devel/gettext ) doc? ( sys-apps/texinfo ) virtual/pkgconfig -DESCRIPTION=The GNU Privacy Guard, a GPL OpenPGP implementation -EAPI=6 -HOMEPAGE=http://www.gnupg.org/ -IUSE=bzip2 doc +gnutls ldap nls readline selinux +smartcard tofu tools usb wks-server -KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris -LICENSE=GPL-3 -RDEPEND=>=dev-libs/npth-1.2 >=dev-libs/libassuan-2.4.3 >=dev-libs/libgcrypt-1.7.3 >=dev-libs/libgpg-error-1.24 >=dev-libs/libksba-1.3.4 >=net-misc/curl-7.10 gnutls? ( >=net-libs/gnutls-3.0:0= ) sys-libs/zlib ldap? ( net-nds/openldap ) bzip2? ( app-arch/bzip2 ) readline? ( sys-libs/readline:0= ) smartcard? ( usb? ( virtual/libusb:0 ) ) tofu? ( >=dev-db/sqlite-3.7 ) app-crypt/pinentry !app-crypt/dirmngr selinux? ( sec-policy/selinux-gpg ) nls? ( virtual/libintl ) -SLOT=0 -SRC_URI=mirror://gnupg/gnupg/gnupg-2.2.1.tar.bz2 -_eclasses_=multilib 97f470f374f2e94ccab04a2fb21d811e systemd 34815d3b76e745c5ca33eec9f95074c2 toolchain-funcs 185a06792159ca143528e7010368e8af -_md5_=f1159e8e3ae629df5b71279fc38d0053 diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-crypt/gnupg-2.2.3 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-crypt/gnupg-2.2.3 deleted file mode 100644 index 543fd0b5db..0000000000 --- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-crypt/gnupg-2.2.3 +++ /dev/null @@ -1,13 +0,0 @@ -DEFINED_PHASES=compile configure install test -DEPEND=>=dev-libs/npth-1.2 >=dev-libs/libassuan-2.4.3 >=dev-libs/libgcrypt-1.7.3 >=dev-libs/libgpg-error-1.24 >=dev-libs/libksba-1.3.4 >=net-misc/curl-7.10 gnutls? ( >=net-libs/gnutls-3.0:0= ) sys-libs/zlib ldap? ( net-nds/openldap ) bzip2? ( app-arch/bzip2 ) readline? ( sys-libs/readline:0= ) smartcard? ( usb? ( virtual/libusb:0 ) ) tofu? ( >=dev-db/sqlite-3.7 ) app-crypt/pinentry !app-crypt/dirmngr nls? ( sys-devel/gettext ) doc? ( sys-apps/texinfo ) virtual/pkgconfig -DESCRIPTION=The GNU Privacy Guard, a GPL OpenPGP implementation -EAPI=6 -HOMEPAGE=http://www.gnupg.org/ -IUSE=bzip2 doc +gnutls ldap nls readline selinux +smartcard tofu tools usb wks-server -KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris -LICENSE=GPL-3 -RDEPEND=>=dev-libs/npth-1.2 >=dev-libs/libassuan-2.4.3 >=dev-libs/libgcrypt-1.7.3 >=dev-libs/libgpg-error-1.24 >=dev-libs/libksba-1.3.4 >=net-misc/curl-7.10 gnutls? ( >=net-libs/gnutls-3.0:0= ) sys-libs/zlib ldap? ( net-nds/openldap ) bzip2? ( app-arch/bzip2 ) readline? ( sys-libs/readline:0= ) smartcard? ( usb? ( virtual/libusb:0 ) ) tofu? ( >=dev-db/sqlite-3.7 ) app-crypt/pinentry !app-crypt/dirmngr selinux? ( sec-policy/selinux-gpg ) nls? ( virtual/libintl ) -SLOT=0 -SRC_URI=mirror://gnupg/gnupg/gnupg-2.2.3.tar.bz2 -_eclasses_=multilib 97f470f374f2e94ccab04a2fb21d811e systemd 34815d3b76e745c5ca33eec9f95074c2 toolchain-funcs 185a06792159ca143528e7010368e8af -_md5_=d739e6a8d7ca06f5d05ff72718389fce diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-crypt/gnupg-2.2.4-r2 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-crypt/gnupg-2.2.4-r2 index dfea2d480b..b8d89a916c 100644 --- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-crypt/gnupg-2.2.4-r2 +++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-crypt/gnupg-2.2.4-r2 @@ -4,10 +4,10 @@ DESCRIPTION=The GNU Privacy Guard, a GPL OpenPGP implementation EAPI=6 HOMEPAGE=http://www.gnupg.org/ IUSE=bzip2 doc ldap nls readline selinux +smartcard ssl tofu tools usb wks-server -KEYWORDS=alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris +KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris LICENSE=GPL-3 RDEPEND=>=dev-libs/npth-1.2 >=dev-libs/libassuan-2.5.0 >=dev-libs/libgcrypt-1.7.3 >=dev-libs/libgpg-error-1.24 >=dev-libs/libksba-1.3.4 >=net-misc/curl-7.10 ssl? ( >=net-libs/gnutls-3.0:0= ) sys-libs/zlib ldap? ( net-nds/openldap ) bzip2? ( app-arch/bzip2 ) readline? ( sys-libs/readline:0= ) smartcard? ( usb? ( virtual/libusb:0 ) ) tofu? ( >=dev-db/sqlite-3.7 ) app-crypt/pinentry !app-crypt/dirmngr selinux? ( sec-policy/selinux-gpg ) nls? ( virtual/libintl ) SLOT=0 SRC_URI=mirror://gnupg/gnupg/gnupg-2.2.4.tar.bz2 _eclasses_=multilib 97f470f374f2e94ccab04a2fb21d811e systemd 34815d3b76e745c5ca33eec9f95074c2 toolchain-funcs 185a06792159ca143528e7010368e8af -_md5_=367d1b45e1b9419626899784cf7da23f +_md5_=c88a3effcef1ac8a42251f242fa95cde diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-crypt/gnupg-2.2.5-r1 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-crypt/gnupg-2.2.6 similarity index 94% rename from sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-crypt/gnupg-2.2.5-r1 rename to sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-crypt/gnupg-2.2.6 index d6f4993899..68f1da37b4 100644 --- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-crypt/gnupg-2.2.5-r1 +++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-crypt/gnupg-2.2.6 @@ -8,6 +8,6 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh LICENSE=GPL-3 RDEPEND=>=dev-libs/npth-1.2 >=dev-libs/libassuan-2.5.0 >=dev-libs/libgcrypt-1.7.3 >=dev-libs/libgpg-error-1.24 >=dev-libs/libksba-1.3.4 >=net-misc/curl-7.10 ssl? ( >=net-libs/gnutls-3.0:0= ) sys-libs/zlib ldap? ( net-nds/openldap ) bzip2? ( app-arch/bzip2 ) readline? ( sys-libs/readline:0= ) smartcard? ( usb? ( virtual/libusb:0 ) ) tofu? ( >=dev-db/sqlite-3.7 ) virtual/mta app-crypt/pinentry !app-crypt/dirmngr selinux? ( sec-policy/selinux-gpg ) nls? ( virtual/libintl ) SLOT=0 -SRC_URI=mirror://gnupg/gnupg/gnupg-2.2.5.tar.bz2 +SRC_URI=mirror://gnupg/gnupg/gnupg-2.2.6.tar.bz2 _eclasses_=multilib 97f470f374f2e94ccab04a2fb21d811e systemd 34815d3b76e745c5ca33eec9f95074c2 toolchain-funcs 185a06792159ca143528e7010368e8af -_md5_=75fe16d993db8f931410af97bfb168a7 +_md5_=566933a15e42687c5dbec7f903233817 diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-crypt/gnupg-2.2.4-r1 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-crypt/gnupg-2.2.7 similarity index 76% rename from sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-crypt/gnupg-2.2.4-r1 rename to sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-crypt/gnupg-2.2.7 index 19bf6f82ce..d77c942336 100644 --- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-crypt/gnupg-2.2.4-r1 +++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-crypt/gnupg-2.2.7 @@ -1,13 +1,13 @@ DEFINED_PHASES=compile configure install test -DEPEND=>=dev-libs/npth-1.2 >=dev-libs/libassuan-2.5.0 >=dev-libs/libgcrypt-1.7.3 >=dev-libs/libgpg-error-1.24 >=dev-libs/libksba-1.3.4 >=net-misc/curl-7.10 ssl? ( >=net-libs/gnutls-3.0:0= ) sys-libs/zlib ldap? ( net-nds/openldap ) bzip2? ( app-arch/bzip2 ) readline? ( sys-libs/readline:0= ) smartcard? ( usb? ( virtual/libusb:0 ) ) tofu? ( >=dev-db/sqlite-3.7 ) app-crypt/pinentry !app-crypt/dirmngr nls? ( sys-devel/gettext ) doc? ( sys-apps/texinfo ) virtual/pkgconfig +DEPEND=>=dev-libs/npth-1.2 >=dev-libs/libassuan-2.5.0 >=dev-libs/libgcrypt-1.7.3 >=dev-libs/libgpg-error-1.24 >=dev-libs/libksba-1.3.4 >=net-misc/curl-7.10 ssl? ( >=net-libs/gnutls-3.0:0= ) sys-libs/zlib ldap? ( net-nds/openldap ) bzip2? ( app-arch/bzip2 ) readline? ( sys-libs/readline:0= ) smartcard? ( usb? ( virtual/libusb:0 ) ) tofu? ( >=dev-db/sqlite-3.7 ) virtual/mta app-crypt/pinentry !app-crypt/dirmngr nls? ( sys-devel/gettext ) doc? ( sys-apps/texinfo ) virtual/pkgconfig DESCRIPTION=The GNU Privacy Guard, a GPL OpenPGP implementation EAPI=6 HOMEPAGE=http://www.gnupg.org/ IUSE=bzip2 doc ldap nls readline selinux +smartcard ssl tofu tools usb wks-server KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris LICENSE=GPL-3 -RDEPEND=>=dev-libs/npth-1.2 >=dev-libs/libassuan-2.5.0 >=dev-libs/libgcrypt-1.7.3 >=dev-libs/libgpg-error-1.24 >=dev-libs/libksba-1.3.4 >=net-misc/curl-7.10 ssl? ( >=net-libs/gnutls-3.0:0= ) sys-libs/zlib ldap? ( net-nds/openldap ) bzip2? ( app-arch/bzip2 ) readline? ( sys-libs/readline:0= ) smartcard? ( usb? ( virtual/libusb:0 ) ) tofu? ( >=dev-db/sqlite-3.7 ) app-crypt/pinentry !app-crypt/dirmngr selinux? ( sec-policy/selinux-gpg ) nls? ( virtual/libintl ) +RDEPEND=>=dev-libs/npth-1.2 >=dev-libs/libassuan-2.5.0 >=dev-libs/libgcrypt-1.7.3 >=dev-libs/libgpg-error-1.24 >=dev-libs/libksba-1.3.4 >=net-misc/curl-7.10 ssl? ( >=net-libs/gnutls-3.0:0= ) sys-libs/zlib ldap? ( net-nds/openldap ) bzip2? ( app-arch/bzip2 ) readline? ( sys-libs/readline:0= ) smartcard? ( usb? ( virtual/libusb:0 ) ) tofu? ( >=dev-db/sqlite-3.7 ) virtual/mta app-crypt/pinentry !app-crypt/dirmngr selinux? ( sec-policy/selinux-gpg ) nls? ( virtual/libintl ) SLOT=0 -SRC_URI=mirror://gnupg/gnupg/gnupg-2.2.4.tar.bz2 +SRC_URI=mirror://gnupg/gnupg/gnupg-2.2.7.tar.bz2 _eclasses_=multilib 97f470f374f2e94ccab04a2fb21d811e systemd 34815d3b76e745c5ca33eec9f95074c2 toolchain-funcs 185a06792159ca143528e7010368e8af -_md5_=6121acf25881bf1bef66691220e8def3 +_md5_=566933a15e42687c5dbec7f903233817 From a084a04dab646e437b6a293ae45769af988501b8 Mon Sep 17 00:00:00 2001 From: David Michael Date: Fri, 11 May 2018 18:48:29 -0400 Subject: [PATCH 04/21] bump(dev-libs/libpcre): sync with upstream --- .../portage-stable/dev-libs/libpcre/Manifest | 4 +- .../libpcre/files/libpcre-8.40-jit-else.patch | 68 ------------- .../libpcre-8.40-pcregrep-multiline-1.patch | 69 ------------- .../libpcre-8.40-pcregrep-multiline-2.patch | 25 ----- ...ibpcre-8.41-fix-stack-size-detection.patch | 17 ++++ .../dev-libs/libpcre/libpcre-8.40-r1.ebuild | 96 ------------------- ...cre-8.41.ebuild => libpcre-8.41-r1.ebuild} | 9 +- .../dev-libs/libpcre/libpcre-8.42.ebuild | 96 +++++++++++++++++++ .../{libpcre-8.41 => libpcre-8.41-r1} | 6 +- .../{libpcre-8.40-r1 => libpcre-8.42} | 10 +- 10 files changed, 126 insertions(+), 274 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/dev-libs/libpcre/files/libpcre-8.40-jit-else.patch delete mode 100644 sdk_container/src/third_party/portage-stable/dev-libs/libpcre/files/libpcre-8.40-pcregrep-multiline-1.patch delete mode 100644 sdk_container/src/third_party/portage-stable/dev-libs/libpcre/files/libpcre-8.40-pcregrep-multiline-2.patch create mode 100644 sdk_container/src/third_party/portage-stable/dev-libs/libpcre/files/libpcre-8.41-fix-stack-size-detection.patch delete mode 100644 sdk_container/src/third_party/portage-stable/dev-libs/libpcre/libpcre-8.40-r1.ebuild rename sdk_container/src/third_party/portage-stable/dev-libs/libpcre/{libpcre-8.41.ebuild => libpcre-8.41-r1.ebuild} (84%) create mode 100644 sdk_container/src/third_party/portage-stable/dev-libs/libpcre/libpcre-8.42.ebuild rename sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-libs/{libpcre-8.41 => libpcre-8.41-r1} (72%) rename sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-libs/{libpcre-8.40-r1 => libpcre-8.42} (65%) diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libpcre/Manifest b/sdk_container/src/third_party/portage-stable/dev-libs/libpcre/Manifest index 7d801d1c0e..f67a4002d1 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/libpcre/Manifest +++ b/sdk_container/src/third_party/portage-stable/dev-libs/libpcre/Manifest @@ -1,2 +1,2 @@ -DIST pcre-8.40.tar.bz2 1560119 SHA256 00e27a29ead4267e3de8111fcaa59b132d0533cdfdbdddf4b0604279acbcf4f4 SHA512 b4c27eafbdf33bd7a1384655b1936f4be3bc6745c072347eb26e988896c52664bd85ac42444da1be78b6e20f45b6c7e5921f5f20f5b0741b5bd3d9844e5bd4e2 WHIRLPOOL 6711688972b3db4b98902d548b84e8b03b61c3a12d24a4e42fc49ddc5e2b4be51f98f91873166e550866e88b6cd55092ea27704a3b7e71d58a2af21148ad3340 -DIST pcre-8.41.tar.bz2 1561874 SHA256 e62c7eac5ae7c0e7286db61ff82912e1c0b7a0c13706616e94a7dd729321b530 SHA512 cc9cdbeb98c010fe4f093a019bebfb91965dae4c6a48f8e49c38ec8df7d9da7f0d32c12fc58f22c51f1c2f010e72b65bcbf8bbf180060e93edf464fa9a7c3551 WHIRLPOOL 24d891c4f6580af20aa07a166038a2bacb52cdb305987f8b91b2fecae65e7b5277d3ef0b26ddbb3a33fd34794e6340e77df6a321e770b3aca4393d1ed144cf64 +DIST pcre-8.41.tar.bz2 1561874 BLAKE2B 2a97a859237994137190da00c30ba7c15e8631b82b7f200858cf722f1fdd0405d36c24bb716eb099d8107f2f829a85fd7d3497f36cdac51769636989331e7a79 SHA512 cc9cdbeb98c010fe4f093a019bebfb91965dae4c6a48f8e49c38ec8df7d9da7f0d32c12fc58f22c51f1c2f010e72b65bcbf8bbf180060e93edf464fa9a7c3551 +DIST pcre-8.42.tar.bz2 1570171 BLAKE2B f68bac3cf8ff5a81ccba31fd4d8926e05143a25a756e7daba9793467cec9cd8a4766f394f958ffca088b472463a43a31ea77014f2d4505082c1f366a18f30c7a SHA512 b47b923108f6ee0c31409b79d0888314271b482a22590e164d02f21d2112fba22dd0342c24f9ba0f5fcc5b8c65550bad08c476e30a2fc79b34ecf4601ed82f3d diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libpcre/files/libpcre-8.40-jit-else.patch b/sdk_container/src/third_party/portage-stable/dev-libs/libpcre/files/libpcre-8.40-jit-else.patch deleted file mode 100644 index d347a7f5e1..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-libs/libpcre/files/libpcre-8.40-jit-else.patch +++ /dev/null @@ -1,68 +0,0 @@ -https://bugs.gentoo.org/609592 -https://bugs.exim.org/show_bug.cgi?id=2035 - -From 7ddfbe9d0b9f43402f8043e940172a318cc407c6 Mon Sep 17 00:00:00 2001 -From: Zoltan Herczeg -Date: Tue, 14 Feb 2017 08:48:18 +0000 -Subject: [PATCH] Fix a missing else in the JIT compiler reported by - 'idaifish'. - -git-svn-id: svn://vcs.exim.org/pcre/code/trunk@1680 2f5784b3-3f2a-0410-8824-cb99058d5e15 ---- - ChangeLog | 2 ++ - pcre_jit_compile.c | 2 +- - testdata/testinput12 | 2 ++ - testdata/testoutput12 | 2 ++ - 4 files changed, 7 insertions(+), 1 deletion(-) - -diff --git a/ChangeLog b/ChangeLog -index 373ee8422ef5..d813935539bd 100644 ---- a/ChangeLog -+++ b/ChangeLog -@@ -15,6 +15,8 @@ mode with --only-matching matched several lines, it restarted scanning at the - next line instead of moving on to the end of the matched string, which can be - several lines after the start. - -+3. Fix a missing else in the JIT compiler reported by 'idaifish'. -+ - - Version 8.40 11-January-2017 - ---------------------------- -diff --git a/pcre_jit_compile.c b/pcre_jit_compile.c -index c301f05d5e3f..6ef8e48ff5e8 100644 ---- a/pcre_jit_compile.c -+++ b/pcre_jit_compile.c -@@ -8110,7 +8110,7 @@ if (opcode == OP_COND || opcode == OP_SCOND) - - if (*matchingpath == OP_FAIL) - stacksize = 0; -- if (*matchingpath == OP_RREF) -+ else if (*matchingpath == OP_RREF) - { - stacksize = GET2(matchingpath, 1); - if (common->currententry == NULL) -diff --git a/testdata/testinput12 b/testdata/testinput12 -index 944be6943f5e..89ed4564bcd4 100644 ---- a/testdata/testinput12 -+++ b/testdata/testinput12 -@@ -104,4 +104,6 @@ and a couple of things that are different with JIT. --/ - /(.|.)*?bx/ - aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabax - -+/((?(?!))x)(?'name')(?1)/S++ -+ - /-- End of testinput12 --/ -diff --git a/testdata/testoutput12 b/testdata/testoutput12 -index 87911086f498..7632c4e58013 100644 ---- a/testdata/testoutput12 -+++ b/testdata/testoutput12 -@@ -201,4 +201,6 @@ No match, mark = m (JIT) - aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabax - Error -8 (match limit exceeded) - -+/((?(?!))x)(?'name')(?1)/S++ -+ - /-- End of testinput12 --/ --- -2.12.0 - diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libpcre/files/libpcre-8.40-pcregrep-multiline-1.patch b/sdk_container/src/third_party/portage-stable/dev-libs/libpcre/files/libpcre-8.40-pcregrep-multiline-1.patch deleted file mode 100644 index f15968dfe9..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-libs/libpcre/files/libpcre-8.40-pcregrep-multiline-1.patch +++ /dev/null @@ -1,69 +0,0 @@ -From 5be027b624bc866702808abadfe5f99360414086 Mon Sep 17 00:00:00 2001 -From: Philip Hazel -Date: Fri, 10 Feb 2017 17:47:34 +0000 -Subject: [PATCH] Correct fix for pcre2grep multiline with --only-matching. - -git-svn-id: svn://vcs.exim.org/pcre/code/trunk@1678 2f5784b3-3f2a-0410-8824-cb99058d5e15 ---- - ChangeLog | 5 +++++ - configure.ac | 6 +++--- - pcregrep.c | 20 +++++++++++++++----- - 3 files changed, 23 insertions(+), 8 deletions(-) - -diff --git a/ChangeLog b/ChangeLog -index ab4e053e601e..373ee8422ef5 100644 ---- a/ChangeLog -+++ b/ChangeLog -@@ -10,6 +10,11 @@ Version 8.41 - 1. Fixed typo in CMakeLists.txt (wrong number of arguments for - PCRE_STATIC_RUNTIME (affects MSVC only). - -+2. Issue 1 for 8.40 below was not correctly fixed. If pcregrep in multiline -+mode with --only-matching matched several lines, it restarted scanning at the -+next line instead of moving on to the end of the matched string, which can be -+several lines after the start. -+ - - Version 8.40 11-January-2017 - ---------------------------- -diff --git a/pcregrep.c b/pcregrep.c -index fd2a67622baa..2070c057e4a0 100644 ---- a/pcregrep.c -+++ b/pcregrep.c -@@ -1804,11 +1804,6 @@ while (ptr < endptr) - if (line_buffered) fflush(stdout); - rc = 0; /* Had some success */ - -- /* If the current match ended past the end of the line (only possible -- in multiline mode), we are done with this line. */ -- -- if ((unsigned int)offsets[1] > linelength) goto END_ONE_MATCH; -- - startoffset = offsets[1]; /* Restart after the match */ - if (startoffset <= oldstartoffset) - { -@@ -1818,6 +1813,21 @@ while (ptr < endptr) - if (utf8) - while ((matchptr[startoffset] & 0xc0) == 0x80) startoffset++; - } -+ -+ /* If the current match ended past the end of the line (only possible -+ in multiline mode), we must move on to the line in which it did end -+ before searching for more matches. */ -+ -+ while (startoffset > (int)linelength) -+ { -+ matchptr = ptr += linelength + endlinelength; -+ filepos += (int)(linelength + endlinelength); -+ linenumber++; -+ startoffset -= (int)(linelength + endlinelength); -+ t = end_of_line(ptr, endptr, &endlinelength); -+ linelength = t - ptr - endlinelength; -+ } -+ - goto ONLY_MATCHING_RESTART; - } - } --- -2.12.0 - diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libpcre/files/libpcre-8.40-pcregrep-multiline-2.patch b/sdk_container/src/third_party/portage-stable/dev-libs/libpcre/files/libpcre-8.40-pcregrep-multiline-2.patch deleted file mode 100644 index 63ad51cd10..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-libs/libpcre/files/libpcre-8.40-pcregrep-multiline-2.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 8b0fdf16e57ce9a653a0a03c39f6cc061e8122e8 Mon Sep 17 00:00:00 2001 -From: Philip Hazel -Date: Sun, 12 Feb 2017 13:28:11 +0000 -Subject: [PATCH] Fix bug in most recent fix for multiline pcre2grep. - -git-svn-id: svn://vcs.exim.org/pcre/code/trunk@1679 2f5784b3-3f2a-0410-8824-cb99058d5e15 ---- - pcregrep.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/pcregrep.c b/pcregrep.c -index 2070c057e4a0..3cd70eeb4261 100644 ---- a/pcregrep.c -+++ b/pcregrep.c -@@ -1826,6 +1826,7 @@ while (ptr < endptr) - startoffset -= (int)(linelength + endlinelength); - t = end_of_line(ptr, endptr, &endlinelength); - linelength = t - ptr - endlinelength; -+ length = (size_t)(endptr - ptr); - } - - goto ONLY_MATCHING_RESTART; --- -2.12.0 - diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libpcre/files/libpcre-8.41-fix-stack-size-detection.patch b/sdk_container/src/third_party/portage-stable/dev-libs/libpcre/files/libpcre-8.41-fix-stack-size-detection.patch new file mode 100644 index 0000000000..b539267794 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-libs/libpcre/files/libpcre-8.41-fix-stack-size-detection.patch @@ -0,0 +1,17 @@ +https://bugs.exim.org/show_bug.cgi?id=2173#c4 + +--- a/pcre_exec.c ++++ b/pcre_exec.c +@@ -509,6 +509,12 @@ + (e.g. stopped by repeated call or recursion limit) + */ + ++#ifdef __GNUC__ ++static int ++match(REGISTER PCRE_PUCHAR eptr, REGISTER const pcre_uchar *ecode, ++ PCRE_PUCHAR mstart, int offset_top, match_data *md, eptrblock *eptrb, ++ unsigned int rdepth) __attribute__((noinline,noclone)); ++#endif + static int + match(REGISTER PCRE_PUCHAR eptr, REGISTER const pcre_uchar *ecode, + PCRE_PUCHAR mstart, int offset_top, match_data *md, eptrblock *eptrb, diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libpcre/libpcre-8.40-r1.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/libpcre/libpcre-8.40-r1.ebuild deleted file mode 100644 index 3b1c5c161f..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-libs/libpcre/libpcre-8.40-r1.ebuild +++ /dev/null @@ -1,96 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -inherit eutils multilib libtool flag-o-matic toolchain-funcs multilib-minimal - -DESCRIPTION="Perl-compatible regular expression library" -HOMEPAGE="http://www.pcre.org/" -MY_P="pcre-${PV/_rc/-RC}" -if [[ ${PV} != *_rc* ]] ; then - # Only the final releases are available here. - SRC_URI="mirror://sourceforge/pcre/${MY_P}.tar.bz2 - ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/${MY_P}.tar.bz2" -else - SRC_URI="ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/Testing/${MY_P}.tar.bz2" -fi - -LICENSE="BSD" -SLOT="3" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="bzip2 +cxx +jit libedit pcre16 pcre32 +readline +recursion-limit static-libs unicode zlib" -REQUIRED_USE="readline? ( !libedit ) - libedit? ( !readline )" - -RDEPEND="bzip2? ( app-arch/bzip2 ) - zlib? ( sys-libs/zlib ) - libedit? ( dev-libs/libedit ) - readline? ( sys-libs/readline:0= )" -DEPEND="${RDEPEND} - virtual/pkgconfig" -RDEPEND="${RDEPEND} - abi_x86_32? ( - !<=app-emulation/emul-linux-x86-baselibs-20131008-r2 - !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] - )" - -S=${WORKDIR}/${MY_P} - -MULTILIB_CHOST_TOOLS=( - /usr/bin/pcre-config -) - -PATCHES=( - "${FILESDIR}"/${P}-pcregrep-multiline-{1,2}.patch - "${FILESDIR}"/${P}-jit-else.patch #609592 -) - -src_prepare() { - epatch "${PATCHES[@]}" - sed -i -e "s:-lpcre ::" libpcrecpp.pc.in || die - elibtoolize -} - -multilib_src_configure() { - ECONF_SOURCE="${S}" econf \ - --with-match-limit-recursion=$(usex recursion-limit 8192 MATCH_LIMIT) \ - $(multilib_native_use_enable bzip2 pcregrep-libbz2) \ - $(use_enable cxx cpp) \ - $(use_enable jit) $(use_enable jit pcregrep-jit) \ - $(use_enable pcre16) \ - $(use_enable pcre32) \ - $(multilib_native_use_enable libedit pcretest-libedit) \ - $(multilib_native_use_enable readline pcretest-libreadline) \ - $(use_enable static-libs static) \ - $(use_enable unicode utf) $(use_enable unicode unicode-properties) \ - $(multilib_native_use_enable zlib pcregrep-libz) \ - --enable-pcre8 \ - --enable-shared \ - --htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \ - --docdir="${EPREFIX}"/usr/share/doc/${PF} -} - -multilib_src_compile() { - emake V=1 $(multilib_is_native_abi || echo "bin_PROGRAMS=") -} - -multilib_src_install() { - emake \ - DESTDIR="${D}" \ - $(multilib_is_native_abi || echo "bin_PROGRAMS= dist_html_DATA=") \ - install - gen_usr_ldscript -a pcre -} - -multilib_src_install_all() { - prune_libtool_files -} - -pkg_preinst() { - preserve_old_lib /$(get_libdir)/libpcre.so.0 -} - -pkg_postinst() { - preserve_old_lib_notify /$(get_libdir)/libpcre.so.0 -} diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libpcre/libpcre-8.41.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/libpcre/libpcre-8.41-r1.ebuild similarity index 84% rename from sdk_container/src/third_party/portage-stable/dev-libs/libpcre/libpcre-8.41.ebuild rename to sdk_container/src/third_party/portage-stable/dev-libs/libpcre/libpcre-8.41-r1.ebuild index 96c3c8993d..ef823d588f 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/libpcre/libpcre-8.41.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-libs/libpcre/libpcre-8.41-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -18,7 +18,7 @@ fi LICENSE="BSD" SLOT="3" -KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="bzip2 +cxx +jit libedit pcre16 pcre32 +readline +recursion-limit static-libs unicode zlib" REQUIRED_USE="readline? ( !libedit ) libedit? ( !readline )" @@ -35,10 +35,6 @@ DEPEND=" " RDEPEND=" ${RDEPEND} - abi_x86_32? ( - !<=app-emulation/emul-linux-x86-baselibs-20131008-r2 - !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] - ) " S="${WORKDIR}/${MY_P}" @@ -49,6 +45,7 @@ MULTILIB_CHOST_TOOLS=( PATCHES=( "${FILESDIR}"/${PN}-8.41-sljit_mips-label-statement-fix.patch + "${FILESDIR}"/${PN}-8.41-fix-stack-size-detection.patch ) src_prepare() { diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libpcre/libpcre-8.42.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/libpcre/libpcre-8.42.ebuild new file mode 100644 index 0000000000..613e96bb36 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-libs/libpcre/libpcre-8.42.ebuild @@ -0,0 +1,96 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit multilib libtool flag-o-matic toolchain-funcs multilib-minimal + +DESCRIPTION="Perl-compatible regular expression library" +HOMEPAGE="http://www.pcre.org/" +MY_P="pcre-${PV/_rc/-RC}" +if [[ ${PV} != *_rc* ]] ; then + # Only the final releases are available here. + SRC_URI="mirror://sourceforge/pcre/${MY_P}.tar.bz2 + ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/${MY_P}.tar.bz2" +else + SRC_URI="ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/Testing/${MY_P}.tar.bz2" +fi + +LICENSE="BSD" +SLOT="3" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="bzip2 +cxx +jit libedit pcre16 pcre32 +readline +recursion-limit static-libs unicode zlib" +REQUIRED_USE="readline? ( !libedit ) + libedit? ( !readline )" + +RDEPEND=" + bzip2? ( app-arch/bzip2 ) + zlib? ( sys-libs/zlib ) + libedit? ( dev-libs/libedit ) + readline? ( sys-libs/readline:0= ) +" +DEPEND=" + ${RDEPEND} + virtual/pkgconfig +" + +S="${WORKDIR}/${MY_P}" + +MULTILIB_CHOST_TOOLS=( + /usr/bin/pcre-config +) + +PATCHES=( + "${FILESDIR}"/${PN}-8.41-fix-stack-size-detection.patch +) + +src_prepare() { + default + sed -i -e "s:-lpcre ::" libpcrecpp.pc.in || die + elibtoolize +} + +multilib_src_configure() { + local myeconfargs=( + --with-match-limit-recursion=$(usex recursion-limit 8192 MATCH_LIMIT) + $(multilib_native_use_enable bzip2 pcregrep-libbz2) + $(use_enable cxx cpp) + $(use_enable jit) + $(use_enable jit pcregrep-jit) + $(use_enable pcre16) + $(use_enable pcre32) + $(multilib_native_use_enable libedit pcretest-libedit) + $(multilib_native_use_enable readline pcretest-libreadline) + $(use_enable static-libs static) + $(use_enable unicode utf) + $(use_enable unicode unicode-properties) + $(multilib_native_use_enable zlib pcregrep-libz) + --enable-pcre8 + --enable-shared + ) + ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" +} + +multilib_src_compile() { + emake V=1 $(multilib_is_native_abi || echo "bin_PROGRAMS=") +} + +multilib_src_install() { + emake \ + DESTDIR="${D}" \ + $(multilib_is_native_abi || echo "bin_PROGRAMS= dist_html_DATA=") \ + install + gen_usr_ldscript -a pcre +} + +multilib_src_install_all() { + find "${ED}" -name "*.la" -delete || die +} + +pkg_preinst() { + preserve_old_lib /$(get_libdir)/libpcre.so.0 +} + +pkg_postinst() { + preserve_old_lib_notify /$(get_libdir)/libpcre.so.0 +} diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-libs/libpcre-8.41 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-libs/libpcre-8.41-r1 similarity index 72% rename from sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-libs/libpcre-8.41 rename to sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-libs/libpcre-8.41-r1 index fd538555b1..00282f8ad4 100644 --- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-libs/libpcre-8.41 +++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-libs/libpcre-8.41-r1 @@ -4,11 +4,11 @@ DESCRIPTION=Perl-compatible regular expression library EAPI=5 HOMEPAGE=http://www.pcre.org/ IUSE=bzip2 +cxx +jit libedit pcre16 pcre32 +readline +recursion-limit static-libs unicode zlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 -KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris +KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris LICENSE=BSD -RDEPEND=bzip2? ( app-arch/bzip2 ) zlib? ( sys-libs/zlib ) libedit? ( dev-libs/libedit ) readline? ( sys-libs/readline:0= ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20131008-r2 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) +RDEPEND=bzip2? ( app-arch/bzip2 ) zlib? ( sys-libs/zlib ) libedit? ( dev-libs/libedit ) readline? ( sys-libs/readline:0= ) REQUIRED_USE=readline? ( !libedit ) libedit? ( !readline ) SLOT=3 SRC_URI=mirror://sourceforge/pcre/pcre-8.41.tar.bz2 ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-8.41.tar.bz2 _eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 flag-o-matic 2274fcc1e7ef6affaff5bcd636275417 libtool 0081a71a261724730ec4c248494f044d ltprune 2770eed66a9b8ef944714cd0e968182e multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build eed53a6313267c9fbcd35fc384bd0087 multilib-minimal 9139c3a57e077cb8e0d0f73ceb080b89 toolchain-funcs 185a06792159ca143528e7010368e8af -_md5_=bde35f1dcc4a5e53f04a823647821fad +_md5_=62346a755ddbd80fef2aeb04f63d9a79 diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-libs/libpcre-8.40-r1 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-libs/libpcre-8.42 similarity index 65% rename from sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-libs/libpcre-8.40-r1 rename to sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-libs/libpcre-8.42 index 503ee26fd0..655b587c98 100644 --- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-libs/libpcre-8.40-r1 +++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-libs/libpcre-8.42 @@ -1,14 +1,14 @@ DEFINED_PHASES=compile configure install postinst preinst prepare test DEPEND=bzip2? ( app-arch/bzip2 ) zlib? ( sys-libs/zlib ) libedit? ( dev-libs/libedit ) readline? ( sys-libs/readline:0= ) virtual/pkgconfig >=app-portage/elt-patches-20170422 DESCRIPTION=Perl-compatible regular expression library -EAPI=5 +EAPI=6 HOMEPAGE=http://www.pcre.org/ IUSE=bzip2 +cxx +jit libedit pcre16 pcre32 +readline +recursion-limit static-libs unicode zlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 -KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris +KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris LICENSE=BSD -RDEPEND=bzip2? ( app-arch/bzip2 ) zlib? ( sys-libs/zlib ) libedit? ( dev-libs/libedit ) readline? ( sys-libs/readline:0= ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20131008-r2 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) +RDEPEND=bzip2? ( app-arch/bzip2 ) zlib? ( sys-libs/zlib ) libedit? ( dev-libs/libedit ) readline? ( sys-libs/readline:0= ) REQUIRED_USE=readline? ( !libedit ) libedit? ( !readline ) SLOT=3 -SRC_URI=mirror://sourceforge/pcre/pcre-8.40.tar.bz2 ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-8.40.tar.bz2 +SRC_URI=mirror://sourceforge/pcre/pcre-8.42.tar.bz2 ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-8.42.tar.bz2 _eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 flag-o-matic 2274fcc1e7ef6affaff5bcd636275417 libtool 0081a71a261724730ec4c248494f044d ltprune 2770eed66a9b8ef944714cd0e968182e multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build eed53a6313267c9fbcd35fc384bd0087 multilib-minimal 9139c3a57e077cb8e0d0f73ceb080b89 toolchain-funcs 185a06792159ca143528e7010368e8af -_md5_=8fa5a2e376df0b50998868f4899fe96b +_md5_=0ea1a70195f29c11906f6be7b6334a0d From d0984fc6ec238f30e87b5015f6913b782f4c2bea Mon Sep 17 00:00:00 2001 From: David Michael Date: Mon, 14 May 2018 13:53:15 -0400 Subject: [PATCH 05/21] bump(sys-apps/gptfdisk): sync with upstream --- .../md5-cache/sys-apps/gptfdisk-0.8.10 | 13 - .../md5-cache/sys-apps/gptfdisk-1.0.1 | 6 +- .../{gptfdisk-1.0.0 => gptfdisk-1.0.3} | 8 +- .../sys-apps/gptfdisk/ChangeLog | 120 -------- .../sys-apps/gptfdisk/ChangeLog-2015 | 272 ------------------ .../portage-stable/sys-apps/gptfdisk/Manifest | 11 +- .../sys-apps/gptfdisk/gptfdisk-0.8.10.ebuild | 48 ---- .../sys-apps/gptfdisk/gptfdisk-1.0.1.ebuild | 7 +- ...isk-1.0.0.ebuild => gptfdisk-1.0.3.ebuild} | 21 +- 9 files changed, 25 insertions(+), 481 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-apps/gptfdisk-0.8.10 rename sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-apps/{gptfdisk-1.0.0 => gptfdisk-1.0.3} (86%) delete mode 100644 sdk_container/src/third_party/portage-stable/sys-apps/gptfdisk/ChangeLog delete mode 100644 sdk_container/src/third_party/portage-stable/sys-apps/gptfdisk/ChangeLog-2015 delete mode 100644 sdk_container/src/third_party/portage-stable/sys-apps/gptfdisk/gptfdisk-0.8.10.ebuild rename sdk_container/src/third_party/portage-stable/sys-apps/gptfdisk/{gptfdisk-1.0.0.ebuild => gptfdisk-1.0.3.ebuild} (77%) diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-apps/gptfdisk-0.8.10 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-apps/gptfdisk-0.8.10 deleted file mode 100644 index 1f949c1793..0000000000 --- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-apps/gptfdisk-0.8.10 +++ /dev/null @@ -1,13 +0,0 @@ -DEFINED_PHASES=install prepare -DEPEND=!static? ( dev-libs/popt ncurses? ( >=sys-libs/ncurses-5.7-r7:0= ) kernel_linux? ( sys-apps/util-linux ) ) static? ( dev-libs/popt[static-libs(+)] ncurses? ( >=sys-libs/ncurses-5.7-r7:0=[static-libs(+)] ) kernel_linux? ( sys-apps/util-linux[static-libs(+)] ) ) virtual/pkgconfig -DESCRIPTION=GPT partition table manipulator for Linux -EAPI=5 -HOMEPAGE=http://www.rodsbooks.com/gdisk/ -IUSE=kernel_linux ncurses static -KEYWORDS=alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~arm-linux ~x86-linux -LICENSE=GPL-2 -RDEPEND=!static? ( dev-libs/popt ncurses? ( >=sys-libs/ncurses-5.7-r7:0= ) kernel_linux? ( sys-apps/util-linux ) ) -SLOT=0 -SRC_URI=mirror://sourceforge/gptfdisk/gptfdisk-0.8.10.tar.gz -_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 flag-o-matic 2274fcc1e7ef6affaff5bcd636275417 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 185a06792159ca143528e7010368e8af -_md5_=cdc105b30f856d1d9f04549c3abefaaf diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-apps/gptfdisk-1.0.1 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-apps/gptfdisk-1.0.1 index c4e6355a39..15d8db2c1c 100644 --- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-apps/gptfdisk-1.0.1 +++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-apps/gptfdisk-1.0.1 @@ -2,12 +2,12 @@ DEFINED_PHASES=install prepare DEPEND=!static? ( dev-libs/popt ncurses? ( >=sys-libs/ncurses-5.7-r7:0= ) kernel_linux? ( sys-apps/util-linux ) ) static? ( dev-libs/popt[static-libs(+)] ncurses? ( >=sys-libs/ncurses-5.7-r7:0=[static-libs(+)] ) kernel_linux? ( sys-apps/util-linux[static-libs(+)] ) ) virtual/pkgconfig DESCRIPTION=GPT partition table manipulator for Linux EAPI=5 -HOMEPAGE=http://www.rodsbooks.com/gdisk/ +HOMEPAGE=https://www.rodsbooks.com/gdisk/ IUSE=kernel_linux ncurses static -KEYWORDS=alpha amd64 arm ~arm64 ~ia64 ~mips ppc ~ppc64 ~sparc x86 ~amd64-linux ~arm-linux ~x86-linux +KEYWORDS=alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~arm-linux ~x86-linux LICENSE=GPL-2 RDEPEND=!static? ( dev-libs/popt ncurses? ( >=sys-libs/ncurses-5.7-r7:0= ) kernel_linux? ( sys-apps/util-linux ) ) SLOT=0 SRC_URI=mirror://sourceforge/gptfdisk/gptfdisk-1.0.1.tar.gz _eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 flag-o-matic 2274fcc1e7ef6affaff5bcd636275417 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 185a06792159ca143528e7010368e8af -_md5_=791fa5a21438847031389b1b5e424cad +_md5_=0f84b5b4ddbb1518290c573656173b46 diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-apps/gptfdisk-1.0.0 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-apps/gptfdisk-1.0.3 similarity index 86% rename from sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-apps/gptfdisk-1.0.0 rename to sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-apps/gptfdisk-1.0.3 index e6bbd786a8..41e75f2bcc 100644 --- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-apps/gptfdisk-1.0.0 +++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-apps/gptfdisk-1.0.3 @@ -1,13 +1,13 @@ DEFINED_PHASES=install prepare DEPEND=!static? ( dev-libs/popt ncurses? ( >=sys-libs/ncurses-5.7-r7:0= ) kernel_linux? ( sys-apps/util-linux ) ) static? ( dev-libs/popt[static-libs(+)] ncurses? ( >=sys-libs/ncurses-5.7-r7:0=[static-libs(+)] ) kernel_linux? ( sys-apps/util-linux[static-libs(+)] ) ) virtual/pkgconfig DESCRIPTION=GPT partition table manipulator for Linux -EAPI=5 -HOMEPAGE=http://www.rodsbooks.com/gdisk/ +EAPI=6 +HOMEPAGE=https://www.rodsbooks.com/gdisk/ IUSE=kernel_linux ncurses static KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux LICENSE=GPL-2 RDEPEND=!static? ( dev-libs/popt ncurses? ( >=sys-libs/ncurses-5.7-r7:0= ) kernel_linux? ( sys-apps/util-linux ) ) SLOT=0 -SRC_URI=mirror://sourceforge/gptfdisk/gptfdisk-1.0.0.tar.gz +SRC_URI=mirror://sourceforge/gptfdisk/gptfdisk-1.0.3.tar.gz _eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 flag-o-matic 2274fcc1e7ef6affaff5bcd636275417 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 185a06792159ca143528e7010368e8af -_md5_=822942772858bc7963eeaf533c092e3d +_md5_=89b6978c9edb147f710fc51ae6e37998 diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/gptfdisk/ChangeLog b/sdk_container/src/third_party/portage-stable/sys-apps/gptfdisk/ChangeLog deleted file mode 100644 index 28d99a3222..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-apps/gptfdisk/ChangeLog +++ /dev/null @@ -1,120 +0,0 @@ -# ChangeLog for sys-apps/gptfdisk -# Copyright 1999-2016 Gentoo Foundation; Distributed under the GPL v2 -# (auto-generated from git log) - -*gptfdisk-1.0.0 (09 Aug 2015) -*gptfdisk-0.8.10 (09 Aug 2015) - - 09 Aug 2015; Robin H. Johnson +gptfdisk-0.8.10.ebuild, - +gptfdisk-1.0.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 - - 16 Aug 2015; Justin Lecher gptfdisk-0.8.10.ebuild, - gptfdisk-1.0.0.ebuild: - Use slot operators for ncurses - - Package-Manager: portage-2.2.20.1 - Signed-off-by: Justin Lecher - - 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 - - 26 Aug 2015; Mike Frysinger gptfdisk-0.8.10.ebuild, - gptfdisk-1.0.0.ebuild: - sys-libs/ncurses: move to SLOT=0 #557472 - - Use SLOT=0 for installing of main development files like other packages - so we can use other SLOTs for installing SONAME libs for binary packages. - -*gptfdisk-1.0.1 (21 Oct 2015) - - 21 Oct 2015; Lars Wendler +gptfdisk-1.0.1.ebuild: - Bump to version 1.0.1 - - Package-Manager: portage-2.2.23 - Signed-off-by: Lars Wendler - - 24 Jan 2016; Michał Górny metadata.xml: - Set appropriate maintainer types in metadata.xml (GLEP 67) - - 31 Mar 2016; Alexey Shvetsov metadata.xml: - drop myself from metadata.xml - - Package-Manager: portage-2.2.28 - - 26 May 2016; Lars Wendler gptfdisk-1.0.1.ebuild: - x86 stable (bug #583982). - - Package-Manager: portage-2.2.28 - RepoMan-Options: --include-arches="x86" - Signed-off-by: Lars Wendler - - 27 May 2016; Lars Wendler gptfdisk-1.0.1.ebuild: - amd64 stable (bug #583982). - - Package-Manager: portage-2.2.28 - Signed-off-by: Lars Wendler - - 01 Jun 2016; Tobias Klausmann gptfdisk-1.0.1.ebuild: - 1.0.1-r0: add alpha keyword - - Gentoo-Bug: 583982 - - Package-Manager: portage-2.3.0_rc1 - - 08 Jun 2016; Markus Meier gptfdisk-1.0.1.ebuild: - arm stable, bug #583982 - - Package-Manager: portage-2.3.0_rc1 - RepoMan-Options: --include-arches="arm" - - 06 Jul 2016; Agostino Sarubbo gptfdisk-1.0.1.ebuild: - ppc stable wrt bug #583982 - - Package-Manager: portage-2.2.28 - RepoMan-Options: --include-arches="ppc" - Signed-off-by: Agostino Sarubbo - diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/gptfdisk/ChangeLog-2015 b/sdk_container/src/third_party/portage-stable/sys-apps/gptfdisk/ChangeLog-2015 deleted file mode 100644 index 04cfa94c8d..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-apps/gptfdisk/ChangeLog-2015 +++ /dev/null @@ -1,272 +0,0 @@ -# ChangeLog for sys-apps/gptfdisk -# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/gptfdisk/ChangeLog,v 1.57 2015/04/16 10:07:18 polynomial-c Exp $ - -*gptfdisk-1.0.0 (16 Apr 2015) - - 16 Apr 2015; Lars Wendler -gptfdisk-0.8.8.ebuild, - +gptfdisk-1.0.0.ebuild: - Version bump. Removed old. - - 03 Mar 2015; Yixun Lan gptfdisk-0.8.10.ebuild: - add arm64 support, tested on A53 board - - 19 Sep 2014; Agostino Sarubbo gptfdisk-0.8.10.ebuild: - Stable for ppc64, wrt bug #510150 - - 07 Aug 2014; Jeroen Roovers gptfdisk-0.8.10.ebuild: - Do not inject configuration flags into build files. - - 01 Aug 2014; Raúl Porcel gptfdisk-0.8.10.ebuild: - ia64/sparc stable wrt #510150 - - 20 Jul 2014; Tobias Klausmann gptfdisk-0.8.10.ebuild: - Stable on alpha, bug #510150 - - 13 Jul 2014; Agostino Sarubbo gptfdisk-0.8.10.ebuild: - Stable for ppc, wrt bug #510150 - - 16 Jun 2014; Chema Alonso gptfdisk-0.8.10.ebuild: - Stable for amd64 wrt bug #510150 - - 14 Jun 2014; Pawel Hajdan jr gptfdisk-0.8.10.ebuild: - x86 stable wrt bug #510150 - - 25 May 2014; Markus Meier gptfdisk-0.8.10.ebuild: - arm stable, bug #510150 - -*gptfdisk-0.8.10 (12 Apr 2014) - - 12 Apr 2014; Lars Wendler -gptfdisk-0.8.4.ebuild, - -gptfdisk-0.8.5.ebuild, -gptfdisk-0.8.6.ebuild, +gptfdisk-0.8.10.ebuild, - metadata.xml: - Version bump. Removed old. Added myself as maintainer. - - 19 Mar 2014; Agostino Sarubbo gptfdisk-0.8.8.ebuild: - Stable for alpha, wrt bug #496530 - - 18 Mar 2014; Agostino Sarubbo gptfdisk-0.8.8.ebuild: - Stable for ia64, wrt bug #496530 - - 14 Mar 2014; Agostino Sarubbo gptfdisk-0.8.8.ebuild: - Stable for ppc64, wrt bug #496530 - - 12 Mar 2014; Agostino Sarubbo gptfdisk-0.8.8.ebuild: - Stable for sparc, wrt bug #496530 - - 05 Mar 2014; Agostino Sarubbo gptfdisk-0.8.8.ebuild: - Stable for ppc, wrt bug #496530 - - 04 Mar 2014; Agostino Sarubbo gptfdisk-0.8.8.ebuild: - Stable for x86, wrt bug #496530 - - 02 Mar 2014; Pacho Ramos gptfdisk-0.8.8.ebuild: - amd64 stable, bug #496530 - - 20 Feb 2014; Markus Meier gptfdisk-0.8.8.ebuild: - arm stable, bug #496530 - -*gptfdisk-0.8.8 (20 Oct 2013) - - 20 Oct 2013; Samuli Suominen +gptfdisk-0.8.8.ebuild: - Version bump. - - 22 May 2013; Mike Gilbert gptfdisk-0.8.6.ebuild: - Use correct ICU flags. Patch by Arfrever. - - 12 May 2013; Mike Frysinger gptfdisk-0.8.6.ebuild: - Add USE=ncurses support. - - 12 May 2013; Mike Frysinger gptfdisk-0.8.6.ebuild: - Add USE=static support. - - 07 May 2013; Agostino Sarubbo gptfdisk-0.8.6.ebuild: - Stable for ppc64, wrt bug #467718 - - 07 May 2013; Agostino Sarubbo gptfdisk-0.8.6.ebuild: - Stable for sparc, wrt bug #467718 - - 05 May 2013; Agostino Sarubbo gptfdisk-0.8.6.ebuild: - Stable for alpha, wrt bug #467718 - - 05 May 2013; Agostino Sarubbo gptfdisk-0.8.6.ebuild: - Stable for arm, wrt bug #467718 - - 28 Apr 2013; Tomáš Chvátal gptfdisk-0.8.6.ebuild: - Stable on amd64 x86 and ppc. - - 06 Apr 2013; Mike Gilbert gptfdisk-0.8.6.ebuild: - Add slot-operator to dev-libs/icu dependency. - - 31 Mar 2013; Mike Gilbert gptfdisk-0.8.6.ebuild: - Append ICU flags to CXXFLAGS with USE=icu, not USE=-icu. Patch by Arfrever. - -*gptfdisk-0.8.6 (29 Mar 2013) - - 29 Mar 2013; Justin Lecher gptfdisk-0.8.4.ebuild, - gptfdisk-0.8.5.ebuild, +gptfdisk-0.8.6.ebuild, metadata.xml: - Version Bump and make icu support optional, #428410, #461454 - - 09 Mar 2013; Agostino Sarubbo gptfdisk-0.8.5.ebuild: - Stable for sparc, wrt bug #427550 - - 23 Feb 2013; Agostino Sarubbo gptfdisk-0.8.5.ebuild: - Stable for alpha, wrt bug #427550 - - 21 Feb 2013; Zac Medico gptfdisk-0.8.5.ebuild: - Add ~arm-linux keyword. - - 09 Feb 2013; Agostino Sarubbo gptfdisk-0.8.5.ebuild: - Stable for ia64, wrt bug #427550 - - 20 Jan 2013; Agostino Sarubbo gptfdisk-0.8.4.ebuild: - Stable for arm, wrt bug #451450 - - 06 Jan 2013; Agostino Sarubbo gptfdisk-0.8.5.ebuild: - Add ~sparc, wrt bug #449220 - - 04 Nov 2012; Samuli Suominen gptfdisk-0.8.5.ebuild: - Read variable CXXFLAGS from icu-{io,uc}.pc pkg-config files wrt #439696 by - Alphat-PC - - 29 Sep 2012; Raúl Porcel gptfdisk-0.8.4.ebuild, - gptfdisk-0.8.5.ebuild: - Add ~alpha/~ia64 wrt #412801 - -*gptfdisk-0.8.5 (31 May 2012) - - 31 May 2012; Samuli Suominen +gptfdisk-0.8.5.ebuild: - Version bump. - - 26 May 2012; Tomáš Chvátal -gptfdisk-0.6.13.ebuild, - gptfdisk-0.8.4.ebuild: - Stable on amd64, x86, ppc and ppc64. Remove older. - - 19 May 2012; Anthony G. Basile gptfdisk-0.8.4.ebuild: - Keyword mips - - 15 May 2012; Samuli Suominen gptfdisk-0.8.4.ebuild: - Keyword ~ppc/~ppc64 wrt #412801 - - 20 Apr 2012; Samuli Suominen gptfdisk-0.8.4.ebuild: - declare x local in src_install() - - 20 Apr 2012; Samuli Suominen - -gptfdisk-0.8.0-r1.ebuild, -gptfdisk-0.8.1.ebuild, -gptfdisk-0.8.2.ebuild: - old - - 14 Apr 2012; Zac Medico gptfdisk-0.8.4.ebuild: - Add ~amd64-linux keyword. - -*gptfdisk-0.8.4 (09 Apr 2012) - - 09 Apr 2012; Alexey Shvetsov +gptfdisk-0.8.4.ebuild, - gptfdisk-0.8.2.ebuild: - [sys-apps/gptfdisk] version bump per bug #410751 and add missing deps per bug - #411317 - -*gptfdisk-0.8.2 (24 Jan 2012) - - 24 Jan 2012; Justin Lecher gptfdisk-0.6.13.ebuild, - gptfdisk-0.8.0-r1.ebuild, gptfdisk-0.8.1.ebuild, +gptfdisk-0.8.2.ebuild: - Version Bump, dropped unneeded dies - -*gptfdisk-0.8.1 (19 Nov 2011) - - 19 Nov 2011; Alexey Shvetsov +gptfdisk-0.8.1.ebuild, - -gptfdisk-0.7.2.ebuild, gptfdisk-0.6.13.ebuild, gptfdisk-0.8.0-r1.ebuild: - Version bump and clean up - -*gptfdisk-0.8.0-r1 (06 Oct 2011) - - 06 Oct 2011; Alexey Shvetsov -gptfdisk-0.8.0.ebuild, - +gptfdisk-0.8.0-r1.ebuild: - fix #383967 - -*gptfdisk-0.8.0 (19 Sep 2011) - - 19 Sep 2011; Alexey Shvetsov +gptfdisk-0.8.0.ebuild: - Version bump - -*gptfdisk-0.7.2 (15 Aug 2011) - - 15 Aug 2011; Alexey Shvetsov -gptfdisk-0.7.1.ebuild, - +gptfdisk-0.7.2.ebuild: - Version bump per bug #379161 - - 29 Jul 2011; Zac Medico gptfdisk-0.7.1.ebuild: - Add ~x86-linux keyword. - - 03 Apr 2011; Alexey Shvetsov gptfdisk-0.7.1.ebuild: - Add missing dep - - 02 Apr 2011; Alexey Shvetsov gptfdisk-0.7.1.ebuild: - Also we have new tool fixparts - - 02 Apr 2011; Alexey Shvetsov gptfdisk-0.7.1.ebuild: - We dont have html help anymore - -*gptfdisk-0.7.1 (02 Apr 2011) -*gptfdisk-0.6.13 (02 Apr 2011) - - 02 Apr 2011; Alexey Shvetsov +gptfdisk-0.6.13.ebuild, - +gptfdisk-0.7.1.ebuild, +metadata.xml: - Version bump & upstream rename bug #361667 - -*gdisk-0.6.14 (30 Jan 2011) - - 30 Jan 2011; Alexey Shvetsov +gdisk-0.6.14.ebuild: - Version bump per Hanno Boeck request - - 28 Nov 2010; Pawel Hajdan jr gdisk-0.6.13.ebuild: - x86 stable wrt bug #343147 - - 28 Nov 2010; Markos Chandras gdisk-0.6.13.ebuild: - Stable on amd64 wrt bug #343147 - -*gdisk-0.6.13 (28 Oct 2010) - - 28 Oct 2010; Tim Harder -gdisk-0.6.11.ebuild, - +gdisk-0.6.13.ebuild: - Version bump for bug #342053, respect CXX, and remove old. - -*gdisk-0.6.11 (28 Sep 2010) - - 28 Sep 2010; Alexey Shvetsov -gdisk-0.6.9.ebuild, - +gdisk-0.6.11.ebuild: - Version bump per bug #337220 - -*gdisk-0.6.9 (16 Aug 2010) - - 16 Aug 2010; Alexey Shvetsov -gdisk-0.6.8.ebuild, - -gdisk-0.6.8-r1.ebuild, +gdisk-0.6.9.ebuild: - Version bump per bug #333019 - -*gdisk-0.6.8-r1 (14 Jun 2010) - - 14 Jun 2010; Robin H. Johnson +gdisk-0.6.8-r1.ebuild: - Install more docs, and confirmed to work on ARM (using MV78100). - -*gdisk-0.6.8 (07 Jun 2010) - - 07 Jun 2010; Alexey Shvetsov -gdisk-0.6.4_p2.ebuild, - +gdisk-0.6.8.ebuild: - Version bump per bug #319767 - -*gdisk-0.6.4_p2 (27 Feb 2010) - - 27 Feb 2010; Alexey Shvetsov -gdisk-0.5.1.ebuild, - +gdisk-0.6.4_p2.ebuild: - Version bump. Fix bug #306777 - -*gdisk-0.5.1 (06 Dec 2009) - - 06 Dec 2009; Alexey Shvetsov -gdisk-0.5.0.ebuild, - +gdisk-0.5.1.ebuild: - Version bump - -*gdisk-0.5.0 (06 Dec 2009) - - 06 Dec 2009; Alexey Shvetsov +gdisk-0.5.0.ebuild, - +metadata.xml: - Initial import per bug #286535 diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/gptfdisk/Manifest b/sdk_container/src/third_party/portage-stable/sys-apps/gptfdisk/Manifest index 5f99c8c64f..af6048f8fc 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/gptfdisk/Manifest +++ b/sdk_container/src/third_party/portage-stable/sys-apps/gptfdisk/Manifest @@ -1,9 +1,2 @@ -DIST gptfdisk-0.8.10.tar.gz 190666 SHA256 73e64151203ae0c347c488358e71ca582bb7fb7f0d66df86b71c42050390eb9b SHA512 3187bc231c3390a86f5b7b32270d5f0d1e6c7bccd9d1cbf100c29f4822afa73362aa1fbdd3b29f20c42d67ec51bd777b7b58b5791e31182b3860915bc695948f WHIRLPOOL f90b95f9f0cfba1b57b7dcfd2e39e475f322fa9ea2a85891ea70877e518bbed96dec8d4f61a8eeae3dbd2d36d276ce4bd2c2781eaa5135058cf544629f4cddbc -DIST gptfdisk-1.0.0.tar.gz 193521 SHA256 5b66956743a799fc0471cdb032665c1391e82f9c5b3f1d7d726d29fe2ba01d6c SHA512 d60660563268c20737415e1cfd4239fba0cc2ceb4c6ae86cc34e9550d969f9b88ac3d8c862d1790f6d644266b423eeb5d78540eec01a447b722793fba54f6afc WHIRLPOOL d7fbec9fd92eb0a871510f2c25d0057577f73668b68336148af86d549522845dda79423e8ddf306d2128153436467f618decb9b65a19a6bf6e89ce5187c67676 -DIST gptfdisk-1.0.1.tar.gz 195378 SHA256 864c8aee2efdda50346804d7e6230407d5f42a8ae754df70404dd8b2fdfaeac7 SHA512 6aa2ed6213183ea38ce7dd6e7f4f23b88cc56bed5a4d078f563b9e0a3c276eacf869e28a27ccb4e473753f7bced7ecb5de4535626f9ed22b7a59a39906d0419c WHIRLPOOL b520ec11cf62d0d2a1b66af1d4acfbd24c2df4dad2c00562900d4f90fb67ee76b6fa2aefc5d730b6ce30551baafddd9d3e2631ad2022b067bed3cdc943fadb5c -EBUILD gptfdisk-0.8.10.ebuild 1153 SHA256 4d69ee0ddacc3fca046c498d950fb162bf4b94a555eb39212d7c502108ab010d SHA512 31cce7f8f5f308d1e5f2ac669719f622a0d4a480d344905aeb9a4c5a2e63c93d6705442489114f3a8f4ba12044dd5e10bf30ef5672f520e24d14dc98d7bc56eb WHIRLPOOL d844abf964f2b388f4b935be54000694441a6cc7fb7632b711484d9526c06fe072e3140d2732a3bd2c703dd40d10c796adf5005e99c48ff7563e645d6dd178b0 -EBUILD gptfdisk-1.0.0.ebuild 1161 SHA256 b4f9f3cdf16932537e2db3a44c8a79b9e8b8282890dddff3d1d447a2cd501d6c SHA512 4d4027248475d6e964ae88f796c8a01af8147b8095ceece747a56aa9ea929080b91b4497e4b2814217322f6c36d2c1a6ca29f9b9d1ae73f3d601d1e57fa6484e WHIRLPOOL 579146ad63faa7b3648d16d9244a533ab6179e1bfdb8af08d684bbefaf4973d83065e6bbee1c71c90277d7487e685de2df034d71df0ed3384a9b032f38459553 -EBUILD gptfdisk-1.0.1.ebuild 1156 SHA256 7a513d4420b5f7ff62bb166a7cda7177ba2872df8a6d6f5eeda5391fad5ce358 SHA512 a6218660d4bb1c8151eebe336685739dd9623d3cbb4b66c5875e2aa29f20b47d0f3be1a61a1271010af0e5e39ff6d009554926b909c249dec9e9fd969490d87e WHIRLPOOL 559341838a8891732e7a240f1bc56ca3460a2bd23107ad474753e1953f30319071be1745656df8ddd512ebbab0dceb52d87365ae2a65d4003baaabda23211b20 -MISC ChangeLog 4117 SHA256 6952af45edc98e796f6645a34c28aab370154fe48e21a8490733cd4d24be2262 SHA512 b0793fa4170f21b921b04cda6d989962cdef186ca4af02a1dcba624f914b68672b620101341356c1b58b794d38ab43f58b38c58190b7f2dc7e855a85a5a8dec3 WHIRLPOOL c05fe356d1ead744507111e046f5e2a6108063fa355262d11eb515bcb44067f0f9facf0d4b3fb9e2450f0bf29865eadb8a8abe6983df1deb5487832cb8d03f02 -MISC ChangeLog-2015 9109 SHA256 90417f19814175bb6548f4583b2a66820b0b0fa5f352dbb5b17d8a51f1df740b SHA512 f559d1f0983aac2a5d8919ecc145aed6a68cabc00c7435bca583f576aff00da8d8eef267a27e203dd1760d15050a9fbe3c23f48c9abd9c0ced02ab02d28d6fdb WHIRLPOOL d4e7e22a12943b6845fe8deee6c38397a38f8adcdc978d6deff22fd260549de042ec2d23c45f28b443c7ca61e19a7bc5970a644dae7eaade7852e44ed8e34141 -MISC metadata.xml 339 SHA256 2b059b110e2a09d74c403973ea97ae4a95b117687e587c9c8ba9ad479d2aed20 SHA512 d8334a3e741adf97739f9fef66d7b38bfab9e2d189ac5fbc96ab27a7c1551938b6184ebb08b03ef8b6864f6e43d536836f373e03f3491cacc8f6ee3496f615b5 WHIRLPOOL 74424f6030acb4f4fa3b1ba5f77354a9ba4ca09bb6cf1c510e1eb70a88f08b7861d7747c9b79d4af954a93ba4dad749f76c067a13b72638123fbf5e92d48fdb2 +DIST gptfdisk-1.0.1.tar.gz 195378 BLAKE2B 50cbfe1143c1e26595757bb40a94952ee9d26caaca54d816c6e02539b652d967bb8de3138d6ffd7aa1d63c010632e4f888d6cff2e6a7b743a8816787319b67e5 SHA512 6aa2ed6213183ea38ce7dd6e7f4f23b88cc56bed5a4d078f563b9e0a3c276eacf869e28a27ccb4e473753f7bced7ecb5de4535626f9ed22b7a59a39906d0419c +DIST gptfdisk-1.0.3.tar.gz 199924 BLAKE2B f664398cb58d081ad19e267a370a4a7363e1060358aac394d87cd5874efe558fbd7bea4a33da871287c144b664c60e283d3338ca88d7d494503afe9a0b652e7a SHA512 80d437bfa2365abfffbd4812ea928fcebd52c5421de321cf190d395549e32c5ebdbb2d060cc4b95f77fe13cdd719f4d2bb3d0ed5d97792b100325f92d7c852d7 diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/gptfdisk/gptfdisk-0.8.10.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/gptfdisk/gptfdisk-0.8.10.ebuild deleted file mode 100644 index cc8fb31962..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-apps/gptfdisk/gptfdisk-0.8.10.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit flag-o-matic toolchain-funcs - -DESCRIPTION="GPT partition table manipulator for Linux" -HOMEPAGE="http://www.rodsbooks.com/gdisk/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~arm-linux ~x86-linux" -IUSE="kernel_linux ncurses static" - -LIB_DEPEND=" - dev-libs/popt[static-libs(+)] - ncurses? ( >=sys-libs/ncurses-5.7-r7:0=[static-libs(+)] ) - kernel_linux? ( sys-apps/util-linux[static-libs(+)] )" # libuuid -RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )" -DEPEND="${RDEPEND} - static? ( ${LIB_DEPEND} ) - virtual/pkgconfig" - -src_prepare() { - tc-export CXX PKG_CONFIG - - if ! use ncurses; then - sed -i \ - -e '/^all:/s:cgdisk::' \ - Makefile || die - fi - - sed \ - -e '/g++/s:=:?=:g' \ - -e 's:-lncursesw:$(shell $(PKG_CONFIG) --libs ncursesw):g' \ - -i Makefile || die - - use static && append-ldflags -static -} - -src_install() { - dosbin gdisk sgdisk $(usex ncurses cgdisk '') fixparts - doman *.8 - dodoc NEWS README -} diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/gptfdisk/gptfdisk-1.0.1.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/gptfdisk/gptfdisk-1.0.1.ebuild index e831e08249..90515a8c8f 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/gptfdisk/gptfdisk-1.0.1.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-apps/gptfdisk/gptfdisk-1.0.1.ebuild @@ -1,18 +1,17 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Id$ EAPI=5 inherit flag-o-matic toolchain-funcs DESCRIPTION="GPT partition table manipulator for Linux" -HOMEPAGE="http://www.rodsbooks.com/gdisk/" +HOMEPAGE="https://www.rodsbooks.com/gdisk/" SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="alpha amd64 arm ~arm64 ~ia64 ~mips ppc ~ppc64 ~sparc x86 ~amd64-linux ~arm-linux ~x86-linux" +KEYWORDS="alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~arm-linux ~x86-linux" IUSE="kernel_linux ncurses static" LIB_DEPEND=" diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/gptfdisk/gptfdisk-1.0.0.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/gptfdisk/gptfdisk-1.0.3.ebuild similarity index 77% rename from sdk_container/src/third_party/portage-stable/sys-apps/gptfdisk/gptfdisk-1.0.0.ebuild rename to sdk_container/src/third_party/portage-stable/sys-apps/gptfdisk/gptfdisk-1.0.3.ebuild index 249a9d2bf2..b813139d27 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/gptfdisk/gptfdisk-1.0.0.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-apps/gptfdisk/gptfdisk-1.0.3.ebuild @@ -1,13 +1,12 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Id$ -EAPI=5 +EAPI=6 inherit flag-o-matic toolchain-funcs DESCRIPTION="GPT partition table manipulator for Linux" -HOMEPAGE="http://www.rodsbooks.com/gdisk/" +HOMEPAGE="https://www.rodsbooks.com/gdisk/" SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" LICENSE="GPL-2" @@ -15,19 +14,25 @@ SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux" IUSE="kernel_linux ncurses static" +# libuuid from util-linux is required. LIB_DEPEND=" dev-libs/popt[static-libs(+)] ncurses? ( >=sys-libs/ncurses-5.7-r7:0=[static-libs(+)] ) - kernel_linux? ( sys-apps/util-linux[static-libs(+)] )" # libuuid + kernel_linux? ( sys-apps/util-linux[static-libs(+)] ) +" RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )" -DEPEND="${RDEPEND} +DEPEND=" + ${RDEPEND} static? ( ${LIB_DEPEND} ) - virtual/pkgconfig" + virtual/pkgconfig +" src_prepare() { + default + tc-export CXX PKG_CONFIG - if ! use ncurses; then + if ! use ncurses ; then sed -i \ -e '/^all:/s:cgdisk::' \ Makefile || die From 3771c0a9321b65d0d50d0b157126b7ed57403b6c Mon Sep 17 00:00:00 2001 From: David Michael Date: Mon, 14 May 2018 13:59:53 -0400 Subject: [PATCH 06/21] bump(dev-util/cmake): sync with upstream --- .../portage-stable/dev-util/cmake/Manifest | 9 +- ...cmake-3.9.1.ebuild => cmake-3.10.2.ebuild} | 26 ++- ...cmake-3.8.2.ebuild => cmake-3.10.3.ebuild} | 32 ++- ...cmake-3.7.2.ebuild => cmake-3.11.0.ebuild} | 43 ++-- .../dev-util/cmake/cmake-3.11.1.ebuild | 217 ++++++++++++++++++ ...{cmake-3.9.0.ebuild => cmake-3.9.6.ebuild} | 20 +- .../cmake-2.8.12.1-FindImageMagick.patch | 23 -- .../files/cmake-3.0.0-FindBoost-python.patch | 93 -------- .../cmake/files/cmake-3.0.0-prefix-dirs.patch | 142 ------------ .../files/cmake-3.1.0-FindPythonInterp.patch | 29 --- .../files/cmake-3.11.0_rc2-FindBLAS.patch | 23 ++ .../metadata/md5-cache/dev-util/cmake-3.10.2 | 13 ++ .../metadata/md5-cache/dev-util/cmake-3.10.3 | 13 ++ .../metadata/md5-cache/dev-util/cmake-3.11.0 | 13 ++ .../metadata/md5-cache/dev-util/cmake-3.11.1 | 13 ++ .../metadata/md5-cache/dev-util/cmake-3.7.2 | 13 -- .../metadata/md5-cache/dev-util/cmake-3.9.0 | 13 -- .../metadata/md5-cache/dev-util/cmake-3.9.1 | 13 -- .../dev-util/{cmake-3.8.2 => cmake-3.9.6} | 12 +- 19 files changed, 385 insertions(+), 375 deletions(-) rename sdk_container/src/third_party/portage-stable/dev-util/cmake/{cmake-3.9.1.ebuild => cmake-3.10.2.ebuild} (87%) rename sdk_container/src/third_party/portage-stable/dev-util/cmake/{cmake-3.8.2.ebuild => cmake-3.10.3.ebuild} (84%) rename sdk_container/src/third_party/portage-stable/dev-util/cmake/{cmake-3.7.2.ebuild => cmake-3.11.0.ebuild} (77%) create mode 100644 sdk_container/src/third_party/portage-stable/dev-util/cmake/cmake-3.11.1.ebuild rename sdk_container/src/third_party/portage-stable/dev-util/cmake/{cmake-3.9.0.ebuild => cmake-3.9.6.ebuild} (87%) delete mode 100644 sdk_container/src/third_party/portage-stable/dev-util/cmake/files/cmake-2.8.12.1-FindImageMagick.patch delete mode 100644 sdk_container/src/third_party/portage-stable/dev-util/cmake/files/cmake-3.0.0-FindBoost-python.patch delete mode 100644 sdk_container/src/third_party/portage-stable/dev-util/cmake/files/cmake-3.0.0-prefix-dirs.patch delete mode 100644 sdk_container/src/third_party/portage-stable/dev-util/cmake/files/cmake-3.1.0-FindPythonInterp.patch create mode 100644 sdk_container/src/third_party/portage-stable/dev-util/cmake/files/cmake-3.11.0_rc2-FindBLAS.patch create mode 100644 sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-util/cmake-3.10.2 create mode 100644 sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-util/cmake-3.10.3 create mode 100644 sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-util/cmake-3.11.0 create mode 100644 sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-util/cmake-3.11.1 delete mode 100644 sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-util/cmake-3.7.2 delete mode 100644 sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-util/cmake-3.9.0 delete mode 100644 sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-util/cmake-3.9.1 rename sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-util/{cmake-3.8.2 => cmake-3.9.6} (56%) diff --git a/sdk_container/src/third_party/portage-stable/dev-util/cmake/Manifest b/sdk_container/src/third_party/portage-stable/dev-util/cmake/Manifest index e3538edc7a..3e975e3d82 100644 --- a/sdk_container/src/third_party/portage-stable/dev-util/cmake/Manifest +++ b/sdk_container/src/third_party/portage-stable/dev-util/cmake/Manifest @@ -1,4 +1,5 @@ -DIST cmake-3.7.2.tar.gz 7361593 SHA256 dc1246c4e6d168ea4d6e042cfba577c1acd65feea27e56f5ff37df920c30cae0 SHA512 b2ed0192e12267de19eb178c2dedc69d06fc33dfadd47efbe0ccf6969ad72d290fa4bff02861c379a8752337d67d2485d7e1ba947cb219f2e4041a53a195e88d WHIRLPOOL 1861fe2887f4483856e1964ff1492e196624d3072ad1e21910fba29d0c0d654e7d5035571648386a77cd6cbe895f8cdfbb1f4cc1ad60d14015a01a22494456f7 -DIST cmake-3.8.2.tar.gz 7504706 SHA256 da3072794eb4c09f2d782fcee043847b99bb4cf8d4573978d9b2024214d6e92d SHA512 49ea6f74a81dfa8ed8336c94ed50e0a483b796132c260f4bef159f9c389d99cc7b26ecfcccdd8b0a8f5b52fddd277c17c547d2a2e8848da9912c464ada1cbe3f WHIRLPOOL 8768bffb365852414eda0349d71e59517c8047689303d7873a5889cb8b28c72cd636982a18b039f26daae33023f7e0ad91c3a9ab2d30c30e4b3a9b3cc525b78e -DIST cmake-3.9.0.tar.gz 7691313 SHA256 167701525183dbb722b9ffe69fb525aa2b81798cf12f5ce1c020c93394dfae0f SHA512 151c5531dec2c9d3170d95c06b9cc92d22285555cb9c074837ff2d0d0bee2ea285726323fa11c59d2290b1a9586492571d34e49709e35481478c403bf1ca9c48 WHIRLPOOL f9ac1b90c10c71bd524a107bdf78706cb388e042da9d552ee1f911817d980d0b8ccac082945f6a6bc394ba6cc0fa7c81552f7d4ed51c2ce0dedacf39dd49eded -DIST cmake-3.9.1.tar.gz 7702497 SHA256 d768ee83d217f91bb597b3ca2ac663da7a8603c97e1f1a5184bc01e0ad2b12bb SHA512 3bdc0f08cac8decd37df8043cf8fb436d08d19444353164bad02feda441bbd5efa636836352227255829ae5360b4ef4c952b3a7635dd61f4e86b01dff44e1ac6 WHIRLPOOL 5177e55df43d87adaaf07c2bcb0a561191df0c675834f936d81b8b34497a27701842209f885b708f30be09f0c77b43d98a0d494f719a63ad7344d51f14cabcec +DIST cmake-3.10.2.tar.gz 7824452 BLAKE2B cc579f27d7d5668d1f375e7263e0b62212be1191735189d34b1f0aa921861ead5d3872388eebbb5136a72e3dec3920f1ebfb0bf45b642cf92eef02e4c8665d49 SHA512 f58fdd025285c9ff5396c0bd0d9573fc8a498fcbe5c11b336cb8ad6154ca6bc875c1a5e22d6654ba98596791ecf89ae8adffb83450839fa1275756b0af5bf82b +DIST cmake-3.10.3.tar.gz 7825559 BLAKE2B 1db8c21abdcfac2612fa914d49f9edcf199240b714104dba1d470c8e1e487d8e6cc5d486febae88d4a71eb9419064bcf94f9bb2c779771323221c1f117baa693 SHA512 1ba6381321cb34c3c050548a1346d3b92d590a196d8aff7435c079cd485d01f7a6cd650ad97d00931aff424fcdc195bbaa6d9d7db679bf02f72f586c7b528ae4 +DIST cmake-3.11.0.tar.gz 7948287 BLAKE2B c56da8645d87bc06735e2afb9b8481918acd0a43e3fc96b6f58c1a311fa6a7a270a9be8d13d2106b3fcde802f8c084314717262edd760c7c7f06bd8c07f1fe69 SHA512 03b058483d236d4f4427c93cc41af77068c243fc4b6f24aeaf2daf97af215bc664bc1b733195463af4cfc94ec70076710f425661859d752ddf3b9610adca9834 +DIST cmake-3.11.1.tar.gz 7951125 BLAKE2B 157c2eac49900df554fb335c4a17484ca425a97e2c41b9539cf1f02cc09246e515d8c2b43549a7a395df378f1dd3f4757465edab6f1ea5d08d5835b6728b35d7 SHA512 d5df043453a9f9478a0e165ded6ce247a7b495fe8c4e56905bb523889a016fb8eb769455c2c2c5f6118c61bcffafe4e3e219ad99b2a85918323c2155f10089d8 +DIST cmake-3.9.6.tar.gz 7705400 BLAKE2B e0a5307af0a34863c50ea6aa9323025ef588b27e648107c3a81c362ee7ae4a1d2a07cc335d816b286ce4ddb249f9c6c08c3e8cf99856c7113f3724f47c62da43 SHA512 9fda2c9ac054ef8fb1bf3885fbdec02c518da89ade220eba06b5502ac3ff300f635ec0922e61f3b2d090644fb743b8f71a04c532ab66b2d890a180cc7da54e6c diff --git a/sdk_container/src/third_party/portage-stable/dev-util/cmake/cmake-3.9.1.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/cmake/cmake-3.10.2.ebuild similarity index 87% rename from sdk_container/src/third_party/portage-stable/dev-util/cmake/cmake-3.9.1.ebuild rename to sdk_container/src/third_party/portage-stable/dev-util/cmake/cmake-3.10.2.ebuild index d3f3f5aeaa..843a7d2707 100644 --- a/sdk_container/src/third_party/portage-stable/dev-util/cmake/cmake-3.9.1.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-util/cmake/cmake-3.10.2.ebuild @@ -1,28 +1,29 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 CMAKE_MAKEFILE_GENERATOR="emake" CMAKE_REMOVE_MODULES="no" -inherit bash-completion-r1 elisp-common toolchain-funcs eutils versionator cmake-utils virtualx flag-o-matic +inherit bash-completion-r1 elisp-common eutils flag-o-matic gnome2-utils toolchain-funcs versionator virtualx xdg-utils cmake-utils MY_P="${P/_/-}" DESCRIPTION="Cross platform Make" -HOMEPAGE="http://www.cmake.org/" -SRC_URI="http://www.cmake.org/files/v$(get_version_component_range 1-2)/${MY_P}.tar.gz" +HOMEPAGE="https://cmake.org/" +SRC_URI="https://cmake.org/files/v$(get_version_component_range 1-2)/${MY_P}.tar.gz" LICENSE="CMake" SLOT="0" [[ "${PV}" = *_rc* ]] || \ -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" -IUSE="doc emacs server system-jsoncpp ncurses qt5" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" +IUSE="doc emacs system-jsoncpp ncurses qt5" RDEPEND=" app-crypt/rhash >=app-arch/libarchive-3.0.0:= >=dev-libs/expat-2.0.1 + >=dev-libs/libuv-1.0.0:= >=net-misc/curl-7.21.5[ssl] sys-libs/zlib virtual/pkgconfig @@ -33,7 +34,6 @@ RDEPEND=" dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) - server? ( >=dev-libs/libuv-1.0.0:= ) system-jsoncpp? ( >=dev-libs/jsoncpp-0.6.0_rc2:0= ) " DEPEND="${RDEPEND} @@ -150,8 +150,6 @@ src_configure() { -DSPHINX_MAN=$(usex doc) -DSPHINX_HTML=$(usex doc) -DBUILD_CursesDialog="$(usex ncurses)" - -DCMake_ENABLE_SERVER_MODE="$(usex server)" - -DCMAKE_USE_LIBUV="$(usex server)" ) if use qt5 ; then @@ -197,8 +195,18 @@ src_install() { pkg_postinst() { use emacs && elisp-site-regen + if use qt5; then + gnome2_icon_cache_update + xdg_desktop_database_update + xdg_mimeinfo_database_update + fi } pkg_postrm() { use emacs && elisp-site-regen + if use qt5; then + gnome2_icon_cache_update + xdg_desktop_database_update + xdg_mimeinfo_database_update + fi } diff --git a/sdk_container/src/third_party/portage-stable/dev-util/cmake/cmake-3.8.2.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/cmake/cmake-3.10.3.ebuild similarity index 84% rename from sdk_container/src/third_party/portage-stable/dev-util/cmake/cmake-3.8.2.ebuild rename to sdk_container/src/third_party/portage-stable/dev-util/cmake/cmake-3.10.3.ebuild index 0a1274bc1f..843a7d2707 100644 --- a/sdk_container/src/third_party/portage-stable/dev-util/cmake/cmake-3.8.2.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-util/cmake/cmake-3.10.3.ebuild @@ -1,28 +1,29 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 CMAKE_MAKEFILE_GENERATOR="emake" CMAKE_REMOVE_MODULES="no" -inherit bash-completion-r1 elisp-common toolchain-funcs eutils versionator cmake-utils virtualx flag-o-matic +inherit bash-completion-r1 elisp-common eutils flag-o-matic gnome2-utils toolchain-funcs versionator virtualx xdg-utils cmake-utils MY_P="${P/_/-}" DESCRIPTION="Cross platform Make" -HOMEPAGE="http://www.cmake.org/" -SRC_URI="http://www.cmake.org/files/v$(get_version_component_range 1-2)/${MY_P}.tar.gz" +HOMEPAGE="https://cmake.org/" +SRC_URI="https://cmake.org/files/v$(get_version_component_range 1-2)/${MY_P}.tar.gz" LICENSE="CMake" SLOT="0" [[ "${PV}" = *_rc* ]] || \ -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" -IUSE="doc emacs server system-jsoncpp ncurses qt5" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" +IUSE="doc emacs system-jsoncpp ncurses qt5" RDEPEND=" app-crypt/rhash >=app-arch/libarchive-3.0.0:= >=dev-libs/expat-2.0.1 + >=dev-libs/libuv-1.0.0:= >=net-misc/curl-7.21.5[ssl] sys-libs/zlib virtual/pkgconfig @@ -33,7 +34,6 @@ RDEPEND=" dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) - server? ( >=dev-libs/libuv-1.0.0:= ) system-jsoncpp? ( >=dev-libs/jsoncpp-0.6.0_rc2:0= ) " DEPEND="${RDEPEND} @@ -47,11 +47,11 @@ SITEFILE="50${PN}-gentoo.el" PATCHES=( # prefix "${FILESDIR}"/${PN}-3.4.0_rc1-darwin-bundle.patch - "${FILESDIR}"/${PN}-3.0.0-prefix-dirs.patch + "${FILESDIR}"/${PN}-3.9.0_rc2-prefix-dirs.patch "${FILESDIR}"/${PN}-3.1.0-darwin-isysroot.patch # handle gentoo packaging in find modules - "${FILESDIR}"/${PN}-2.8.12.1-FindImageMagick.patch + "${FILESDIR}"/${PN}-3.9.0_rc2-FindImageMagick.patch "${FILESDIR}"/${PN}-3.0.0-FindBLAS.patch "${FILESDIR}"/${PN}-3.8.0_rc2-FindBoost-python.patch "${FILESDIR}"/${PN}-3.0.2-FindLAPACK.patch @@ -59,7 +59,7 @@ PATCHES=( # respect python eclasses "${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch - "${FILESDIR}"/${PN}-3.1.0-FindPythonInterp.patch + "${FILESDIR}"/${PN}-3.9.0_rc2-FindPythonInterp.patch # upstream fixes (can usually be removed with a version bump) ) @@ -150,8 +150,6 @@ src_configure() { -DSPHINX_MAN=$(usex doc) -DSPHINX_HTML=$(usex doc) -DBUILD_CursesDialog="$(usex ncurses)" - -DCMake_ENABLE_SERVER_MODE="$(usex server)" - -DCMAKE_USE_LIBUV="$(usex server)" ) if use qt5 ; then @@ -197,8 +195,18 @@ src_install() { pkg_postinst() { use emacs && elisp-site-regen + if use qt5; then + gnome2_icon_cache_update + xdg_desktop_database_update + xdg_mimeinfo_database_update + fi } pkg_postrm() { use emacs && elisp-site-regen + if use qt5; then + gnome2_icon_cache_update + xdg_desktop_database_update + xdg_mimeinfo_database_update + fi } diff --git a/sdk_container/src/third_party/portage-stable/dev-util/cmake/cmake-3.7.2.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/cmake/cmake-3.11.0.ebuild similarity index 77% rename from sdk_container/src/third_party/portage-stable/dev-util/cmake/cmake-3.7.2.ebuild rename to sdk_container/src/third_party/portage-stable/dev-util/cmake/cmake-3.11.0.ebuild index c6e7f4e36e..6bab5d7c8c 100644 --- a/sdk_container/src/third_party/portage-stable/dev-util/cmake/cmake-3.7.2.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-util/cmake/cmake-3.11.0.ebuild @@ -1,25 +1,26 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 CMAKE_MAKEFILE_GENERATOR="emake" CMAKE_REMOVE_MODULES="no" -inherit bash-completion-r1 elisp-common toolchain-funcs eutils versionator cmake-utils virtualx flag-o-matic +inherit bash-completion-r1 elisp-common eutils flag-o-matic gnome2-utils toolchain-funcs versionator virtualx xdg-utils cmake-utils MY_P="${P/_/-}" DESCRIPTION="Cross platform Make" -HOMEPAGE="http://www.cmake.org/" -SRC_URI="http://www.cmake.org/files/v$(get_version_component_range 1-2)/${MY_P}.tar.gz" +HOMEPAGE="https://cmake.org/" +SRC_URI="https://cmake.org/files/v$(get_version_component_range 1-2)/${MY_P}.tar.gz" LICENSE="CMake" SLOT="0" [[ "${PV}" = *_rc* ]] || \ -KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" IUSE="doc emacs system-jsoncpp ncurses qt5" RDEPEND=" + app-crypt/rhash >=app-arch/libarchive-3.0.0:= >=dev-libs/expat-2.0.1 >=dev-libs/libuv-1.0.0:= @@ -46,19 +47,17 @@ SITEFILE="50${PN}-gentoo.el" PATCHES=( # prefix "${FILESDIR}"/${PN}-3.4.0_rc1-darwin-bundle.patch - "${FILESDIR}"/${PN}-3.0.0-prefix-dirs.patch + "${FILESDIR}"/${PN}-3.9.0_rc2-prefix-dirs.patch "${FILESDIR}"/${PN}-3.1.0-darwin-isysroot.patch # handle gentoo packaging in find modules - "${FILESDIR}"/${PN}-2.8.12.1-FindImageMagick.patch - "${FILESDIR}"/${PN}-3.0.0-FindBLAS.patch - "${FILESDIR}"/${PN}-3.0.0-FindBoost-python.patch + "${FILESDIR}"/${PN}-3.11.0_rc2-FindBLAS.patch "${FILESDIR}"/${PN}-3.0.2-FindLAPACK.patch "${FILESDIR}"/${PN}-3.5.2-FindQt4.patch # respect python eclasses "${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch - "${FILESDIR}"/${PN}-3.1.0-FindPythonInterp.patch + "${FILESDIR}"/${PN}-3.9.0_rc2-FindPythonInterp.patch # upstream fixes (can usually be removed with a version bump) ) @@ -81,7 +80,8 @@ cmake_src_bootstrap() { # execinfo.h on Solaris isn't quite what it is on Darwin if [[ ${CHOST} == *-solaris* ]] ; then - sed -i -e 's/execinfo\.h/blablabla.h/' Source/kwsys/CMakeLists.txt || die + sed -i -e 's/execinfo\.h/blablabla.h/' \ + Source/kwsys/CMakeLists.txt || die fi tc-export CC CXX LD @@ -111,10 +111,11 @@ cmake_src_test() { # CTest.updatecvs: which fails to commit as root # Fortran: requires fortran # Qt4Deploy, which tries to break sandbox and ignores prefix - # Qt5Autogen, which breaks for unknown reason + # RunCMake.CPack_RPM: breaks if app-arch/rpm is installed because + # debugedit binary is not in the expected location # TestUpload, which requires network access "${BUILD_DIR}"/bin/ctest ${ctestargs} \ - -E "(BootstrapTest|BundleUtilities|CTest.UpdateCVS|Fortran|Qt4Deploy|Qt5Autogen|TestUpload)" \ + -E "(BootstrapTest|BundleUtilities|CTest.UpdateCVS|Fortran|Qt4Deploy|RunCMake.CPack_RPM|TestUpload)" \ || die "Tests failed" popd > /dev/null @@ -123,6 +124,12 @@ cmake_src_test() { src_prepare() { cmake-utils_src_prepare + # disable Xcode hooks, bug #652134 + if [[ ${CHOST} == *-darwin* ]] ; then + sed -i -e 's/__APPLE__/__DISABLED_APPLE__/' \ + Source/cmGlobalXCodeGenerator.cxx || die + fi + # Add gcc libs to the default link paths sed -i \ -e "s|@GENTOO_PORTAGE_GCCLIBDIR@|${EPREFIX}/usr/${CHOST}/lib/|g" \ @@ -193,8 +200,18 @@ src_install() { pkg_postinst() { use emacs && elisp-site-regen + if use qt5; then + gnome2_icon_cache_update + xdg_desktop_database_update + xdg_mimeinfo_database_update + fi } pkg_postrm() { use emacs && elisp-site-regen + if use qt5; then + gnome2_icon_cache_update + xdg_desktop_database_update + xdg_mimeinfo_database_update + fi } diff --git a/sdk_container/src/third_party/portage-stable/dev-util/cmake/cmake-3.11.1.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/cmake/cmake-3.11.1.ebuild new file mode 100644 index 0000000000..6bab5d7c8c --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-util/cmake/cmake-3.11.1.ebuild @@ -0,0 +1,217 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +CMAKE_MAKEFILE_GENERATOR="emake" +CMAKE_REMOVE_MODULES="no" +inherit bash-completion-r1 elisp-common eutils flag-o-matic gnome2-utils toolchain-funcs versionator virtualx xdg-utils cmake-utils + +MY_P="${P/_/-}" + +DESCRIPTION="Cross platform Make" +HOMEPAGE="https://cmake.org/" +SRC_URI="https://cmake.org/files/v$(get_version_component_range 1-2)/${MY_P}.tar.gz" + +LICENSE="CMake" +SLOT="0" +[[ "${PV}" = *_rc* ]] || \ +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" +IUSE="doc emacs system-jsoncpp ncurses qt5" + +RDEPEND=" + app-crypt/rhash + >=app-arch/libarchive-3.0.0:= + >=dev-libs/expat-2.0.1 + >=dev-libs/libuv-1.0.0:= + >=net-misc/curl-7.21.5[ssl] + sys-libs/zlib + virtual/pkgconfig + emacs? ( virtual/emacs ) + ncurses? ( sys-libs/ncurses:0= ) + qt5? ( + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtwidgets:5 + ) + system-jsoncpp? ( >=dev-libs/jsoncpp-0.6.0_rc2:0= ) +" +DEPEND="${RDEPEND} + doc? ( dev-python/sphinx ) +" + +S="${WORKDIR}/${MY_P}" + +SITEFILE="50${PN}-gentoo.el" + +PATCHES=( + # prefix + "${FILESDIR}"/${PN}-3.4.0_rc1-darwin-bundle.patch + "${FILESDIR}"/${PN}-3.9.0_rc2-prefix-dirs.patch + "${FILESDIR}"/${PN}-3.1.0-darwin-isysroot.patch + + # handle gentoo packaging in find modules + "${FILESDIR}"/${PN}-3.11.0_rc2-FindBLAS.patch + "${FILESDIR}"/${PN}-3.0.2-FindLAPACK.patch + "${FILESDIR}"/${PN}-3.5.2-FindQt4.patch + + # respect python eclasses + "${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch + "${FILESDIR}"/${PN}-3.9.0_rc2-FindPythonInterp.patch + + # upstream fixes (can usually be removed with a version bump) +) + +cmake_src_bootstrap() { + # Cleanup args to extract only JOBS. + # Because bootstrap does not know anything else. + echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' > /dev/null + if [ $? -eq 0 ]; then + par_arg=$(echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' | tail -n1 | egrep -o '[[:digit:]]+') + par_arg="--parallel=${par_arg}" + else + par_arg="--parallel=1" + fi + + # disable running of cmake in boostrap command + sed -i \ + -e '/"${cmake_bootstrap_dir}\/cmake"/s/^/#DONOTRUN /' \ + bootstrap || die "sed failed" + + # execinfo.h on Solaris isn't quite what it is on Darwin + if [[ ${CHOST} == *-solaris* ]] ; then + sed -i -e 's/execinfo\.h/blablabla.h/' \ + Source/kwsys/CMakeLists.txt || die + fi + + tc-export CC CXX LD + + # bootstrap script isn't exactly /bin/sh compatible + ${CONFIG_SHELL:-sh} ./bootstrap \ + --prefix="${T}/cmakestrap/" \ + ${par_arg} \ + || die "Bootstrap failed" +} + +cmake_src_test() { + # fix OutDir and SelectLibraryConfigurations tests + # these are altered thanks to our eclass + sed -i -e 's:#IGNORE ::g' \ + "${S}"/Tests/{OutDir,CMakeOnly/SelectLibraryConfigurations}/CMakeLists.txt \ + || die + + pushd "${BUILD_DIR}" > /dev/null + + local ctestargs + [[ -n ${TEST_VERBOSE} ]] && ctestargs="--extra-verbose --output-on-failure" + + # Excluded tests: + # BootstrapTest: we actualy bootstrap it every time so why test it. + # BundleUtilities: bundle creation broken + # CTest.updatecvs: which fails to commit as root + # Fortran: requires fortran + # Qt4Deploy, which tries to break sandbox and ignores prefix + # RunCMake.CPack_RPM: breaks if app-arch/rpm is installed because + # debugedit binary is not in the expected location + # TestUpload, which requires network access + "${BUILD_DIR}"/bin/ctest ${ctestargs} \ + -E "(BootstrapTest|BundleUtilities|CTest.UpdateCVS|Fortran|Qt4Deploy|RunCMake.CPack_RPM|TestUpload)" \ + || die "Tests failed" + + popd > /dev/null +} + +src_prepare() { + cmake-utils_src_prepare + + # disable Xcode hooks, bug #652134 + if [[ ${CHOST} == *-darwin* ]] ; then + sed -i -e 's/__APPLE__/__DISABLED_APPLE__/' \ + Source/cmGlobalXCodeGenerator.cxx || die + fi + + # Add gcc libs to the default link paths + sed -i \ + -e "s|@GENTOO_PORTAGE_GCCLIBDIR@|${EPREFIX}/usr/${CHOST}/lib/|g" \ + -e "s|@GENTOO_PORTAGE_EPREFIX@|${EPREFIX}/|g" \ + Modules/Platform/{UnixPaths,Darwin}.cmake || die "sed failed" + if ! has_version \>=${CATEGORY}/${PN}-3.4.0_rc1 ; then + CMAKE_BINARY="${S}/Bootstrap.cmk/cmake" + cmake_src_bootstrap + fi +} + +src_configure() { + # Fix linking on Solaris + [[ ${CHOST} == *-solaris* ]] && append-ldflags -lsocket -lnsl + + local mycmakeargs=( + -DCMAKE_USE_SYSTEM_LIBRARIES=ON + -DCMAKE_USE_SYSTEM_LIBRARY_JSONCPP=$(usex system-jsoncpp) + -DCMAKE_INSTALL_PREFIX="${EPREFIX}"/usr + -DCMAKE_DOC_DIR=/share/doc/${PF} + -DCMAKE_MAN_DIR=/share/man + -DCMAKE_DATA_DIR=/share/${PN} + -DSPHINX_MAN=$(usex doc) + -DSPHINX_HTML=$(usex doc) + -DBUILD_CursesDialog="$(usex ncurses)" + ) + + if use qt5 ; then + mycmakeargs+=( + -DBUILD_QtDialog=ON + $(cmake-utils_use_find_package qt5 Qt5Widgets) + ) + fi + + cmake-utils_src_configure +} + +src_compile() { + cmake-utils_src_compile + use emacs && elisp-compile Auxiliary/cmake-mode.el +} + +src_test() { + virtx cmake_src_test +} + +src_install() { + cmake-utils_src_install + + if use emacs; then + elisp-install ${PN} Auxiliary/cmake-mode.el Auxiliary/cmake-mode.elc + elisp-site-file-install "${FILESDIR}/${SITEFILE}" + fi + + insinto /usr/share/vim/vimfiles/syntax + doins Auxiliary/vim/syntax/cmake.vim + + insinto /usr/share/vim/vimfiles/indent + doins Auxiliary/vim/indent/cmake.vim + + insinto /usr/share/vim/vimfiles/ftdetect + doins "${FILESDIR}/${PN}.vim" + + dobashcomp Auxiliary/bash-completion/{${PN},ctest,cpack} + + rm -r "${ED}"/usr/share/cmake/{completions,editors} || die +} + +pkg_postinst() { + use emacs && elisp-site-regen + if use qt5; then + gnome2_icon_cache_update + xdg_desktop_database_update + xdg_mimeinfo_database_update + fi +} + +pkg_postrm() { + use emacs && elisp-site-regen + if use qt5; then + gnome2_icon_cache_update + xdg_desktop_database_update + xdg_mimeinfo_database_update + fi +} diff --git a/sdk_container/src/third_party/portage-stable/dev-util/cmake/cmake-3.9.0.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/cmake/cmake-3.9.6.ebuild similarity index 87% rename from sdk_container/src/third_party/portage-stable/dev-util/cmake/cmake-3.9.0.ebuild rename to sdk_container/src/third_party/portage-stable/dev-util/cmake/cmake-3.9.6.ebuild index d3f3f5aeaa..5debbd53be 100644 --- a/sdk_container/src/third_party/portage-stable/dev-util/cmake/cmake-3.9.0.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-util/cmake/cmake-3.9.6.ebuild @@ -1,22 +1,22 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 CMAKE_MAKEFILE_GENERATOR="emake" CMAKE_REMOVE_MODULES="no" -inherit bash-completion-r1 elisp-common toolchain-funcs eutils versionator cmake-utils virtualx flag-o-matic +inherit bash-completion-r1 elisp-common eutils flag-o-matic gnome2-utils toolchain-funcs versionator virtualx xdg-utils cmake-utils MY_P="${P/_/-}" DESCRIPTION="Cross platform Make" -HOMEPAGE="http://www.cmake.org/" -SRC_URI="http://www.cmake.org/files/v$(get_version_component_range 1-2)/${MY_P}.tar.gz" +HOMEPAGE="https://cmake.org/" +SRC_URI="https://cmake.org/files/v$(get_version_component_range 1-2)/${MY_P}.tar.gz" LICENSE="CMake" SLOT="0" [[ "${PV}" = *_rc* ]] || \ -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" IUSE="doc emacs server system-jsoncpp ncurses qt5" RDEPEND=" @@ -197,8 +197,18 @@ src_install() { pkg_postinst() { use emacs && elisp-site-regen + if use qt5; then + gnome2_icon_cache_update + xdg_desktop_database_update + xdg_mimeinfo_database_update + fi } pkg_postrm() { use emacs && elisp-site-regen + if use qt5; then + gnome2_icon_cache_update + xdg_desktop_database_update + xdg_mimeinfo_database_update + fi } diff --git a/sdk_container/src/third_party/portage-stable/dev-util/cmake/files/cmake-2.8.12.1-FindImageMagick.patch b/sdk_container/src/third_party/portage-stable/dev-util/cmake/files/cmake-2.8.12.1-FindImageMagick.patch deleted file mode 100644 index 0c42303955..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-util/cmake/files/cmake-2.8.12.1-FindImageMagick.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- a/Modules/FindImageMagick.cmake -+++ b/Modules/FindImageMagick.cmake -@@ -147,17 +147,17 @@ - ) - if(component STREQUAL "Magick++") - FIND_IMAGEMAGICK_API(Magick++ Magick++.h -- Magick++ CORE_RL_Magick++_ Magick++-6.Q16 Magick++-Q16 Magick++-6.Q8 Magick++-Q8 Magick++-6.Q16HDRI Magick++-Q16HDRI Magick++-6.Q8HDRI Magick++-Q8HDRI -+ Magick++ CORE_RL_Magick++_ Magick++-6.Q64 Magick++-6.Q64HDRI Magick++-6.Q32 Magick++-6.Q32HDRI Magick++-6.Q16 Magick++-6.Q16HDRI Magick++-6.Q8 Magick++-6.Q8HDRI - ) - list(APPEND ImageMagick_REQUIRED_VARS ImageMagick_Magick++_LIBRARY) - elseif(component STREQUAL "MagickWand") - FIND_IMAGEMAGICK_API(MagickWand wand/MagickWand.h -- Wand MagickWand CORE_RL_wand_ MagickWand-6.Q16 MagickWand-Q16 MagickWand-6.Q8 MagickWand-Q8 MagickWand-6.Q16HDRI MagickWand-Q16HDRI MagickWand-6.Q8HDRI MagickWand-Q8HDRI -+ Wand MagickWand CORE_RL_wand_ MagickWand-6.Q64 MagickWand-6.Q64HDRI MagickWand-6.Q32 MagickWand-6.Q32HDRI MagickWand-6.Q16 MagickWand-6.Q16HDRI MagickWand-6.Q8 MagickWand-6.Q8HDRI - ) - list(APPEND ImageMagick_REQUIRED_VARS ImageMagick_MagickWand_LIBRARY) - elseif(component STREQUAL "MagickCore") - FIND_IMAGEMAGICK_API(MagickCore magick/MagickCore.h -- Magick MagickCore CORE_RL_magick_ MagickCore-6.Q16 MagickCore-Q16 MagickCore-6.Q8 MagickCore-Q8 MagickCore-6.Q16HDRI MagickCore-Q16HDRI MagickCore-6.Q8HDRI MagickCore-Q8HDRI -+ Magick MagickCore CORE_RL_magick_ MagickCore-6.Q64 MagickCore-6.Q64HDRI MagickCore-6.Q32 MagickCore-6.Q32HDRI MagickCore-6.Q16 MagickCore-6.Q16HDRI MagickCore-6.Q8 MagickCore-6.Q8HDRI - ) - list(APPEND ImageMagick_REQUIRED_VARS ImageMagick_MagickCore_LIBRARY) - else() diff --git a/sdk_container/src/third_party/portage-stable/dev-util/cmake/files/cmake-3.0.0-FindBoost-python.patch b/sdk_container/src/third_party/portage-stable/dev-util/cmake/files/cmake-3.0.0-FindBoost-python.patch deleted file mode 100644 index a6291d2b85..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-util/cmake/files/cmake-3.0.0-FindBoost-python.patch +++ /dev/null @@ -1,93 +0,0 @@ -From 934ec9add33d413e4d5c9cec1cb3ebb5cbfd81f4 Mon Sep 17 00:00:00 2001 -From: Michael Palimaka -Date: Thu, 19 Jun 2014 00:17:48 +1000 -Subject: [PATCH] Fix detection of PYTHON_ABI-versioned Boost Python libraries - wrt bug #400969. - ---- - Modules/FindBoost.cmake | 41 +++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 41 insertions(+) - -diff --git a/Modules/FindBoost.cmake b/Modules/FindBoost.cmake -index dfd4460..70bfb4f 100644 ---- a/Modules/FindBoost.cmake -+++ b/Modules/FindBoost.cmake -@@ -952,6 +952,15 @@ foreach(COMPONENT ${Boost_FIND_COMPONENTS}) - set( _boost_docstring_release "Boost ${COMPONENT} library (release)") - set( _boost_docstring_debug "Boost ${COMPONENT} library (debug)") - -+ if(${COMPONENT} STREQUAL "python" OR ${COMPONENT} STREQUAL "mpi_python") -+ # Get version of Python. -+ if (NOT PYTHON_EXECUTABLE) -+ #if a certain version of python was detected by cmake before use that one -+ set(PYTHON_EXECUTABLE "python") -+ endif (NOT PYTHON_EXECUTABLE) -+ execute_process(COMMAND "${PYTHON_EXECUTABLE}" -c "import sys; sys.stdout.write('.'.join(str(x) for x in sys.version_info[:2]))" OUTPUT_VARIABLE _python_version) -+ endif() -+ - # Compute component-specific hints. - set(_Boost_FIND_LIBRARY_HINTS_FOR_COMPONENT "") - if(${COMPONENT} STREQUAL "mpi" OR ${COMPONENT} STREQUAL "mpi_python" OR -@@ -984,6 +993,15 @@ foreach(COMPONENT ${Boost_FIND_COMPONENTS}) - ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}-${Boost_LIB_VERSION} - ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG} - ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT} ) -+ if(${COMPONENT} STREQUAL "python" OR ${COMPONENT} STREQUAL "mpi_python") -+ list(APPEND _boost_RELEASE_NAMES -+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}-${Boost_LIB_VERSION} -+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG} -+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}-${Boost_LIB_VERSION} -+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG} -+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version} ) -+ endif() -+ - if(_boost_STATIC_RUNTIME_WORKAROUND) - set(_boost_RELEASE_STATIC_ABI_TAG "-s${_boost_RELEASE_ABI_TAG}") - list(APPEND _boost_RELEASE_NAMES -@@ -991,6 +1009,13 @@ foreach(COMPONENT ${Boost_FIND_COMPONENTS}) - ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG} - ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}-${Boost_LIB_VERSION} - ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG} ) -+ if(${COMPONENT} STREQUAL "python" OR ${COMPONENT} STREQUAL "mpi_python") -+ list(APPEND _boost_RELEASE_NAMES -+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}-${Boost_LIB_VERSION} -+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG} -+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}-${Boost_LIB_VERSION} -+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG} ) -+ endif() - endif() - if(Boost_THREADAPI AND ${COMPONENT} STREQUAL "thread") - _Boost_PREPEND_LIST_WITH_THREADAPI(_boost_RELEASE_NAMES ${_boost_RELEASE_NAMES}) -@@ -1020,6 +1045,15 @@ foreach(COMPONENT ${Boost_FIND_COMPONENTS}) - ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG} - ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED} - ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT} ) -+ if(${COMPONENT} STREQUAL "python" OR ${COMPONENT} STREQUAL "mpi_python") -+ list(APPEND _boost_DEBUG_NAMES -+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}-${Boost_LIB_VERSION} -+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG} -+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}-${Boost_LIB_VERSION} -+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG} -+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED} -+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version} ) -+ endif() - if(_boost_STATIC_RUNTIME_WORKAROUND) - set(_boost_DEBUG_STATIC_ABI_TAG "-s${_boost_DEBUG_ABI_TAG}") - list(APPEND _boost_DEBUG_NAMES -@@ -1027,6 +1061,13 @@ foreach(COMPONENT ${Boost_FIND_COMPONENTS}) - ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG} - ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}-${Boost_LIB_VERSION} - ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG} ) -+ if(${COMPONENT} STREQUAL "python" OR ${COMPONENT} STREQUAL "mpi_python") -+ list(APPEND _boost_DEBUG_NAMES -+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}-${Boost_LIB_VERSION} -+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG} -+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}-${Boost_LIB_VERSION} -+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG} ) -+ endif() - endif() - if(Boost_THREADAPI AND ${COMPONENT} STREQUAL "thread") - _Boost_PREPEND_LIST_WITH_THREADAPI(_boost_DEBUG_NAMES ${_boost_DEBUG_NAMES}) --- -1.8.5.5 - diff --git a/sdk_container/src/third_party/portage-stable/dev-util/cmake/files/cmake-3.0.0-prefix-dirs.patch b/sdk_container/src/third_party/portage-stable/dev-util/cmake/files/cmake-3.0.0-prefix-dirs.patch deleted file mode 100644 index decfb91260..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-util/cmake/files/cmake-3.0.0-prefix-dirs.patch +++ /dev/null @@ -1,142 +0,0 @@ -From e7ce3e523f8cfa1bc749118f381753230766827f Mon Sep 17 00:00:00 2001 -From: Michael Palimaka -Date: Thu, 19 Jun 2014 00:08:13 +1000 -Subject: [PATCH] Set some proper paths to make cmake find our tools. - -The ebuild now adds an extra / at the end of $EPREFIX so that it is -never the empty string (so that CMAKE_SYSTEM_PREFIX_PATH remains -correct) - -Original patch by Heiko Przybyl. -Updated by Chris Reffett (cmake-2.8.8) -Updated by Johannes Huber (cmake-2.8.9) -Updated by Michael Palimaka (cmake-2.8.10) -Updated by Chris Reffett (cmake-2.8.11) -Updated by Michael Palimaka (cmake-3.0.0) ---- - Modules/Platform/Darwin.cmake | 12 +++++++---- - Modules/Platform/UnixPaths.cmake | 43 ++++++++++++++++++++-------------------- - 2 files changed, 29 insertions(+), 26 deletions(-) - -diff --git a/Modules/Platform/Darwin.cmake b/Modules/Platform/Darwin.cmake -index e25df1e..9b22a6a 100644 ---- a/Modules/Platform/Darwin.cmake -+++ b/Modules/Platform/Darwin.cmake -@@ -132,9 +132,9 @@ set(CMAKE_C_FRAMEWORK_SEARCH_FLAG -F) - set(CMAKE_CXX_FRAMEWORK_SEARCH_FLAG -F) - set(CMAKE_Fortran_FRAMEWORK_SEARCH_FLAG -F) - --# default to searching for frameworks first -+# default to searching for frameworks last - if(NOT DEFINED CMAKE_FIND_FRAMEWORK) -- set(CMAKE_FIND_FRAMEWORK FIRST) -+ set(CMAKE_FIND_FRAMEWORK LAST) - endif() - - # Older OS X linkers do not report their framework search path -@@ -156,6 +156,8 @@ endif() - - # set up the default search directories for frameworks - set(CMAKE_SYSTEM_FRAMEWORK_PATH -+ @GENTOO_PORTAGE_EPREFIX@Frameworks -+ @GENTOO_PORTAGE_EPREFIX@usr/lib - ~/Library/Frameworks - ) - if(_CMAKE_OSX_SYSROOT_PATH) -@@ -187,13 +189,15 @@ if(CMAKE_OSX_SYSROOT) - endif() - endif() - --# default to searching for application bundles first -+# default to searching for application bundles last - if(NOT DEFINED CMAKE_FIND_APPBUNDLE) -- set(CMAKE_FIND_APPBUNDLE FIRST) -+ set(CMAKE_FIND_APPBUNDLE LAST) - endif() - # set up the default search directories for application bundles - set(_apps_paths) - foreach(_path -+ @GENTOO_PORTAGE_EPREFIX@Applications -+ @GENTOO_PORTAGE_EPREFIX@usr/bin - "~/Applications" - "/Applications" - "${OSX_DEVELOPER_ROOT}/../Applications" # Xcode 4.3+ -diff --git a/Modules/Platform/UnixPaths.cmake b/Modules/Platform/UnixPaths.cmake -index 20ee1d1..3481ca8 100644 ---- a/Modules/Platform/UnixPaths.cmake -+++ b/Modules/Platform/UnixPaths.cmake -@@ -33,6 +33,7 @@ get_filename_component(_CMAKE_INSTALL_DIR "${_CMAKE_INSTALL_DIR}" PATH) - # search types. - list(APPEND CMAKE_SYSTEM_PREFIX_PATH - # Standard -+ @GENTOO_PORTAGE_EPREFIX@usr/local @GENTOO_PORTAGE_EPREFIX@usr @GENTOO_PORTAGE_EPREFIX@ - /usr/local /usr / - - # CMake install location -@@ -53,43 +54,41 @@ endif() - - # List common include file locations not under the common prefixes. - list(APPEND CMAKE_SYSTEM_INCLUDE_PATH -- # Windows API on Cygwin -- /usr/include/w32api -- -- # X11 -- /usr/X11R6/include /usr/include/X11 -- -- # Other -- /usr/pkg/include -- /opt/csw/include /opt/include -- /usr/openwin/include -+ @GENTOO_PORTAGE_EPREFIX@usr/include - ) - - list(APPEND CMAKE_SYSTEM_LIBRARY_PATH -- # Windows API on Cygwin -- /usr/lib/w32api -- -- # X11 -- /usr/X11R6/lib /usr/lib/X11 -- -- # Other -- /usr/pkg/lib -- /opt/csw/lib /opt/lib -- /usr/openwin/lib -+ @GENTOO_PORTAGE_GCCLIBDIR@/gcc -+ @GENTOO_PORTAGE_GCCLIBDIR@ -+ @GENTOO_PORTAGE_EPREFIX@usr/lib64 -+ @GENTOO_PORTAGE_EPREFIX@usr/libx32 -+ @GENTOO_PORTAGE_EPREFIX@usr/lib32 -+ @GENTOO_PORTAGE_EPREFIX@usr/lib -+ @GENTOO_PORTAGE_EPREFIX@lib - ) - - list(APPEND CMAKE_SYSTEM_PROGRAM_PATH -- /usr/pkg/bin -+ @GENTOO_PORTAGE_EPREFIX@usr/bin -+ @GENTOO_PORTAGE_EPREFIX@bin - ) - - list(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES -- /lib /lib32 /lib64 /usr/lib /usr/lib32 /usr/lib64 -+ @GENTOO_PORTAGE_GCCLIBDIR@/gcc -+ @GENTOO_PORTAGE_GCCLIBDIR@ -+ @GENTOO_PORTAGE_EPREFIX@usr/lib64 -+ @GENTOO_PORTAGE_EPREFIX@usr/libx32 -+ @GENTOO_PORTAGE_EPREFIX@usr/lib32 -+ @GENTOO_PORTAGE_EPREFIX@usr/lib -+ @GENTOO_PORTAGE_EPREFIX@lib -+ /lib /usr/lib /usr/lib32 /usr/lib64 /usr/libx32 - ) - - list(APPEND CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES -+ GENTOO_PORTAGE_EPREFIX@usr/include - /usr/include - ) - list(APPEND CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES -+ @GENTOO_PORTAGE_EPREFIX@usr/include - /usr/include - ) - --- -1.8.5.5 - diff --git a/sdk_container/src/third_party/portage-stable/dev-util/cmake/files/cmake-3.1.0-FindPythonInterp.patch b/sdk_container/src/third_party/portage-stable/dev-util/cmake/files/cmake-3.1.0-FindPythonInterp.patch deleted file mode 100644 index bb3ca9580a..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-util/cmake/files/cmake-3.1.0-FindPythonInterp.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- a/Modules/FindPythonInterp.cmake -+++ b/Modules/FindPythonInterp.cmake -@@ -75,6 +75,11 @@ - else() - set(_PYTHON_FIND_OTHER_VERSIONS ${_PYTHON3_VERSIONS} ${_PYTHON2_VERSIONS} ${_PYTHON1_VERSIONS}) - endif() -+ -+if (CMAKE_GENTOO_BUILD OR CMAKE_BUILD_TYPE STREQUAL Gentoo) -+ set(_Python_NAMES python) -+endif() -+ - find_program(PYTHON_EXECUTABLE NAMES ${_Python_NAMES}) - - # Set up the versions we know about, in the order we will search. Always add -@@ -99,12 +104,13 @@ - unset(_PYTHON3_VERSIONS) - - # Search for newest python version if python executable isn't found --if(NOT PYTHON_EXECUTABLE) -+if(NOT PYTHON_EXECUTABLE AND NOT (CMAKE_GENTOO_BUILD OR CMAKE_BUILD_TYPE STREQUAL Gentoo)) - foreach(_CURRENT_VERSION IN LISTS _Python_VERSIONS) - set(_Python_NAMES python${_CURRENT_VERSION}) - if(WIN32) - list(APPEND _Python_NAMES python) - endif() -+ - find_program(PYTHON_EXECUTABLE - NAMES ${_Python_NAMES} - PATHS [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\${_CURRENT_VERSION}\\InstallPath] diff --git a/sdk_container/src/third_party/portage-stable/dev-util/cmake/files/cmake-3.11.0_rc2-FindBLAS.patch b/sdk_container/src/third_party/portage-stable/dev-util/cmake/files/cmake-3.11.0_rc2-FindBLAS.patch new file mode 100644 index 0000000000..6bad45b208 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-util/cmake/files/cmake-3.11.0_rc2-FindBLAS.patch @@ -0,0 +1,23 @@ +--- a/Modules/FindBLAS.cmake ++++ b/Modules/FindBLAS.cmake +@@ -4,6 +4,10 @@ + # + # Find BLAS library + # ++# Version modified for Gentoo Linux. ++# If a valid PkgConfig configuration is found, this overrides and cancels ++# all further checks. ++# + # This module finds an installed fortran library that implements the + # BLAS linear-algebra interface (see http://www.netlib.org/blas/). The + # list of libraries searched for is taken from the autoconf macro file, +@@ -50,6 +54,9 @@ + # (To distribute this file outside of CMake, substitute the full + # License text for the above reference.) + ++# first, try PkgConfig ++set(BLA_PREFER_PKGCONFIG On) ++ + include(${CMAKE_CURRENT_LIST_DIR}/CheckFunctionExists.cmake) + include(${CMAKE_CURRENT_LIST_DIR}/CheckFortranFunctionExists.cmake) + diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-util/cmake-3.10.2 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-util/cmake-3.10.2 new file mode 100644 index 0000000000..35845c125f --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-util/cmake-3.10.2 @@ -0,0 +1,13 @@ +DEFINED_PHASES=compile configure install postinst postrm prepare test +DEPEND=app-crypt/rhash >=app-arch/libarchive-3.0.0:= >=dev-libs/expat-2.0.1 >=dev-libs/libuv-1.0.0:= >=net-misc/curl-7.21.5[ssl] sys-libs/zlib virtual/pkgconfig emacs? ( virtual/emacs ) ncurses? ( sys-libs/ncurses:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) system-jsoncpp? ( >=dev-libs/jsoncpp-0.6.0_rc2:0= ) doc? ( dev-python/sphinx ) >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) sys-devel/make +DESCRIPTION=Cross platform Make +EAPI=6 +HOMEPAGE=https://cmake.org/ +IUSE=doc emacs system-jsoncpp ncurses qt5 test +KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris +LICENSE=CMake +RDEPEND=app-crypt/rhash >=app-arch/libarchive-3.0.0:= >=dev-libs/expat-2.0.1 >=dev-libs/libuv-1.0.0:= >=net-misc/curl-7.21.5[ssl] sys-libs/zlib virtual/pkgconfig emacs? ( virtual/emacs ) ncurses? ( sys-libs/ncurses:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) system-jsoncpp? ( >=dev-libs/jsoncpp-0.6.0_rc2:0= ) +SLOT=0 +SRC_URI=https://cmake.org/files/v3.10/cmake-3.10.2.tar.gz +_eclasses_=bash-completion-r1 8e447753aaf658afa609fbf961d80ab7 cmake-utils f9fb12e2dbe2e0c9c17f030bae85eb02 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 flag-o-matic 2274fcc1e7ef6affaff5bcd636275417 gnome2-utils 4d211d7614f303710fca59db6ec12c88 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing 6f5991c7101863d0b29df63990ad852e ninja-utils ebb2eaddc6331c4fa000b8eb8f6fe074 toolchain-funcs 185a06792159ca143528e7010368e8af versionator c80ccf29e90adea7c5cae94b42eb76d0 virtualx 171580f737f5aaf18fcb456548588066 xdg-utils f2c8335407f0b935b0a96d4adf23ef25 +_md5_=b0204f9bdfa02fe4d32aafc5e5f36a55 diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-util/cmake-3.10.3 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-util/cmake-3.10.3 new file mode 100644 index 0000000000..39efbeb783 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-util/cmake-3.10.3 @@ -0,0 +1,13 @@ +DEFINED_PHASES=compile configure install postinst postrm prepare test +DEPEND=app-crypt/rhash >=app-arch/libarchive-3.0.0:= >=dev-libs/expat-2.0.1 >=dev-libs/libuv-1.0.0:= >=net-misc/curl-7.21.5[ssl] sys-libs/zlib virtual/pkgconfig emacs? ( virtual/emacs ) ncurses? ( sys-libs/ncurses:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) system-jsoncpp? ( >=dev-libs/jsoncpp-0.6.0_rc2:0= ) doc? ( dev-python/sphinx ) >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) sys-devel/make +DESCRIPTION=Cross platform Make +EAPI=6 +HOMEPAGE=https://cmake.org/ +IUSE=doc emacs system-jsoncpp ncurses qt5 test +KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris +LICENSE=CMake +RDEPEND=app-crypt/rhash >=app-arch/libarchive-3.0.0:= >=dev-libs/expat-2.0.1 >=dev-libs/libuv-1.0.0:= >=net-misc/curl-7.21.5[ssl] sys-libs/zlib virtual/pkgconfig emacs? ( virtual/emacs ) ncurses? ( sys-libs/ncurses:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) system-jsoncpp? ( >=dev-libs/jsoncpp-0.6.0_rc2:0= ) +SLOT=0 +SRC_URI=https://cmake.org/files/v3.10/cmake-3.10.3.tar.gz +_eclasses_=bash-completion-r1 8e447753aaf658afa609fbf961d80ab7 cmake-utils f9fb12e2dbe2e0c9c17f030bae85eb02 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 flag-o-matic 2274fcc1e7ef6affaff5bcd636275417 gnome2-utils 4d211d7614f303710fca59db6ec12c88 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing 6f5991c7101863d0b29df63990ad852e ninja-utils ebb2eaddc6331c4fa000b8eb8f6fe074 toolchain-funcs 185a06792159ca143528e7010368e8af versionator c80ccf29e90adea7c5cae94b42eb76d0 virtualx 171580f737f5aaf18fcb456548588066 xdg-utils f2c8335407f0b935b0a96d4adf23ef25 +_md5_=b0204f9bdfa02fe4d32aafc5e5f36a55 diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-util/cmake-3.11.0 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-util/cmake-3.11.0 new file mode 100644 index 0000000000..5ffc48cfd3 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-util/cmake-3.11.0 @@ -0,0 +1,13 @@ +DEFINED_PHASES=compile configure install postinst postrm prepare test +DEPEND=app-crypt/rhash >=app-arch/libarchive-3.0.0:= >=dev-libs/expat-2.0.1 >=dev-libs/libuv-1.0.0:= >=net-misc/curl-7.21.5[ssl] sys-libs/zlib virtual/pkgconfig emacs? ( virtual/emacs ) ncurses? ( sys-libs/ncurses:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) system-jsoncpp? ( >=dev-libs/jsoncpp-0.6.0_rc2:0= ) doc? ( dev-python/sphinx ) >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) sys-devel/make +DESCRIPTION=Cross platform Make +EAPI=6 +HOMEPAGE=https://cmake.org/ +IUSE=doc emacs system-jsoncpp ncurses qt5 test +KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris +LICENSE=CMake +RDEPEND=app-crypt/rhash >=app-arch/libarchive-3.0.0:= >=dev-libs/expat-2.0.1 >=dev-libs/libuv-1.0.0:= >=net-misc/curl-7.21.5[ssl] sys-libs/zlib virtual/pkgconfig emacs? ( virtual/emacs ) ncurses? ( sys-libs/ncurses:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) system-jsoncpp? ( >=dev-libs/jsoncpp-0.6.0_rc2:0= ) +SLOT=0 +SRC_URI=https://cmake.org/files/v3.11/cmake-3.11.0.tar.gz +_eclasses_=bash-completion-r1 8e447753aaf658afa609fbf961d80ab7 cmake-utils f9fb12e2dbe2e0c9c17f030bae85eb02 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 flag-o-matic 2274fcc1e7ef6affaff5bcd636275417 gnome2-utils 4d211d7614f303710fca59db6ec12c88 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing 6f5991c7101863d0b29df63990ad852e ninja-utils ebb2eaddc6331c4fa000b8eb8f6fe074 toolchain-funcs 185a06792159ca143528e7010368e8af versionator c80ccf29e90adea7c5cae94b42eb76d0 virtualx 171580f737f5aaf18fcb456548588066 xdg-utils f2c8335407f0b935b0a96d4adf23ef25 +_md5_=56b3b321e1620e16b106a3f5d528b394 diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-util/cmake-3.11.1 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-util/cmake-3.11.1 new file mode 100644 index 0000000000..c22bad2808 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-util/cmake-3.11.1 @@ -0,0 +1,13 @@ +DEFINED_PHASES=compile configure install postinst postrm prepare test +DEPEND=app-crypt/rhash >=app-arch/libarchive-3.0.0:= >=dev-libs/expat-2.0.1 >=dev-libs/libuv-1.0.0:= >=net-misc/curl-7.21.5[ssl] sys-libs/zlib virtual/pkgconfig emacs? ( virtual/emacs ) ncurses? ( sys-libs/ncurses:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) system-jsoncpp? ( >=dev-libs/jsoncpp-0.6.0_rc2:0= ) doc? ( dev-python/sphinx ) >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) sys-devel/make +DESCRIPTION=Cross platform Make +EAPI=6 +HOMEPAGE=https://cmake.org/ +IUSE=doc emacs system-jsoncpp ncurses qt5 test +KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris +LICENSE=CMake +RDEPEND=app-crypt/rhash >=app-arch/libarchive-3.0.0:= >=dev-libs/expat-2.0.1 >=dev-libs/libuv-1.0.0:= >=net-misc/curl-7.21.5[ssl] sys-libs/zlib virtual/pkgconfig emacs? ( virtual/emacs ) ncurses? ( sys-libs/ncurses:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) system-jsoncpp? ( >=dev-libs/jsoncpp-0.6.0_rc2:0= ) +SLOT=0 +SRC_URI=https://cmake.org/files/v3.11/cmake-3.11.1.tar.gz +_eclasses_=bash-completion-r1 8e447753aaf658afa609fbf961d80ab7 cmake-utils f9fb12e2dbe2e0c9c17f030bae85eb02 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 flag-o-matic 2274fcc1e7ef6affaff5bcd636275417 gnome2-utils 4d211d7614f303710fca59db6ec12c88 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing 6f5991c7101863d0b29df63990ad852e ninja-utils ebb2eaddc6331c4fa000b8eb8f6fe074 toolchain-funcs 185a06792159ca143528e7010368e8af versionator c80ccf29e90adea7c5cae94b42eb76d0 virtualx 171580f737f5aaf18fcb456548588066 xdg-utils f2c8335407f0b935b0a96d4adf23ef25 +_md5_=56b3b321e1620e16b106a3f5d528b394 diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-util/cmake-3.7.2 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-util/cmake-3.7.2 deleted file mode 100644 index fdffd16362..0000000000 --- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-util/cmake-3.7.2 +++ /dev/null @@ -1,13 +0,0 @@ -DEFINED_PHASES=compile configure install postinst postrm prepare test -DEPEND=>=app-arch/libarchive-3.0.0:= >=dev-libs/expat-2.0.1 >=dev-libs/libuv-1.0.0:= >=net-misc/curl-7.21.5[ssl] sys-libs/zlib virtual/pkgconfig emacs? ( virtual/emacs ) ncurses? ( sys-libs/ncurses:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) system-jsoncpp? ( >=dev-libs/jsoncpp-0.6.0_rc2:0= ) doc? ( dev-python/sphinx ) sys-devel/make test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) -DESCRIPTION=Cross platform Make -EAPI=6 -HOMEPAGE=http://www.cmake.org/ -IUSE=doc emacs system-jsoncpp ncurses qt5 test -KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris -LICENSE=CMake -RDEPEND=>=app-arch/libarchive-3.0.0:= >=dev-libs/expat-2.0.1 >=dev-libs/libuv-1.0.0:= >=net-misc/curl-7.21.5[ssl] sys-libs/zlib virtual/pkgconfig emacs? ( virtual/emacs ) ncurses? ( sys-libs/ncurses:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) system-jsoncpp? ( >=dev-libs/jsoncpp-0.6.0_rc2:0= ) -SLOT=0 -SRC_URI=http://www.cmake.org/files/v3.7/cmake-3.7.2.tar.gz -_eclasses_=bash-completion-r1 8e447753aaf658afa609fbf961d80ab7 cmake-utils f9fb12e2dbe2e0c9c17f030bae85eb02 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 flag-o-matic 2274fcc1e7ef6affaff5bcd636275417 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing 6f5991c7101863d0b29df63990ad852e ninja-utils ebb2eaddc6331c4fa000b8eb8f6fe074 toolchain-funcs 185a06792159ca143528e7010368e8af versionator c80ccf29e90adea7c5cae94b42eb76d0 virtualx 171580f737f5aaf18fcb456548588066 -_md5_=c4ec63ed493d92fbc517032d67ea6250 diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-util/cmake-3.9.0 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-util/cmake-3.9.0 deleted file mode 100644 index b5c878a183..0000000000 --- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-util/cmake-3.9.0 +++ /dev/null @@ -1,13 +0,0 @@ -DEFINED_PHASES=compile configure install postinst postrm prepare test -DEPEND=app-crypt/rhash >=app-arch/libarchive-3.0.0:= >=dev-libs/expat-2.0.1 >=net-misc/curl-7.21.5[ssl] sys-libs/zlib virtual/pkgconfig emacs? ( virtual/emacs ) ncurses? ( sys-libs/ncurses:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) server? ( >=dev-libs/libuv-1.0.0:= ) system-jsoncpp? ( >=dev-libs/jsoncpp-0.6.0_rc2:0= ) doc? ( dev-python/sphinx ) sys-devel/make test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) -DESCRIPTION=Cross platform Make -EAPI=6 -HOMEPAGE=http://www.cmake.org/ -IUSE=doc emacs server system-jsoncpp ncurses qt5 test -KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris -LICENSE=CMake -RDEPEND=app-crypt/rhash >=app-arch/libarchive-3.0.0:= >=dev-libs/expat-2.0.1 >=net-misc/curl-7.21.5[ssl] sys-libs/zlib virtual/pkgconfig emacs? ( virtual/emacs ) ncurses? ( sys-libs/ncurses:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) server? ( >=dev-libs/libuv-1.0.0:= ) system-jsoncpp? ( >=dev-libs/jsoncpp-0.6.0_rc2:0= ) -SLOT=0 -SRC_URI=http://www.cmake.org/files/v3.9/cmake-3.9.0.tar.gz -_eclasses_=bash-completion-r1 8e447753aaf658afa609fbf961d80ab7 cmake-utils f9fb12e2dbe2e0c9c17f030bae85eb02 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 flag-o-matic 2274fcc1e7ef6affaff5bcd636275417 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing 6f5991c7101863d0b29df63990ad852e ninja-utils ebb2eaddc6331c4fa000b8eb8f6fe074 toolchain-funcs 185a06792159ca143528e7010368e8af versionator c80ccf29e90adea7c5cae94b42eb76d0 virtualx 171580f737f5aaf18fcb456548588066 -_md5_=abb9f30198600ad65e896ce1acf12992 diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-util/cmake-3.9.1 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-util/cmake-3.9.1 deleted file mode 100644 index e9dd7cdb20..0000000000 --- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-util/cmake-3.9.1 +++ /dev/null @@ -1,13 +0,0 @@ -DEFINED_PHASES=compile configure install postinst postrm prepare test -DEPEND=app-crypt/rhash >=app-arch/libarchive-3.0.0:= >=dev-libs/expat-2.0.1 >=net-misc/curl-7.21.5[ssl] sys-libs/zlib virtual/pkgconfig emacs? ( virtual/emacs ) ncurses? ( sys-libs/ncurses:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) server? ( >=dev-libs/libuv-1.0.0:= ) system-jsoncpp? ( >=dev-libs/jsoncpp-0.6.0_rc2:0= ) doc? ( dev-python/sphinx ) sys-devel/make test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) -DESCRIPTION=Cross platform Make -EAPI=6 -HOMEPAGE=http://www.cmake.org/ -IUSE=doc emacs server system-jsoncpp ncurses qt5 test -KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris -LICENSE=CMake -RDEPEND=app-crypt/rhash >=app-arch/libarchive-3.0.0:= >=dev-libs/expat-2.0.1 >=net-misc/curl-7.21.5[ssl] sys-libs/zlib virtual/pkgconfig emacs? ( virtual/emacs ) ncurses? ( sys-libs/ncurses:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) server? ( >=dev-libs/libuv-1.0.0:= ) system-jsoncpp? ( >=dev-libs/jsoncpp-0.6.0_rc2:0= ) -SLOT=0 -SRC_URI=http://www.cmake.org/files/v3.9/cmake-3.9.1.tar.gz -_eclasses_=bash-completion-r1 8e447753aaf658afa609fbf961d80ab7 cmake-utils f9fb12e2dbe2e0c9c17f030bae85eb02 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 flag-o-matic 2274fcc1e7ef6affaff5bcd636275417 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing 6f5991c7101863d0b29df63990ad852e ninja-utils ebb2eaddc6331c4fa000b8eb8f6fe074 toolchain-funcs 185a06792159ca143528e7010368e8af versionator c80ccf29e90adea7c5cae94b42eb76d0 virtualx 171580f737f5aaf18fcb456548588066 -_md5_=abb9f30198600ad65e896ce1acf12992 diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-util/cmake-3.8.2 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-util/cmake-3.9.6 similarity index 56% rename from sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-util/cmake-3.8.2 rename to sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-util/cmake-3.9.6 index f77cbee2b8..fa3e689079 100644 --- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-util/cmake-3.8.2 +++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-util/cmake-3.9.6 @@ -1,13 +1,13 @@ DEFINED_PHASES=compile configure install postinst postrm prepare test -DEPEND=app-crypt/rhash >=app-arch/libarchive-3.0.0:= >=dev-libs/expat-2.0.1 >=net-misc/curl-7.21.5[ssl] sys-libs/zlib virtual/pkgconfig emacs? ( virtual/emacs ) ncurses? ( sys-libs/ncurses:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) server? ( >=dev-libs/libuv-1.0.0:= ) system-jsoncpp? ( >=dev-libs/jsoncpp-0.6.0_rc2:0= ) doc? ( dev-python/sphinx ) sys-devel/make test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) +DEPEND=app-crypt/rhash >=app-arch/libarchive-3.0.0:= >=dev-libs/expat-2.0.1 >=net-misc/curl-7.21.5[ssl] sys-libs/zlib virtual/pkgconfig emacs? ( virtual/emacs ) ncurses? ( sys-libs/ncurses:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) server? ( >=dev-libs/libuv-1.0.0:= ) system-jsoncpp? ( >=dev-libs/jsoncpp-0.6.0_rc2:0= ) doc? ( dev-python/sphinx ) >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) sys-devel/make DESCRIPTION=Cross platform Make EAPI=6 -HOMEPAGE=http://www.cmake.org/ +HOMEPAGE=https://cmake.org/ IUSE=doc emacs server system-jsoncpp ncurses qt5 test -KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris +KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris LICENSE=CMake RDEPEND=app-crypt/rhash >=app-arch/libarchive-3.0.0:= >=dev-libs/expat-2.0.1 >=net-misc/curl-7.21.5[ssl] sys-libs/zlib virtual/pkgconfig emacs? ( virtual/emacs ) ncurses? ( sys-libs/ncurses:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) server? ( >=dev-libs/libuv-1.0.0:= ) system-jsoncpp? ( >=dev-libs/jsoncpp-0.6.0_rc2:0= ) SLOT=0 -SRC_URI=http://www.cmake.org/files/v3.8/cmake-3.8.2.tar.gz -_eclasses_=bash-completion-r1 8e447753aaf658afa609fbf961d80ab7 cmake-utils f9fb12e2dbe2e0c9c17f030bae85eb02 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 flag-o-matic 2274fcc1e7ef6affaff5bcd636275417 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing 6f5991c7101863d0b29df63990ad852e ninja-utils ebb2eaddc6331c4fa000b8eb8f6fe074 toolchain-funcs 185a06792159ca143528e7010368e8af versionator c80ccf29e90adea7c5cae94b42eb76d0 virtualx 171580f737f5aaf18fcb456548588066 -_md5_=f33114acb093e22393e515f804db3a73 +SRC_URI=https://cmake.org/files/v3.9/cmake-3.9.6.tar.gz +_eclasses_=bash-completion-r1 8e447753aaf658afa609fbf961d80ab7 cmake-utils f9fb12e2dbe2e0c9c17f030bae85eb02 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 flag-o-matic 2274fcc1e7ef6affaff5bcd636275417 gnome2-utils 4d211d7614f303710fca59db6ec12c88 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing 6f5991c7101863d0b29df63990ad852e ninja-utils ebb2eaddc6331c4fa000b8eb8f6fe074 toolchain-funcs 185a06792159ca143528e7010368e8af versionator c80ccf29e90adea7c5cae94b42eb76d0 virtualx 171580f737f5aaf18fcb456548588066 xdg-utils f2c8335407f0b935b0a96d4adf23ef25 +_md5_=49a7c6e3cfc375cfb363ce7c8ba778a5 From 0e1e958888ae64e46a9c12ba2a85340eca0aae58 Mon Sep 17 00:00:00 2001 From: David Michael Date: Mon, 14 May 2018 14:03:40 -0400 Subject: [PATCH 07/21] bump(app-crypt/rhash): sync with upstream --- .../portage-stable/app-crypt/rhash/Manifest | 2 + .../rhash/files/rhash-1.3.6-no_echon.patch | 54 +++++++++++ .../app-crypt/rhash/files/unquote-cc.patch | 26 +++++ .../app-crypt/rhash/metadata.xml | 16 ++++ .../app-crypt/rhash/rhash-1.3.5.ebuild | 94 +++++++++++++++++++ .../app-crypt/rhash/rhash-1.3.6-r1.ebuild | 77 +++++++++++++++ .../metadata/md5-cache/app-crypt/rhash-1.3.5 | 13 +++ .../md5-cache/app-crypt/rhash-1.3.6-r1 | 13 +++ 8 files changed, 295 insertions(+) create mode 100644 sdk_container/src/third_party/portage-stable/app-crypt/rhash/Manifest create mode 100644 sdk_container/src/third_party/portage-stable/app-crypt/rhash/files/rhash-1.3.6-no_echon.patch create mode 100644 sdk_container/src/third_party/portage-stable/app-crypt/rhash/files/unquote-cc.patch create mode 100644 sdk_container/src/third_party/portage-stable/app-crypt/rhash/metadata.xml create mode 100644 sdk_container/src/third_party/portage-stable/app-crypt/rhash/rhash-1.3.5.ebuild create mode 100644 sdk_container/src/third_party/portage-stable/app-crypt/rhash/rhash-1.3.6-r1.ebuild create mode 100644 sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-crypt/rhash-1.3.5 create mode 100644 sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-crypt/rhash-1.3.6-r1 diff --git a/sdk_container/src/third_party/portage-stable/app-crypt/rhash/Manifest b/sdk_container/src/third_party/portage-stable/app-crypt/rhash/Manifest new file mode 100644 index 0000000000..f3404d7c09 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/app-crypt/rhash/Manifest @@ -0,0 +1,2 @@ +DIST rhash-1.3.5-src.tar.gz 316867 BLAKE2B 3ffbf2ec5aef24ef63455e21c3efcae043a321a78be522a26bd25086111430071a496ab3775ff9b4956da7304df8d8e552a061f3306a7a683be5fc65ea3fd1c4 SHA512 e8450aab0c16bfb975bf4aeee218740fb4d86d5514e426b70c3edb84e4d63865cd4051939aa95c24a87a78baaedc49e40bb509b2610e89ca3745930808b3ef6c +DIST rhash-1.3.6-src.tar.gz 328097 BLAKE2B c74993d183f0f2e479f0bd5831a9f653b9bd17bbed4d1ba896f6e33db98b7141175cd3c688dc41dfd8ec4b98acb51255ae5b795435cbc9dfb5ab77573cb25543 SHA512 54f7f238ed1fdc01c29cc1338fa86be90b69beff0df8f20d24ce9cb3c48c7f4668b84a3fe0d4d8b04b54bc8145485d493435edf3219de3a637af0f9c007c85c6 diff --git a/sdk_container/src/third_party/portage-stable/app-crypt/rhash/files/rhash-1.3.6-no_echon.patch b/sdk_container/src/third_party/portage-stable/app-crypt/rhash/files/rhash-1.3.6-no_echon.patch new file mode 100644 index 0000000000..9b25b29a89 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/app-crypt/rhash/files/rhash-1.3.6-no_echon.patch @@ -0,0 +1,54 @@ +From c1776248a0b34a690e99ab9a7a814c34f78088ec Mon Sep 17 00:00:00 2001 +From: Lars Wendler +Date: Mon, 19 Mar 2018 10:47:13 +0100 +Subject: [PATCH] "echo -n" cannot be expected to work with every POSIX shell + +See "man 1p echo" section APPLICATION USAGE. This patch replaces "echo -n" +with "printf '%s'". +--- + configure | 15 ++------------- + 1 file changed, 2 insertions(+), 13 deletions(-) + +diff --git a/configure b/configure +index f480f7b..2a7d485 100755 +--- a/configure ++++ b/configure +@@ -22,17 +22,6 @@ INSTALL_LIB_STATIC=auto + INSTALL_LIB_SHARED=auto + INSTALL_PKGCONFIGDIR="$PKG_INSTALLDIR" + +-case $(echo -n) in +- -n) # SysV style +- ECHO_N= +- ECHO_C='\c' +- ;; +- *) # BSD style +- ECHO_N='-n ' +- ECHO_C= +- ;; +-esac +- + # display error message and exit + die () { + echo +@@ -235,7 +224,7 @@ trap remove_tmpdir EXIT + + str_concat() + { +- echo ${ECHO_N} $@ ${ECHO_C} ++ printf '%s ' $@ + } + + yn_nonempty() +@@ -246,7 +235,7 @@ yn_nonempty() + # Use this before starting a check + start_check() { + echo "============ Checking for $1 ============" >> "$TMPLOG" +- echo ${ECHO_N} "Checking for $1 ... ${ECHO_C}" ++ printf '%s' "Checking for $1 ... " + res_comment="" + } + +-- +2.16.2 + diff --git a/sdk_container/src/third_party/portage-stable/app-crypt/rhash/files/unquote-cc.patch b/sdk_container/src/third_party/portage-stable/app-crypt/rhash/files/unquote-cc.patch new file mode 100644 index 0000000000..77ccc9b2c5 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/app-crypt/rhash/files/unquote-cc.patch @@ -0,0 +1,26 @@ +From 4558d6753611ab1bf21765017e5b451aee8409f6 Mon Sep 17 00:00:00 2001 +From: James Le Cuirot +Date: Sun, 18 Mar 2018 14:23:28 +0000 +Subject: [PATCH] configure: Don't quote $CC when calling it + +It might have additional arguments. +--- + configure | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure b/configure +index f480f7b..8ebb929 100755 +--- a/configure ++++ b/configure +@@ -480,7 +480,7 @@ if test "$(basename $CC)" = "icc" || test "$(basename $CC)" = "ecc"; then + else + CC_TMP="$CC" + for CC in "$CC_TMP" gcc cc ; do +- if "$CC" -v >/dev/null 2>&1; then ++ if $CC -v >/dev/null 2>&1; then + cc_name_tmp=$($CC -v 2>&1 | tail -n 1 | cut -d ' ' -f 1) + if test "$cc_name_tmp" = "gcc"; then + cc_name=$cc_name_tmp +-- +2.16.1 + diff --git a/sdk_container/src/third_party/portage-stable/app-crypt/rhash/metadata.xml b/sdk_container/src/third_party/portage-stable/app-crypt/rhash/metadata.xml new file mode 100644 index 0000000000..a6651d883c --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/app-crypt/rhash/metadata.xml @@ -0,0 +1,16 @@ + + + + + chewi@gentoo.org + James Le Cuirot + + + rhash + rhash/RHash + https://github.com/rhash/RHash/issues + + + RHash is a console utility for calculation and verification of magnet links and a wide range of hash sums like CRC32, MD4, MD5, SHA1, SHA256, SHA512, SHA3, AICH, ED2K, Tiger, DC++ TTH, BitTorrent BTIH, GOST R 34.11-94, RIPEMD-160, HAS-160, EDON-R, Whirlpool and Snefru. + + diff --git a/sdk_container/src/third_party/portage-stable/app-crypt/rhash/rhash-1.3.5.ebuild b/sdk_container/src/third_party/portage-stable/app-crypt/rhash/rhash-1.3.5.ebuild new file mode 100644 index 0000000000..dd34f36efb --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/app-crypt/rhash/rhash-1.3.5.ebuild @@ -0,0 +1,94 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit toolchain-funcs multilib-minimal + +DESCRIPTION="Console utility and library for computing and verifying file hash sums" +HOMEPAGE="http://rhash.anz.ru/" +SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" +IUSE="debug nls libressl ssl static-libs" + +RDEPEND=" + ssl? ( + !libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] ) + libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] ) +)" + +DEPEND="${RDEPEND} + nls? ( sys-devel/gettext )" + +S="${WORKDIR}/RHash-${PV}" + +src_prepare() { + default + + # Install /etc stuff inside the Prefix + sed -i -e 's:\$(DESTDIR)/etc:\$(DESTDIR)/$(SYSCONFDIR):g' Makefile || die + + if use elibc_Darwin ; then + local ver_script='-Wl,--version-script,exports.sym,-soname,$(SONAME)' + local install_name='-install_name $(LIBDIR)/$(SONAME)' + sed -i -e '/^\(SONAME\|SHAREDLIB\)/s/\.so\.\([0-9]\+\)/.\1.dylib/' \ + -e '/^SOLINK/s/\.so/.dylib/' \ + -e "s:${ver_script}:${install_name}:" \ + librhash/Makefile \ + Makefile || die + fi + + if use elibc_SunOS ; then + # https://sourceware.org/bugzilla/show_bug.cgi?id=12548 + # skip the export.sym for now + sed -i -e 's/,--version-script,exports.sym//' librhash/Makefile || die + fi + + multilib_copy_sources +} + +multilib_src_compile() { + local ADDCFLAGS=( + $(use debug || echo -DNDEBUG) + $(use nls && echo -DUSE_GETTEXT) + $(use ssl && echo -DOPENSSL_RUNTIME -rdynamic) + ) + + local ADDLDFLAGS=( + $(use ssl && echo -ldl) + ) + + use elibc_Darwin || use elibc_DragonFly || use elibc_FreeBSD || + use elibc_NetBSD || use elibc_OpenBSD || use elibc_SunOS && + ADDLDFLAGS+=( $(use nls && echo -lintl) ) + + emake CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" \ + ADDCFLAGS="${ADDCFLAGS[*]}" ADDLDFLAGS="${ADDLDFLAGS[*]}" \ + PREFIX="${EPREFIX}"/usr LIBDIR='$(PREFIX)'/$(get_libdir) \ + build-shared $(use static-libs && echo lib-static) +} + +myemake() { + emake DESTDIR="${D}" PREFIX="${EPREFIX}"/usr \ + LIBDIR='$(PREFIX)'/$(get_libdir) SYSCONFDIR="${EPREFIX}"/etc "${@}" +} + +multilib_src_install() { + myemake -C librhash install-lib-shared install-so-link + multilib_is_native_abi && myemake install-shared + use static-libs && myemake install-lib-static +} + +multilib_src_install_all() { + myemake -C librhash install-headers + use nls && myemake install-gmo + einstalldocs +} + +multilib_src_test() { + cd tests || die + LD_LIBRARY_PATH=$(pwd)/../librhash ./test_rhash.sh --full ../rhash_shared || die "tests failed" +} diff --git a/sdk_container/src/third_party/portage-stable/app-crypt/rhash/rhash-1.3.6-r1.ebuild b/sdk_container/src/third_party/portage-stable/app-crypt/rhash/rhash-1.3.6-r1.ebuild new file mode 100644 index 0000000000..24efa67054 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/app-crypt/rhash/rhash-1.3.6-r1.ebuild @@ -0,0 +1,77 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit toolchain-funcs multilib-minimal + +DESCRIPTION="Console utility and library for computing and verifying file hash sums" +HOMEPAGE="http://rhash.anz.ru/" +SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x64-solaris ~x86-solaris" +IUSE="debug nls libressl ssl static-libs" + +RDEPEND=" + ssl? ( + !libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] ) + libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] ) +)" + +DEPEND="${RDEPEND} + nls? ( sys-devel/gettext )" + +S="${WORKDIR}/RHash-${PV}" + +PATCHES=( + "${FILESDIR}"/unquote-cc.patch + "${FILESDIR}"/${P}-no_echon.patch +) + +src_prepare() { + default + multilib_copy_sources +} + +multilib_src_configure() { + set -- \ + ./configure \ + --target="${CHOST}" \ + --cc="$(tc-getCC)" \ + --ar="$(tc-getAR)" \ + --extra-cflags="${CFLAGS}" \ + --extra-ldflags="${LDFLAGS}" \ + --prefix="${EPREFIX}"/usr \ + --libdir="${EPREFIX}"/usr/$(get_libdir) \ + --sysconfdir="${EPREFIX}"/etc \ + --disable-openssl-runtime \ + --disable-static \ + --enable-lib-shared \ + $(use_enable debug) \ + $(use_enable nls gettext) \ + $(use_enable ssl openssl) \ + $(use_enable static-libs lib-static) + + echo "${@}" + "${@}" || die "configure failed" +} + +# We would add compile-gmo to the build targets but install-gmo always +# recompiles unconditionally. :( + +multilib_src_install() { + # -j1 needed due to race condition. + emake DESTDIR="${D}" -j1 \ + install{,-pkg-config} \ + $(use nls && echo install-gmo) \ + $(use kernel_Winnt || echo install-lib-so-link) + + emake DESTDIR="${D}" -j1 \ + -C lib${PN} install-headers +} + +multilib_src_test() { + emake test +} diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-crypt/rhash-1.3.5 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-crypt/rhash-1.3.5 new file mode 100644 index 0000000000..c8281d8702 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-crypt/rhash-1.3.5 @@ -0,0 +1,13 @@ +DEFINED_PHASES=compile configure install prepare test +DEPEND=ssl? ( !libressl? ( dev-libs/openssl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) nls? ( sys-devel/gettext ) +DESCRIPTION=Console utility and library for computing and verifying file hash sums +EAPI=6 +HOMEPAGE=http://rhash.anz.ru/ +IUSE=debug nls libressl ssl static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 +KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris +LICENSE=MIT +RDEPEND=ssl? ( !libressl? ( dev-libs/openssl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) +SLOT=0 +SRC_URI=mirror://sourceforge/rhash/rhash-1.3.5-src.tar.gz +_eclasses_=multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build eed53a6313267c9fbcd35fc384bd0087 multilib-minimal 9139c3a57e077cb8e0d0f73ceb080b89 toolchain-funcs 185a06792159ca143528e7010368e8af +_md5_=4aefbd488aec345d7b4bbc5c784f021d diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-crypt/rhash-1.3.6-r1 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-crypt/rhash-1.3.6-r1 new file mode 100644 index 0000000000..8008bb09cb --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-crypt/rhash-1.3.6-r1 @@ -0,0 +1,13 @@ +DEFINED_PHASES=compile configure install prepare test +DEPEND=ssl? ( !libressl? ( dev-libs/openssl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) nls? ( sys-devel/gettext ) +DESCRIPTION=Console utility and library for computing and verifying file hash sums +EAPI=6 +HOMEPAGE=http://rhash.anz.ru/ +IUSE=debug nls libressl ssl static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 +KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x64-solaris ~x86-solaris +LICENSE=MIT +RDEPEND=ssl? ( !libressl? ( dev-libs/openssl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) +SLOT=0 +SRC_URI=mirror://sourceforge/rhash/rhash-1.3.6-src.tar.gz +_eclasses_=multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build eed53a6313267c9fbcd35fc384bd0087 multilib-minimal 9139c3a57e077cb8e0d0f73ceb080b89 toolchain-funcs 185a06792159ca143528e7010368e8af +_md5_=5460f3faee7265c62db57c3b52d7e35d From 7763981707baaa77adb96cfbeba881c44ecb125e Mon Sep 17 00:00:00 2001 From: David Michael Date: Mon, 14 May 2018 14:19:07 -0400 Subject: [PATCH 08/21] bump(sys-apps/less): sync with upstream --- .../metadata/md5-cache/sys-apps/less-487 | 4 +-- .../metadata/md5-cache/sys-apps/less-491 | 12 --------- .../metadata/md5-cache/sys-apps/less-529 | 12 +++++++++ .../md5-cache/sys-apps/{less-488 => less-530} | 10 +++---- .../portage-stable/sys-apps/less/Manifest | 16 +++--------- .../sys-apps/less/files/code2color-0.2.patch | 26 ------------------- .../sys-apps/less/files/lesspipe.sh | 2 +- .../sys-apps/less/less-487.ebuild | 4 +-- .../less/{less-488.ebuild => less-529.ebuild} | 10 +++---- .../less/{less-491.ebuild => less-530.ebuild} | 10 +++---- 10 files changed, 31 insertions(+), 75 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-apps/less-491 create mode 100644 sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-apps/less-529 rename sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-apps/{less-488 => less-530} (50%) delete mode 100644 sdk_container/src/third_party/portage-stable/sys-apps/less/files/code2color-0.2.patch rename sdk_container/src/third_party/portage-stable/sys-apps/less/{less-488.ebuild => less-529.ebuild} (73%) rename sdk_container/src/third_party/portage-stable/sys-apps/less/{less-491.ebuild => less-530.ebuild} (82%) diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-apps/less-487 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-apps/less-487 index 14d5db8d03..fc074bccc7 100644 --- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-apps/less-487 +++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-apps/less-487 @@ -4,9 +4,9 @@ DESCRIPTION=Excellent text file viewer EAPI=5 HOMEPAGE=http://www.greenwoodsoftware.com/less/ IUSE=pcre unicode -KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris +KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris LICENSE=|| ( GPL-3 BSD-2 ) RDEPEND=>=app-misc/editor-wrapper-3 >=sys-libs/ncurses-5.2:0= pcre? ( dev-libs/libpcre ) SLOT=0 SRC_URI=http://www.greenwoodsoftware.com/less/less-487.tar.gz -_md5_=f7286d17f7aa46c2f61f89530dee8d6c +_md5_=d7b25729dbda641ca0601c3f72416d73 diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-apps/less-491 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-apps/less-491 deleted file mode 100644 index 86361e1162..0000000000 --- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-apps/less-491 +++ /dev/null @@ -1,12 +0,0 @@ -DEFINED_PHASES=configure install preinst prepare -DEPEND=>=app-misc/editor-wrapper-3 >=sys-libs/ncurses-5.2:0= pcre? ( dev-libs/libpcre ) -DESCRIPTION=Excellent text file viewer -EAPI=5 -HOMEPAGE=http://www.greenwoodsoftware.com/less/ -IUSE=pcre unicode -KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris -LICENSE=|| ( GPL-3 BSD-2 ) -RDEPEND=>=app-misc/editor-wrapper-3 >=sys-libs/ncurses-5.2:0= pcre? ( dev-libs/libpcre ) -SLOT=0 -SRC_URI=http://www.greenwoodsoftware.com/less/less-491.tar.gz -_md5_=e9db4513de1d1e344ed16693f509e050 diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-apps/less-529 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-apps/less-529 new file mode 100644 index 0000000000..3e3460c345 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-apps/less-529 @@ -0,0 +1,12 @@ +DEFINED_PHASES=configure install preinst +DEPEND=>=app-misc/editor-wrapper-3 >=sys-libs/ncurses-5.2:0= pcre? ( dev-libs/libpcre ) +DESCRIPTION=Excellent text file viewer +EAPI=6 +HOMEPAGE=http://www.greenwoodsoftware.com/less/ +IUSE=pcre unicode +KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris +LICENSE=|| ( GPL-3 BSD-2 ) +RDEPEND=>=app-misc/editor-wrapper-3 >=sys-libs/ncurses-5.2:0= pcre? ( dev-libs/libpcre ) +SLOT=0 +SRC_URI=http://www.greenwoodsoftware.com/less/less-529.tar.gz +_md5_=206ecd6a70cf9b5066fb1362286ac5d0 diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-apps/less-488 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-apps/less-530 similarity index 50% rename from sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-apps/less-488 rename to sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-apps/less-530 index a4ea7983b3..3bd4273298 100644 --- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-apps/less-488 +++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-apps/less-530 @@ -1,12 +1,12 @@ -DEFINED_PHASES=configure install preinst prepare +DEFINED_PHASES=configure install preinst DEPEND=>=app-misc/editor-wrapper-3 >=sys-libs/ncurses-5.2:0= pcre? ( dev-libs/libpcre ) DESCRIPTION=Excellent text file viewer -EAPI=5 +EAPI=6 HOMEPAGE=http://www.greenwoodsoftware.com/less/ IUSE=pcre unicode -KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris +KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris LICENSE=|| ( GPL-3 BSD-2 ) RDEPEND=>=app-misc/editor-wrapper-3 >=sys-libs/ncurses-5.2:0= pcre? ( dev-libs/libpcre ) SLOT=0 -SRC_URI=http://www.greenwoodsoftware.com/less/less-488.tar.gz -_md5_=e9db4513de1d1e344ed16693f509e050 +SRC_URI=http://www.greenwoodsoftware.com/less/less-530.tar.gz +_md5_=b8d42a8262da5e4d7abf2d2611cff5a7 diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/less/Manifest b/sdk_container/src/third_party/portage-stable/sys-apps/less/Manifest index a966133954..196d87fdae 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/less/Manifest +++ b/sdk_container/src/third_party/portage-stable/sys-apps/less/Manifest @@ -1,13 +1,3 @@ -AUX README.Gentoo 823 SHA256 3985fd1810f660ea1c1f2732f719b069b6934d62d8d9e8a09287e63f049ba27d SHA512 fe18f4f5bac70f31ca833cb25d4f1aecde03c3993495ab964cc67f0e52737e3d04aa2263eff26ded279121cc346ef77738743943b5b092c9586c5622ee3a6c92 WHIRLPOOL 7b4de4d109da49392cf9ded961fc9aa0a7cda1ff82dc837b0303f02d00f76f73563397c14440ab0c8638a5a2a92e3b6c62f20a904ae7cd1dd0f5eb8efa68ec39 -AUX code2color-0.2.patch 919 SHA256 1792992964eb024150025b6e357649e07dab6209254512cc9be1a7d5bcc31b77 SHA512 6569c652dc5bcff9eb0eb3d85699b319f1439bb69268157d2d63a96ebe5a48577ed2f5e6af4510a8c742b38848e5f76a79397fd3b05e7acaf487955d60f6b5ce WHIRLPOOL d661d0226a753e4aaf1d60dc1fc756e05a78490d5781df54db1c2da73fee0a44edf4e70f28aeb9ca6e888a2d5c8cb94f3ed9e864c034d9e9b7219e2f6e191600 -AUX less.envd 47 SHA256 961d6e87eeb2b41d163def66718ee78d4b7c778dbe91b24c6764635b0ae1cdd7 SHA512 261b25887b08b3255e412b36130d014fc37ffc7de75dce3b5ba2521d94a1b0be4c584808b9698c30a8dafea70c62fae2cd0642d0983f96cdb418c3c501433674 WHIRLPOOL dbb1fbec8c6370a5feec2eecdb3e109e035f2f40c2a1d00672d7660d2058aaf0a104487e1ae8c06ecfb32161d4aa2aceed6194e60cacde3590974bbcb00511ba -AUX lesspipe.sh 7785 SHA256 e63251d3cef88ab34c74d498baf29908396fbd660f4c685e913347a9a2d102a9 SHA512 607079051a9d5bda5f11addf5a391fb1dac48654e422dd216b8ec56f8e50943d3267d7d66eab49caceaf73b491d13fe045f424173f0da707250d3f86e790aa32 WHIRLPOOL 740f48bf929690a6bd162f8eab996b6dc96c46442b4023cd36bbf2335c707e79a4143f72606c7953232e25f453dd6e1fd63cdc32c60002abc6ca7e3eddc2f2e1 -DIST less-487.tar.gz 318488 SHA256 f3dc8455cb0b2b66e0c6b816c00197a71bf6d1787078adeee0bcf2aea4b12706 SHA512 d31274fdada570fbc6706d7c52637d1accbd18ce947ec062e10b1624c251a8533c6638bc3a1d89d3c70a0c7b9c6d45740598bec9003f281d64c587b1f829125a WHIRLPOOL e1a6c5dc2ea17e57226083f022d3c39b8a9d17428b7aa15385138680e78fa1ee22800e216a40fe5aa0ca38ca4c0025792a2839031faabdf8f9384dec3c750f74 -DIST less-488.tar.gz 318564 SHA256 f3b622a7b1d29a28b327357cacfd3b0e8e50710eeb6d290107e478f3f0ca15a2 SHA512 2483fd417981a92b415989ecca4e58e239ad71d687b59674f0c5557c2ff4f6d111f7dd528f15fe7002217125597f329a70a831f5d7ea67883ed8c236a0a7e6c6 WHIRLPOOL bce3064c2ee7fb1c7e0737dfb0743b1aa8210f3b14b36701a8a6c478098a4b7af18162060ff37d56311ebfe037e3138a18784cb63fbd7aa0a37f19433271faf6 -DIST less-491.tar.gz 320276 SHA256 1b40da1d58e9604b50bc75fd31c8591e6138a627a9525572c6c4232dee4c83fd SHA512 51f3e6d835066c16392cbf8b804d204b53ef128ce0c6d8553c7722351b7b48760abf516236c7ff6b83fd66700c01e78e90c836d6b82b726dd3a3bede851edf61 WHIRLPOOL 6c05eae01e506f7a3ea198736e3ad38e2711c6f968867c3d731318acab8d399505b01711a0f4a60ef7110c3b05f056ba133176d07f2d44b39e9ad4f81cff6cce -EBUILD less-487.ebuild 1440 SHA256 387fd47561a791fda5a06b659155abc842eecc64978cc53444d2576fbca67c35 SHA512 b7a1ee3d58a3ad29c3ef7d50f5f37c9fea7bbd0bf15a157f323ced895daf6a1aa31544374428df2ebd4e3385897e6721cf530b0c21de688e3cd0dee9c7e2939c WHIRLPOOL db87dbeb58f0cf81532abbc87a803083223776ab4200553163c361acdc20cf34bc4d8760e2f0db336eccd0ffc52e4900b096e8e48f1c9ed4c6d561a0a13e2260 -EBUILD less-488.ebuild 1453 SHA256 8926c4e70c762a2b3ea6ce9cc257931c9e0e679d473ef5970819ce05819e57db SHA512 bbb6d6d31b82326a901a323ba847caa7c7fb4aa615895a0c86010a170c34f15c54be6a3f1ca1552e49b63033a3c1d1b67e9ced8ad33b5e0536a63fcf8be5f8a8 WHIRLPOOL 5b2bc3c8cc5fe4e23f9963d5d994b4efc97e5842d695afbe7aaf2ceeec7e0bcc49b4b2afa124e1549849a2f56f3e6b6bb6300d7ed79e097cb1c12aa702288b98 -EBUILD less-491.ebuild 1453 SHA256 8926c4e70c762a2b3ea6ce9cc257931c9e0e679d473ef5970819ce05819e57db SHA512 bbb6d6d31b82326a901a323ba847caa7c7fb4aa615895a0c86010a170c34f15c54be6a3f1ca1552e49b63033a3c1d1b67e9ced8ad33b5e0536a63fcf8be5f8a8 WHIRLPOOL 5b2bc3c8cc5fe4e23f9963d5d994b4efc97e5842d695afbe7aaf2ceeec7e0bcc49b4b2afa124e1549849a2f56f3e6b6bb6300d7ed79e097cb1c12aa702288b98 -MISC ChangeLog 6770 SHA256 231ea462342a5410001f601c3b5be0b8aecddd4bda45ced16d823e54588943ff SHA512 1eeea73307e6c68f8c4026bc22d42fed0b4b3fc6eadf00967cd7f525b3c5843353c2be38591892e6444d2f3d6a374e58a960a0e969c4d9153a373a286c2590ee WHIRLPOOL 15496a1ff7dad80804d3bb76da1508d45e3bccb22bb8452cf6d63438c1d30913dc3da6159e0d426ebac27d1d68e3dcbde154f6c8e7fcc0198225bb4f1469f466 -MISC ChangeLog-2015 23847 SHA256 825f54e1e57d50358f5dc9a197553cb4e9472a7aea705968075815cfd5f90527 SHA512 99e9ed06109e4967a2cdba06c9116fbd1ae7a33489a758ae001c809e3bba6dfa107b3d67dfa69ccdb0ebeaae51c24cb144b13f8c1f46d0e26a274cb1b2e1ece8 WHIRLPOOL a27d97c7da86ff507da122e0e54eb5729e55c2eed535cc86a9d3775f59a2b70c35e70fc6220728c36d893aff0ff546cb8ecccc86a3e61c284966f50dc21ef7fb -MISC metadata.xml 253 SHA256 d82c33ef453113a5c1ebe250dcba373c22934a69b0a86c6ab15a5ca589c25b91 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555 WHIRLPOOL e5aee23acff864609953a1e4de768f0e4aef704b44c53c021f28573e1ca5c99f1a46d92935ecec2449f7b4419a36d8373127d0ecfa8d7bae72d835e1839eb3f8 +DIST less-487.tar.gz 318488 BLAKE2B 294ce992da39488fe5b50edf80d70179a45a449f5bcf8b93d6735be9f57db708734984f3a58654773155148c96037e2c445dac63abed1bc4ce655a4e472eca08 SHA512 d31274fdada570fbc6706d7c52637d1accbd18ce947ec062e10b1624c251a8533c6638bc3a1d89d3c70a0c7b9c6d45740598bec9003f281d64c587b1f829125a +DIST less-529.tar.gz 339651 BLAKE2B 745146fd584c6144b4052d18bae07a2b4c7a719d36c556c69837f2018ef95efeea35acadcb9946bdde0272848d1bd8537c847e89591d980ceb2eda5a4c5963c4 SHA512 902e3ed86161c5a9eb3c08567b6b702371b5c88a85ef0b21beada223eaa47e0abf4d4d166a4a7a195caef67509fa683d07d0b6a40b529d703ee26aa8910c360a +DIST less-530.tar.gz 339723 BLAKE2B 9321548b06330c0b1b5b5a36147f5b9348619ff15d907808744b89581edeb4d8c2118ba455d024a23850902cac4d2c34d1e7b9897e02769584315c0e67ef667e SHA512 8d83a18b5648c4fe85921a563aa2c40bcf495aeb611098c83cd167b1e2f706649846cdf457c8506ae2683ab362ad970a0b261747349673020894bccdb9acbc10 diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/less/files/code2color-0.2.patch b/sdk_container/src/third_party/portage-stable/sys-apps/less/files/code2color-0.2.patch deleted file mode 100644 index f8a782504e..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-apps/less/files/code2color-0.2.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- code2color -+++ code2color -@@ -163,11 +163,11 @@ - # building up the database - # newer entries overwrite old ones - my @CONFIG_FILES; -- push @CONFIG_FILES, "/etc/code2html.config"; -+ push @CONFIG_FILES, "/etc/code2color"; - push @CONFIG_FILES, -- $ENV{'HOME'}."/.code2html.config" if $ENV{'HOME'}; -+ $ENV{'HOME'}."/.code2color" if $ENV{'HOME'}; - push @CONFIG_FILES, -- split(/:/,$ENV{'CODE2HTML_CONFIG'}) if $ENV{'CODE2HTML_CONFIG'}; -+ split(/:/,$ENV{'CODE2COLOR_CONFIG'}) if $ENV{'CODE2COLOR_CONFIG'}; - push @CONFIG_FILES, - split(/:/,$params{'langfile'}) if $params{'langfile'}; - -@@ -3192,7 +3192,7 @@ - # - - $LANGUAGE{'shellscript'} = { -- 'filename' => '\\.(sh|shell)$', -+ 'filename' => '\\.(ebuild|eclass|sh|shell)$', - 'regex' => '^\\s*#\\s*![^\\s]*(sh|bash|ash|zsh|ksh)', - 'patterns' => [ { - 'name' => 'comment', diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/less/files/lesspipe.sh b/sdk_container/src/third_party/portage-stable/sys-apps/less/files/lesspipe.sh index abd934905a..66078850cb 100755 --- a/sdk_container/src/third_party/portage-stable/sys-apps/less/files/lesspipe.sh +++ b/sdk_container/src/third_party/portage-stable/sys-apps/less/files/lesspipe.sh @@ -164,7 +164,7 @@ lesspipe() { *.bmp|*.gif|*.jpeg|*.jpg|*.ico|*.pcd|*.pcx|*.png|*.ppm|*.tga|*.tiff|*.tif|*.webp) identify -verbose -- "$1" || file -L -- "$1" ;; - *.asf|*.avi|*.mov|*.mp4|*.mpeg|*.mpg|*.qt|*.ram|*.rm|*.webm|*.wmv) + *.asf|*.avi|*.flv|*.mkv|*.mov|*.mp4|*.mpeg|*.mpg|*.qt|*.ram|*.rm|*.webm|*.wmv) midentify "$1" || file -L -- "$1" ;; *.mp3) mp3info "$1" || id3info "$1" ;; diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/less/less-487.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/less/less-487.ebuild index 89f64cced9..b1552f3d1c 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/less/less-487.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-apps/less/less-487.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI="5" @@ -9,7 +9,7 @@ SRC_URI="http://www.greenwoodsoftware.com/less/${P}.tar.gz" LICENSE="|| ( GPL-3 BSD-2 )" SLOT="0" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="pcre unicode" DEPEND=">=app-misc/editor-wrapper-3 diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/less/less-488.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/less/less-529.ebuild similarity index 73% rename from sdk_container/src/third_party/portage-stable/sys-apps/less/less-488.ebuild rename to sdk_container/src/third_party/portage-stable/sys-apps/less/less-529.ebuild index 9c55ece254..647f74ce41 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/less/less-488.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-apps/less/less-529.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI="5" +EAPI=6 DESCRIPTION="Excellent text file viewer" HOMEPAGE="http://www.greenwoodsoftware.com/less/" @@ -9,7 +9,7 @@ SRC_URI="http://www.greenwoodsoftware.com/less/${P}.tar.gz" LICENSE="|| ( GPL-3 BSD-2 )" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="pcre unicode" DEPEND=">=app-misc/editor-wrapper-3 @@ -17,10 +17,6 @@ DEPEND=">=app-misc/editor-wrapper-3 pcre? ( dev-libs/libpcre )" RDEPEND="${DEPEND}" -src_prepare() { - chmod a+x configure || die -} - src_configure() { export ac_cv_lib_ncursesw_initscr=$(usex unicode) export ac_cv_lib_ncurses_initscr=$(usex !unicode) diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/less/less-491.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/less/less-530.ebuild similarity index 82% rename from sdk_container/src/third_party/portage-stable/sys-apps/less/less-491.ebuild rename to sdk_container/src/third_party/portage-stable/sys-apps/less/less-530.ebuild index 9c55ece254..84d4144cc4 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/less/less-491.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-apps/less/less-530.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI="5" +EAPI=6 DESCRIPTION="Excellent text file viewer" HOMEPAGE="http://www.greenwoodsoftware.com/less/" @@ -9,7 +9,7 @@ SRC_URI="http://www.greenwoodsoftware.com/less/${P}.tar.gz" LICENSE="|| ( GPL-3 BSD-2 )" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="pcre unicode" DEPEND=">=app-misc/editor-wrapper-3 @@ -17,10 +17,6 @@ DEPEND=">=app-misc/editor-wrapper-3 pcre? ( dev-libs/libpcre )" RDEPEND="${DEPEND}" -src_prepare() { - chmod a+x configure || die -} - src_configure() { export ac_cv_lib_ncursesw_initscr=$(usex unicode) export ac_cv_lib_ncurses_initscr=$(usex !unicode) From 673f065a5301d31e55c4290775924d9cd04fbc8e Mon Sep 17 00:00:00 2001 From: David Michael Date: Mon, 14 May 2018 14:21:54 -0400 Subject: [PATCH 09/21] bump(app-editors/vim): sync with upstream --- .../portage-stable/app-editors/vim/Manifest | 14 +- .../app-editors/vim/metadata.xml | 4 +- ...im-8.0.0386.ebuild => vim-8.0.1298.ebuild} | 167 ++++------ ...8.0.0386-r1.ebuild => vim-8.0.1428.ebuild} | 138 ++++---- .../app-editors/vim/vim-8.0.1645.ebuild | 309 +++++++++++++++++ .../app-editors/vim/vim-8.0.1699.ebuild | 311 ++++++++++++++++++ .../app-editors/vim/vim-9999.ebuild | 142 ++++---- .../md5-cache/app-editors/vim-8.0.0386 | 14 - .../md5-cache/app-editors/vim-8.0.1298 | 14 + .../md5-cache/app-editors/vim-8.0.1428 | 14 + .../{vim-8.0.0386-r1 => vim-8.0.1645} | 16 +- .../md5-cache/app-editors/vim-8.0.1699 | 14 + .../metadata/md5-cache/app-editors/vim-9999 | 12 +- 13 files changed, 868 insertions(+), 301 deletions(-) rename sdk_container/src/third_party/portage-stable/app-editors/vim/{vim-8.0.0386.ebuild => vim-8.0.1298.ebuild} (64%) rename sdk_container/src/third_party/portage-stable/app-editors/vim/{vim-8.0.0386-r1.ebuild => vim-8.0.1428.ebuild} (68%) create mode 100644 sdk_container/src/third_party/portage-stable/app-editors/vim/vim-8.0.1645.ebuild create mode 100644 sdk_container/src/third_party/portage-stable/app-editors/vim/vim-8.0.1699.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-editors/vim-8.0.0386 create mode 100644 sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-editors/vim-8.0.1298 create mode 100644 sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-editors/vim-8.0.1428 rename sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-editors/{vim-8.0.0386-r1 => vim-8.0.1645} (65%) create mode 100644 sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-editors/vim-8.0.1699 diff --git a/sdk_container/src/third_party/portage-stable/app-editors/vim/Manifest b/sdk_container/src/third_party/portage-stable/app-editors/vim/Manifest index 2990a1db52..1625bab72a 100644 --- a/sdk_container/src/third_party/portage-stable/app-editors/vim/Manifest +++ b/sdk_container/src/third_party/portage-stable/app-editors/vim/Manifest @@ -1,9 +1,5 @@ -AUX vim-completion 1004 SHA256 8191a5a47e03de62d67ad6936259c8eb005e50b52d94994bcf4164e54ffefdae SHA512 dccf663a93efdf2ec3be69f49e418a0ef66277e2fae6c12287adde772592e19f5130388a04242121846f1dae39f78b30780c99dc6fe1b847f4f08354bda3cc41 WHIRLPOOL 0f5d9ed640ecd3520c79e9abb4473bbca66f145106d2c997791eacf6f0f93131f102d55b2f056f87484c5d5ca781af958fd48f1a24e2c2c1a4ac1be378700f84 -DIST vim-8.0.0106-gentoo-patches.tar.bz2 2281 SHA256 9823a91b050eb4b001cc50f508d2ad03c7c256ed49183c1af7582318667f48d4 SHA512 39edd9f518c230d2b0486b18aa155572a9eada4a5e21108573d6e66e2eef1276f23b77d766648f018c9cf973a7d03712d8861be6ea13255d7b389912d554a47a WHIRLPOOL d6d01e3944d56762a2a999ee631f89e212360aa030ddd16ea96e32d518ec171e04d8565dcb89e804248d53e4c6e06b19be239ad2316ea88bb57364815b85d26b -DIST vim-8.0.0386.tar.gz 13000882 SHA256 25b28f6ef55a8d0b3f255f0fbed90ad1450bde7f7b231cc09d86c5119adc95bc SHA512 3169ea4dbc836c724f63d99cd345227f870a3a922beba84a6b42011685c0dd209f6bba8c69af0650c9a57bb47fc541e1150ca8cefb21fcada022259bf4c94a66 WHIRLPOOL 99a5582e0db0dc53fd8385cddf1fbf13d2fe1dd5c8e33c9959288c19d4b85f50139791269edd4ec3d5cbed6548cc3d9c7962ec1706eb422a4ef83c207aac009b -EBUILD vim-8.0.0386-r1.ebuild 9843 SHA256 46779ed099d073cdaf90b68c6a6afef3de1954a4ad1dee680e3f3040577e97b4 SHA512 08db4fae98cb400f9c105d1cc2e6938de2e64035e78af6fc95dad9e0dabac7faa46c5eeeb481310a8e6854181e526d6cb2e2521234600e77a482a159eddd26ea WHIRLPOOL 3d75af738e603a9518154a57f4159d44b5db95c6b0a0c4b5aa22b1195415767bce2c41aa2c9f5520c95ad260a83eb217144ea330d204b2f62b311f94a82efb2e -EBUILD vim-8.0.0386.ebuild 10124 SHA256 bf05c7d3c48a49c8ee2ab91799e2258681d3d8cceb631eb0a002c8382e4e9032 SHA512 df3604a0c5025cc34bffa597107e7ee0013a4aa691ad284cefbef701ede72d0db5648d01d20ddd4791b1a30b5359dd2cb1a8f70b0e75e57fcec7b4f045c8d040 WHIRLPOOL 99e4329f7c78df2b274676805d08224440e10144d8ad4e4ca2e45ab7ce3c91fc10efd3dcafa6373920353b21c2b6999b68e3a6bafda31047adfd93138d18fe8f -EBUILD vim-9999.ebuild 9831 SHA256 db850496134483d440a3fd888b86292342bef688c871cc9834ca450866d909b4 SHA512 fdabdd8cc6bd829846bd796cac66adecf36818aad49bd5977c35909a0545c5550fc748477fc7d53162fe948c2fc08cb017d4ebcf1b688a0da018e79b498aeada WHIRLPOOL 8bf855e12c91b4b82c4f61ed45a0e75cb1f603f284895202fbb36ee8627afd79874be393994b510be31f6f31456782bee3d1104dc7f71e6deae65297c7caaf25 -MISC ChangeLog 7848 SHA256 6fc0792ca6d0bc4bf25efefac019e1938db855deffd2a47a02de28f848e29c48 SHA512 de0459f63bb4caad161089ec6e662cb6f5aba4fc8413de18f205ed5e5ec3b1576fe6d3ad9c5799c333bd3435857801a80eb63d77a9ac3e30c1e9ea44580076d8 WHIRLPOOL d8df884c001bb4572d0c50a0b69ce2cdad81abefc95a66769cde7c34eb50a52db31bb192de1015f8927d123102e0c9c4e1222e02b5955f8aea88d1cca19410f7 -MISC ChangeLog-2015 67669 SHA256 86ac1b2a4e92a9eab943636dde488ccb9351b509b3775e8e11f30e5367d48732 SHA512 f84c582b834fdb2907730b9f409f243e10d98777083a8b9a5b689a803d974f2181a93c7de6d197f4482e6b054992f1324d5e0e9d580f7cc89d6d48947a3e9ed7 WHIRLPOOL 047df580ce408d600fd30222ecd55b24414ee3aaea8cd156728a371a878ee0da86ec18843699bc961a911429c57bbf578bd2d4569c2d116f8cf1bac110ee79b4 -MISC metadata.xml 779 SHA256 d9701e486eaad4caac728b1eecdcf0a9f88aefe093d6846f559821fdaecc8f83 SHA512 4e6fd3126e8b090f1cd89418ace750073a1dd0bbaa5fecca9be10fb19c70147e7d97b71ab1e3ffc480427a0477bd6fa5e27c475d5685c43e9d0137ea1df5d31d WHIRLPOOL df429412c61fc3023f1cee9f3899978ff3bb9841332915e13a1478ac76215d1d773248efbc31bbf774168b3a88d7a04fa8d985b64b20cd3925f369249a2e50d2 +DIST vim-8.0.0938-gentoo-patches.tar.bz2 2316 BLAKE2B 05a87f32fc5cc65e7f5e4e5a87c654b2040ad39f1555ddde7e0e6f473dc8b520916a795406bb6bbeaf5e7ae8748aacebe7a9679461e48802e69417e945eea827 SHA512 a6062be5e6a5c5b437081312df5742353242b5171bf26da04aa6ca216d2b142b2411a88bc1edd460d28e00a59a210c8e1729e801fac6f1efd86bb2e437a56a2b +DIST vim-8.0.1298.tar.gz 13395459 BLAKE2B 4b6e3c4443cd675dc3727e8609b89c422f66c7d32908b5136ee312d48427568a8236214c85135242269b6575e0e1336b0973395a6372664435f8bae4d7bee843 SHA512 7704c493359c1a922f876e4d6f3b4ad265d8ce974a59d51a39e5a4424251105250ffc803bcf6c6750daeb5e6376cbbfd24557b075eacf2b0274d7c432db2f681 +DIST vim-8.0.1428.tar.gz 13415243 BLAKE2B 88f86c371d0a644212b9e4dc1a15d61244847037f36262a225c361bfc2799b741c128de21ac92bb3fb4a4955894e46d34dc01baa7cbf58f1371d772b36887103 SHA512 f635c53c7e2ca808dc1cb424e6e4b16d8c41c66a86c3c7584444dab3d2482904795fea7c071d65862ae6ac6b2b66b7ad5ac832e1e30f4624d46f220c6f41e2e9 +DIST vim-8.0.1645.tar.gz 13535252 BLAKE2B a5c7463e85eed12825bdf46d15eb7e7513d62831eba76cbb90af875010b33662b7a6ef2c4c5cecddface415d75e97caf0a670e69835ecd3b4a89704f3b18b905 SHA512 367b9e205e776f84fcfbb92725afd5e7aa66898110d46dbea1a33f7b74c239559e829b5104c45360539c8f2b23c375ed59ccea7ee35a5dd10770400d9a7be085 +DIST vim-8.0.1699.tar.gz 13546105 BLAKE2B cabf29d5a89c55e2fe3bc5e39eb499412f5907ddf856f8644b466f1e0fbffefff3cd801b6bc5e49e62ffdf8805b0556058b9a913015a9f9fbe1a4f580132fd49 SHA512 b0fe8e1dc05fdc3758896caf4746da40988ca7604d77dbe78c47525cbf8f0d7e6c05f690687268eda581009050d4e02e93fb4d30734cbbab4cfd6a8a1488c1e7 diff --git a/sdk_container/src/third_party/portage-stable/app-editors/vim/metadata.xml b/sdk_container/src/third_party/portage-stable/app-editors/vim/metadata.xml index ae7d854776..f65afcd745 100644 --- a/sdk_container/src/third_party/portage-stable/app-editors/vim/metadata.xml +++ b/sdk_container/src/third_party/portage-stable/app-editors/vim/metadata.xml @@ -6,11 +6,11 @@ Gentoo Vim Project - Use dev-lang/luajit instead of dev-lang/lua Enable support for Scheme using dev-scheme/racket + Enable terminal emulation support Install vimpager and vimmanpager links Link console vim against X11 libraries to enable title and - clipboard features in xterm + clipboard features in xterm cpe:/a:vim:vim diff --git a/sdk_container/src/third_party/portage-stable/app-editors/vim/vim-8.0.0386.ebuild b/sdk_container/src/third_party/portage-stable/app-editors/vim/vim-8.0.1298.ebuild similarity index 64% rename from sdk_container/src/third_party/portage-stable/app-editors/vim/vim-8.0.0386.ebuild rename to sdk_container/src/third_party/portage-stable/app-editors/vim/vim-8.0.1298.ebuild index 9067dade25..3b1ca50111 100644 --- a/sdk_container/src/third_party/portage-stable/app-editors/vim/vim-8.0.0386.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-editors/vim/vim-8.0.1298.ebuild @@ -1,34 +1,30 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 VIM_VERSION="8.0" PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} ) PYTHON_REQ_USE=threads -inherit eutils vim-doc flag-o-matic fdo-mime versionator bash-completion-r1 python-r1 +inherit vim-doc flag-o-matic versionator bash-completion-r1 python-single-r1 if [[ ${PV} == 9999* ]] ; then inherit git-r3 EGIT_REPO_URI="https://github.com/vim/vim.git" else SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> ${P}.tar.gz - https://dev.gentoo.org/~radhermit/vim/vim-8.0.0106-gentoo-patches.tar.bz2" - KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + https://dev.gentoo.org/~radhermit/vim/vim-8.0.0938-gentoo-patches.tar.bz2" + KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" fi DESCRIPTION="Vim, an improved vi-style text editor" -HOMEPAGE="http://www.vim.org/ https://github.com/vim/vim" +HOMEPAGE="https://vim.sourceforge.io/ https://github.com/vim/vim" SLOT="0" LICENSE="vim" -IUSE="X acl cscope debug gpm lua luajit minimal nls perl python racket ruby selinux tcl vim-pager" +IUSE="X acl cscope debug gpm lua luajit minimal nls perl python racket ruby selinux tcl terminal vim-pager" REQUIRED_USE=" luajit? ( lua ) - python? ( - || ( $(python_gen_useflags '*') ) - ?? ( $(python_gen_useflags 'python2*') ) - ?? ( $(python_gen_useflags 'python3*') ) - ) + python? ( ${PYTHON_REQUIRED_USE} ) " RDEPEND=" @@ -49,12 +45,14 @@ RDEPEND=" perl? ( dev-lang/perl:= ) python? ( ${PYTHON_DEPS} ) racket? ( dev-scheme/racket ) - ruby? ( || ( dev-lang/ruby:2.4 dev-lang/ruby:2.3 dev-lang/ruby:2.2 dev-lang/ruby:2.1 ) ) + ruby? ( || ( dev-lang/ruby:2.4 dev-lang/ruby:2.3 dev-lang/ruby:2.2 ) ) selinux? ( sys-libs/libselinux ) tcl? ( dev-lang/tcl:0= ) X? ( x11-libs/libXt ) " -DEPEND="${RDEPEND} + +DEPEND=" + ${RDEPEND} sys-devel/autoconf nls? ( sys-devel/gettext ) " @@ -65,8 +63,10 @@ pkg_setup() { export LC_COLLATE="C" # Gnome sandbox silliness. bug #114475. - mkdir -p "${T}"/home + mkdir -p "${T}"/home || die "mkdir failed" export HOME="${T}"/home + + use python && python-single-r1_pkg_setup } src_prepare() { @@ -76,17 +76,21 @@ src_prepare() { fi # Fixup a script to use awk instead of nawk - sed -i '1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' "${S}"/runtime/tools/mve.awk \ - || die "mve.awk sed failed" + sed -i -e \ + '1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' \ + "${S}"/runtime/tools/mve.awk || die "mve.awk sed failed" # Read vimrc and gvimrc from /etc/vim - echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' >> "${S}"/src/feature.h - echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' >> "${S}"/src/feature.h + echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' \ + >> "${S}"/src/feature.h || die "echo failed" + echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' \ + >> "${S}"/src/feature.h || die "echo failed" # Use exuberant ctags which installs as /usr/bin/exuberant-ctags. # Hopefully this pattern won't break for a while at least. # This fixes bug 29398 (27 Sep 2003 agriffis) - sed -i 's/\> "$c" ; done + find "${S}" -name '*.c' | while read c; do + echo >> "$c" || die "echo failed" + done # conditionally make the manpager.sh script - if use vim-pager ; then - cat <<-END > "${S}"/runtime/macros/manpager.sh + if use vim-pager; then + cat > "${S}"/runtime/macros/manpager.sh <<-_EOF_ || die "cat EOF failed" #!/bin/sh sed -e 's/\x1B\[[[:digit:]]\+m//g' | col -b | \\ vim \\ @@ -114,24 +122,21 @@ src_prepare() { -c 'set nolist nomod ft=man ts=8' \\ -c 'let g:showmarks_enable=0' \\ -c 'runtime! macros/less.vim' - - END + _EOF_ fi # Try to avoid sandbox problems. Bug #114475. - if [[ -d "${S}"/src/po ]] ; then - sed -i '/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \ - "${S}"/src/po/Makefile + if [[ -d "${S}"/src/po ]]; then + sed -i -e \ + '/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \ + "${S}"/src/po/Makefile || die "sed failed" fi - if version_is_at_least 7.3.122 ; then - cp "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk - fi + cp -v "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk || die "cp failed" - # Bug #378107 - Build properly with >=perl-core/ExtUtils-ParseXS-3.20.0 - if version_is_at_least 7.3 ; then - sed -i "s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:" \ - "${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed' - fi + sed -i -e \ + "s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:" \ + "${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed' eapply_user } @@ -154,16 +159,18 @@ src_configure() { # (3) Notice auto/configure is newer than auto/config.mk # (4) Run ./configure (with wrong args) to remake auto/config.mk sed -i 's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed" - rm -f src/auto/configure + rm src/auto/configure || die "rm failed" emake -j1 -C src autoconf # This should fix a sandbox violation (see bug 24447). The hvc # things are for ppc64, see bug 86433. - for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc* ; do - [[ -e ${file} ]] && addwrite $file + for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc*; do + if [[ -e "${file}" ]]; then + addwrite $file + fi done - if use minimal ; then + if use minimal; then myconf=( --with-features=tiny --disable-nls @@ -195,36 +202,20 @@ src_configure() { $(use_with luajit) $(use_enable nls) $(use_enable perl perlinterp) + $(use_enable python pythoninterp) + $(use_enable python python3interp) $(use_enable racket mzschemeinterp) $(use_enable ruby rubyinterp) $(use_enable selinux) $(use_enable tcl tclinterp) + $(use_enable terminal) ) - if use python ; then - py_add_interp() { - local v - - [[ ${EPYTHON} == python3* ]] && v=3 - myconf+=( - --enable-python${v}interp - vi_cv_path_python${v}="${PYTHON}" - ) - } - - python_foreach_impl py_add_interp - else - myconf+=( - --disable-pythoninterp - --disable-python3interp - ) - fi - # --with-features=huge forces on cscope even if we --disable it. We need # to sed this out to avoid screwiness. (1 Sep 2004 ciaranm) - if ! use cscope ; then - sed -i '/# define FEAT_CSCOPE/d' src/feature.h || \ - die "couldn't disable cscope" + if ! use cscope; then + sed -i -e \ + '/# define FEAT_CSCOPE/d' src/feature.h || die "sed failed" fi # don't test USE=X here ... see bug #19115 @@ -255,14 +246,14 @@ src_compile() { } src_test() { - echo + einfo einfo "Starting vim tests. Several error messages will be shown" einfo "while the tests run. This is normal behaviour and does not" einfo "indicate a fault." - echo + einfo ewarn "If the tests fail, your terminal may be left in a strange" ewarn "state. Usually, running 'reset' will fix this." - echo + einfo # Don't let vim talk to X unset DISPLAY @@ -270,39 +261,12 @@ src_test() { emake -j1 -C src/testdir nongui } -# Make convenience symlinks, hopefully without stepping on toes. Some -# of these links are "owned" by the vim ebuild when it is installed, -# but they might be good for gvim as well (see bug 45828) -update_vim_symlinks() { - local f syms - syms="vimdiff rvim rview" +# Call eselect vi update with --if-unset +# to respect user's choice (bug 187449) +eselect_vi_update() { einfo "Calling eselect vi update..." - # Call this with --if-unset to respect user's choice (bug 187449) eselect vi update --if-unset - - # Make or remove convenience symlink, vim -> gvim - if [[ -f "${EROOT}"/usr/bin/gvim ]]; then - ln -s gvim "${EROOT}"/usr/bin/vim 2>/dev/null - elif [[ -L "${EROOT}"/usr/bin/vim && ! -f "${EROOT}"/usr/bin/vim ]]; then - rm "${EROOT}"/usr/bin/vim - fi - - # Make or remove convenience symlinks to vim - if [[ -f "${EROOT}"/usr/bin/vim ]]; then - for f in ${syms}; do - ln -s vim "${EROOT}"/usr/bin/${f} 2>/dev/null - done - else - for f in ${syms}; do - if [[ -L "${EROOT}"/usr/bin/${f} && ! -f "${EROOT}"/usr/bin/${f} ]]; then - rm -f "${EROOT}"/usr/bin/${f} - fi - done - fi - - # This will still break if you merge then remove the vi package, - # but there's only so much you can do, eh? Unfortunately we don't - # have triggers like are done in rpm-land. + eend $? } src_install() { @@ -323,26 +287,23 @@ src_install() { fi newbashcomp "${FILESDIR}"/${PN}-completion ${PN} + # keep in sync with 'complete ... -F' list bashcomp_alias vim ex vi view rvim rview vimdiff - - # We shouldn't be installing the ex or view man page symlinks, as they - # are managed by eselect-vi - rm -f "${ED}"/usr/share/man/man1/{ex,view}.1 } pkg_postinst() { # Update documentation tags (from vim-doc.eclass) update_vim_helptags - # Make convenience symlinks - update_vim_symlinks + # Call eselect vi update + eselect_vi_update } pkg_postrm() { # Update documentation tags (from vim-doc.eclass) update_vim_helptags - # Make convenience symlinks - update_vim_symlinks + # Call eselect vi update + eselect_vi_update } diff --git a/sdk_container/src/third_party/portage-stable/app-editors/vim/vim-8.0.0386-r1.ebuild b/sdk_container/src/third_party/portage-stable/app-editors/vim/vim-8.0.1428.ebuild similarity index 68% rename from sdk_container/src/third_party/portage-stable/app-editors/vim/vim-8.0.0386-r1.ebuild rename to sdk_container/src/third_party/portage-stable/app-editors/vim/vim-8.0.1428.ebuild index dcd8894653..5b4fa3b576 100644 --- a/sdk_container/src/third_party/portage-stable/app-editors/vim/vim-8.0.0386-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-editors/vim/vim-8.0.1428.ebuild @@ -1,27 +1,27 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 VIM_VERSION="8.0" PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} ) PYTHON_REQ_USE=threads -inherit eutils vim-doc flag-o-matic fdo-mime versionator bash-completion-r1 python-single-r1 +inherit vim-doc flag-o-matic versionator bash-completion-r1 python-single-r1 if [[ ${PV} == 9999* ]] ; then inherit git-r3 EGIT_REPO_URI="https://github.com/vim/vim.git" else SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> ${P}.tar.gz - https://dev.gentoo.org/~radhermit/vim/vim-8.0.0106-gentoo-patches.tar.bz2" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + https://dev.gentoo.org/~radhermit/vim/vim-8.0.0938-gentoo-patches.tar.bz2" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" fi DESCRIPTION="Vim, an improved vi-style text editor" -HOMEPAGE="http://www.vim.org/ https://github.com/vim/vim" +HOMEPAGE="https://vim.sourceforge.io/ https://github.com/vim/vim" SLOT="0" LICENSE="vim" -IUSE="X acl cscope debug gpm lua luajit minimal nls perl python racket ruby selinux tcl vim-pager" +IUSE="X acl cscope debug gpm lua luajit minimal nls perl python racket ruby selinux tcl terminal vim-pager" REQUIRED_USE=" luajit? ( lua ) python? ( ${PYTHON_REQUIRED_USE} ) @@ -45,12 +45,14 @@ RDEPEND=" perl? ( dev-lang/perl:= ) python? ( ${PYTHON_DEPS} ) racket? ( dev-scheme/racket ) - ruby? ( || ( dev-lang/ruby:2.4 dev-lang/ruby:2.3 dev-lang/ruby:2.2 dev-lang/ruby:2.1 ) ) + ruby? ( || ( dev-lang/ruby:2.4 dev-lang/ruby:2.3 dev-lang/ruby:2.2 ) ) selinux? ( sys-libs/libselinux ) tcl? ( dev-lang/tcl:0= ) X? ( x11-libs/libXt ) " -DEPEND="${RDEPEND} + +DEPEND=" + ${RDEPEND} sys-devel/autoconf nls? ( sys-devel/gettext ) " @@ -61,7 +63,7 @@ pkg_setup() { export LC_COLLATE="C" # Gnome sandbox silliness. bug #114475. - mkdir -p "${T}"/home + mkdir -p "${T}"/home || die "mkdir failed" export HOME="${T}"/home use python && python-single-r1_pkg_setup @@ -74,17 +76,21 @@ src_prepare() { fi # Fixup a script to use awk instead of nawk - sed -i '1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' "${S}"/runtime/tools/mve.awk \ - || die "mve.awk sed failed" + sed -i -e \ + '1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' \ + "${S}"/runtime/tools/mve.awk || die "mve.awk sed failed" # Read vimrc and gvimrc from /etc/vim - echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' >> "${S}"/src/feature.h - echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' >> "${S}"/src/feature.h + echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' \ + >> "${S}"/src/feature.h || die "echo failed" + echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' \ + >> "${S}"/src/feature.h || die "echo failed" # Use exuberant ctags which installs as /usr/bin/exuberant-ctags. # Hopefully this pattern won't break for a while at least. # This fixes bug 29398 (27 Sep 2003 agriffis) - sed -i 's/\> "$c" ; done + find "${S}" -name '*.c' | while read c; do + echo >> "$c" || die "echo failed" + done # conditionally make the manpager.sh script - if use vim-pager ; then - cat <<-END > "${S}"/runtime/macros/manpager.sh + if use vim-pager; then + cat > "${S}"/runtime/macros/manpager.sh <<-_EOF_ || die "cat EOF failed" #!/bin/sh sed -e 's/\x1B\[[[:digit:]]\+m//g' | col -b | \\ vim \\ @@ -112,24 +122,21 @@ src_prepare() { -c 'set nolist nomod ft=man ts=8' \\ -c 'let g:showmarks_enable=0' \\ -c 'runtime! macros/less.vim' - - END + _EOF_ fi # Try to avoid sandbox problems. Bug #114475. - if [[ -d "${S}"/src/po ]] ; then - sed -i '/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \ - "${S}"/src/po/Makefile + if [[ -d "${S}"/src/po ]]; then + sed -i -e \ + '/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \ + "${S}"/src/po/Makefile || die "sed failed" fi - if version_is_at_least 7.3.122 ; then - cp "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk - fi + cp -v "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk || die "cp failed" - # Bug #378107 - Build properly with >=perl-core/ExtUtils-ParseXS-3.20.0 - if version_is_at_least 7.3 ; then - sed -i "s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:" \ - "${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed' - fi + sed -i -e \ + "s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:" \ + "${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed' eapply_user } @@ -152,16 +159,18 @@ src_configure() { # (3) Notice auto/configure is newer than auto/config.mk # (4) Run ./configure (with wrong args) to remake auto/config.mk sed -i 's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed" - rm -f src/auto/configure + rm src/auto/configure || die "rm failed" emake -j1 -C src autoconf # This should fix a sandbox violation (see bug 24447). The hvc # things are for ppc64, see bug 86433. - for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc* ; do - [[ -e ${file} ]] && addwrite $file + for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc*; do + if [[ -e "${file}" ]]; then + addwrite $file + fi done - if use minimal ; then + if use minimal; then myconf=( --with-features=tiny --disable-nls @@ -199,13 +208,14 @@ src_configure() { $(use_enable ruby rubyinterp) $(use_enable selinux) $(use_enable tcl tclinterp) + $(use_enable terminal) ) # --with-features=huge forces on cscope even if we --disable it. We need # to sed this out to avoid screwiness. (1 Sep 2004 ciaranm) - if ! use cscope ; then - sed -i '/# define FEAT_CSCOPE/d' src/feature.h || \ - die "couldn't disable cscope" + if ! use cscope; then + sed -i -e \ + '/# define FEAT_CSCOPE/d' src/feature.h || die "sed failed" fi # don't test USE=X here ... see bug #19115 @@ -236,14 +246,14 @@ src_compile() { } src_test() { - echo + einfo einfo "Starting vim tests. Several error messages will be shown" einfo "while the tests run. This is normal behaviour and does not" einfo "indicate a fault." - echo + einfo ewarn "If the tests fail, your terminal may be left in a strange" ewarn "state. Usually, running 'reset' will fix this." - echo + einfo # Don't let vim talk to X unset DISPLAY @@ -251,39 +261,12 @@ src_test() { emake -j1 -C src/testdir nongui } -# Make convenience symlinks, hopefully without stepping on toes. Some -# of these links are "owned" by the vim ebuild when it is installed, -# but they might be good for gvim as well (see bug 45828) -update_vim_symlinks() { - local f syms - syms="vimdiff rvim rview" +# Call eselect vi update with --if-unset +# to respect user's choice (bug 187449) +eselect_vi_update() { einfo "Calling eselect vi update..." - # Call this with --if-unset to respect user's choice (bug 187449) eselect vi update --if-unset - - # Make or remove convenience symlink, vim -> gvim - if [[ -f "${EROOT}"/usr/bin/gvim ]]; then - ln -s gvim "${EROOT}"/usr/bin/vim 2>/dev/null - elif [[ -L "${EROOT}"/usr/bin/vim && ! -f "${EROOT}"/usr/bin/vim ]]; then - rm "${EROOT}"/usr/bin/vim - fi - - # Make or remove convenience symlinks to vim - if [[ -f "${EROOT}"/usr/bin/vim ]]; then - for f in ${syms}; do - ln -s vim "${EROOT}"/usr/bin/${f} 2>/dev/null - done - else - for f in ${syms}; do - if [[ -L "${EROOT}"/usr/bin/${f} && ! -f "${EROOT}"/usr/bin/${f} ]]; then - rm -f "${EROOT}"/usr/bin/${f} - fi - done - fi - - # This will still break if you merge then remove the vi package, - # but there's only so much you can do, eh? Unfortunately we don't - # have triggers like are done in rpm-land. + eend $? } src_install() { @@ -304,26 +287,23 @@ src_install() { fi newbashcomp "${FILESDIR}"/${PN}-completion ${PN} + # keep in sync with 'complete ... -F' list bashcomp_alias vim ex vi view rvim rview vimdiff - - # We shouldn't be installing the ex or view man page symlinks, as they - # are managed by eselect-vi - rm -f "${ED}"/usr/share/man/man1/{ex,view}.1 } pkg_postinst() { # Update documentation tags (from vim-doc.eclass) update_vim_helptags - # Make convenience symlinks - update_vim_symlinks + # Call eselect vi update + eselect_vi_update } pkg_postrm() { # Update documentation tags (from vim-doc.eclass) update_vim_helptags - # Make convenience symlinks - update_vim_symlinks + # Call eselect vi update + eselect_vi_update } diff --git a/sdk_container/src/third_party/portage-stable/app-editors/vim/vim-8.0.1645.ebuild b/sdk_container/src/third_party/portage-stable/app-editors/vim/vim-8.0.1645.ebuild new file mode 100644 index 0000000000..01f04731da --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/app-editors/vim/vim-8.0.1645.ebuild @@ -0,0 +1,309 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +VIM_VERSION="8.0" +PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} ) +PYTHON_REQ_USE=threads +inherit vim-doc flag-o-matic versionator bash-completion-r1 python-single-r1 + +if [[ ${PV} == 9999* ]] ; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/vim/vim.git" +else + SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> ${P}.tar.gz + https://dev.gentoo.org/~radhermit/vim/vim-8.0.0938-gentoo-patches.tar.bz2" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +fi + +DESCRIPTION="Vim, an improved vi-style text editor" +HOMEPAGE="https://vim.sourceforge.io/ https://github.com/vim/vim" + +SLOT="0" +LICENSE="vim" +IUSE="X acl cscope debug gpm lua luajit minimal nls perl python racket ruby selinux tcl terminal vim-pager" +REQUIRED_USE=" + luajit? ( lua ) + python? ( ${PYTHON_REQUIRED_USE} ) +" + +RDEPEND=" + >=app-eselect/eselect-vi-1.1 + >=sys-libs/ncurses-5.2-r2:0= + nls? ( virtual/libintl ) + acl? ( kernel_linux? ( sys-apps/acl ) ) + cscope? ( dev-util/cscope ) + gpm? ( >=sys-libs/gpm-1.19.3 ) + lua? ( + luajit? ( dev-lang/luajit:2= ) + !luajit? ( dev-lang/lua:0[deprecated] ) + ) + !minimal? ( + ~app-editors/vim-core-${PV} + dev-util/ctags + ) + perl? ( dev-lang/perl:= ) + python? ( ${PYTHON_DEPS} ) + racket? ( dev-scheme/racket ) + ruby? ( || ( dev-lang/ruby:2.5 dev-lang/ruby:2.4 dev-lang/ruby:2.3 dev-lang/ruby:2.2 ) ) + selinux? ( sys-libs/libselinux ) + tcl? ( dev-lang/tcl:0= ) + X? ( x11-libs/libXt ) +" + +DEPEND=" + ${RDEPEND} + sys-devel/autoconf + nls? ( sys-devel/gettext ) +" + +pkg_setup() { + # people with broken alphabets run into trouble. bug 82186. + unset LANG LC_ALL + export LC_COLLATE="C" + + # Gnome sandbox silliness. bug #114475. + mkdir -p "${T}"/home || die "mkdir failed" + export HOME="${T}"/home + + use python && python-single-r1_pkg_setup +} + +src_prepare() { + if [[ ${PV} != 9999* ]] ; then + # Gentoo patches to fix runtime issues, cross-compile errors, etc + eapply "${WORKDIR}"/patches/ + fi + + # Fixup a script to use awk instead of nawk + sed -i -e \ + '1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' \ + "${S}"/runtime/tools/mve.awk || die "mve.awk sed failed" + + # Read vimrc and gvimrc from /etc/vim + echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' \ + >> "${S}"/src/feature.h || die "echo failed" + echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' \ + >> "${S}"/src/feature.h || die "echo failed" + + # Use exuberant ctags which installs as /usr/bin/exuberant-ctags. + # Hopefully this pattern won't break for a while at least. + # This fixes bug 29398 (27 Sep 2003 agriffis) + sed -i -e \ + 's/\> "$c" || die "echo failed" + done + + # conditionally make the manpager.sh script + if use vim-pager; then + cat > "${S}"/runtime/macros/manpager.sh <<-_EOF_ || die "cat EOF failed" + #!/bin/sh + sed -e 's/\x1B\[[[:digit:]]\+m//g' | col -b | \\ + vim \\ + -c 'let no_plugin_maps = 1' \\ + -c 'set nolist nomod ft=man ts=8' \\ + -c 'let g:showmarks_enable=0' \\ + -c 'runtime! macros/less.vim' - + _EOF_ + fi + + # Try to avoid sandbox problems. Bug #114475. + if [[ -d "${S}"/src/po ]]; then + sed -i -e \ + '/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \ + "${S}"/src/po/Makefile || die "sed failed" + fi + + cp -v "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk || die "cp failed" + + sed -i -e \ + "s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:" \ + "${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed' + + eapply_user +} + +src_configure() { + local myconf=() + + # Fix bug 37354: Disallow -funroll-all-loops on amd64 + # Bug 57859 suggests that we want to do this for all archs + filter-flags -funroll-all-loops + + # Fix bug 76331: -O3 causes problems, use -O2 instead. We'll do this for + # everyone since previous flag filtering bugs have turned out to affect + # multiple archs... + replace-flags -O3 -O2 + + # Fix bug 18245: Prevent "make" from the following chain: + # (1) Notice configure.ac is newer than auto/configure + # (2) Rebuild auto/configure + # (3) Notice auto/configure is newer than auto/config.mk + # (4) Run ./configure (with wrong args) to remake auto/config.mk + sed -i 's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed" + rm src/auto/configure || die "rm failed" + emake -j1 -C src autoconf + + # This should fix a sandbox violation (see bug 24447). The hvc + # things are for ppc64, see bug 86433. + for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc*; do + if [[ -e "${file}" ]]; then + addwrite $file + fi + done + + if use minimal; then + myconf=( + --with-features=tiny + --disable-nls + --disable-multibyte + --disable-acl + --enable-gui=no + --without-x + --disable-darwin + --disable-luainterp + --disable-perlinterp + --disable-pythoninterp + --disable-mzschemeinterp + --disable-rubyinterp + --disable-selinux + --disable-tclinterp + --disable-gpm + ) + else + use debug && append-flags "-DDEBUG" + + myconf=( + --with-features=huge + --enable-multibyte + $(use_enable acl) + $(use_enable cscope) + $(use_enable gpm) + $(use_enable lua luainterp) + $(usex lua "--with-lua-prefix=${EPREFIX}/usr" "") + $(use_with luajit) + $(use_enable nls) + $(use_enable perl perlinterp) + $(use_enable python pythoninterp) + $(use_enable python python3interp) + $(use_enable racket mzschemeinterp) + $(use_enable ruby rubyinterp) + $(use_enable selinux) + $(use_enable tcl tclinterp) + $(use_enable terminal) + ) + + # --with-features=huge forces on cscope even if we --disable it. We need + # to sed this out to avoid screwiness. (1 Sep 2004 ciaranm) + if ! use cscope; then + sed -i -e \ + '/# define FEAT_CSCOPE/d' src/feature.h || die "sed failed" + fi + + # don't test USE=X here ... see bug #19115 + # but need to provide a way to link against X ... see bug #20093 + myconf+=( + --enable-gui=no + --disable-darwin + $(use_with X x) + ) + fi + + # let package manager strip binaries + export ac_cv_prog_STRIP="$(type -P true ) faking strip" + + # keep prefix env contained within the EPREFIX + use prefix && myconf+=( --without-local-dir ) + + econf \ + --with-modified-by=Gentoo-${PVR} \ + "${myconf[@]}" +} + +src_compile() { + # The following allows emake to be used + emake -j1 -C src auto/osdef.h objects + + emake +} + +src_test() { + einfo + einfo "Starting vim tests. Several error messages will be shown" + einfo "while the tests run. This is normal behaviour and does not" + einfo "indicate a fault." + einfo + ewarn "If the tests fail, your terminal may be left in a strange" + ewarn "state. Usually, running 'reset' will fix this." + einfo + + # Don't let vim talk to X + unset DISPLAY + + emake -j1 -C src/testdir nongui +} + +# Call eselect vi update with --if-unset +# to respect user's choice (bug 187449) +eselect_vi_update() { + einfo "Calling eselect vi update..." + eselect vi update --if-unset + eend $? +} + +src_install() { + local vimfiles=/usr/share/vim/vim${VIM_VERSION/.} + + # Note: Do not install symlinks for 'vi', 'ex', or 'view', as these are + # managed by eselect-vi + dobin src/vim + dosym vim /usr/bin/vimdiff + dosym vim /usr/bin/rvim + dosym vim /usr/bin/rview + if use vim-pager ; then + dosym ${vimfiles}/macros/less.sh /usr/bin/vimpager + dosym ${vimfiles}/macros/manpager.sh /usr/bin/vimmanpager + insinto ${vimfiles}/macros + doins runtime/macros/manpager.sh + fperms a+x ${vimfiles}/macros/manpager.sh + fi + + newbashcomp "${FILESDIR}"/${PN}-completion ${PN} + + # keep in sync with 'complete ... -F' list + bashcomp_alias vim ex vi view rvim rview vimdiff +} + +pkg_postinst() { + # Update documentation tags (from vim-doc.eclass) + update_vim_helptags + + # Call eselect vi update + eselect_vi_update +} + +pkg_postrm() { + # Update documentation tags (from vim-doc.eclass) + update_vim_helptags + + # Call eselect vi update + eselect_vi_update +} diff --git a/sdk_container/src/third_party/portage-stable/app-editors/vim/vim-8.0.1699.ebuild b/sdk_container/src/third_party/portage-stable/app-editors/vim/vim-8.0.1699.ebuild new file mode 100644 index 0000000000..1fdeedc42c --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/app-editors/vim/vim-8.0.1699.ebuild @@ -0,0 +1,311 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +VIM_VERSION="8.0" +PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} ) +PYTHON_REQ_USE="threads" +USE_RUBY="ruby22 ruby23 ruby24 ruby25" + +inherit vim-doc flag-o-matic versionator bash-completion-r1 python-single-r1 ruby-single + +if [[ ${PV} == 9999* ]] ; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/vim/vim.git" +else + SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> ${P}.tar.gz + https://dev.gentoo.org/~radhermit/vim/vim-8.0.0938-gentoo-patches.tar.bz2" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +fi + +DESCRIPTION="Vim, an improved vi-style text editor" +HOMEPAGE="https://vim.sourceforge.io/ https://github.com/vim/vim" + +SLOT="0" +LICENSE="vim" +IUSE="X acl cscope debug gpm lua luajit minimal nls perl python racket ruby selinux tcl terminal vim-pager" +REQUIRED_USE=" + luajit? ( lua ) + python? ( ${PYTHON_REQUIRED_USE} ) +" + +RDEPEND=" + >=app-eselect/eselect-vi-1.1 + >=sys-libs/ncurses-5.2-r2:0= + nls? ( virtual/libintl ) + acl? ( kernel_linux? ( sys-apps/acl ) ) + cscope? ( dev-util/cscope ) + gpm? ( >=sys-libs/gpm-1.19.3 ) + lua? ( + luajit? ( dev-lang/luajit:2= ) + !luajit? ( dev-lang/lua:0[deprecated] ) + ) + !minimal? ( + ~app-editors/vim-core-${PV} + dev-util/ctags + ) + perl? ( dev-lang/perl:= ) + python? ( ${PYTHON_DEPS} ) + racket? ( dev-scheme/racket ) + ruby? ( ${RUBY_DEPS} ) + selinux? ( sys-libs/libselinux ) + tcl? ( dev-lang/tcl:0= ) + X? ( x11-libs/libXt ) +" + +DEPEND=" + ${RDEPEND} + sys-devel/autoconf + nls? ( sys-devel/gettext ) +" + +pkg_setup() { + # people with broken alphabets run into trouble. bug 82186. + unset LANG LC_ALL + export LC_COLLATE="C" + + # Gnome sandbox silliness. bug #114475. + mkdir -p "${T}"/home || die "mkdir failed" + export HOME="${T}"/home + + use python && python-single-r1_pkg_setup +} + +src_prepare() { + if [[ ${PV} != 9999* ]] ; then + # Gentoo patches to fix runtime issues, cross-compile errors, etc + eapply "${WORKDIR}"/patches/ + fi + + # Fixup a script to use awk instead of nawk + sed -i -e \ + '1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' \ + "${S}"/runtime/tools/mve.awk || die "mve.awk sed failed" + + # Read vimrc and gvimrc from /etc/vim + echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' \ + >> "${S}"/src/feature.h || die "echo failed" + echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' \ + >> "${S}"/src/feature.h || die "echo failed" + + # Use exuberant ctags which installs as /usr/bin/exuberant-ctags. + # Hopefully this pattern won't break for a while at least. + # This fixes bug 29398 (27 Sep 2003 agriffis) + sed -i -e \ + 's/\> "$c" || die "echo failed" + done + + # conditionally make the manpager.sh script + if use vim-pager; then + cat > "${S}"/runtime/macros/manpager.sh <<-_EOF_ || die "cat EOF failed" + #!/bin/sh + sed -e 's/\x1B\[[[:digit:]]\+m//g' | col -b | \\ + vim \\ + -c 'let no_plugin_maps = 1' \\ + -c 'set nolist nomod ft=man ts=8' \\ + -c 'let g:showmarks_enable=0' \\ + -c 'runtime! macros/less.vim' - + _EOF_ + fi + + # Try to avoid sandbox problems. Bug #114475. + if [[ -d "${S}"/src/po ]]; then + sed -i -e \ + '/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \ + "${S}"/src/po/Makefile || die "sed failed" + fi + + cp -v "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk || die "cp failed" + + sed -i -e \ + "s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:" \ + "${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed' + + eapply_user +} + +src_configure() { + local myconf=() + + # Fix bug 37354: Disallow -funroll-all-loops on amd64 + # Bug 57859 suggests that we want to do this for all archs + filter-flags -funroll-all-loops + + # Fix bug 76331: -O3 causes problems, use -O2 instead. We'll do this for + # everyone since previous flag filtering bugs have turned out to affect + # multiple archs... + replace-flags -O3 -O2 + + # Fix bug 18245: Prevent "make" from the following chain: + # (1) Notice configure.ac is newer than auto/configure + # (2) Rebuild auto/configure + # (3) Notice auto/configure is newer than auto/config.mk + # (4) Run ./configure (with wrong args) to remake auto/config.mk + sed -i 's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed" + rm src/auto/configure || die "rm failed" + emake -j1 -C src autoconf + + # This should fix a sandbox violation (see bug 24447). The hvc + # things are for ppc64, see bug 86433. + for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc*; do + if [[ -e "${file}" ]]; then + addwrite $file + fi + done + + if use minimal; then + myconf=( + --with-features=tiny + --disable-nls + --disable-multibyte + --disable-acl + --enable-gui=no + --without-x + --disable-darwin + --disable-luainterp + --disable-perlinterp + --disable-pythoninterp + --disable-mzschemeinterp + --disable-rubyinterp + --disable-selinux + --disable-tclinterp + --disable-gpm + ) + else + use debug && append-flags "-DDEBUG" + + myconf=( + --with-features=huge + --enable-multibyte + $(use_enable acl) + $(use_enable cscope) + $(use_enable gpm) + $(use_enable lua luainterp) + $(usex lua "--with-lua-prefix=${EPREFIX}/usr" "") + $(use_with luajit) + $(use_enable nls) + $(use_enable perl perlinterp) + $(use_enable python pythoninterp) + $(use_enable python python3interp) + $(use_enable racket mzschemeinterp) + $(use_enable ruby rubyinterp) + $(use_enable selinux) + $(use_enable tcl tclinterp) + $(use_enable terminal) + ) + + # --with-features=huge forces on cscope even if we --disable it. We need + # to sed this out to avoid screwiness. (1 Sep 2004 ciaranm) + if ! use cscope; then + sed -i -e \ + '/# define FEAT_CSCOPE/d' src/feature.h || die "sed failed" + fi + + # don't test USE=X here ... see bug #19115 + # but need to provide a way to link against X ... see bug #20093 + myconf+=( + --enable-gui=no + --disable-darwin + $(use_with X x) + ) + fi + + # let package manager strip binaries + export ac_cv_prog_STRIP="$(type -P true ) faking strip" + + # keep prefix env contained within the EPREFIX + use prefix && myconf+=( --without-local-dir ) + + econf \ + --with-modified-by=Gentoo-${PVR} \ + "${myconf[@]}" +} + +src_compile() { + # The following allows emake to be used + emake -j1 -C src auto/osdef.h objects + + emake +} + +src_test() { + einfo + einfo "Starting vim tests. Several error messages will be shown" + einfo "while the tests run. This is normal behaviour and does not" + einfo "indicate a fault." + einfo + ewarn "If the tests fail, your terminal may be left in a strange" + ewarn "state. Usually, running 'reset' will fix this." + einfo + + # Don't let vim talk to X + unset DISPLAY + + emake -j1 -C src/testdir nongui +} + +# Call eselect vi update with --if-unset +# to respect user's choice (bug 187449) +eselect_vi_update() { + einfo "Calling eselect vi update..." + eselect vi update --if-unset + eend $? +} + +src_install() { + local vimfiles=/usr/share/vim/vim${VIM_VERSION/.} + + # Note: Do not install symlinks for 'vi', 'ex', or 'view', as these are + # managed by eselect-vi + dobin src/vim + dosym vim /usr/bin/vimdiff + dosym vim /usr/bin/rvim + dosym vim /usr/bin/rview + if use vim-pager ; then + dosym ${vimfiles}/macros/less.sh /usr/bin/vimpager + dosym ${vimfiles}/macros/manpager.sh /usr/bin/vimmanpager + insinto ${vimfiles}/macros + doins runtime/macros/manpager.sh + fperms a+x ${vimfiles}/macros/manpager.sh + fi + + newbashcomp "${FILESDIR}"/${PN}-completion ${PN} + + # keep in sync with 'complete ... -F' list + bashcomp_alias vim ex vi view rvim rview vimdiff +} + +pkg_postinst() { + # Update documentation tags (from vim-doc.eclass) + update_vim_helptags + + # Call eselect vi update + eselect_vi_update +} + +pkg_postrm() { + # Update documentation tags (from vim-doc.eclass) + update_vim_helptags + + # Call eselect vi update + eselect_vi_update +} diff --git a/sdk_container/src/third_party/portage-stable/app-editors/vim/vim-9999.ebuild b/sdk_container/src/third_party/portage-stable/app-editors/vim/vim-9999.ebuild index f1b87f0b3a..1fdeedc42c 100644 --- a/sdk_container/src/third_party/portage-stable/app-editors/vim/vim-9999.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-editors/vim/vim-9999.ebuild @@ -1,27 +1,29 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 VIM_VERSION="8.0" PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} ) -PYTHON_REQ_USE=threads -inherit eutils vim-doc flag-o-matic fdo-mime versionator bash-completion-r1 python-single-r1 +PYTHON_REQ_USE="threads" +USE_RUBY="ruby22 ruby23 ruby24 ruby25" + +inherit vim-doc flag-o-matic versionator bash-completion-r1 python-single-r1 ruby-single if [[ ${PV} == 9999* ]] ; then inherit git-r3 EGIT_REPO_URI="https://github.com/vim/vim.git" else SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> ${P}.tar.gz - https://dev.gentoo.org/~radhermit/vim/vim-8.0.0106-gentoo-patches.tar.bz2" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + https://dev.gentoo.org/~radhermit/vim/vim-8.0.0938-gentoo-patches.tar.bz2" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" fi DESCRIPTION="Vim, an improved vi-style text editor" -HOMEPAGE="http://www.vim.org/ https://github.com/vim/vim" +HOMEPAGE="https://vim.sourceforge.io/ https://github.com/vim/vim" SLOT="0" LICENSE="vim" -IUSE="X acl cscope debug gpm lua luajit minimal nls perl python racket ruby selinux tcl vim-pager" +IUSE="X acl cscope debug gpm lua luajit minimal nls perl python racket ruby selinux tcl terminal vim-pager" REQUIRED_USE=" luajit? ( lua ) python? ( ${PYTHON_REQUIRED_USE} ) @@ -45,12 +47,14 @@ RDEPEND=" perl? ( dev-lang/perl:= ) python? ( ${PYTHON_DEPS} ) racket? ( dev-scheme/racket ) - ruby? ( || ( dev-lang/ruby:2.4 dev-lang/ruby:2.3 dev-lang/ruby:2.2 dev-lang/ruby:2.1 ) ) + ruby? ( ${RUBY_DEPS} ) selinux? ( sys-libs/libselinux ) tcl? ( dev-lang/tcl:0= ) X? ( x11-libs/libXt ) " -DEPEND="${RDEPEND} + +DEPEND=" + ${RDEPEND} sys-devel/autoconf nls? ( sys-devel/gettext ) " @@ -61,7 +65,7 @@ pkg_setup() { export LC_COLLATE="C" # Gnome sandbox silliness. bug #114475. - mkdir -p "${T}"/home + mkdir -p "${T}"/home || die "mkdir failed" export HOME="${T}"/home use python && python-single-r1_pkg_setup @@ -74,17 +78,21 @@ src_prepare() { fi # Fixup a script to use awk instead of nawk - sed -i '1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' "${S}"/runtime/tools/mve.awk \ - || die "mve.awk sed failed" + sed -i -e \ + '1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' \ + "${S}"/runtime/tools/mve.awk || die "mve.awk sed failed" # Read vimrc and gvimrc from /etc/vim - echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' >> "${S}"/src/feature.h - echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' >> "${S}"/src/feature.h + echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' \ + >> "${S}"/src/feature.h || die "echo failed" + echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' \ + >> "${S}"/src/feature.h || die "echo failed" # Use exuberant ctags which installs as /usr/bin/exuberant-ctags. # Hopefully this pattern won't break for a while at least. # This fixes bug 29398 (27 Sep 2003 agriffis) - sed -i 's/\> "$c" ; done + find "${S}" -name '*.c' | while read c; do + echo >> "$c" || die "echo failed" + done # conditionally make the manpager.sh script - if use vim-pager ; then - cat <<-END > "${S}"/runtime/macros/manpager.sh + if use vim-pager; then + cat > "${S}"/runtime/macros/manpager.sh <<-_EOF_ || die "cat EOF failed" #!/bin/sh sed -e 's/\x1B\[[[:digit:]]\+m//g' | col -b | \\ vim \\ @@ -112,24 +124,21 @@ src_prepare() { -c 'set nolist nomod ft=man ts=8' \\ -c 'let g:showmarks_enable=0' \\ -c 'runtime! macros/less.vim' - - END + _EOF_ fi # Try to avoid sandbox problems. Bug #114475. - if [[ -d "${S}"/src/po ]] ; then - sed -i '/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \ - "${S}"/src/po/Makefile + if [[ -d "${S}"/src/po ]]; then + sed -i -e \ + '/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \ + "${S}"/src/po/Makefile || die "sed failed" fi - if version_is_at_least 7.3.122 ; then - cp "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk - fi + cp -v "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk || die "cp failed" - # Bug #378107 - Build properly with >=perl-core/ExtUtils-ParseXS-3.20.0 - if version_is_at_least 7.3 ; then - sed -i "s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:" \ - "${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed' - fi + sed -i -e \ + "s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:" \ + "${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed' eapply_user } @@ -152,16 +161,18 @@ src_configure() { # (3) Notice auto/configure is newer than auto/config.mk # (4) Run ./configure (with wrong args) to remake auto/config.mk sed -i 's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed" - rm -f src/auto/configure + rm src/auto/configure || die "rm failed" emake -j1 -C src autoconf # This should fix a sandbox violation (see bug 24447). The hvc # things are for ppc64, see bug 86433. - for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc* ; do - [[ -e ${file} ]] && addwrite $file + for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc*; do + if [[ -e "${file}" ]]; then + addwrite $file + fi done - if use minimal ; then + if use minimal; then myconf=( --with-features=tiny --disable-nls @@ -199,13 +210,14 @@ src_configure() { $(use_enable ruby rubyinterp) $(use_enable selinux) $(use_enable tcl tclinterp) + $(use_enable terminal) ) # --with-features=huge forces on cscope even if we --disable it. We need # to sed this out to avoid screwiness. (1 Sep 2004 ciaranm) - if ! use cscope ; then - sed -i '/# define FEAT_CSCOPE/d' src/feature.h || \ - die "couldn't disable cscope" + if ! use cscope; then + sed -i -e \ + '/# define FEAT_CSCOPE/d' src/feature.h || die "sed failed" fi # don't test USE=X here ... see bug #19115 @@ -236,14 +248,14 @@ src_compile() { } src_test() { - echo + einfo einfo "Starting vim tests. Several error messages will be shown" einfo "while the tests run. This is normal behaviour and does not" einfo "indicate a fault." - echo + einfo ewarn "If the tests fail, your terminal may be left in a strange" ewarn "state. Usually, running 'reset' will fix this." - echo + einfo # Don't let vim talk to X unset DISPLAY @@ -251,39 +263,12 @@ src_test() { emake -j1 -C src/testdir nongui } -# Make convenience symlinks, hopefully without stepping on toes. Some -# of these links are "owned" by the vim ebuild when it is installed, -# but they might be good for gvim as well (see bug 45828) -update_vim_symlinks() { - local f syms - syms="vimdiff rvim rview" +# Call eselect vi update with --if-unset +# to respect user's choice (bug 187449) +eselect_vi_update() { einfo "Calling eselect vi update..." - # Call this with --if-unset to respect user's choice (bug 187449) eselect vi update --if-unset - - # Make or remove convenience symlink, vim -> gvim - if [[ -f "${EROOT}"/usr/bin/gvim ]]; then - ln -s gvim "${EROOT}"/usr/bin/vim 2>/dev/null - elif [[ -L "${EROOT}"/usr/bin/vim && ! -f "${EROOT}"/usr/bin/vim ]]; then - rm "${EROOT}"/usr/bin/vim - fi - - # Make or remove convenience symlinks to vim - if [[ -f "${EROOT}"/usr/bin/vim ]]; then - for f in ${syms}; do - ln -s vim "${EROOT}"/usr/bin/${f} 2>/dev/null - done - else - for f in ${syms}; do - if [[ -L "${EROOT}"/usr/bin/${f} && ! -f "${EROOT}"/usr/bin/${f} ]]; then - rm -f "${EROOT}"/usr/bin/${f} - fi - done - fi - - # This will still break if you merge then remove the vi package, - # but there's only so much you can do, eh? Unfortunately we don't - # have triggers like are done in rpm-land. + eend $? } src_install() { @@ -304,26 +289,23 @@ src_install() { fi newbashcomp "${FILESDIR}"/${PN}-completion ${PN} + # keep in sync with 'complete ... -F' list bashcomp_alias vim ex vi view rvim rview vimdiff - - # We shouldn't be installing the ex or view man page symlinks, as they - # are managed by eselect-vi - rm -f "${ED}"/usr/share/man/man1/{ex,view}.1 } pkg_postinst() { # Update documentation tags (from vim-doc.eclass) update_vim_helptags - # Make convenience symlinks - update_vim_symlinks + # Call eselect vi update + eselect_vi_update } pkg_postrm() { # Update documentation tags (from vim-doc.eclass) update_vim_helptags - # Make convenience symlinks - update_vim_symlinks + # Call eselect vi update + eselect_vi_update } diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-editors/vim-8.0.0386 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-editors/vim-8.0.0386 deleted file mode 100644 index 2c6dd5dcda..0000000000 --- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-editors/vim-8.0.0386 +++ /dev/null @@ -1,14 +0,0 @@ -DEFINED_PHASES=compile configure install postinst postrm prepare setup test -DEPEND=>=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= nls? ( virtual/libintl ) acl? ( kernel_linux? ( sys-apps/acl ) ) cscope? ( dev-util/cscope ) gpm? ( >=sys-libs/gpm-1.19.3 ) lua? ( luajit? ( dev-lang/luajit:2= ) !luajit? ( dev-lang/lua:0[deprecated] ) ) !minimal? ( ~app-editors/vim-core-8.0.0386 dev-util/ctags ) perl? ( dev-lang/perl:= ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) python_targets_python3_4? ( dev-lang/python:3.4[threads] ) python_targets_python3_5? ( dev-lang/python:3.5[threads] ) python_targets_python3_6? ( dev-lang/python:3.6[threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) racket? ( dev-scheme/racket ) ruby? ( || ( dev-lang/ruby:2.4 dev-lang/ruby:2.3 dev-lang/ruby:2.2 dev-lang/ruby:2.1 ) ) selinux? ( sys-libs/libselinux ) tcl? ( dev-lang/tcl:0= ) X? ( x11-libs/libXt ) sys-devel/autoconf nls? ( sys-devel/gettext ) -DESCRIPTION=Vim, an improved vi-style text editor -EAPI=6 -HOMEPAGE=http://www.vim.org/ https://github.com/vim/vim -IUSE=X acl cscope debug gpm lua luajit minimal nls perl python racket ruby selinux tcl vim-pager python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 -KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris -LICENSE=vim -RDEPEND=>=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= nls? ( virtual/libintl ) acl? ( kernel_linux? ( sys-apps/acl ) ) cscope? ( dev-util/cscope ) gpm? ( >=sys-libs/gpm-1.19.3 ) lua? ( luajit? ( dev-lang/luajit:2= ) !luajit? ( dev-lang/lua:0[deprecated] ) ) !minimal? ( ~app-editors/vim-core-8.0.0386 dev-util/ctags ) perl? ( dev-lang/perl:= ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) python_targets_python3_4? ( dev-lang/python:3.4[threads] ) python_targets_python3_5? ( dev-lang/python:3.5[threads] ) python_targets_python3_6? ( dev-lang/python:3.6[threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) racket? ( dev-scheme/racket ) ruby? ( || ( dev-lang/ruby:2.4 dev-lang/ruby:2.3 dev-lang/ruby:2.2 dev-lang/ruby:2.1 ) ) selinux? ( sys-libs/libselinux ) tcl? ( dev-lang/tcl:0= ) X? ( x11-libs/libXt ) -REQUIRED_USE=luajit? ( lua ) python? ( || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) ?? ( python_targets_python2_7 ) ?? ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) ) -SLOT=0 -SRC_URI=https://github.com/vim/vim/archive/v8.0.0386.tar.gz -> vim-8.0.0386.tar.gz https://dev.gentoo.org/~radhermit/vim/vim-8.0.0106-gentoo-patches.tar.bz2 -_eclasses_=bash-completion-r1 8e447753aaf658afa609fbf961d80ab7 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 fdo-mime 995b19d3f30e956b4e1bc5a91fdc4ea7 flag-o-matic 2274fcc1e7ef6affaff5bcd636275417 ltprune 2770eed66a9b8ef944714cd0e968182e multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e python-r1 e9350ec46bb5c9f3504b4fbe8b8d8987 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 185a06792159ca143528e7010368e8af versionator c80ccf29e90adea7c5cae94b42eb76d0 vim-doc af2c81a1feeb0a99e91bee3e20769edb -_md5_=0c403bc83cbbdba30f2e9def21b6b832 diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-editors/vim-8.0.1298 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-editors/vim-8.0.1298 new file mode 100644 index 0000000000..b15dc92305 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-editors/vim-8.0.1298 @@ -0,0 +1,14 @@ +DEFINED_PHASES=compile configure install postinst postrm prepare setup test +DEPEND=>=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= nls? ( virtual/libintl ) acl? ( kernel_linux? ( sys-apps/acl ) ) cscope? ( dev-util/cscope ) gpm? ( >=sys-libs/gpm-1.19.3 ) lua? ( luajit? ( dev-lang/luajit:2= ) !luajit? ( dev-lang/lua:0[deprecated] ) ) !minimal? ( ~app-editors/vim-core-8.0.1298 dev-util/ctags ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) python_single_target_python3_4? ( dev-lang/python:3.4[threads] ) python_single_target_python3_5? ( dev-lang/python:3.5[threads] ) python_single_target_python3_6? ( dev-lang/python:3.6[threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) racket? ( dev-scheme/racket ) ruby? ( || ( dev-lang/ruby:2.4 dev-lang/ruby:2.3 dev-lang/ruby:2.2 ) ) selinux? ( sys-libs/libselinux ) tcl? ( dev-lang/tcl:0= ) X? ( x11-libs/libXt ) sys-devel/autoconf nls? ( sys-devel/gettext ) +DESCRIPTION=Vim, an improved vi-style text editor +EAPI=6 +HOMEPAGE=https://vim.sourceforge.io/ https://github.com/vim/vim +IUSE=X acl cscope debug gpm lua luajit minimal nls perl python racket ruby selinux tcl terminal vim-pager python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 +KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris +LICENSE=vim +RDEPEND=>=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= nls? ( virtual/libintl ) acl? ( kernel_linux? ( sys-apps/acl ) ) cscope? ( dev-util/cscope ) gpm? ( >=sys-libs/gpm-1.19.3 ) lua? ( luajit? ( dev-lang/luajit:2= ) !luajit? ( dev-lang/lua:0[deprecated] ) ) !minimal? ( ~app-editors/vim-core-8.0.1298 dev-util/ctags ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) python_single_target_python3_4? ( dev-lang/python:3.4[threads] ) python_single_target_python3_5? ( dev-lang/python:3.5[threads] ) python_single_target_python3_6? ( dev-lang/python:3.6[threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) racket? ( dev-scheme/racket ) ruby? ( || ( dev-lang/ruby:2.4 dev-lang/ruby:2.3 dev-lang/ruby:2.2 ) ) selinux? ( sys-libs/libselinux ) tcl? ( dev-lang/tcl:0= ) X? ( x11-libs/libXt ) +REQUIRED_USE=luajit? ( lua ) python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) ) +SLOT=0 +SRC_URI=https://github.com/vim/vim/archive/v8.0.1298.tar.gz -> vim-8.0.1298.tar.gz https://dev.gentoo.org/~radhermit/vim/vim-8.0.0938-gentoo-patches.tar.bz2 +_eclasses_=bash-completion-r1 8e447753aaf658afa609fbf961d80ab7 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 flag-o-matic 2274fcc1e7ef6affaff5bcd636275417 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e python-single-r1 317a2557b4d7319a7418225f65accf77 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 185a06792159ca143528e7010368e8af versionator c80ccf29e90adea7c5cae94b42eb76d0 vim-doc af2c81a1feeb0a99e91bee3e20769edb +_md5_=c9accdddbe544e6eeb3b647bf4298628 diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-editors/vim-8.0.1428 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-editors/vim-8.0.1428 new file mode 100644 index 0000000000..9a910de4d0 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-editors/vim-8.0.1428 @@ -0,0 +1,14 @@ +DEFINED_PHASES=compile configure install postinst postrm prepare setup test +DEPEND=>=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= nls? ( virtual/libintl ) acl? ( kernel_linux? ( sys-apps/acl ) ) cscope? ( dev-util/cscope ) gpm? ( >=sys-libs/gpm-1.19.3 ) lua? ( luajit? ( dev-lang/luajit:2= ) !luajit? ( dev-lang/lua:0[deprecated] ) ) !minimal? ( ~app-editors/vim-core-8.0.1428 dev-util/ctags ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) python_single_target_python3_4? ( dev-lang/python:3.4[threads] ) python_single_target_python3_5? ( dev-lang/python:3.5[threads] ) python_single_target_python3_6? ( dev-lang/python:3.6[threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) racket? ( dev-scheme/racket ) ruby? ( || ( dev-lang/ruby:2.4 dev-lang/ruby:2.3 dev-lang/ruby:2.2 ) ) selinux? ( sys-libs/libselinux ) tcl? ( dev-lang/tcl:0= ) X? ( x11-libs/libXt ) sys-devel/autoconf nls? ( sys-devel/gettext ) +DESCRIPTION=Vim, an improved vi-style text editor +EAPI=6 +HOMEPAGE=https://vim.sourceforge.io/ https://github.com/vim/vim +IUSE=X acl cscope debug gpm lua luajit minimal nls perl python racket ruby selinux tcl terminal vim-pager python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 +KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris +LICENSE=vim +RDEPEND=>=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= nls? ( virtual/libintl ) acl? ( kernel_linux? ( sys-apps/acl ) ) cscope? ( dev-util/cscope ) gpm? ( >=sys-libs/gpm-1.19.3 ) lua? ( luajit? ( dev-lang/luajit:2= ) !luajit? ( dev-lang/lua:0[deprecated] ) ) !minimal? ( ~app-editors/vim-core-8.0.1428 dev-util/ctags ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) python_single_target_python3_4? ( dev-lang/python:3.4[threads] ) python_single_target_python3_5? ( dev-lang/python:3.5[threads] ) python_single_target_python3_6? ( dev-lang/python:3.6[threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) racket? ( dev-scheme/racket ) ruby? ( || ( dev-lang/ruby:2.4 dev-lang/ruby:2.3 dev-lang/ruby:2.2 ) ) selinux? ( sys-libs/libselinux ) tcl? ( dev-lang/tcl:0= ) X? ( x11-libs/libXt ) +REQUIRED_USE=luajit? ( lua ) python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) ) +SLOT=0 +SRC_URI=https://github.com/vim/vim/archive/v8.0.1428.tar.gz -> vim-8.0.1428.tar.gz https://dev.gentoo.org/~radhermit/vim/vim-8.0.0938-gentoo-patches.tar.bz2 +_eclasses_=bash-completion-r1 8e447753aaf658afa609fbf961d80ab7 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 flag-o-matic 2274fcc1e7ef6affaff5bcd636275417 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e python-single-r1 317a2557b4d7319a7418225f65accf77 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 185a06792159ca143528e7010368e8af versionator c80ccf29e90adea7c5cae94b42eb76d0 vim-doc af2c81a1feeb0a99e91bee3e20769edb +_md5_=0fa9515434cb324136229e0e2ab0ad3d diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-editors/vim-8.0.0386-r1 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-editors/vim-8.0.1645 similarity index 65% rename from sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-editors/vim-8.0.0386-r1 rename to sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-editors/vim-8.0.1645 index 3703460134..d07c47e9b3 100644 --- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-editors/vim-8.0.0386-r1 +++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-editors/vim-8.0.1645 @@ -1,14 +1,14 @@ DEFINED_PHASES=compile configure install postinst postrm prepare setup test -DEPEND=>=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= nls? ( virtual/libintl ) acl? ( kernel_linux? ( sys-apps/acl ) ) cscope? ( dev-util/cscope ) gpm? ( >=sys-libs/gpm-1.19.3 ) lua? ( luajit? ( dev-lang/luajit:2= ) !luajit? ( dev-lang/lua:0[deprecated] ) ) !minimal? ( ~app-editors/vim-core-8.0.0386 dev-util/ctags ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) python_single_target_python3_4? ( dev-lang/python:3.4[threads] ) python_single_target_python3_5? ( dev-lang/python:3.5[threads] ) python_single_target_python3_6? ( dev-lang/python:3.6[threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) racket? ( dev-scheme/racket ) ruby? ( || ( dev-lang/ruby:2.4 dev-lang/ruby:2.3 dev-lang/ruby:2.2 dev-lang/ruby:2.1 ) ) selinux? ( sys-libs/libselinux ) tcl? ( dev-lang/tcl:0= ) X? ( x11-libs/libXt ) sys-devel/autoconf nls? ( sys-devel/gettext ) +DEPEND=>=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= nls? ( virtual/libintl ) acl? ( kernel_linux? ( sys-apps/acl ) ) cscope? ( dev-util/cscope ) gpm? ( >=sys-libs/gpm-1.19.3 ) lua? ( luajit? ( dev-lang/luajit:2= ) !luajit? ( dev-lang/lua:0[deprecated] ) ) !minimal? ( ~app-editors/vim-core-8.0.1645 dev-util/ctags ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) python_single_target_python3_4? ( dev-lang/python:3.4[threads] ) python_single_target_python3_5? ( dev-lang/python:3.5[threads] ) python_single_target_python3_6? ( dev-lang/python:3.6[threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) racket? ( dev-scheme/racket ) ruby? ( || ( dev-lang/ruby:2.5 dev-lang/ruby:2.4 dev-lang/ruby:2.3 dev-lang/ruby:2.2 ) ) selinux? ( sys-libs/libselinux ) tcl? ( dev-lang/tcl:0= ) X? ( x11-libs/libXt ) sys-devel/autoconf nls? ( sys-devel/gettext ) DESCRIPTION=Vim, an improved vi-style text editor EAPI=6 -HOMEPAGE=http://www.vim.org/ https://github.com/vim/vim -IUSE=X acl cscope debug gpm lua luajit minimal nls perl python racket ruby selinux tcl vim-pager python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 -KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris +HOMEPAGE=https://vim.sourceforge.io/ https://github.com/vim/vim +IUSE=X acl cscope debug gpm lua luajit minimal nls perl python racket ruby selinux tcl terminal vim-pager python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 +KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris LICENSE=vim -RDEPEND=>=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= nls? ( virtual/libintl ) acl? ( kernel_linux? ( sys-apps/acl ) ) cscope? ( dev-util/cscope ) gpm? ( >=sys-libs/gpm-1.19.3 ) lua? ( luajit? ( dev-lang/luajit:2= ) !luajit? ( dev-lang/lua:0[deprecated] ) ) !minimal? ( ~app-editors/vim-core-8.0.0386 dev-util/ctags ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) python_single_target_python3_4? ( dev-lang/python:3.4[threads] ) python_single_target_python3_5? ( dev-lang/python:3.5[threads] ) python_single_target_python3_6? ( dev-lang/python:3.6[threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) racket? ( dev-scheme/racket ) ruby? ( || ( dev-lang/ruby:2.4 dev-lang/ruby:2.3 dev-lang/ruby:2.2 dev-lang/ruby:2.1 ) ) selinux? ( sys-libs/libselinux ) tcl? ( dev-lang/tcl:0= ) X? ( x11-libs/libXt ) +RDEPEND=>=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= nls? ( virtual/libintl ) acl? ( kernel_linux? ( sys-apps/acl ) ) cscope? ( dev-util/cscope ) gpm? ( >=sys-libs/gpm-1.19.3 ) lua? ( luajit? ( dev-lang/luajit:2= ) !luajit? ( dev-lang/lua:0[deprecated] ) ) !minimal? ( ~app-editors/vim-core-8.0.1645 dev-util/ctags ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) python_single_target_python3_4? ( dev-lang/python:3.4[threads] ) python_single_target_python3_5? ( dev-lang/python:3.5[threads] ) python_single_target_python3_6? ( dev-lang/python:3.6[threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) racket? ( dev-scheme/racket ) ruby? ( || ( dev-lang/ruby:2.5 dev-lang/ruby:2.4 dev-lang/ruby:2.3 dev-lang/ruby:2.2 ) ) selinux? ( sys-libs/libselinux ) tcl? ( dev-lang/tcl:0= ) X? ( x11-libs/libXt ) REQUIRED_USE=luajit? ( lua ) python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) ) SLOT=0 -SRC_URI=https://github.com/vim/vim/archive/v8.0.0386.tar.gz -> vim-8.0.0386.tar.gz https://dev.gentoo.org/~radhermit/vim/vim-8.0.0106-gentoo-patches.tar.bz2 -_eclasses_=bash-completion-r1 8e447753aaf658afa609fbf961d80ab7 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 fdo-mime 995b19d3f30e956b4e1bc5a91fdc4ea7 flag-o-matic 2274fcc1e7ef6affaff5bcd636275417 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e python-single-r1 317a2557b4d7319a7418225f65accf77 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 185a06792159ca143528e7010368e8af versionator c80ccf29e90adea7c5cae94b42eb76d0 vim-doc af2c81a1feeb0a99e91bee3e20769edb -_md5_=af9b1d5c5cbfc4e1c9e546d71d0249cb +SRC_URI=https://github.com/vim/vim/archive/v8.0.1645.tar.gz -> vim-8.0.1645.tar.gz https://dev.gentoo.org/~radhermit/vim/vim-8.0.0938-gentoo-patches.tar.bz2 +_eclasses_=bash-completion-r1 8e447753aaf658afa609fbf961d80ab7 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 flag-o-matic 2274fcc1e7ef6affaff5bcd636275417 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e python-single-r1 317a2557b4d7319a7418225f65accf77 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 185a06792159ca143528e7010368e8af versionator c80ccf29e90adea7c5cae94b42eb76d0 vim-doc af2c81a1feeb0a99e91bee3e20769edb +_md5_=4e7218ef57ce47be2f5f74980b9c2c11 diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-editors/vim-8.0.1699 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-editors/vim-8.0.1699 new file mode 100644 index 0000000000..7a7bb9d9fa --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-editors/vim-8.0.1699 @@ -0,0 +1,14 @@ +DEFINED_PHASES=compile configure install postinst postrm prepare setup test +DEPEND=>=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= nls? ( virtual/libintl ) acl? ( kernel_linux? ( sys-apps/acl ) ) cscope? ( dev-util/cscope ) gpm? ( >=sys-libs/gpm-1.19.3 ) lua? ( luajit? ( dev-lang/luajit:2= ) !luajit? ( dev-lang/lua:0[deprecated] ) ) !minimal? ( ~app-editors/vim-core-8.0.1699 dev-util/ctags ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) python_single_target_python3_4? ( dev-lang/python:3.4[threads] ) python_single_target_python3_5? ( dev-lang/python:3.5[threads] ) python_single_target_python3_6? ( dev-lang/python:3.6[threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) racket? ( dev-scheme/racket ) ruby? ( || ( dev-lang/ruby:2.2 dev-lang/ruby:2.3 dev-lang/ruby:2.4 ) virtual/rubygems ) selinux? ( sys-libs/libselinux ) tcl? ( dev-lang/tcl:0= ) X? ( x11-libs/libXt ) sys-devel/autoconf nls? ( sys-devel/gettext ) +DESCRIPTION=Vim, an improved vi-style text editor +EAPI=6 +HOMEPAGE=https://vim.sourceforge.io/ https://github.com/vim/vim +IUSE=X acl cscope debug gpm lua luajit minimal nls perl python racket ruby selinux tcl terminal vim-pager python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 +KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris +LICENSE=vim +RDEPEND=>=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= nls? ( virtual/libintl ) acl? ( kernel_linux? ( sys-apps/acl ) ) cscope? ( dev-util/cscope ) gpm? ( >=sys-libs/gpm-1.19.3 ) lua? ( luajit? ( dev-lang/luajit:2= ) !luajit? ( dev-lang/lua:0[deprecated] ) ) !minimal? ( ~app-editors/vim-core-8.0.1699 dev-util/ctags ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) python_single_target_python3_4? ( dev-lang/python:3.4[threads] ) python_single_target_python3_5? ( dev-lang/python:3.5[threads] ) python_single_target_python3_6? ( dev-lang/python:3.6[threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) racket? ( dev-scheme/racket ) ruby? ( || ( dev-lang/ruby:2.2 dev-lang/ruby:2.3 dev-lang/ruby:2.4 ) virtual/rubygems ) selinux? ( sys-libs/libselinux ) tcl? ( dev-lang/tcl:0= ) X? ( x11-libs/libXt ) +REQUIRED_USE=luajit? ( lua ) python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) ) +SLOT=0 +SRC_URI=https://github.com/vim/vim/archive/v8.0.1699.tar.gz -> vim-8.0.1699.tar.gz https://dev.gentoo.org/~radhermit/vim/vim-8.0.0938-gentoo-patches.tar.bz2 +_eclasses_=bash-completion-r1 8e447753aaf658afa609fbf961d80ab7 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 flag-o-matic 2274fcc1e7ef6affaff5bcd636275417 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e python-single-r1 317a2557b4d7319a7418225f65accf77 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d ruby-single af6ea0a8fe4c4faf733f4dbafae9e233 ruby-utils 453e0fe0dd06baac93b584c91528cc62 toolchain-funcs 185a06792159ca143528e7010368e8af versionator c80ccf29e90adea7c5cae94b42eb76d0 vim-doc af2c81a1feeb0a99e91bee3e20769edb +_md5_=afed47f5984834953221e33d99627e58 diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-editors/vim-9999 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-editors/vim-9999 index 9799c2d83b..4c5a94b611 100644 --- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-editors/vim-9999 +++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-editors/vim-9999 @@ -1,12 +1,12 @@ DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack -DEPEND=>=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= nls? ( virtual/libintl ) acl? ( kernel_linux? ( sys-apps/acl ) ) cscope? ( dev-util/cscope ) gpm? ( >=sys-libs/gpm-1.19.3 ) lua? ( luajit? ( dev-lang/luajit:2= ) !luajit? ( dev-lang/lua:0[deprecated] ) ) !minimal? ( ~app-editors/vim-core-9999 dev-util/ctags ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) python_single_target_python3_4? ( dev-lang/python:3.4[threads] ) python_single_target_python3_5? ( dev-lang/python:3.5[threads] ) python_single_target_python3_6? ( dev-lang/python:3.6[threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) racket? ( dev-scheme/racket ) ruby? ( || ( dev-lang/ruby:2.4 dev-lang/ruby:2.3 dev-lang/ruby:2.2 dev-lang/ruby:2.1 ) ) selinux? ( sys-libs/libselinux ) tcl? ( dev-lang/tcl:0= ) X? ( x11-libs/libXt ) sys-devel/autoconf nls? ( sys-devel/gettext ) >=dev-vcs/git-1.8.2.1 +DEPEND=>=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= nls? ( virtual/libintl ) acl? ( kernel_linux? ( sys-apps/acl ) ) cscope? ( dev-util/cscope ) gpm? ( >=sys-libs/gpm-1.19.3 ) lua? ( luajit? ( dev-lang/luajit:2= ) !luajit? ( dev-lang/lua:0[deprecated] ) ) !minimal? ( ~app-editors/vim-core-9999 dev-util/ctags ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) python_single_target_python3_4? ( dev-lang/python:3.4[threads] ) python_single_target_python3_5? ( dev-lang/python:3.5[threads] ) python_single_target_python3_6? ( dev-lang/python:3.6[threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) racket? ( dev-scheme/racket ) ruby? ( || ( dev-lang/ruby:2.2 dev-lang/ruby:2.3 dev-lang/ruby:2.4 ) virtual/rubygems ) selinux? ( sys-libs/libselinux ) tcl? ( dev-lang/tcl:0= ) X? ( x11-libs/libXt ) sys-devel/autoconf nls? ( sys-devel/gettext ) >=dev-vcs/git-1.8.2.1 DESCRIPTION=Vim, an improved vi-style text editor EAPI=6 -HOMEPAGE=http://www.vim.org/ https://github.com/vim/vim -IUSE=X acl cscope debug gpm lua luajit minimal nls perl python racket ruby selinux tcl vim-pager python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 +HOMEPAGE=https://vim.sourceforge.io/ https://github.com/vim/vim +IUSE=X acl cscope debug gpm lua luajit minimal nls perl python racket ruby selinux tcl terminal vim-pager python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 LICENSE=vim -RDEPEND=>=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= nls? ( virtual/libintl ) acl? ( kernel_linux? ( sys-apps/acl ) ) cscope? ( dev-util/cscope ) gpm? ( >=sys-libs/gpm-1.19.3 ) lua? ( luajit? ( dev-lang/luajit:2= ) !luajit? ( dev-lang/lua:0[deprecated] ) ) !minimal? ( ~app-editors/vim-core-9999 dev-util/ctags ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) python_single_target_python3_4? ( dev-lang/python:3.4[threads] ) python_single_target_python3_5? ( dev-lang/python:3.5[threads] ) python_single_target_python3_6? ( dev-lang/python:3.6[threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) racket? ( dev-scheme/racket ) ruby? ( || ( dev-lang/ruby:2.4 dev-lang/ruby:2.3 dev-lang/ruby:2.2 dev-lang/ruby:2.1 ) ) selinux? ( sys-libs/libselinux ) tcl? ( dev-lang/tcl:0= ) X? ( x11-libs/libXt ) +RDEPEND=>=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= nls? ( virtual/libintl ) acl? ( kernel_linux? ( sys-apps/acl ) ) cscope? ( dev-util/cscope ) gpm? ( >=sys-libs/gpm-1.19.3 ) lua? ( luajit? ( dev-lang/luajit:2= ) !luajit? ( dev-lang/lua:0[deprecated] ) ) !minimal? ( ~app-editors/vim-core-9999 dev-util/ctags ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) python_single_target_python3_4? ( dev-lang/python:3.4[threads] ) python_single_target_python3_5? ( dev-lang/python:3.5[threads] ) python_single_target_python3_6? ( dev-lang/python:3.6[threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) racket? ( dev-scheme/racket ) ruby? ( || ( dev-lang/ruby:2.2 dev-lang/ruby:2.3 dev-lang/ruby:2.4 ) virtual/rubygems ) selinux? ( sys-libs/libselinux ) tcl? ( dev-lang/tcl:0= ) X? ( x11-libs/libXt ) REQUIRED_USE=luajit? ( lua ) python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) ) SLOT=0 -_eclasses_=bash-completion-r1 8e447753aaf658afa609fbf961d80ab7 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 fdo-mime 995b19d3f30e956b4e1bc5a91fdc4ea7 flag-o-matic 2274fcc1e7ef6affaff5bcd636275417 git-r3 52a888802d25387c2c74cb845d1219bc ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e python-single-r1 317a2557b4d7319a7418225f65accf77 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 185a06792159ca143528e7010368e8af versionator c80ccf29e90adea7c5cae94b42eb76d0 vim-doc af2c81a1feeb0a99e91bee3e20769edb -_md5_=a3514f00fd2d6c62b31dd4f0881c237b +_eclasses_=bash-completion-r1 8e447753aaf658afa609fbf961d80ab7 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 flag-o-matic 2274fcc1e7ef6affaff5bcd636275417 git-r3 52a888802d25387c2c74cb845d1219bc ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e python-single-r1 317a2557b4d7319a7418225f65accf77 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d ruby-single af6ea0a8fe4c4faf733f4dbafae9e233 ruby-utils 453e0fe0dd06baac93b584c91528cc62 toolchain-funcs 185a06792159ca143528e7010368e8af versionator c80ccf29e90adea7c5cae94b42eb76d0 vim-doc af2c81a1feeb0a99e91bee3e20769edb +_md5_=afed47f5984834953221e33d99627e58 From 6c798c1c1de47453bc7a8d7f8c55b3e2dd596361 Mon Sep 17 00:00:00 2001 From: David Michael Date: Mon, 14 May 2018 14:22:14 -0400 Subject: [PATCH 10/21] bump(app-editors/vim-core): sync with upstream --- .../app-editors/vim-core/Manifest | 7 +- .../app-editors/vim-core/files/vimrc-r5 | 11 + ...0.0386.ebuild => vim-core-8.0.1298.ebuild} | 69 +++--- .../vim-core/vim-core-8.0.1428.ebuild | 214 ++++++++++++++++++ .../vim-core/vim-core-8.0.1645.ebuild | 214 ++++++++++++++++++ .../vim-core/vim-core-8.0.1699.ebuild | 214 ++++++++++++++++++ .../app-editors/vim-core/vim-core-9999.ebuild | 69 +++--- .../{vim-core-8.0.0386 => vim-core-8.0.1298} | 8 +- .../md5-cache/app-editors/vim-core-8.0.1428 | 13 ++ .../md5-cache/app-editors/vim-core-8.0.1645 | 13 ++ .../md5-cache/app-editors/vim-core-8.0.1699 | 13 ++ .../md5-cache/app-editors/vim-core-9999 | 4 +- 12 files changed, 769 insertions(+), 80 deletions(-) rename sdk_container/src/third_party/portage-stable/app-editors/vim-core/{vim-core-8.0.0386.ebuild => vim-core-8.0.1298.ebuild} (75%) create mode 100644 sdk_container/src/third_party/portage-stable/app-editors/vim-core/vim-core-8.0.1428.ebuild create mode 100644 sdk_container/src/third_party/portage-stable/app-editors/vim-core/vim-core-8.0.1645.ebuild create mode 100644 sdk_container/src/third_party/portage-stable/app-editors/vim-core/vim-core-8.0.1699.ebuild rename sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-editors/{vim-core-8.0.0386 => vim-core-8.0.1298} (63%) create mode 100644 sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-editors/vim-core-8.0.1428 create mode 100644 sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-editors/vim-core-8.0.1645 create mode 100644 sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-editors/vim-core-8.0.1699 diff --git a/sdk_container/src/third_party/portage-stable/app-editors/vim-core/Manifest b/sdk_container/src/third_party/portage-stable/app-editors/vim-core/Manifest index 210d7aea1a..1625bab72a 100644 --- a/sdk_container/src/third_party/portage-stable/app-editors/vim-core/Manifest +++ b/sdk_container/src/third_party/portage-stable/app-editors/vim-core/Manifest @@ -1,2 +1,5 @@ -DIST vim-8.0.0106-gentoo-patches.tar.bz2 2281 SHA256 9823a91b050eb4b001cc50f508d2ad03c7c256ed49183c1af7582318667f48d4 SHA512 39edd9f518c230d2b0486b18aa155572a9eada4a5e21108573d6e66e2eef1276f23b77d766648f018c9cf973a7d03712d8861be6ea13255d7b389912d554a47a WHIRLPOOL d6d01e3944d56762a2a999ee631f89e212360aa030ddd16ea96e32d518ec171e04d8565dcb89e804248d53e4c6e06b19be239ad2316ea88bb57364815b85d26b -DIST vim-8.0.0386.tar.gz 13000882 SHA256 25b28f6ef55a8d0b3f255f0fbed90ad1450bde7f7b231cc09d86c5119adc95bc SHA512 3169ea4dbc836c724f63d99cd345227f870a3a922beba84a6b42011685c0dd209f6bba8c69af0650c9a57bb47fc541e1150ca8cefb21fcada022259bf4c94a66 WHIRLPOOL 99a5582e0db0dc53fd8385cddf1fbf13d2fe1dd5c8e33c9959288c19d4b85f50139791269edd4ec3d5cbed6548cc3d9c7962ec1706eb422a4ef83c207aac009b +DIST vim-8.0.0938-gentoo-patches.tar.bz2 2316 BLAKE2B 05a87f32fc5cc65e7f5e4e5a87c654b2040ad39f1555ddde7e0e6f473dc8b520916a795406bb6bbeaf5e7ae8748aacebe7a9679461e48802e69417e945eea827 SHA512 a6062be5e6a5c5b437081312df5742353242b5171bf26da04aa6ca216d2b142b2411a88bc1edd460d28e00a59a210c8e1729e801fac6f1efd86bb2e437a56a2b +DIST vim-8.0.1298.tar.gz 13395459 BLAKE2B 4b6e3c4443cd675dc3727e8609b89c422f66c7d32908b5136ee312d48427568a8236214c85135242269b6575e0e1336b0973395a6372664435f8bae4d7bee843 SHA512 7704c493359c1a922f876e4d6f3b4ad265d8ce974a59d51a39e5a4424251105250ffc803bcf6c6750daeb5e6376cbbfd24557b075eacf2b0274d7c432db2f681 +DIST vim-8.0.1428.tar.gz 13415243 BLAKE2B 88f86c371d0a644212b9e4dc1a15d61244847037f36262a225c361bfc2799b741c128de21ac92bb3fb4a4955894e46d34dc01baa7cbf58f1371d772b36887103 SHA512 f635c53c7e2ca808dc1cb424e6e4b16d8c41c66a86c3c7584444dab3d2482904795fea7c071d65862ae6ac6b2b66b7ad5ac832e1e30f4624d46f220c6f41e2e9 +DIST vim-8.0.1645.tar.gz 13535252 BLAKE2B a5c7463e85eed12825bdf46d15eb7e7513d62831eba76cbb90af875010b33662b7a6ef2c4c5cecddface415d75e97caf0a670e69835ecd3b4a89704f3b18b905 SHA512 367b9e205e776f84fcfbb92725afd5e7aa66898110d46dbea1a33f7b74c239559e829b5104c45360539c8f2b23c375ed59ccea7ee35a5dd10770400d9a7be085 +DIST vim-8.0.1699.tar.gz 13546105 BLAKE2B cabf29d5a89c55e2fe3bc5e39eb499412f5907ddf856f8644b466f1e0fbffefff3cd801b6bc5e49e62ffdf8805b0556058b9a913015a9f9fbe1a4f580132fd49 SHA512 b0fe8e1dc05fdc3758896caf4746da40988ca7604d77dbe78c47525cbf8f0d7e6c05f690687268eda581009050d4e02e93fb4d30734cbbab4cfd6a8a1488c1e7 diff --git a/sdk_container/src/third_party/portage-stable/app-editors/vim-core/files/vimrc-r5 b/sdk_container/src/third_party/portage-stable/app-editors/vim-core/files/vimrc-r5 index 3386b6c54b..2409822e62 100644 --- a/sdk_container/src/third_party/portage-stable/app-editors/vim-core/files/vimrc-r5 +++ b/sdk_container/src/third_party/portage-stable/app-editors/vim-core/files/vimrc-r5 @@ -193,6 +193,17 @@ endif " has("autocmd") " instead: let g:skip_defaults_vim = 1 +" Enable Omni completion when opening a file only if a specific plugin does +" not already exist for that filetype. This allows Omni completion +" (Ctrl-x/Ctrl-o) to work with any programming language if and only if a syntax +" file exists for the said language. +if exists("+omnifunc") + autocmd Filetype * + \ if &omnifunc == "" | + \ setlocal omnifunc=syntaxcomplete#Complete | + \ endif +endif + " {{{ vimrc.local if filereadable("@GENTOO_PORTAGE_EPREFIX@/etc/vim/vimrc.local") source @GENTOO_PORTAGE_EPREFIX@/etc/vim/vimrc.local diff --git a/sdk_container/src/third_party/portage-stable/app-editors/vim-core/vim-core-8.0.0386.ebuild b/sdk_container/src/third_party/portage-stable/app-editors/vim-core/vim-core-8.0.1298.ebuild similarity index 75% rename from sdk_container/src/third_party/portage-stable/app-editors/vim-core/vim-core-8.0.0386.ebuild rename to sdk_container/src/third_party/portage-stable/app-editors/vim-core/vim-core-8.0.1298.ebuild index b0e2eda803..fee4142350 100644 --- a/sdk_container/src/third_party/portage-stable/app-editors/vim-core/vim-core-8.0.0386.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-editors/vim-core/vim-core-8.0.1298.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 VIM_VERSION="8.0" -inherit eutils vim-doc flag-o-matic versionator bash-completion-r1 prefix +inherit estack vim-doc flag-o-matic versionator bash-completion-r1 prefix if [[ ${PV} == 9999* ]] ; then inherit git-r3 @@ -11,12 +11,12 @@ if [[ ${PV} == 9999* ]] ; then EGIT_CHECKOUT_DIR=${WORKDIR}/vim-${PV} else SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> vim-${PV}.tar.gz - https://dev.gentoo.org/~radhermit/vim/vim-8.0.0106-gentoo-patches.tar.bz2" - KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + https://dev.gentoo.org/~radhermit/vim/vim-8.0.0938-gentoo-patches.tar.bz2" + KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" fi DESCRIPTION="vim and gvim shared files" -HOMEPAGE="http://www.vim.org/ https://github.com/vim/vim" +HOMEPAGE="https://vim.sourceforge.io/ https://github.com/vim/vim" SLOT="0" LICENSE="vim" @@ -33,7 +33,7 @@ pkg_setup() { export LC_COLLATE="C" # Gnome sandbox silliness. bug #114475. - mkdir -p "${T}"/home + mkdir -p "${T}"/home || die "mkdir -p failed" export HOME="${T}"/home } @@ -44,8 +44,12 @@ src_prepare() { fi # Fixup a script to use awk instead of nawk - sed -i '1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' "${S}"/runtime/tools/mve.awk \ - || die "mve.awk sed failed" + sed -i \ + -e '1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' \ + "${S}"/runtime/tools/mve.awk || die "sed failed" + + # See #77841. We remove this file after the tarball extraction. + rm -v "${S}"/runtime/tools/vimspell.sh || die "rm failed" # Read vimrc and gvimrc from /etc/vim echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' >> "${S}"/src/feature.h @@ -70,24 +74,23 @@ src_prepare() { # correctly. To avoid some really entertaining error messages about stuff # which isn't even in the source file being invalid, we'll do some trickery # to make the error never occur. bug 66162 (02 October 2004 ciaranm) - find "${S}" -name '*.c' | while read c ; do echo >> "$c" ; done + find "${S}" -name '*.c' | while read c; do + echo >> "$c" || die "echo failed" + done # Try to avoid sandbox problems. Bug #114475. - if [[ -d "${S}"/src/po ]] ; then + if [[ -d "${S}"/src/po ]]; then sed -i -e \ '/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \ - "${S}"/src/po/Makefile + "${S}"/src/po/Makefile || die "sed failed" fi - if version_is_at_least 7.3.122 ; then - cp "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk - fi + cp -v "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk || die "cp failed" # Bug #378107 - Build properly with >=perl-core/ExtUtils-ParseXS-3.20.0 - if version_is_at_least 7.3 ; then - sed -i "s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:" \ - "${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed' - fi + sed -i -e \ + "s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:" \ + "${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed' eapply_user } @@ -110,13 +113,18 @@ src_configure() { # (3) Notice auto/configure is newer than auto/config.mk # (4) Run ./configure (with wrong args) to remake auto/config.mk sed -i 's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed" - rm -f src/auto/configure + + # Remove src/auto/configure file. + rm -v src/auto/configure || die "rm configure failed" + emake -j1 -C src autoconf # This should fix a sandbox violation (see bug 24447). The hvc # things are for ppc64, see bug 86433. - for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc* ; do - [[ -e ${file} ]] && addwrite $file + for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc*; do + if [[ -e "${file}" ]]; then + addwrite $file + fi done # Let Portage do the stripping. Some people like that. @@ -141,9 +149,7 @@ src_configure() { } src_compile() { - # The following allows emake to be used emake -j1 -C src auto/osdef.h objects - emake tools } @@ -174,14 +180,14 @@ src_install() { newins "${FILESDIR}"/vimrc-r5 vimrc eprefixify "${ED}"/etc/vim/vimrc - if use minimal ; then + if use minimal; then # To save space, install only a subset of the files. # Helps minimalize the livecd, bug 65144. eshopts_push -s extglob - rm -fr "${ED}${vimfiles}"/{compiler,doc,ftplugin,indent} - rm -fr "${ED}${vimfiles}"/{macros,print,tools,tutor} - rm "${ED}"/usr/bin/vimtutor + rm -rv "${ED}${vimfiles}"/{compiler,doc,ftplugin,indent} || die "rm failed" + rm -rv "${ED}${vimfiles}"/{macros,print,tools,tutor} || die "rm failed" + rm -v "${ED}"/usr/bin/vimtutor || die "rm failed" local keep_colors="default" ignore=$(rm -fr "${ED}${vimfiles}"/colors/!(${keep_colors}).vim ) @@ -194,16 +200,7 @@ src_install() { eshopts_pop fi - # These files might have slight security issues, so we won't - # install them. See bug #77841. We don't mind if these don't - # exist. - rm "${ED}${vimfiles}"/tools/{vimspell.sh,tcltags} 2>/dev/null - newbashcomp "${FILESDIR}"/xxd-completion xxd - - # We shouldn't be installing the ex or view man page symlinks, as they - # are managed by eselect-vi - rm -f "${ED}"/usr/share/man/man1/{ex,view}.1 } pkg_postinst() { diff --git a/sdk_container/src/third_party/portage-stable/app-editors/vim-core/vim-core-8.0.1428.ebuild b/sdk_container/src/third_party/portage-stable/app-editors/vim-core/vim-core-8.0.1428.ebuild new file mode 100644 index 0000000000..004a0a1c69 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/app-editors/vim-core/vim-core-8.0.1428.ebuild @@ -0,0 +1,214 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +VIM_VERSION="8.0" +inherit estack vim-doc flag-o-matic versionator bash-completion-r1 prefix + +if [[ ${PV} == 9999* ]] ; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/vim/vim.git" + EGIT_CHECKOUT_DIR=${WORKDIR}/vim-${PV} +else + SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> vim-${PV}.tar.gz + https://dev.gentoo.org/~radhermit/vim/vim-8.0.0938-gentoo-patches.tar.bz2" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +fi + +DESCRIPTION="vim and gvim shared files" +HOMEPAGE="https://vim.sourceforge.io/ https://github.com/vim/vim" + +SLOT="0" +LICENSE="vim" +IUSE="nls acl minimal" + +DEPEND="sys-devel/autoconf" +PDEPEND="!minimal? ( app-vim/gentoo-syntax )" + +S=${WORKDIR}/vim-${PV} + +pkg_setup() { + # people with broken alphabets run into trouble. bug 82186. + unset LANG LC_ALL + export LC_COLLATE="C" + + # Gnome sandbox silliness. bug #114475. + mkdir -p "${T}"/home || die "mkdir -p failed" + export HOME="${T}"/home +} + +src_prepare() { + if [[ ${PV} != 9999* ]] ; then + # Gentoo patches to fix runtime issues, cross-compile errors, etc + eapply "${WORKDIR}"/patches + fi + + # Fixup a script to use awk instead of nawk + sed -i \ + -e '1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' \ + "${S}"/runtime/tools/mve.awk || die "sed failed" + + # See #77841. We remove this file after the tarball extraction. + rm -v "${S}"/runtime/tools/vimspell.sh || die "rm failed" + + # Read vimrc and gvimrc from /etc/vim + echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' >> "${S}"/src/feature.h + echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' >> "${S}"/src/feature.h + + # Use exuberant ctags which installs as /usr/bin/exuberant-ctags. + # Hopefully this pattern won't break for a while at least. + # This fixes bug 29398 (27 Sep 2003 agriffis) + sed -i 's/\> "$c" || die "echo failed" + done + + # Try to avoid sandbox problems. Bug #114475. + if [[ -d "${S}"/src/po ]]; then + sed -i -e \ + '/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \ + "${S}"/src/po/Makefile || die "sed failed" + fi + + cp -v "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk || die "cp failed" + + # Bug #378107 - Build properly with >=perl-core/ExtUtils-ParseXS-3.20.0 + sed -i -e \ + "s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:" \ + "${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed' + + eapply_user +} + +src_configure() { + local myconf + + # Fix bug 37354: Disallow -funroll-all-loops on amd64 + # Bug 57859 suggests that we want to do this for all archs + filter-flags -funroll-all-loops + + # Fix bug 76331: -O3 causes problems, use -O2 instead. We'll do this for + # everyone since previous flag filtering bugs have turned out to affect + # multiple archs... + replace-flags -O3 -O2 + + # Fix bug 18245: Prevent "make" from the following chain: + # (1) Notice configure.ac is newer than auto/configure + # (2) Rebuild auto/configure + # (3) Notice auto/configure is newer than auto/config.mk + # (4) Run ./configure (with wrong args) to remake auto/config.mk + sed -i 's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed" + + # Remove src/auto/configure file. + rm -v src/auto/configure || die "rm configure failed" + + emake -j1 -C src autoconf + + # This should fix a sandbox violation (see bug 24447). The hvc + # things are for ppc64, see bug 86433. + for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc*; do + if [[ -e "${file}" ]]; then + addwrite $file + fi + done + + # Let Portage do the stripping. Some people like that. + export ac_cv_prog_STRIP="$(type -P true ) faking strip" + + # Keep Gentoo Prefix env contained within the EPREFIX + use prefix && myconf+=" --without-local-dir" + + econf \ + --with-modified-by=Gentoo-${PVR} \ + --enable-gui=no \ + --without-x \ + --disable-darwin \ + --disable-perlinterp \ + --disable-pythoninterp \ + --disable-rubyinterp \ + --disable-gpm \ + --disable-selinux \ + $(use_enable nls) \ + $(use_enable acl) \ + ${myconf} +} + +src_compile() { + emake -j1 -C src auto/osdef.h objects + emake tools +} + +src_test() { :; } + +src_install() { + local vimfiles=/usr/share/vim/vim${VIM_VERSION/.} + + dodir /usr/{bin,share/{man/man1,vim}} + emake -C src \ + installruntime \ + installmanlinks \ + installmacros \ + installtutor \ + installtutorbin \ + installtools \ + install-languages \ + DESTDIR="${D}" \ + BINDIR="${EPREFIX}"/usr/bin \ + MANDIR="${EPREFIX}"/usr/share/man \ + DATADIR="${EPREFIX}"/usr/share + + keepdir ${vimfiles}/keymap + + # default vimrc is installed by vim-core since it applies to + # both vim and gvim + insinto /etc/vim/ + newins "${FILESDIR}"/vimrc-r5 vimrc + eprefixify "${ED}"/etc/vim/vimrc + + if use minimal; then + # To save space, install only a subset of the files. + # Helps minimalize the livecd, bug 65144. + eshopts_push -s extglob + + rm -rv "${ED}${vimfiles}"/{compiler,doc,ftplugin,indent} || die "rm failed" + rm -rv "${ED}${vimfiles}"/{macros,print,tools,tutor} || die "rm failed" + rm -v "${ED}"/usr/bin/vimtutor || die "rm failed" + + local keep_colors="default" + ignore=$(rm -fr "${ED}${vimfiles}"/colors/!(${keep_colors}).vim ) + + local keep_syntax="conf|crontab|fstab|inittab|resolv|sshdconfig" + # tinkering with the next line might make bad things happen ... + keep_syntax="${keep_syntax}|syntax|nosyntax|synload" + ignore=$(rm -fr "${ED}${vimfiles}"/syntax/!(${keep_syntax}).vim ) + + eshopts_pop + fi + + newbashcomp "${FILESDIR}"/xxd-completion xxd +} + +pkg_postinst() { + # Update documentation tags (from vim-doc.eclass) + update_vim_helptags +} + +pkg_postrm() { + # Update documentation tags (from vim-doc.eclass) + update_vim_helptags +} diff --git a/sdk_container/src/third_party/portage-stable/app-editors/vim-core/vim-core-8.0.1645.ebuild b/sdk_container/src/third_party/portage-stable/app-editors/vim-core/vim-core-8.0.1645.ebuild new file mode 100644 index 0000000000..004a0a1c69 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/app-editors/vim-core/vim-core-8.0.1645.ebuild @@ -0,0 +1,214 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +VIM_VERSION="8.0" +inherit estack vim-doc flag-o-matic versionator bash-completion-r1 prefix + +if [[ ${PV} == 9999* ]] ; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/vim/vim.git" + EGIT_CHECKOUT_DIR=${WORKDIR}/vim-${PV} +else + SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> vim-${PV}.tar.gz + https://dev.gentoo.org/~radhermit/vim/vim-8.0.0938-gentoo-patches.tar.bz2" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +fi + +DESCRIPTION="vim and gvim shared files" +HOMEPAGE="https://vim.sourceforge.io/ https://github.com/vim/vim" + +SLOT="0" +LICENSE="vim" +IUSE="nls acl minimal" + +DEPEND="sys-devel/autoconf" +PDEPEND="!minimal? ( app-vim/gentoo-syntax )" + +S=${WORKDIR}/vim-${PV} + +pkg_setup() { + # people with broken alphabets run into trouble. bug 82186. + unset LANG LC_ALL + export LC_COLLATE="C" + + # Gnome sandbox silliness. bug #114475. + mkdir -p "${T}"/home || die "mkdir -p failed" + export HOME="${T}"/home +} + +src_prepare() { + if [[ ${PV} != 9999* ]] ; then + # Gentoo patches to fix runtime issues, cross-compile errors, etc + eapply "${WORKDIR}"/patches + fi + + # Fixup a script to use awk instead of nawk + sed -i \ + -e '1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' \ + "${S}"/runtime/tools/mve.awk || die "sed failed" + + # See #77841. We remove this file after the tarball extraction. + rm -v "${S}"/runtime/tools/vimspell.sh || die "rm failed" + + # Read vimrc and gvimrc from /etc/vim + echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' >> "${S}"/src/feature.h + echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' >> "${S}"/src/feature.h + + # Use exuberant ctags which installs as /usr/bin/exuberant-ctags. + # Hopefully this pattern won't break for a while at least. + # This fixes bug 29398 (27 Sep 2003 agriffis) + sed -i 's/\> "$c" || die "echo failed" + done + + # Try to avoid sandbox problems. Bug #114475. + if [[ -d "${S}"/src/po ]]; then + sed -i -e \ + '/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \ + "${S}"/src/po/Makefile || die "sed failed" + fi + + cp -v "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk || die "cp failed" + + # Bug #378107 - Build properly with >=perl-core/ExtUtils-ParseXS-3.20.0 + sed -i -e \ + "s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:" \ + "${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed' + + eapply_user +} + +src_configure() { + local myconf + + # Fix bug 37354: Disallow -funroll-all-loops on amd64 + # Bug 57859 suggests that we want to do this for all archs + filter-flags -funroll-all-loops + + # Fix bug 76331: -O3 causes problems, use -O2 instead. We'll do this for + # everyone since previous flag filtering bugs have turned out to affect + # multiple archs... + replace-flags -O3 -O2 + + # Fix bug 18245: Prevent "make" from the following chain: + # (1) Notice configure.ac is newer than auto/configure + # (2) Rebuild auto/configure + # (3) Notice auto/configure is newer than auto/config.mk + # (4) Run ./configure (with wrong args) to remake auto/config.mk + sed -i 's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed" + + # Remove src/auto/configure file. + rm -v src/auto/configure || die "rm configure failed" + + emake -j1 -C src autoconf + + # This should fix a sandbox violation (see bug 24447). The hvc + # things are for ppc64, see bug 86433. + for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc*; do + if [[ -e "${file}" ]]; then + addwrite $file + fi + done + + # Let Portage do the stripping. Some people like that. + export ac_cv_prog_STRIP="$(type -P true ) faking strip" + + # Keep Gentoo Prefix env contained within the EPREFIX + use prefix && myconf+=" --without-local-dir" + + econf \ + --with-modified-by=Gentoo-${PVR} \ + --enable-gui=no \ + --without-x \ + --disable-darwin \ + --disable-perlinterp \ + --disable-pythoninterp \ + --disable-rubyinterp \ + --disable-gpm \ + --disable-selinux \ + $(use_enable nls) \ + $(use_enable acl) \ + ${myconf} +} + +src_compile() { + emake -j1 -C src auto/osdef.h objects + emake tools +} + +src_test() { :; } + +src_install() { + local vimfiles=/usr/share/vim/vim${VIM_VERSION/.} + + dodir /usr/{bin,share/{man/man1,vim}} + emake -C src \ + installruntime \ + installmanlinks \ + installmacros \ + installtutor \ + installtutorbin \ + installtools \ + install-languages \ + DESTDIR="${D}" \ + BINDIR="${EPREFIX}"/usr/bin \ + MANDIR="${EPREFIX}"/usr/share/man \ + DATADIR="${EPREFIX}"/usr/share + + keepdir ${vimfiles}/keymap + + # default vimrc is installed by vim-core since it applies to + # both vim and gvim + insinto /etc/vim/ + newins "${FILESDIR}"/vimrc-r5 vimrc + eprefixify "${ED}"/etc/vim/vimrc + + if use minimal; then + # To save space, install only a subset of the files. + # Helps minimalize the livecd, bug 65144. + eshopts_push -s extglob + + rm -rv "${ED}${vimfiles}"/{compiler,doc,ftplugin,indent} || die "rm failed" + rm -rv "${ED}${vimfiles}"/{macros,print,tools,tutor} || die "rm failed" + rm -v "${ED}"/usr/bin/vimtutor || die "rm failed" + + local keep_colors="default" + ignore=$(rm -fr "${ED}${vimfiles}"/colors/!(${keep_colors}).vim ) + + local keep_syntax="conf|crontab|fstab|inittab|resolv|sshdconfig" + # tinkering with the next line might make bad things happen ... + keep_syntax="${keep_syntax}|syntax|nosyntax|synload" + ignore=$(rm -fr "${ED}${vimfiles}"/syntax/!(${keep_syntax}).vim ) + + eshopts_pop + fi + + newbashcomp "${FILESDIR}"/xxd-completion xxd +} + +pkg_postinst() { + # Update documentation tags (from vim-doc.eclass) + update_vim_helptags +} + +pkg_postrm() { + # Update documentation tags (from vim-doc.eclass) + update_vim_helptags +} diff --git a/sdk_container/src/third_party/portage-stable/app-editors/vim-core/vim-core-8.0.1699.ebuild b/sdk_container/src/third_party/portage-stable/app-editors/vim-core/vim-core-8.0.1699.ebuild new file mode 100644 index 0000000000..004a0a1c69 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/app-editors/vim-core/vim-core-8.0.1699.ebuild @@ -0,0 +1,214 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +VIM_VERSION="8.0" +inherit estack vim-doc flag-o-matic versionator bash-completion-r1 prefix + +if [[ ${PV} == 9999* ]] ; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/vim/vim.git" + EGIT_CHECKOUT_DIR=${WORKDIR}/vim-${PV} +else + SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> vim-${PV}.tar.gz + https://dev.gentoo.org/~radhermit/vim/vim-8.0.0938-gentoo-patches.tar.bz2" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +fi + +DESCRIPTION="vim and gvim shared files" +HOMEPAGE="https://vim.sourceforge.io/ https://github.com/vim/vim" + +SLOT="0" +LICENSE="vim" +IUSE="nls acl minimal" + +DEPEND="sys-devel/autoconf" +PDEPEND="!minimal? ( app-vim/gentoo-syntax )" + +S=${WORKDIR}/vim-${PV} + +pkg_setup() { + # people with broken alphabets run into trouble. bug 82186. + unset LANG LC_ALL + export LC_COLLATE="C" + + # Gnome sandbox silliness. bug #114475. + mkdir -p "${T}"/home || die "mkdir -p failed" + export HOME="${T}"/home +} + +src_prepare() { + if [[ ${PV} != 9999* ]] ; then + # Gentoo patches to fix runtime issues, cross-compile errors, etc + eapply "${WORKDIR}"/patches + fi + + # Fixup a script to use awk instead of nawk + sed -i \ + -e '1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' \ + "${S}"/runtime/tools/mve.awk || die "sed failed" + + # See #77841. We remove this file after the tarball extraction. + rm -v "${S}"/runtime/tools/vimspell.sh || die "rm failed" + + # Read vimrc and gvimrc from /etc/vim + echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' >> "${S}"/src/feature.h + echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' >> "${S}"/src/feature.h + + # Use exuberant ctags which installs as /usr/bin/exuberant-ctags. + # Hopefully this pattern won't break for a while at least. + # This fixes bug 29398 (27 Sep 2003 agriffis) + sed -i 's/\> "$c" || die "echo failed" + done + + # Try to avoid sandbox problems. Bug #114475. + if [[ -d "${S}"/src/po ]]; then + sed -i -e \ + '/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \ + "${S}"/src/po/Makefile || die "sed failed" + fi + + cp -v "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk || die "cp failed" + + # Bug #378107 - Build properly with >=perl-core/ExtUtils-ParseXS-3.20.0 + sed -i -e \ + "s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:" \ + "${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed' + + eapply_user +} + +src_configure() { + local myconf + + # Fix bug 37354: Disallow -funroll-all-loops on amd64 + # Bug 57859 suggests that we want to do this for all archs + filter-flags -funroll-all-loops + + # Fix bug 76331: -O3 causes problems, use -O2 instead. We'll do this for + # everyone since previous flag filtering bugs have turned out to affect + # multiple archs... + replace-flags -O3 -O2 + + # Fix bug 18245: Prevent "make" from the following chain: + # (1) Notice configure.ac is newer than auto/configure + # (2) Rebuild auto/configure + # (3) Notice auto/configure is newer than auto/config.mk + # (4) Run ./configure (with wrong args) to remake auto/config.mk + sed -i 's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed" + + # Remove src/auto/configure file. + rm -v src/auto/configure || die "rm configure failed" + + emake -j1 -C src autoconf + + # This should fix a sandbox violation (see bug 24447). The hvc + # things are for ppc64, see bug 86433. + for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc*; do + if [[ -e "${file}" ]]; then + addwrite $file + fi + done + + # Let Portage do the stripping. Some people like that. + export ac_cv_prog_STRIP="$(type -P true ) faking strip" + + # Keep Gentoo Prefix env contained within the EPREFIX + use prefix && myconf+=" --without-local-dir" + + econf \ + --with-modified-by=Gentoo-${PVR} \ + --enable-gui=no \ + --without-x \ + --disable-darwin \ + --disable-perlinterp \ + --disable-pythoninterp \ + --disable-rubyinterp \ + --disable-gpm \ + --disable-selinux \ + $(use_enable nls) \ + $(use_enable acl) \ + ${myconf} +} + +src_compile() { + emake -j1 -C src auto/osdef.h objects + emake tools +} + +src_test() { :; } + +src_install() { + local vimfiles=/usr/share/vim/vim${VIM_VERSION/.} + + dodir /usr/{bin,share/{man/man1,vim}} + emake -C src \ + installruntime \ + installmanlinks \ + installmacros \ + installtutor \ + installtutorbin \ + installtools \ + install-languages \ + DESTDIR="${D}" \ + BINDIR="${EPREFIX}"/usr/bin \ + MANDIR="${EPREFIX}"/usr/share/man \ + DATADIR="${EPREFIX}"/usr/share + + keepdir ${vimfiles}/keymap + + # default vimrc is installed by vim-core since it applies to + # both vim and gvim + insinto /etc/vim/ + newins "${FILESDIR}"/vimrc-r5 vimrc + eprefixify "${ED}"/etc/vim/vimrc + + if use minimal; then + # To save space, install only a subset of the files. + # Helps minimalize the livecd, bug 65144. + eshopts_push -s extglob + + rm -rv "${ED}${vimfiles}"/{compiler,doc,ftplugin,indent} || die "rm failed" + rm -rv "${ED}${vimfiles}"/{macros,print,tools,tutor} || die "rm failed" + rm -v "${ED}"/usr/bin/vimtutor || die "rm failed" + + local keep_colors="default" + ignore=$(rm -fr "${ED}${vimfiles}"/colors/!(${keep_colors}).vim ) + + local keep_syntax="conf|crontab|fstab|inittab|resolv|sshdconfig" + # tinkering with the next line might make bad things happen ... + keep_syntax="${keep_syntax}|syntax|nosyntax|synload" + ignore=$(rm -fr "${ED}${vimfiles}"/syntax/!(${keep_syntax}).vim ) + + eshopts_pop + fi + + newbashcomp "${FILESDIR}"/xxd-completion xxd +} + +pkg_postinst() { + # Update documentation tags (from vim-doc.eclass) + update_vim_helptags +} + +pkg_postrm() { + # Update documentation tags (from vim-doc.eclass) + update_vim_helptags +} diff --git a/sdk_container/src/third_party/portage-stable/app-editors/vim-core/vim-core-9999.ebuild b/sdk_container/src/third_party/portage-stable/app-editors/vim-core/vim-core-9999.ebuild index 606c830250..004a0a1c69 100644 --- a/sdk_container/src/third_party/portage-stable/app-editors/vim-core/vim-core-9999.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-editors/vim-core/vim-core-9999.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 VIM_VERSION="8.0" -inherit eutils vim-doc flag-o-matic versionator bash-completion-r1 prefix +inherit estack vim-doc flag-o-matic versionator bash-completion-r1 prefix if [[ ${PV} == 9999* ]] ; then inherit git-r3 @@ -11,12 +11,12 @@ if [[ ${PV} == 9999* ]] ; then EGIT_CHECKOUT_DIR=${WORKDIR}/vim-${PV} else SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> vim-${PV}.tar.gz - https://dev.gentoo.org/~radhermit/vim/vim-8.0.0106-gentoo-patches.tar.bz2" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + https://dev.gentoo.org/~radhermit/vim/vim-8.0.0938-gentoo-patches.tar.bz2" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" fi DESCRIPTION="vim and gvim shared files" -HOMEPAGE="http://www.vim.org/ https://github.com/vim/vim" +HOMEPAGE="https://vim.sourceforge.io/ https://github.com/vim/vim" SLOT="0" LICENSE="vim" @@ -33,7 +33,7 @@ pkg_setup() { export LC_COLLATE="C" # Gnome sandbox silliness. bug #114475. - mkdir -p "${T}"/home + mkdir -p "${T}"/home || die "mkdir -p failed" export HOME="${T}"/home } @@ -44,8 +44,12 @@ src_prepare() { fi # Fixup a script to use awk instead of nawk - sed -i '1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' "${S}"/runtime/tools/mve.awk \ - || die "mve.awk sed failed" + sed -i \ + -e '1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' \ + "${S}"/runtime/tools/mve.awk || die "sed failed" + + # See #77841. We remove this file after the tarball extraction. + rm -v "${S}"/runtime/tools/vimspell.sh || die "rm failed" # Read vimrc and gvimrc from /etc/vim echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' >> "${S}"/src/feature.h @@ -70,24 +74,23 @@ src_prepare() { # correctly. To avoid some really entertaining error messages about stuff # which isn't even in the source file being invalid, we'll do some trickery # to make the error never occur. bug 66162 (02 October 2004 ciaranm) - find "${S}" -name '*.c' | while read c ; do echo >> "$c" ; done + find "${S}" -name '*.c' | while read c; do + echo >> "$c" || die "echo failed" + done # Try to avoid sandbox problems. Bug #114475. - if [[ -d "${S}"/src/po ]] ; then + if [[ -d "${S}"/src/po ]]; then sed -i -e \ '/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \ - "${S}"/src/po/Makefile + "${S}"/src/po/Makefile || die "sed failed" fi - if version_is_at_least 7.3.122 ; then - cp "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk - fi + cp -v "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk || die "cp failed" # Bug #378107 - Build properly with >=perl-core/ExtUtils-ParseXS-3.20.0 - if version_is_at_least 7.3 ; then - sed -i "s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:" \ - "${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed' - fi + sed -i -e \ + "s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:" \ + "${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed' eapply_user } @@ -110,13 +113,18 @@ src_configure() { # (3) Notice auto/configure is newer than auto/config.mk # (4) Run ./configure (with wrong args) to remake auto/config.mk sed -i 's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed" - rm -f src/auto/configure + + # Remove src/auto/configure file. + rm -v src/auto/configure || die "rm configure failed" + emake -j1 -C src autoconf # This should fix a sandbox violation (see bug 24447). The hvc # things are for ppc64, see bug 86433. - for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc* ; do - [[ -e ${file} ]] && addwrite $file + for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc*; do + if [[ -e "${file}" ]]; then + addwrite $file + fi done # Let Portage do the stripping. Some people like that. @@ -141,9 +149,7 @@ src_configure() { } src_compile() { - # The following allows emake to be used emake -j1 -C src auto/osdef.h objects - emake tools } @@ -174,14 +180,14 @@ src_install() { newins "${FILESDIR}"/vimrc-r5 vimrc eprefixify "${ED}"/etc/vim/vimrc - if use minimal ; then + if use minimal; then # To save space, install only a subset of the files. # Helps minimalize the livecd, bug 65144. eshopts_push -s extglob - rm -fr "${ED}${vimfiles}"/{compiler,doc,ftplugin,indent} - rm -fr "${ED}${vimfiles}"/{macros,print,tools,tutor} - rm "${ED}"/usr/bin/vimtutor + rm -rv "${ED}${vimfiles}"/{compiler,doc,ftplugin,indent} || die "rm failed" + rm -rv "${ED}${vimfiles}"/{macros,print,tools,tutor} || die "rm failed" + rm -v "${ED}"/usr/bin/vimtutor || die "rm failed" local keep_colors="default" ignore=$(rm -fr "${ED}${vimfiles}"/colors/!(${keep_colors}).vim ) @@ -194,16 +200,7 @@ src_install() { eshopts_pop fi - # These files might have slight security issues, so we won't - # install them. See bug #77841. We don't mind if these don't - # exist. - rm "${ED}${vimfiles}"/tools/{vimspell.sh,tcltags} 2>/dev/null - newbashcomp "${FILESDIR}"/xxd-completion xxd - - # We shouldn't be installing the ex or view man page symlinks, as they - # are managed by eselect-vi - rm -f "${ED}"/usr/share/man/man1/{ex,view}.1 } pkg_postinst() { diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-editors/vim-core-8.0.0386 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-editors/vim-core-8.0.1298 similarity index 63% rename from sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-editors/vim-core-8.0.0386 rename to sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-editors/vim-core-8.0.1298 index 648f2d313b..667c328211 100644 --- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-editors/vim-core-8.0.0386 +++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-editors/vim-core-8.0.1298 @@ -2,12 +2,12 @@ DEFINED_PHASES=compile configure install postinst postrm prepare setup test DEPEND=sys-devel/autoconf DESCRIPTION=vim and gvim shared files EAPI=6 -HOMEPAGE=http://www.vim.org/ https://github.com/vim/vim +HOMEPAGE=https://vim.sourceforge.io/ https://github.com/vim/vim IUSE=nls acl minimal -KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris +KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris LICENSE=vim PDEPEND=!minimal? ( app-vim/gentoo-syntax ) SLOT=0 -SRC_URI=https://github.com/vim/vim/archive/v8.0.0386.tar.gz -> vim-8.0.0386.tar.gz https://dev.gentoo.org/~radhermit/vim/vim-8.0.0106-gentoo-patches.tar.bz2 +SRC_URI=https://github.com/vim/vim/archive/v8.0.1298.tar.gz -> vim-8.0.1298.tar.gz https://dev.gentoo.org/~radhermit/vim/vim-8.0.0938-gentoo-patches.tar.bz2 _eclasses_=bash-completion-r1 8e447753aaf658afa609fbf961d80ab7 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 flag-o-matic 2274fcc1e7ef6affaff5bcd636275417 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e prefix 7b6fb2fc216b101b5d97d171925a847c toolchain-funcs 185a06792159ca143528e7010368e8af versionator c80ccf29e90adea7c5cae94b42eb76d0 vim-doc af2c81a1feeb0a99e91bee3e20769edb -_md5_=90b1c059ff9f99f2e2c6c99bddf9dafd +_md5_=1a218cceabb40bf4d4de0724178f3cea diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-editors/vim-core-8.0.1428 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-editors/vim-core-8.0.1428 new file mode 100644 index 0000000000..1f91e07475 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-editors/vim-core-8.0.1428 @@ -0,0 +1,13 @@ +DEFINED_PHASES=compile configure install postinst postrm prepare setup test +DEPEND=sys-devel/autoconf +DESCRIPTION=vim and gvim shared files +EAPI=6 +HOMEPAGE=https://vim.sourceforge.io/ https://github.com/vim/vim +IUSE=nls acl minimal +KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris +LICENSE=vim +PDEPEND=!minimal? ( app-vim/gentoo-syntax ) +SLOT=0 +SRC_URI=https://github.com/vim/vim/archive/v8.0.1428.tar.gz -> vim-8.0.1428.tar.gz https://dev.gentoo.org/~radhermit/vim/vim-8.0.0938-gentoo-patches.tar.bz2 +_eclasses_=bash-completion-r1 8e447753aaf658afa609fbf961d80ab7 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 flag-o-matic 2274fcc1e7ef6affaff5bcd636275417 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e prefix 7b6fb2fc216b101b5d97d171925a847c toolchain-funcs 185a06792159ca143528e7010368e8af versionator c80ccf29e90adea7c5cae94b42eb76d0 vim-doc af2c81a1feeb0a99e91bee3e20769edb +_md5_=270757509200029d6bc809620769bf83 diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-editors/vim-core-8.0.1645 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-editors/vim-core-8.0.1645 new file mode 100644 index 0000000000..ba02aebefe --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-editors/vim-core-8.0.1645 @@ -0,0 +1,13 @@ +DEFINED_PHASES=compile configure install postinst postrm prepare setup test +DEPEND=sys-devel/autoconf +DESCRIPTION=vim and gvim shared files +EAPI=6 +HOMEPAGE=https://vim.sourceforge.io/ https://github.com/vim/vim +IUSE=nls acl minimal +KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris +LICENSE=vim +PDEPEND=!minimal? ( app-vim/gentoo-syntax ) +SLOT=0 +SRC_URI=https://github.com/vim/vim/archive/v8.0.1645.tar.gz -> vim-8.0.1645.tar.gz https://dev.gentoo.org/~radhermit/vim/vim-8.0.0938-gentoo-patches.tar.bz2 +_eclasses_=bash-completion-r1 8e447753aaf658afa609fbf961d80ab7 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 flag-o-matic 2274fcc1e7ef6affaff5bcd636275417 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e prefix 7b6fb2fc216b101b5d97d171925a847c toolchain-funcs 185a06792159ca143528e7010368e8af versionator c80ccf29e90adea7c5cae94b42eb76d0 vim-doc af2c81a1feeb0a99e91bee3e20769edb +_md5_=270757509200029d6bc809620769bf83 diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-editors/vim-core-8.0.1699 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-editors/vim-core-8.0.1699 new file mode 100644 index 0000000000..90a8760562 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-editors/vim-core-8.0.1699 @@ -0,0 +1,13 @@ +DEFINED_PHASES=compile configure install postinst postrm prepare setup test +DEPEND=sys-devel/autoconf +DESCRIPTION=vim and gvim shared files +EAPI=6 +HOMEPAGE=https://vim.sourceforge.io/ https://github.com/vim/vim +IUSE=nls acl minimal +KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris +LICENSE=vim +PDEPEND=!minimal? ( app-vim/gentoo-syntax ) +SLOT=0 +SRC_URI=https://github.com/vim/vim/archive/v8.0.1699.tar.gz -> vim-8.0.1699.tar.gz https://dev.gentoo.org/~radhermit/vim/vim-8.0.0938-gentoo-patches.tar.bz2 +_eclasses_=bash-completion-r1 8e447753aaf658afa609fbf961d80ab7 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 flag-o-matic 2274fcc1e7ef6affaff5bcd636275417 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e prefix 7b6fb2fc216b101b5d97d171925a847c toolchain-funcs 185a06792159ca143528e7010368e8af versionator c80ccf29e90adea7c5cae94b42eb76d0 vim-doc af2c81a1feeb0a99e91bee3e20769edb +_md5_=270757509200029d6bc809620769bf83 diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-editors/vim-core-9999 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-editors/vim-core-9999 index 60600ebd67..17b7feb769 100644 --- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-editors/vim-core-9999 +++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-editors/vim-core-9999 @@ -2,10 +2,10 @@ DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpa DEPEND=sys-devel/autoconf >=dev-vcs/git-1.8.2.1 DESCRIPTION=vim and gvim shared files EAPI=6 -HOMEPAGE=http://www.vim.org/ https://github.com/vim/vim +HOMEPAGE=https://vim.sourceforge.io/ https://github.com/vim/vim IUSE=nls acl minimal LICENSE=vim PDEPEND=!minimal? ( app-vim/gentoo-syntax ) SLOT=0 _eclasses_=bash-completion-r1 8e447753aaf658afa609fbf961d80ab7 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 flag-o-matic 2274fcc1e7ef6affaff5bcd636275417 git-r3 52a888802d25387c2c74cb845d1219bc ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e prefix 7b6fb2fc216b101b5d97d171925a847c toolchain-funcs 185a06792159ca143528e7010368e8af versionator c80ccf29e90adea7c5cae94b42eb76d0 vim-doc af2c81a1feeb0a99e91bee3e20769edb -_md5_=58efc16dca262c27904a1f374d744a92 +_md5_=270757509200029d6bc809620769bf83 From db98cd9b81fc09fe1e4ce7e654d5a310b6590174 Mon Sep 17 00:00:00 2001 From: David Michael Date: Mon, 14 May 2018 14:25:08 -0400 Subject: [PATCH 11/21] bump(app-crypt/pinentry): sync with upstream --- .../app-crypt/pinentry/Manifest | 12 +-- ...try-0.9.7-require-CPP11-for-qt-5-7.patches | 48 --------- ...e-tooltips-in-keyboard-grabbing-mode.patch | 47 ++++++++ ...y-1.0.0-gtk2-Fix-a-problem-with-fvwm.patch | 47 ++++++++ ...-make-icon-work-under-Plasma-Wayland.patch | 52 +++++++++ ...9.7-r1.ebuild => pinentry-1.0.0-r2.ebuild} | 78 +++++--------- ...-1.0.0.ebuild => pinentry-1.0.0-r3.ebuild} | 65 ++++------- .../pinentry/pinentry-1.1.0-r1.ebuild | 100 +++++++++++++++++ .../pinentry/pinentry-1.1.0-r2.ebuild | 102 ++++++++++++++++++ .../md5-cache/app-crypt/pinentry-0.9.7-r1 | 14 --- .../md5-cache/app-crypt/pinentry-1.0.0 | 14 --- .../md5-cache/app-crypt/pinentry-1.0.0-r2 | 14 +++ .../md5-cache/app-crypt/pinentry-1.0.0-r3 | 14 +++ .../md5-cache/app-crypt/pinentry-1.1.0-r1 | 14 +++ .../md5-cache/app-crypt/pinentry-1.1.0-r2 | 14 +++ 15 files changed, 457 insertions(+), 178 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/app-crypt/pinentry/files/pinentry-0.9.7-require-CPP11-for-qt-5-7.patches create mode 100644 sdk_container/src/third_party/portage-stable/app-crypt/pinentry/files/pinentry-1.0.0-Disable-tooltips-in-keyboard-grabbing-mode.patch create mode 100644 sdk_container/src/third_party/portage-stable/app-crypt/pinentry/files/pinentry-1.0.0-gtk2-Fix-a-problem-with-fvwm.patch create mode 100644 sdk_container/src/third_party/portage-stable/app-crypt/pinentry/files/pinentry-1.0.0-make-icon-work-under-Plasma-Wayland.patch rename sdk_container/src/third_party/portage-stable/app-crypt/pinentry/{pinentry-0.9.7-r1.ebuild => pinentry-1.0.0-r2.ebuild} (62%) rename sdk_container/src/third_party/portage-stable/app-crypt/pinentry/{pinentry-1.0.0.ebuild => pinentry-1.0.0-r3.ebuild} (74%) create mode 100644 sdk_container/src/third_party/portage-stable/app-crypt/pinentry/pinentry-1.1.0-r1.ebuild create mode 100644 sdk_container/src/third_party/portage-stable/app-crypt/pinentry/pinentry-1.1.0-r2.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-crypt/pinentry-0.9.7-r1 delete mode 100644 sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-crypt/pinentry-1.0.0 create mode 100644 sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-crypt/pinentry-1.0.0-r2 create mode 100644 sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-crypt/pinentry-1.0.0-r3 create mode 100644 sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-crypt/pinentry-1.1.0-r1 create mode 100644 sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-crypt/pinentry-1.1.0-r2 diff --git a/sdk_container/src/third_party/portage-stable/app-crypt/pinentry/Manifest b/sdk_container/src/third_party/portage-stable/app-crypt/pinentry/Manifest index c14da8775b..e8e43f0ce1 100644 --- a/sdk_container/src/third_party/portage-stable/app-crypt/pinentry/Manifest +++ b/sdk_container/src/third_party/portage-stable/app-crypt/pinentry/Manifest @@ -1,10 +1,2 @@ -AUX pinentry-0.8.2-ncurses.patch 824 SHA256 7d5e485e2c6dcce80ab63055d24761f53ae28e19b5ab2dacc424ebc7677805e8 SHA512 415ad55fd7a4ab66e87e5db76b1314b00f5a86552804f1f431a533ba1e7ec3f2c7136096106688b572639ceb637fdf0c3e25d96aa2e07fd1f6f295d39e1d4901 WHIRLPOOL 5483ccb6041e769387685ce987a19a2aa50835781a391169abbe7a838325149b81ce186692dbdc588858f74ef912a80f1eca6efb0f3421ace57925ca9c6f9ca5 -AUX pinentry-0.9.7-require-CPP11-for-qt-5-7.patches 1415 SHA256 ee9fc1ccc6d8c96a7097d8cb93a2277b7809dff24314d616615ae3bbe369c5a1 SHA512 1191ec7aa71042e4c770ea2793aac73f5501e83f0f93e9ae5440cbf84e4796c258156af7da9d0aaa7603e690c6bfa97d921c7721b3519d7ba33bd0f0def0baf4 WHIRLPOOL bbd686b0bde31c1a07074720ae611454f8a2f383c4d950c29deac974ac91b44c64c06066a65467589451bf596badbcc56d63a6bbfcb2061329861983b9209915 -AUX pinentry-1.0.0-build.patch 6634 SHA256 ddc05cb4e3760b3c2f92c0dd76f316aed455400f34dd4ff2939a5a59995c5c15 SHA512 cd71552db3c4ab3bd7dd34d5009ad332e5a430ae1e909085cac6a04e63801086cac18916af65a37c110c2b667054c356f38dcc8af43468a23b1b562bf6dbafec WHIRLPOOL d117a3e591b38ed5e5239b5e2fab01c3db0d90fc6b8f52204d9e4cb7a579e703de1615be0bc8d481bc23149731835d6f78b25ffc74a8b361a1400a9d80da0344 -DIST pinentry-0.9.7.tar.bz2 432978 SHA256 6398208394972bbf897c3325780195584682a0d0c164ca5a0da35b93b1e4e7b2 SHA512 9c5bc8f7246e8b0affd83fea6e64c47cecf6a12515a82dd2a6712b230306a9c3c97da4dbf6519ea98c85c88bf180a5a2b8c46cedcd594f224e5a08f2f0e35bf0 WHIRLPOOL eb3f72acf6990d61b4279de89a334e68c6052a3edef789aab2a421c2e489c1286b756bf3c9b8e6dd4cee3716e32b53d0e9d41db15a5069e010fe713dfba0596a -DIST pinentry-1.0.0.tar.bz2 436930 SHA256 1672c2edc1feb036075b187c0773787b2afd0544f55025c645a71b4c2f79275a SHA512 f109236707c51871b5020ef807a551366461fafcfbe09bf8cda19d4b163a42cf622562b905ceb41429f1d648b3f3d27807538709da6a135b67f9888709eccd62 WHIRLPOOL 182d75e37afc40c02705ed6611354eb3429924df9062e64d42e511a5bdac5f7094b351aae406ef243e4a9d6f7db0eb897820bd23ed925b8787941342bc67d187 -EBUILD pinentry-0.9.7-r1.ebuild 3246 SHA256 7f098011d46661c2b5fea2b03ec0402d232b7845564d57e1d56d954f70367325 SHA512 78e797ea8a8f806fbac7a161b82ada7941e80b69dc1a3051d20655abca27dcab40888d6a08d913203c8e2d14308d8e6164249f6ec915ed2c991a763d66d0e8af WHIRLPOOL ede02f69437072f1b2251613078a62f592f682793c8c4fa422be6982f071b563b0a85c4207996f8c5752fa0d176b194ef805d960536f9c3a1434023e9f4c3c3d -EBUILD pinentry-1.0.0.ebuild 3187 SHA256 5c38f93fd97fab439d9f7b87349f130f816b5fc842d2b9dfbcc74e05d72c07b4 SHA512 6960375928be6637f611a87795336cce35d910ce9fe6f045b7d7603751f0d999611b41afe70d1baf5613720020384f1676d63e45ed1ebbf5b02297c84f789d7f WHIRLPOOL 4544a7bd4154fbf46277956423170ec507e728f0ee8a73c5517498c20655778613a5bd0f742a7eab9d384ff10a8227e7abf0d07881041af9e7f3c94472248307 -MISC ChangeLog 9508 SHA256 c9cc05ed15e6ab1341299c3fb985fdd2d8a9539e62d73a16b4dd8f5815bbeefb SHA512 7ff10fc6c2e2621c475ebb0805b63092d8d9fd56b40d69fa4669a4456c5900644aa51b758b92086621035b83e4f728fcfc20d2d8a13e53194d7ef88b3aeb3fa4 WHIRLPOOL 4dac379391947f44aec42b9c3d71b01f46700ede56347dea6b73d9771c7e55cdcbdbdec20cf7781119e1aaf4d3dd822eb423a4810ff3657a8d76dd1768f2a6dc -MISC ChangeLog-2015 25487 SHA256 599f868331443fbdf95c4b9ef073517aeb355df82a2878199d311310891ebaa1 SHA512 b6cbb7b6abb7ba7e70094d334d18da227aec8b0e7654af58736fd6a5626dd178c23ac7524abddaf2dbf67037f117e98d6bf4a3757f0c2bb9428e55f0154c8f96 WHIRLPOOL 7683a728f4a93c78d60061a1a85785a3a7271e5854a81e7485fae2760190d49edd1d43e68db525ffc785a1ae45cb52b7df7af9a47d77b84c8a5c397ee4a29d56 -MISC metadata.xml 352 SHA256 7fd48348fd50b298029c84f873443f5b826fb46f05437440cef6dc2e1ce3773e SHA512 3817eb6ad931ab0ee363ed7f8612b08a44c0d02e7abb9d0734452c289350c9909ca4208acad01c54a3f1b260417c400f4692e37b34113c6d618680d41796e2d0 WHIRLPOOL 46aba74d2e5243e320da11ac8193123ec2576b4fa7d6c904a494b8e234716afe4a90fe1c2c6ea211b40b53edef261eb1735200950563ecc1592d213c66d40ad8 +DIST pinentry-1.0.0.tar.bz2 436930 BLAKE2B 949be8de8504a42cd5bd6ffebe331a825db7ff3c2ccc5fc554155b7621fddf9df957aa92063eb1a06c6964826a296bf60a4cc46cf2886552e37703a62042f35a SHA512 f109236707c51871b5020ef807a551366461fafcfbe09bf8cda19d4b163a42cf622562b905ceb41429f1d648b3f3d27807538709da6a135b67f9888709eccd62 +DIST pinentry-1.1.0.tar.bz2 467702 BLAKE2B cf43555848ab0dc60756fca123aba7599ebb1bfe0458b973ed9d84479f8de9ee69ef309b518b40aa340434d64d37793cf97c94f78f99820bc5c71ecd2aac7a49 SHA512 5012672925bcb5f683358c259e55e4b87c67cf063ad52c759308933733025c33f7ce08e5b8019ffc101cbf7ef30499040ef2fd34a7611698e65e1593f80948cd diff --git a/sdk_container/src/third_party/portage-stable/app-crypt/pinentry/files/pinentry-0.9.7-require-CPP11-for-qt-5-7.patches b/sdk_container/src/third_party/portage-stable/app-crypt/pinentry/files/pinentry-0.9.7-require-CPP11-for-qt-5-7.patches deleted file mode 100644 index 406571cdd3..0000000000 --- a/sdk_container/src/third_party/portage-stable/app-crypt/pinentry/files/pinentry-0.9.7-require-CPP11-for-qt-5-7.patches +++ /dev/null @@ -1,48 +0,0 @@ -From 7384e2a575dde2809784d9f182fd1d247064c8a2 Mon Sep 17 00:00:00 2001 -From: Kristian Fiskerstrand -Date: Thu, 11 Aug 2016 14:44:37 +0200 -Subject: [PATCH] Qt: Append -std=c++11 if building against Qt 5.7 - - * m4/qt.m4: Append -std=c++11 to CFLAGS if building against Qt 5.7 - --- -Qt 5.7 enables C++11 for Qt modules, and any app relying on it require to be -compiled with at least this standard. - -This patch adds detection for Qt 5.7 and make sure -std=c++11 is passed if -building against Qt 5.7 or higher. ---- - m4/qt.m4 | 10 ++++++++++ - 1 file changed, 10 insertions(+) - -diff --git a/m4/qt.m4 b/m4/qt.m4 -index 093f428..90c4a6e 100644 ---- a/m4/qt.m4 -+++ b/m4/qt.m4 -@@ -35,6 +35,7 @@ AC_DEFUN([FIND_QT], - enable_pinentry_qt5="try") - - have_qt5_libs="no"; -+ require_qt_cpp11="no"; - - if test "$enable_pinentry_qt5" != "no"; then - PKG_CHECK_MODULES(PINENTRY_QT, -@@ -47,6 +48,15 @@ AC_DEFUN([FIND_QT], - fi - fi - if test "$have_qt5_libs" = "yes"; then -+ PKG_CHECK_MODULES(PINENTRY_QT_REQUIRE_CPP11, -+ Qt5Core >= 5.7.0, -+ [require_qt_cpp11="yes"], -+ [require_qt_cpp11="no"]) -+ -+ if test "${require_qt_cpp11}" = "yes"; then -+ PINENTRY_QT_CFLAGS="$PINENTRY_QT_CFLAGS -std=c++11" -+ fi -+ - AC_CHECK_TOOL(MOC, moc) - AC_MSG_CHECKING([moc version]) - mocversion=`$MOC -v 2>&1` --- -2.7.3 - diff --git a/sdk_container/src/third_party/portage-stable/app-crypt/pinentry/files/pinentry-1.0.0-Disable-tooltips-in-keyboard-grabbing-mode.patch b/sdk_container/src/third_party/portage-stable/app-crypt/pinentry/files/pinentry-1.0.0-Disable-tooltips-in-keyboard-grabbing-mode.patch new file mode 100644 index 0000000000..7724d1beae --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/app-crypt/pinentry/files/pinentry-1.0.0-Disable-tooltips-in-keyboard-grabbing-mode.patch @@ -0,0 +1,47 @@ +From 1590b664d88be8386a4664c2994b685187d1eb25 Mon Sep 17 00:00:00 2001 +From: Damien Goutte-Gattat +Date: Thu, 3 Aug 2017 22:56:49 +0200 +Subject: [PATCH 1/6] gtk: Disable tooltips in keyboard-grabbing mode. + +* gtk+-2:/pinentry-gtk-2.c (show_hide_button): Do not show the +tooltip if we attempt to grab the keyboard. +(create_window): Likewise. +-- + +For unclear reasons, those tooltips may interfere with grabbing +under some tiling window managers. + +GnuPG-bug-id: 3297 +Signed-off-by: Damien Goutte-Gattat +--- + gtk+-2/pinentry-gtk-2.c | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +diff --git a/gtk+-2/pinentry-gtk-2.c b/gtk+-2/pinentry-gtk-2.c +index d467ec5..f17a702 100644 +--- a/gtk+-2/pinentry-gtk-2.c ++++ b/gtk+-2/pinentry-gtk-2.c +@@ -516,7 +516,10 @@ show_hide_button_toggled (GtkWidget *widget, gpointer data) + } + + gtk_label_set_markup (GTK_LABEL(label), text); +- gtk_widget_set_tooltip_text (GTK_WIDGET(button), tooltip); ++ if (!pinentry->grab) ++ { ++ gtk_widget_set_tooltip_text (GTK_WIDGET(button), tooltip); ++ } + g_free (tooltip); + } + +@@ -736,7 +739,7 @@ create_window (pinentry_t ctx) + gtk_progress_bar_set_text (GTK_PROGRESS_BAR (qualitybar), + QUALITYBAR_EMPTY_TEXT); + gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (qualitybar), 0.0); +- if (pinentry->quality_bar_tt) ++ if (pinentry->quality_bar_tt && !pinentry->grab) + { + #if !GTK_CHECK_VERSION (2, 12, 0) + gtk_tooltips_set_tip (GTK_TOOLTIPS (tooltips), qualitybar, +-- +2.13.6 + diff --git a/sdk_container/src/third_party/portage-stable/app-crypt/pinentry/files/pinentry-1.0.0-gtk2-Fix-a-problem-with-fvwm.patch b/sdk_container/src/third_party/portage-stable/app-crypt/pinentry/files/pinentry-1.0.0-gtk2-Fix-a-problem-with-fvwm.patch new file mode 100644 index 0000000000..f7476de1ff --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/app-crypt/pinentry/files/pinentry-1.0.0-gtk2-Fix-a-problem-with-fvwm.patch @@ -0,0 +1,47 @@ +From b0e0bdeac5d40ca645afc9017778b39a26303523 Mon Sep 17 00:00:00 2001 +From: Werner Koch +Date: Wed, 11 Jan 2017 18:40:17 +0100 +Subject: [PATCH 01/25] gtk2: Fix a problem with fvwm + +* gtk+-2/pinentry-gtk-2.c (grab_pointer): Take care of +GDK_GRAB_ALREADY_GRABBED. +-- + +Debian-bug-id: 850708 +Co-authored-by: Vincent Lefevre +Signed-off-by: Werner Koch +--- + gtk+-2/pinentry-gtk-2.c | 10 ++++++++-- + 1 file changed, 8 insertions(+), 2 deletions(-) + +diff --git a/gtk+-2/pinentry-gtk-2.c b/gtk+-2/pinentry-gtk-2.c +index 473c4aa..e37601f 100644 +--- a/gtk+-2/pinentry-gtk-2.c ++++ b/gtk+-2/pinentry-gtk-2.c +@@ -203,7 +203,12 @@ grab_pointer (GtkWidget *win, GdkEvent *event, gpointer data) + (void)data; + + /* Change the cursor for the duration of the grab to indicate that +- something is going on. */ ++ * something is going on. The fvwm window manager grabs the pointer ++ * for a short time and thus we may end up with the already grabbed ++ * error code. Actually this error code should be used to detect a ++ * malicious grabbing application but with fvwm this renders ++ * Pinentry only unusable. Thus we try again several times also for ++ * that error code. See Debian bug 850708 for details. */ + /* XXX: It would be nice to have a key cursor, unfortunately there + is none readily available. */ + cursor = gdk_cursor_new_for_display (gtk_widget_get_display (win), +@@ -215,7 +220,8 @@ grab_pointer (GtkWidget *win, GdkEvent *event, gpointer data) + NULL /* confine to */, + cursor, + gdk_event_get_time (event)); +- while (tries++ < max_tries && err == GDK_GRAB_NOT_VIEWABLE); ++ while (tries++ < max_tries && (err == GDK_GRAB_NOT_VIEWABLE ++ || err == GDK_GRAB_ALREADY_GRABBED)); + + if (err) + { +-- +2.13.6 + diff --git a/sdk_container/src/third_party/portage-stable/app-crypt/pinentry/files/pinentry-1.0.0-make-icon-work-under-Plasma-Wayland.patch b/sdk_container/src/third_party/portage-stable/app-crypt/pinentry/files/pinentry-1.0.0-make-icon-work-under-Plasma-Wayland.patch new file mode 100644 index 0000000000..646df19637 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/app-crypt/pinentry/files/pinentry-1.0.0-make-icon-work-under-Plasma-Wayland.patch @@ -0,0 +1,52 @@ +From 7218becac7132c2508d4e8f42c693d69c406795a Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andrius=20=C5=A0tikonas?= +Date: Wed, 7 Mar 2018 15:14:22 +0100 +Subject: [PATCH] Make pinentry-qt icon work under Plasma Wayland. + +--- + qt/Makefile.am | 2 ++ + qt/main.cpp | 2 ++ + qt/org.gnupg.pinentry-qt.desktop | 5 +++++ + 3 files changed, 9 insertions(+) + create mode 100644 qt/org.gnupg.pinentry-qt.desktop + +diff --git a/qt/Makefile.am b/qt/Makefile.am +index 698005e..bbf39d1 100644 +--- a/qt/Makefile.am ++++ b/qt/Makefile.am +@@ -24,6 +24,8 @@ bin_PROGRAMS = pinentry-qt + + EXTRA_DIST = document-encrypt.png pinentry.qrc + ++desktopdir = $(datadir)/applications ++dist_desktop_DATA = org.gnupg.pinentry-qt.desktop + + if FALLBACK_CURSES + ncurses_include = $(NCURSES_INCLUDE) +diff --git a/qt/main.cpp b/qt/main.cpp +index fe88d26..b767cb4 100644 +--- a/qt/main.cpp ++++ b/qt/main.cpp +@@ -372,6 +372,8 @@ main(int argc, char *argv[]) + i = argc; + app = new QApplication(i, new_argv); + app->setWindowIcon(QIcon(QLatin1String(":/document-encrypt.png"))); ++ app->setOrganizationDomain(QStringLiteral("gnupg.org")); ++ app->setDesktopFileName(QStringLiteral("org.gnupg.pinentry-qt")); + } + + pinentry_parse_opts(argc, argv); +diff --git a/qt/org.gnupg.pinentry-qt.desktop b/qt/org.gnupg.pinentry-qt.desktop +new file mode 100644 +index 0000000..0ac89aa +--- /dev/null ++++ b/qt/org.gnupg.pinentry-qt.desktop +@@ -0,0 +1,5 @@ ++[Desktop Entry] ++Type=Application ++Name=Pinentry dialog ++Icon=document-encrypt ++NoDisplay=true +-- +2.16.1 + diff --git a/sdk_container/src/third_party/portage-stable/app-crypt/pinentry/pinentry-0.9.7-r1.ebuild b/sdk_container/src/third_party/portage-stable/app-crypt/pinentry/pinentry-1.0.0-r2.ebuild similarity index 62% rename from sdk_container/src/third_party/portage-stable/app-crypt/pinentry/pinentry-0.9.7-r1.ebuild rename to sdk_container/src/third_party/portage-stable/app-crypt/pinentry/pinentry-1.0.0-r2.ebuild index 82a5092109..f1444b26ed 100644 --- a/sdk_container/src/third_party/portage-stable/app-crypt/pinentry/pinentry-0.9.7-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-crypt/pinentry/pinentry-1.0.0-r2.ebuild @@ -1,106 +1,86 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=6 -inherit autotools qmake-utils multilib eutils flag-o-matic toolchain-funcs +inherit autotools flag-o-matic qmake-utils toolchain-funcs DESCRIPTION="Simple passphrase entry dialogs which utilize the Assuan protocol" -HOMEPAGE="http://gnupg.org/aegypten2/index.html" +HOMEPAGE="https://gnupg.org/aegypten2/index.html" SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2" LICENSE="GPL-2" SLOT="0" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="emacs gtk ncurses qt4 qt5 caps gnome-keyring static" +KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="caps emacs gnome-keyring gtk ncurses qt5 static" CDEPEND=" - >=dev-libs/libgpg-error-1.17 + app-eselect/eselect-pinentry >=dev-libs/libassuan-2.1 >=dev-libs/libgcrypt-1.6.3 - ncurses? ( sys-libs/ncurses:0= ) + >=dev-libs/libgpg-error-1.17 + caps? ( sys-libs/libcap ) + gnome-keyring? ( app-crypt/libsecret ) gtk? ( x11-libs/gtk+:2 ) - qt4? ( - >=dev-qt/qtgui-4.4.1:4 - ) + ncurses? ( sys-libs/ncurses:0= ) qt5? ( + dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 - ) - caps? ( sys-libs/libcap ) + ) static? ( >=sys-libs/ncurses-5.7-r5:0=[static-libs,-gpm] ) - app-eselect/eselect-pinentry - gnome-keyring? ( app-crypt/libsecret ) " - DEPEND="${CDEPEND} sys-devel/gettext virtual/pkgconfig " - -RDEPEND=" - ${CDEPEND} +RDEPEND="${CDEPEND} gnome-keyring? ( app-crypt/gcr ) " REQUIRED_USE=" - || ( ncurses gtk qt4 qt5 ) gtk? ( !static ) - qt4? ( !static ) qt5? ( !static ) - static? ( ncurses ) - ?? ( qt4 qt5 ) " DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO ) +PATCHES=( + "${FILESDIR}/${PN}-0.8.2-ncurses.patch" + "${FILESDIR}/${P}-build.patch" + "${FILESDIR}/${P}-Disable-tooltips-in-keyboard-grabbing-mode.patch" + "${FILESDIR}/${P}-gtk2-Fix-a-problem-with-fvwm.patch" +) + src_prepare() { - epatch "${FILESDIR}/${PN}-0.8.2-ncurses.patch"\ - "${FILESDIR}/${P}-require-CPP11-for-qt-5-7.patches" + default eautoreconf } src_configure() { - local myconf=() use static && append-ldflags -static [[ "$(gcc-major-version)" -ge 5 ]] && append-cxxflags -std=gnu++11 - QT_MOC="" - if use qt4; then - myconf+=( --enable-pinentry-qt - --disable-pinentry-qt5 - ) - QT_MOC="$(qt4_get_bindir)"/moc - # Issues finding qt on multilib systems - export QTLIB="$(qt4_get_libdir)" - elif use qt5; then - myconf+=( --enable-pinentry-qt ) - QT_MOC="$(qt5_get_bindir)"/moc - export QTLIB="$(qt5_get_libdir)" - else - myconf+=( --disable-pinentry-qt ) - fi + export QTLIB="$(qt5_get_libdir)" econf \ --enable-pinentry-tty \ + $(use_with caps libcap) \ $(use_enable emacs pinentry-emacs) \ + $(use_enable gnome-keyring libsecret) \ + $(use_enable gnome-keyring pinentry-gnome3) \ $(use_enable gtk pinentry-gtk2) \ $(use_enable ncurses pinentry-curses) \ $(use_enable ncurses fallback-curses) \ - $(use_with caps libcap) \ - $(use_enable gnome-keyring libsecret) \ - $(use_enable gnome-keyring pinentry-gnome3) \ - "${myconf[@]}" \ - MOC="${QT_MOC}" + $(use_enable qt5 pinentry-qt) \ + MOC="$(qt5_get_bindir)"/moc } src_install() { default rm -f "${ED}"/usr/bin/pinentry || die - if use qt4 || use qt5; then - dosym pinentry-qt /usr/bin/pinentry-qt4 - fi + use qt5 && dosym pinentry-qt /usr/bin/pinentry-qt4 } pkg_postinst() { diff --git a/sdk_container/src/third_party/portage-stable/app-crypt/pinentry/pinentry-1.0.0.ebuild b/sdk_container/src/third_party/portage-stable/app-crypt/pinentry/pinentry-1.0.0-r3.ebuild similarity index 74% rename from sdk_container/src/third_party/portage-stable/app-crypt/pinentry/pinentry-1.0.0.ebuild rename to sdk_container/src/third_party/portage-stable/app-crypt/pinentry/pinentry-1.0.0-r3.ebuild index df050ed83e..86f29751d3 100644 --- a/sdk_container/src/third_party/portage-stable/app-crypt/pinentry/pinentry-1.0.0.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-crypt/pinentry/pinentry-1.0.0-r3.ebuild @@ -1,55 +1,46 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 -inherit autotools qmake-utils multilib flag-o-matic toolchain-funcs +inherit autotools flag-o-matic qmake-utils toolchain-funcs DESCRIPTION="Simple passphrase entry dialogs which utilize the Assuan protocol" -HOMEPAGE="http://gnupg.org/aegypten2/index.html" +HOMEPAGE="https://gnupg.org/aegypten2/index.html" SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2" LICENSE="GPL-2" SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="emacs gtk ncurses qt4 qt5 caps gnome-keyring static" +IUSE="caps emacs gnome-keyring gtk ncurses qt5 static" CDEPEND=" - >=dev-libs/libgpg-error-1.17 + app-eselect/eselect-pinentry >=dev-libs/libassuan-2.1 >=dev-libs/libgcrypt-1.6.3 - ncurses? ( sys-libs/ncurses:0= ) + >=dev-libs/libgpg-error-1.17 + caps? ( sys-libs/libcap ) + gnome-keyring? ( app-crypt/libsecret ) gtk? ( x11-libs/gtk+:2 ) - qt4? ( - >=dev-qt/qtgui-4.4.1:4 - ) + ncurses? ( sys-libs/ncurses:0= ) qt5? ( + dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 - ) - caps? ( sys-libs/libcap ) + ) static? ( >=sys-libs/ncurses-5.7-r5:0=[static-libs,-gpm] ) - app-eselect/eselect-pinentry - gnome-keyring? ( app-crypt/libsecret ) " - DEPEND="${CDEPEND} sys-devel/gettext virtual/pkgconfig " - -RDEPEND=" - ${CDEPEND} +RDEPEND="${CDEPEND} gnome-keyring? ( app-crypt/gcr ) " REQUIRED_USE=" - || ( ncurses gtk qt4 qt5 ) gtk? ( !static ) - qt4? ( !static ) qt5? ( !static ) - static? ( ncurses ) - ?? ( qt4 qt5 ) " DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO ) @@ -57,6 +48,9 @@ DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO ) PATCHES=( "${FILESDIR}/${PN}-0.8.2-ncurses.patch" "${FILESDIR}/${P}-build.patch" + "${FILESDIR}/${P}-Disable-tooltips-in-keyboard-grabbing-mode.patch" + "${FILESDIR}/${P}-gtk2-Fix-a-problem-with-fvwm.patch" + "${FILESDIR}/${P}-make-icon-work-under-Plasma-Wayland.patch" ) src_prepare() { @@ -65,44 +59,29 @@ src_prepare() { } src_configure() { - local myconf=() use static && append-ldflags -static [[ "$(gcc-major-version)" -ge 5 ]] && append-cxxflags -std=gnu++11 - if use qt4; then - myconf+=( - --enable-pinentry-qt - --disable-pinentry-qt5 - ) - export MOC="$(qt4_get_bindir)"/moc - export QTLIB="$(qt4_get_libdir)" - elif use qt5; then - myconf+=( --enable-pinentry-qt ) - export MOC="$(qt5_get_bindir)"/moc - export QTLIB="$(qt5_get_libdir)" - else - myconf+=( --disable-pinentry-qt ) - fi + export QTLIB="$(qt5_get_libdir)" econf \ --enable-pinentry-tty \ + $(use_with caps libcap) \ $(use_enable emacs pinentry-emacs) \ + $(use_enable gnome-keyring libsecret) \ + $(use_enable gnome-keyring pinentry-gnome3) \ $(use_enable gtk pinentry-gtk2) \ $(use_enable ncurses pinentry-curses) \ $(use_enable ncurses fallback-curses) \ - $(use_with caps libcap) \ - $(use_enable gnome-keyring libsecret) \ - $(use_enable gnome-keyring pinentry-gnome3) \ - "${myconf[@]}" + $(use_enable qt5 pinentry-qt) \ + MOC="$(qt5_get_bindir)"/moc } src_install() { default rm -f "${ED}"/usr/bin/pinentry || die - if use qt4 || use qt5; then - dosym pinentry-qt /usr/bin/pinentry-qt4 - fi + use qt5 && dosym pinentry-qt /usr/bin/pinentry-qt4 } pkg_postinst() { diff --git a/sdk_container/src/third_party/portage-stable/app-crypt/pinentry/pinentry-1.1.0-r1.ebuild b/sdk_container/src/third_party/portage-stable/app-crypt/pinentry/pinentry-1.1.0-r1.ebuild new file mode 100644 index 0000000000..cf2bbd6858 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/app-crypt/pinentry/pinentry-1.1.0-r1.ebuild @@ -0,0 +1,100 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit autotools flag-o-matic qmake-utils toolchain-funcs + +DESCRIPTION="Simple passphrase entry dialogs which utilize the Assuan protocol" +HOMEPAGE="https://gnupg.org/aegypten2/index.html" +SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="caps emacs gnome-keyring gtk ncurses qt5 static" + +CDEPEND=" + app-eselect/eselect-pinentry + >=dev-libs/libassuan-2.1 + >=dev-libs/libgcrypt-1.6.3 + >=dev-libs/libgpg-error-1.17 + caps? ( sys-libs/libcap ) + gnome-keyring? ( app-crypt/libsecret ) + gtk? ( x11-libs/gtk+:2 ) + ncurses? ( sys-libs/ncurses:0= ) + qt5? ( + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtwidgets:5 + ) + static? ( >=sys-libs/ncurses-5.7-r5:0=[static-libs,-gpm] ) +" +DEPEND="${CDEPEND} + sys-devel/gettext + virtual/pkgconfig +" +RDEPEND="${CDEPEND} + gnome-keyring? ( app-crypt/gcr ) +" + +REQUIRED_USE=" + gtk? ( !static ) + qt5? ( !static ) +" + +DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO ) + +PATCHES=( + "${FILESDIR}/${PN}-1.0.0-make-icon-work-under-Plasma-Wayland.patch" + "${FILESDIR}/${PN}-0.8.2-ncurses.patch" +) + +src_prepare() { + default + eautoreconf +} + +src_configure() { + use static && append-ldflags -static + [[ "$(gcc-major-version)" -ge 5 ]] && append-cxxflags -std=gnu++11 + + export QTLIB="$(qt5_get_libdir)" + + econf \ + --enable-pinentry-tty \ + $(use_with caps libcap) \ + $(use_enable emacs pinentry-emacs) \ + $(use_enable gnome-keyring libsecret) \ + $(use_enable gnome-keyring pinentry-gnome3) \ + $(use_enable gtk pinentry-gtk2) \ + $(use_enable ncurses pinentry-curses) \ + $(use_enable ncurses fallback-curses) \ + $(use_enable qt5 pinentry-qt) \ + MOC="$(qt5_get_bindir)"/moc +} + +src_install() { + default + rm -f "${ED}"/usr/bin/pinentry || die + + use qt5 && dosym pinentry-qt /usr/bin/pinentry-qt4 +} + +pkg_postinst() { + if ! has_version 'app-crypt/pinentry' || has_version '=2.6.9 support memory locking for unprivileged processes." + elog "The soft resource limit for memory locking specifies the limit an" + elog "unprivileged process may lock into memory. You can also use POSIX" + elog "capabilities to allow pinentry to lock memory. To do so activate the caps" + elog "USE flag and add the CAP_IPC_LOCK capability to the permitted set of" + elog "your users." + fi + + eselect pinentry update ifunset +} + +pkg_postrm() { + eselect pinentry update ifunset +} diff --git a/sdk_container/src/third_party/portage-stable/app-crypt/pinentry/pinentry-1.1.0-r2.ebuild b/sdk_container/src/third_party/portage-stable/app-crypt/pinentry/pinentry-1.1.0-r2.ebuild new file mode 100644 index 0000000000..5b9da6b3a4 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/app-crypt/pinentry/pinentry-1.1.0-r2.ebuild @@ -0,0 +1,102 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit autotools flag-o-matic qmake-utils toolchain-funcs + +DESCRIPTION="Simple passphrase entry dialogs which utilize the Assuan protocol" +HOMEPAGE="https://gnupg.org/aegypten2/index.html" +SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="caps emacs gnome-keyring fltk gtk ncurses qt5 static" + +CDEPEND=" + app-eselect/eselect-pinentry + >=dev-libs/libassuan-2.1 + >=dev-libs/libgcrypt-1.6.3 + >=dev-libs/libgpg-error-1.17 + caps? ( sys-libs/libcap ) + fltk? ( x11-libs/fltk ) + gnome-keyring? ( app-crypt/libsecret ) + gtk? ( x11-libs/gtk+:2 ) + ncurses? ( sys-libs/ncurses:0= ) + qt5? ( + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtwidgets:5 + ) + static? ( >=sys-libs/ncurses-5.7-r5:0=[static-libs,-gpm] ) +" +DEPEND="${CDEPEND} + sys-devel/gettext + virtual/pkgconfig +" +RDEPEND="${CDEPEND} + gnome-keyring? ( app-crypt/gcr ) +" + +REQUIRED_USE=" + gtk? ( !static ) + qt5? ( !static ) +" + +DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO ) + +PATCHES=( + "${FILESDIR}/${PN}-1.0.0-make-icon-work-under-Plasma-Wayland.patch" + "${FILESDIR}/${PN}-0.8.2-ncurses.patch" +) + +src_prepare() { + default + eautoreconf +} + +src_configure() { + use static && append-ldflags -static + [[ "$(gcc-major-version)" -ge 5 ]] && append-cxxflags -std=gnu++11 + + export QTLIB="$(qt5_get_libdir)" + + econf \ + --enable-pinentry-tty \ + $(use_with caps libcap) \ + $(use_enable emacs pinentry-emacs) \ + $(use_enable fltk pinentry-fltk) \ + $(use_enable gnome-keyring libsecret) \ + $(use_enable gnome-keyring pinentry-gnome3) \ + $(use_enable gtk pinentry-gtk2) \ + $(use_enable ncurses pinentry-curses) \ + $(use_enable ncurses fallback-curses) \ + $(use_enable qt5 pinentry-qt) \ + MOC="$(qt5_get_bindir)"/moc +} + +src_install() { + default + rm -f "${ED}"/usr/bin/pinentry || die + + use qt5 && dosym pinentry-qt /usr/bin/pinentry-qt4 +} + +pkg_postinst() { + if ! has_version 'app-crypt/pinentry' || has_version '=2.6.9 support memory locking for unprivileged processes." + elog "The soft resource limit for memory locking specifies the limit an" + elog "unprivileged process may lock into memory. You can also use POSIX" + elog "capabilities to allow pinentry to lock memory. To do so activate the caps" + elog "USE flag and add the CAP_IPC_LOCK capability to the permitted set of" + elog "your users." + fi + + eselect pinentry update ifunset +} + +pkg_postrm() { + eselect pinentry update ifunset +} diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-crypt/pinentry-0.9.7-r1 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-crypt/pinentry-0.9.7-r1 deleted file mode 100644 index c1f9a03a91..0000000000 --- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-crypt/pinentry-0.9.7-r1 +++ /dev/null @@ -1,14 +0,0 @@ -DEFINED_PHASES=configure install postinst postrm prepare -DEPEND=>=dev-libs/libgpg-error-1.17 >=dev-libs/libassuan-2.1 >=dev-libs/libgcrypt-1.6.3 ncurses? ( sys-libs/ncurses:0= ) gtk? ( x11-libs/gtk+:2 ) qt4? ( >=dev-qt/qtgui-4.4.1:4 ) qt5? ( dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) caps? ( sys-libs/libcap ) static? ( >=sys-libs/ncurses-5.7-r5:0=[static-libs,-gpm] ) app-eselect/eselect-pinentry gnome-keyring? ( app-crypt/libsecret ) sys-devel/gettext virtual/pkgconfig >=app-portage/elt-patches-20170422 !=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 -DESCRIPTION=Simple passphrase entry dialogs which utilize the Assuan protocol -EAPI=5 -HOMEPAGE=http://gnupg.org/aegypten2/index.html -IUSE=emacs gtk ncurses qt4 qt5 caps gnome-keyring static -KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris -LICENSE=GPL-2 -RDEPEND=>=dev-libs/libgpg-error-1.17 >=dev-libs/libassuan-2.1 >=dev-libs/libgcrypt-1.6.3 ncurses? ( sys-libs/ncurses:0= ) gtk? ( x11-libs/gtk+:2 ) qt4? ( >=dev-qt/qtgui-4.4.1:4 ) qt5? ( dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) caps? ( sys-libs/libcap ) static? ( >=sys-libs/ncurses-5.7-r5:0=[static-libs,-gpm] ) app-eselect/eselect-pinentry gnome-keyring? ( app-crypt/libsecret ) gnome-keyring? ( app-crypt/gcr ) -REQUIRED_USE=|| ( ncurses gtk qt4 qt5 ) gtk? ( !static ) qt4? ( !static ) qt5? ( !static ) static? ( ncurses ) ?? ( qt4 qt5 ) -SLOT=0 -SRC_URI=mirror://gnupg/pinentry/pinentry-0.9.7.tar.bz2 -_eclasses_=autotools dc412f38566b91012efd58b9c203e6c3 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 flag-o-matic 2274fcc1e7ef6affaff5bcd636275417 libtool 0081a71a261724730ec4c248494f044d ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e qmake-utils 990448b067cb3cfe1443bc25fb57239c toolchain-funcs 185a06792159ca143528e7010368e8af -_md5_=8e679633ac4efce6e309a060af9e0b93 diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-crypt/pinentry-1.0.0 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-crypt/pinentry-1.0.0 deleted file mode 100644 index 4e60eff187..0000000000 --- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-crypt/pinentry-1.0.0 +++ /dev/null @@ -1,14 +0,0 @@ -DEFINED_PHASES=configure install postinst postrm prepare -DEPEND=>=dev-libs/libgpg-error-1.17 >=dev-libs/libassuan-2.1 >=dev-libs/libgcrypt-1.6.3 ncurses? ( sys-libs/ncurses:0= ) gtk? ( x11-libs/gtk+:2 ) qt4? ( >=dev-qt/qtgui-4.4.1:4 ) qt5? ( dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) caps? ( sys-libs/libcap ) static? ( >=sys-libs/ncurses-5.7-r5:0=[static-libs,-gpm] ) app-eselect/eselect-pinentry gnome-keyring? ( app-crypt/libsecret ) sys-devel/gettext virtual/pkgconfig >=app-portage/elt-patches-20170422 !=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 -DESCRIPTION=Simple passphrase entry dialogs which utilize the Assuan protocol -EAPI=6 -HOMEPAGE=http://gnupg.org/aegypten2/index.html -IUSE=emacs gtk ncurses qt4 qt5 caps gnome-keyring static -KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris -LICENSE=GPL-2 -RDEPEND=>=dev-libs/libgpg-error-1.17 >=dev-libs/libassuan-2.1 >=dev-libs/libgcrypt-1.6.3 ncurses? ( sys-libs/ncurses:0= ) gtk? ( x11-libs/gtk+:2 ) qt4? ( >=dev-qt/qtgui-4.4.1:4 ) qt5? ( dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) caps? ( sys-libs/libcap ) static? ( >=sys-libs/ncurses-5.7-r5:0=[static-libs,-gpm] ) app-eselect/eselect-pinentry gnome-keyring? ( app-crypt/libsecret ) gnome-keyring? ( app-crypt/gcr ) -REQUIRED_USE=|| ( ncurses gtk qt4 qt5 ) gtk? ( !static ) qt4? ( !static ) qt5? ( !static ) static? ( ncurses ) ?? ( qt4 qt5 ) -SLOT=0 -SRC_URI=mirror://gnupg/pinentry/pinentry-1.0.0.tar.bz2 -_eclasses_=autotools dc412f38566b91012efd58b9c203e6c3 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 flag-o-matic 2274fcc1e7ef6affaff5bcd636275417 libtool 0081a71a261724730ec4c248494f044d ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e qmake-utils 990448b067cb3cfe1443bc25fb57239c toolchain-funcs 185a06792159ca143528e7010368e8af -_md5_=a49dc701b5ff5d0395a4377841aee355 diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-crypt/pinentry-1.0.0-r2 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-crypt/pinentry-1.0.0-r2 new file mode 100644 index 0000000000..fb16cadfa5 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-crypt/pinentry-1.0.0-r2 @@ -0,0 +1,14 @@ +DEFINED_PHASES=configure install postinst postrm prepare +DEPEND=app-eselect/eselect-pinentry >=dev-libs/libassuan-2.1 >=dev-libs/libgcrypt-1.6.3 >=dev-libs/libgpg-error-1.17 caps? ( sys-libs/libcap ) gnome-keyring? ( app-crypt/libsecret ) gtk? ( x11-libs/gtk+:2 ) ncurses? ( sys-libs/ncurses:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) static? ( >=sys-libs/ncurses-5.7-r5:0=[static-libs,-gpm] ) sys-devel/gettext virtual/pkgconfig >=app-portage/elt-patches-20170422 !=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 +DESCRIPTION=Simple passphrase entry dialogs which utilize the Assuan protocol +EAPI=6 +HOMEPAGE=https://gnupg.org/aegypten2/index.html +IUSE=caps emacs gnome-keyring gtk ncurses qt5 static +KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris +LICENSE=GPL-2 +RDEPEND=app-eselect/eselect-pinentry >=dev-libs/libassuan-2.1 >=dev-libs/libgcrypt-1.6.3 >=dev-libs/libgpg-error-1.17 caps? ( sys-libs/libcap ) gnome-keyring? ( app-crypt/libsecret ) gtk? ( x11-libs/gtk+:2 ) ncurses? ( sys-libs/ncurses:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) static? ( >=sys-libs/ncurses-5.7-r5:0=[static-libs,-gpm] ) gnome-keyring? ( app-crypt/gcr ) +REQUIRED_USE=gtk? ( !static ) qt5? ( !static ) +SLOT=0 +SRC_URI=mirror://gnupg/pinentry/pinentry-1.0.0.tar.bz2 +_eclasses_=autotools dc412f38566b91012efd58b9c203e6c3 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 flag-o-matic 2274fcc1e7ef6affaff5bcd636275417 libtool 0081a71a261724730ec4c248494f044d ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e qmake-utils 990448b067cb3cfe1443bc25fb57239c toolchain-funcs 185a06792159ca143528e7010368e8af +_md5_=8532b4f97f2af98cc1ad3057b2c4a2a4 diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-crypt/pinentry-1.0.0-r3 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-crypt/pinentry-1.0.0-r3 new file mode 100644 index 0000000000..1145062f06 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-crypt/pinentry-1.0.0-r3 @@ -0,0 +1,14 @@ +DEFINED_PHASES=configure install postinst postrm prepare +DEPEND=app-eselect/eselect-pinentry >=dev-libs/libassuan-2.1 >=dev-libs/libgcrypt-1.6.3 >=dev-libs/libgpg-error-1.17 caps? ( sys-libs/libcap ) gnome-keyring? ( app-crypt/libsecret ) gtk? ( x11-libs/gtk+:2 ) ncurses? ( sys-libs/ncurses:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) static? ( >=sys-libs/ncurses-5.7-r5:0=[static-libs,-gpm] ) sys-devel/gettext virtual/pkgconfig >=app-portage/elt-patches-20170422 !=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 +DESCRIPTION=Simple passphrase entry dialogs which utilize the Assuan protocol +EAPI=6 +HOMEPAGE=https://gnupg.org/aegypten2/index.html +IUSE=caps emacs gnome-keyring gtk ncurses qt5 static +KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris +LICENSE=GPL-2 +RDEPEND=app-eselect/eselect-pinentry >=dev-libs/libassuan-2.1 >=dev-libs/libgcrypt-1.6.3 >=dev-libs/libgpg-error-1.17 caps? ( sys-libs/libcap ) gnome-keyring? ( app-crypt/libsecret ) gtk? ( x11-libs/gtk+:2 ) ncurses? ( sys-libs/ncurses:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) static? ( >=sys-libs/ncurses-5.7-r5:0=[static-libs,-gpm] ) gnome-keyring? ( app-crypt/gcr ) +REQUIRED_USE=gtk? ( !static ) qt5? ( !static ) +SLOT=0 +SRC_URI=mirror://gnupg/pinentry/pinentry-1.0.0.tar.bz2 +_eclasses_=autotools dc412f38566b91012efd58b9c203e6c3 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 flag-o-matic 2274fcc1e7ef6affaff5bcd636275417 libtool 0081a71a261724730ec4c248494f044d ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e qmake-utils 990448b067cb3cfe1443bc25fb57239c toolchain-funcs 185a06792159ca143528e7010368e8af +_md5_=c349cc11f6589ff5fe93f15efe55f2ab diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-crypt/pinentry-1.1.0-r1 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-crypt/pinentry-1.1.0-r1 new file mode 100644 index 0000000000..3bfaf93600 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-crypt/pinentry-1.1.0-r1 @@ -0,0 +1,14 @@ +DEFINED_PHASES=configure install postinst postrm prepare +DEPEND=app-eselect/eselect-pinentry >=dev-libs/libassuan-2.1 >=dev-libs/libgcrypt-1.6.3 >=dev-libs/libgpg-error-1.17 caps? ( sys-libs/libcap ) gnome-keyring? ( app-crypt/libsecret ) gtk? ( x11-libs/gtk+:2 ) ncurses? ( sys-libs/ncurses:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) static? ( >=sys-libs/ncurses-5.7-r5:0=[static-libs,-gpm] ) sys-devel/gettext virtual/pkgconfig >=app-portage/elt-patches-20170422 !=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 +DESCRIPTION=Simple passphrase entry dialogs which utilize the Assuan protocol +EAPI=6 +HOMEPAGE=https://gnupg.org/aegypten2/index.html +IUSE=caps emacs gnome-keyring gtk ncurses qt5 static +KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris +LICENSE=GPL-2 +RDEPEND=app-eselect/eselect-pinentry >=dev-libs/libassuan-2.1 >=dev-libs/libgcrypt-1.6.3 >=dev-libs/libgpg-error-1.17 caps? ( sys-libs/libcap ) gnome-keyring? ( app-crypt/libsecret ) gtk? ( x11-libs/gtk+:2 ) ncurses? ( sys-libs/ncurses:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) static? ( >=sys-libs/ncurses-5.7-r5:0=[static-libs,-gpm] ) gnome-keyring? ( app-crypt/gcr ) +REQUIRED_USE=gtk? ( !static ) qt5? ( !static ) +SLOT=0 +SRC_URI=mirror://gnupg/pinentry/pinentry-1.1.0.tar.bz2 +_eclasses_=autotools dc412f38566b91012efd58b9c203e6c3 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 flag-o-matic 2274fcc1e7ef6affaff5bcd636275417 libtool 0081a71a261724730ec4c248494f044d ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e qmake-utils 990448b067cb3cfe1443bc25fb57239c toolchain-funcs 185a06792159ca143528e7010368e8af +_md5_=7df7303c767e57d353c43d1ed63fe72b diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-crypt/pinentry-1.1.0-r2 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-crypt/pinentry-1.1.0-r2 new file mode 100644 index 0000000000..22de91c319 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-crypt/pinentry-1.1.0-r2 @@ -0,0 +1,14 @@ +DEFINED_PHASES=configure install postinst postrm prepare +DEPEND=app-eselect/eselect-pinentry >=dev-libs/libassuan-2.1 >=dev-libs/libgcrypt-1.6.3 >=dev-libs/libgpg-error-1.17 caps? ( sys-libs/libcap ) fltk? ( x11-libs/fltk ) gnome-keyring? ( app-crypt/libsecret ) gtk? ( x11-libs/gtk+:2 ) ncurses? ( sys-libs/ncurses:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) static? ( >=sys-libs/ncurses-5.7-r5:0=[static-libs,-gpm] ) sys-devel/gettext virtual/pkgconfig >=app-portage/elt-patches-20170422 !=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 +DESCRIPTION=Simple passphrase entry dialogs which utilize the Assuan protocol +EAPI=6 +HOMEPAGE=https://gnupg.org/aegypten2/index.html +IUSE=caps emacs gnome-keyring fltk gtk ncurses qt5 static +KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris +LICENSE=GPL-2 +RDEPEND=app-eselect/eselect-pinentry >=dev-libs/libassuan-2.1 >=dev-libs/libgcrypt-1.6.3 >=dev-libs/libgpg-error-1.17 caps? ( sys-libs/libcap ) fltk? ( x11-libs/fltk ) gnome-keyring? ( app-crypt/libsecret ) gtk? ( x11-libs/gtk+:2 ) ncurses? ( sys-libs/ncurses:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) static? ( >=sys-libs/ncurses-5.7-r5:0=[static-libs,-gpm] ) gnome-keyring? ( app-crypt/gcr ) +REQUIRED_USE=gtk? ( !static ) qt5? ( !static ) +SLOT=0 +SRC_URI=mirror://gnupg/pinentry/pinentry-1.1.0.tar.bz2 +_eclasses_=autotools dc412f38566b91012efd58b9c203e6c3 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 flag-o-matic 2274fcc1e7ef6affaff5bcd636275417 libtool 0081a71a261724730ec4c248494f044d ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e qmake-utils 990448b067cb3cfe1443bc25fb57239c toolchain-funcs 185a06792159ca143528e7010368e8af +_md5_=17195501c433b19dcdc518dd5faaf6ab From 7c6f33d9f7e2df6ffd0a4eb5f909dae70caa0c25 Mon Sep 17 00:00:00 2001 From: David Michael Date: Mon, 14 May 2018 14:26:31 -0400 Subject: [PATCH 12/21] bump(app-eselect/eselect-pinentry): sync with upstream --- .../app-eselect/eselect-pinentry/ChangeLog | 113 -------------- .../app-eselect/eselect-pinentry/Manifest | 23 --- .../eselect-pinentry-0.3.ebuild | 21 --- .../eselect-pinentry-0.4.ebuild | 23 --- .../eselect-pinentry-0.7.ebuild | 23 +++ .../files/eselect-pinentry-0.3 | 147 ------------------ ...entry.eselect-0.4 => pinentry.eselect-0.7} | 7 +- .../app-eselect/eselect-pinentry/metadata.xml | 5 +- .../app-eselect/eselect-pinentry-0.3 | 10 -- .../app-eselect/eselect-pinentry-0.4 | 9 -- .../app-eselect/eselect-pinentry-0.7 | 9 ++ 11 files changed, 39 insertions(+), 351 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/app-eselect/eselect-pinentry/ChangeLog delete mode 100644 sdk_container/src/third_party/portage-stable/app-eselect/eselect-pinentry/Manifest delete mode 100644 sdk_container/src/third_party/portage-stable/app-eselect/eselect-pinentry/eselect-pinentry-0.3.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/app-eselect/eselect-pinentry/eselect-pinentry-0.4.ebuild create mode 100644 sdk_container/src/third_party/portage-stable/app-eselect/eselect-pinentry/eselect-pinentry-0.7.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/app-eselect/eselect-pinentry/files/eselect-pinentry-0.3 rename sdk_container/src/third_party/portage-stable/app-eselect/eselect-pinentry/files/{pinentry.eselect-0.4 => pinentry.eselect-0.7} (56%) delete mode 100644 sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-eselect/eselect-pinentry-0.3 delete mode 100644 sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-eselect/eselect-pinentry-0.4 create mode 100644 sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-eselect/eselect-pinentry-0.7 diff --git a/sdk_container/src/third_party/portage-stable/app-eselect/eselect-pinentry/ChangeLog b/sdk_container/src/third_party/portage-stable/app-eselect/eselect-pinentry/ChangeLog deleted file mode 100644 index 42b8b3d1df..0000000000 --- a/sdk_container/src/third_party/portage-stable/app-eselect/eselect-pinentry/ChangeLog +++ /dev/null @@ -1,113 +0,0 @@ -# ChangeLog for app-eselect/eselect-pinentry -# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-eselect/eselect-pinentry/ChangeLog,v 1.1 2015/03/31 16:54:08 ulm Exp $ - - 31 Mar 2015; Ulrich Müller +eselect-pinentry-0.3.ebuild, - +eselect-pinentry-0.4.ebuild, +files/eselect-pinentry-0.3, - +files/pinentry.eselect-0.4, +metadata.xml: - Move package from app-admin to app-eselect category. - - 20 Jan 2014; Mike Frysinger eselect-pinentry-0.4.ebuild: - Add arm64 love. - - 05 Dec 2013; Michael Haubenwallner - eselect-pinentry-0.4.ebuild: - add ~ppc-aix keyword - - 07 Jul 2013; Agostino Sarubbo eselect-pinentry-0.4.ebuild: - Stable for x86, wrt bug #470286 - - 30 Jun 2013; Agostino Sarubbo eselect-pinentry-0.4.ebuild: - Stable for s390, wrt bug #470286 - - 29 Jun 2013; Agostino Sarubbo eselect-pinentry-0.4.ebuild: - Stable for ppc64, wrt bug #470286 - - 29 Jun 2013; Agostino Sarubbo eselect-pinentry-0.4.ebuild: - Stable for ppc, wrt bug #470286 - - 29 Jun 2013; Agostino Sarubbo eselect-pinentry-0.4.ebuild: - Stable for sparc, wrt bug #470286 - - 26 Jun 2013; Agostino Sarubbo eselect-pinentry-0.4.ebuild: - Stable for ia64, wrt bug #470286 - - 26 Jun 2013; Agostino Sarubbo eselect-pinentry-0.4.ebuild: - Stable for alpha, wrt bug #470286 - - 09 Jun 2013; Agostino Sarubbo eselect-pinentry-0.4.ebuild: - Stable for sh, wrt bug #470286 - - 09 Jun 2013; Markus Meier eselect-pinentry-0.4.ebuild: - arm stable, bug #470286 - - 04 Jun 2013; Chema Alonso eselect-pinentry-0.4.ebuild: - Stable for amd64 wrt bug #470286 - - 03 Jun 2013; Jeroen Roovers eselect-pinentry-0.4.ebuild: - Stable for HPPA (bug #470286). - - 19 Feb 2013; Zac Medico eselect-pinentry-0.4.ebuild: - Add ~arm-linux keyword. - -*eselect-pinentry-0.4 (14 Jan 2013) - - 14 Jan 2013; Samuli Suominen - +files/pinentry.eselect-0.4, +eselect-pinentry-0.4.ebuild: - Version bump to use shared code from eselect-lib-bin-symlink by mgorny. - - 28 Nov 2012; Tim Harder metadata.xml: - Add to crypto herd. - - 25 Nov 2012; Sven Wegener metadata.xml: - Move to maintainer-needed. - - 14 Sep 2012; Samuli Suominen metadata.xml: - Copy metadata.xml from app-crypt/pinentry since you can't maintain one - without another. - - 09 Sep 2012; Raúl Porcel eselect-pinentry-0.3.ebuild: - alpha/ia64/s390/sh/sparc stable wrt #421593 - - 17 Aug 2012; Anthony G. Basile - eselect-pinentry-0.3.ebuild: - Stable ppc ppc64, bug #421593 - - 03 Jul 2012; Jeroen Roovers eselect-pinentry-0.3.ebuild: - Stable for HPPA (bug #421593). - - 25 Jun 2012; Markus Meier eselect-pinentry-0.3.ebuild: - arm stable, bug #421593 - - 19 Jun 2012; Agostino Sarubbo eselect-pinentry-0.3.ebuild: - Stable for amd64, wrt bug #421593 - - 17 Jun 2012; Jeff Horelick eselect-pinentry-0.3.ebuild: - marked x86 per bug 421593 - - 17 Jun 2012; Samuli Suominen - -eselect-pinentry-0.1.ebuild, -eselect-pinentry-0.2.ebuild, - -files/eselect-pinentry-0.1, -files/eselect-pinentry-0.2: - old - - 09 May 2012; Alexis Ballier - eselect-pinentry-0.3.ebuild: - keyword ~amd64-fbsd - -*eselect-pinentry-0.3 (21 Oct 2010) - - 21 Oct 2010; Samuli Suominen - +files/eselect-pinentry-0.3, +eselect-pinentry-0.3.ebuild: - Use EROOT instead of ROOT for prefix support. - -*eselect-pinentry-0.2 (30 Sep 2010) - - 30 Sep 2010; Samuli Suominen - +files/eselect-pinentry-0.2, +eselect-pinentry-0.2.ebuild: - If no targets are found, remove the symlink and exit. - -*eselect-pinentry-0.1 (30 Sep 2010) - - 30 Sep 2010; Samuli Suominen - +files/eselect-pinentry-0.1, +eselect-pinentry-0.1.ebuild: - Initial commit wrt #338691 by Michał Górny. diff --git a/sdk_container/src/third_party/portage-stable/app-eselect/eselect-pinentry/Manifest b/sdk_container/src/third_party/portage-stable/app-eselect/eselect-pinentry/Manifest deleted file mode 100644 index e3bc284dfc..0000000000 --- a/sdk_container/src/third_party/portage-stable/app-eselect/eselect-pinentry/Manifest +++ /dev/null @@ -1,23 +0,0 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 - -AUX eselect-pinentry-0.3 3465 SHA256 854367bc7bc9a377315a406632a30b25a22ffa9b7543042578fd522f270ce425 SHA512 757429cec97ab91781a3cc10ee1ded2718963cbc92dc14752b46aaac2054c7db2ff2861b966f132efe8b4fa4fe7d4561833bbbbedb961e067aacfdf47932ba27 WHIRLPOOL ea99694d0a5483614f60221c61fcb9e6170e14cf6069e3d48b751c9622fb6872827df572790ca7a5a06f5e20040d790377d05aba7740554816a6d16876883fd8 -AUX pinentry.eselect-0.4 441 SHA256 d61a081051de1c72d5aa5376b78a78e9e39c0cfa439e825e6002fa9905492800 SHA512 dc681dc0cbd9e98218463a1cd53a9bf246827596e3c092061e0069373badb0e966f5e91107fd3bc5cbe4e58b688fdd5d67f4f2bf9fdb50c51bcb94a235b98aa3 WHIRLPOOL 4b31b3eb2b810b775f560ed1344579ebef1dd2c91754b9667a6ab4e786d857dbc8fb0479ef2c446337e021586e8bda825aa606ab92f631829b4b6d86a18fdb12 -EBUILD eselect-pinentry-0.3.ebuild 795 SHA256 1b892149ce8d8ec1eada91dd1c4427b295383a023051efabbbd3790ed95c3be5 SHA512 0b849904560e8dcc57801a43362d3fac26560be8303a211ffb9607fd52c15bedf49c7a280508ea341819ceeb325c66a0114953be667d54bb48f091bada3d9022 WHIRLPOOL 31ff9c0fa44e683cc00b79afa36df440a825be51edffe34c28bada2c54907916c069e34e58278e276a5f8e33918526a37a0c1557e722b77a090060e51afa6493 -EBUILD eselect-pinentry-0.4.ebuild 832 SHA256 e56f46050870b0f35b95f37fd52ca5fa2e25f4d6c373ec1feb1ddd9a3a92b965 SHA512 36781fc29610e37c38d13594f80f511d83abd02d79f9e596c15d2f0769a34f482d729ad9fd2ed776ecbb8ac0e5d7abf38b037b6d9eda8d7b79b20d788196e3b3 WHIRLPOOL d96c766b2e2459d7bd60b68c02ccff49b2b5a373b2e9183f1a6be6f8658d3b93e92da9c3827f09234478a56af7575ee1402e4564240a6c19fed66739f0017eb5 -MISC ChangeLog 4163 SHA256 898445704533f36e6f95a8ac2c57b48701ad4b81bb9ac41c53573315f32a6fd4 SHA512 a992480db11f459ad096573b6abd0b59fbf13846370f1e5c4b32ec4de7bebd62e6674411b812f45244ad91f71d29264ef0e6bc905e841e592ab72c268472c93b WHIRLPOOL 14bd06552c6baa75b69f0fad59234f19644b7eba39ef7c4bc3b5def8cd0233a53d0f446bb018d4c024e915712239a411cfde41a2459a57eaa3fa3ecf4490c580 -MISC metadata.xml 159 SHA256 fabd15e2740a2a68e0bda738d0cd4300b133ff11239802afe7e60aa3862c9c03 SHA512 96a1f7f082adc57e52a1a32666e1206e68f8ff03c728fdb7666ff98c255905977491fc4dfc37bc8bdf5da0eb50cdc408adec357bbd75bd980bc90659cc157194 WHIRLPOOL 82fca1c4b75b090abdb0a4233c8e49fc43535ca6e470f725c1872653ea922b6693e9646bc3ee1fd6f1293ebedad661642cec13b2817fb5315268300f7675a751 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2 - -iQGcBAEBCAAGBQJVGtEzAAoJEJQzkH1pP7W4A34L/3twrSuUQlPlIFLCYSq488Oi -jhqtw4vIib42XKoxzUm0+1QI2XvQaTSOZSLq+KhI9lmrcY0TSbQmHxfPK0/XIBZl -2Ki6gkXSWTENUnqFP9pvw17mhhJq9gePqAbnIsrw85S7CHKdktseMT66X9HP8Wsc -uSlrwRyQQvmpZ/VoJ448SLtsV+TGSTh6t1a0wI3Ap2B8btJ2o5ZymXkbmMUDM+ES -OdesCkRQnMUWmSotQ0a4tX0l7tCYq2sl70TQheZtYgtDFhf7eScJvJx25ca6kxbU -PLL7GeGZFTwnJW1Om+7gYcHXDUTv4VBlPqN79tgWj9wIHEg4VIu743nzFD8FeU20 -ZdkTkRIuYnIZwmtMGTEdd88vbvPBelr53MuZ7Oda/MscHQLoxeHhI/TemaWi0/0o -fID9oZzhwDKrdkns2YeCAWliD339ioLkamgG2K+dtikgQPryF1nK9Fjc/SW4zB+p -UPjYaHjY2VDivxgzBUGwC4lvnnFxD2tUOqU2F8POIQ== -=JJaf ------END PGP SIGNATURE----- diff --git a/sdk_container/src/third_party/portage-stable/app-eselect/eselect-pinentry/eselect-pinentry-0.3.ebuild b/sdk_container/src/third_party/portage-stable/app-eselect/eselect-pinentry/eselect-pinentry-0.3.ebuild deleted file mode 100644 index 128b81a1f8..0000000000 --- a/sdk_container/src/third_party/portage-stable/app-eselect/eselect-pinentry/eselect-pinentry-0.3.ebuild +++ /dev/null @@ -1,21 +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-pinentry/eselect-pinentry-0.3.ebuild,v 1.1 2015/03/31 16:54:08 ulm Exp $ - -DESCRIPTION="Manage /usr/bin/pinentry symlink" -HOMEPAGE="http://www.gentoo.org/" -SRC_URI="" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 ~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 - !" -} - -do_set() { - if [[ -z ${1} ]]; then - die -q "Not enough parameters" - elif [[ -n ${2} ]]; then - die -q "Too many parameters" - else - set_symlinks "${1}" - fi -} - -### update action ### - -describe_update() { - echo "Automatically update the pinentry implementation" -} - -describe_update_options() { - echo "ifunset : Do not override existing implementation" -} - -do_update() { - [[ -z ${1} || ( -z ${2} && ( ${1} == ifunset || ${1} == '--if-unset' ) ) ]] || \ - die -q "Usage error" - - [[ ( ${1} == ifunset || ${1} == '--if-unset' ) && -L ${EROOT}/usr/bin/pinentry && -x ${EROOT}/usr/bin/pinentry ]] && \ - return - - set_symlinks 1 -} diff --git a/sdk_container/src/third_party/portage-stable/app-eselect/eselect-pinentry/files/pinentry.eselect-0.4 b/sdk_container/src/third_party/portage-stable/app-eselect/eselect-pinentry/files/pinentry.eselect-0.7 similarity index 56% rename from sdk_container/src/third_party/portage-stable/app-eselect/eselect-pinentry/files/pinentry.eselect-0.4 rename to sdk_container/src/third_party/portage-stable/app-eselect/eselect-pinentry/files/pinentry.eselect-0.7 index 91fe4ee181..ec49ca1a60 100644 --- a/sdk_container/src/third_party/portage-stable/app-eselect/eselect-pinentry/files/pinentry.eselect-0.4 +++ b/sdk_container/src/third_party/portage-stable/app-eselect/eselect-pinentry/files/pinentry.eselect-0.7 @@ -1,13 +1,12 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Id: pinentry.eselect-0.4,v 1.1 2015/03/31 16:54:08 ulm Exp $ DESCRIPTION="Manage /usr/bin/pinentry implementation" MAINTAINER="ssuominen@gentoo.org" -VERSION="0.4" +VERSION="0.7" SYMLINK_PATH=/usr/bin/pinentry -SYMLINK_TARGETS=( pinentry-qt pinentry-gtk-2 pinentry-qt4 pinentry-curses ) +SYMLINK_TARGETS=( pinentry-gnome3 pinentry-qt pinentry-gtk-2 pinentry-qt4 pinentry-curses pinentry-tty ) SYMLINK_DESCRIPTION='pinentry binary' inherit bin-symlink diff --git a/sdk_container/src/third_party/portage-stable/app-eselect/eselect-pinentry/metadata.xml b/sdk_container/src/third_party/portage-stable/app-eselect/eselect-pinentry/metadata.xml index d68fe974c1..f1c3d59fb2 100644 --- a/sdk_container/src/third_party/portage-stable/app-eselect/eselect-pinentry/metadata.xml +++ b/sdk_container/src/third_party/portage-stable/app-eselect/eselect-pinentry/metadata.xml @@ -1,5 +1,8 @@ -crypto + + crypto@gentoo.org + Crypto + diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-eselect/eselect-pinentry-0.3 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-eselect/eselect-pinentry-0.3 deleted file mode 100644 index 4465f50ccc..0000000000 --- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-eselect/eselect-pinentry-0.3 +++ /dev/null @@ -1,10 +0,0 @@ -DEFINED_PHASES=install -DEPEND=app-admin/eselect !=app-eselect/eselect-lib-bin-symlink-0.1.1 -SLOT=0 -_md5_=177761a73977a00de40a2fef0921af26 diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-eselect/eselect-pinentry-0.7 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-eselect/eselect-pinentry-0.7 new file mode 100644 index 0000000000..fca57b960f --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-eselect/eselect-pinentry-0.7 @@ -0,0 +1,9 @@ +DEFINED_PHASES=install +DESCRIPTION=Manage /usr/bin/pinentry symlink +EAPI=6 +HOMEPAGE=https://www.gentoo.org/proj/en/eselect/ +KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris +LICENSE=GPL-2 +RDEPEND=>=app-eselect/eselect-lib-bin-symlink-0.1.1 +SLOT=0 +_md5_=fea360a9b16e6142796364621987ada9 From 9c3b03faf4667703cbb3b1ad9321faeef0dfd358 Mon Sep 17 00:00:00 2001 From: David Michael Date: Mon, 14 May 2018 14:58:20 -0400 Subject: [PATCH 13/21] bump(sys-apps/util-linux): sync with upstream --- .../{util-linux-2.32_rc2 => util-linux-2.32} | 3 +- .../md5-cache/sys-apps/util-linux-2.32-r3 | 14 ++ .../md5-cache/sys-apps/util-linux-9999 | 10 +- .../sys-apps/util-linux/Manifest | 2 +- .../util-linux-2.32-add-missing-lintl.patch | 38 +++ .../sys-apps/util-linux/metadata.xml | 1 + .../util-linux/util-linux-2.32-r3.ebuild | 230 ++++++++++++++++++ ...2.32_rc2.ebuild => util-linux-2.32.ebuild} | 0 .../util-linux/util-linux-9999.ebuild | 110 +++++---- 9 files changed, 355 insertions(+), 53 deletions(-) rename sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-apps/{util-linux-2.32_rc2 => util-linux-2.32} (97%) create mode 100644 sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-apps/util-linux-2.32-r3 create mode 100644 sdk_container/src/third_party/portage-stable/sys-apps/util-linux/files/util-linux-2.32-add-missing-lintl.patch create mode 100644 sdk_container/src/third_party/portage-stable/sys-apps/util-linux/util-linux-2.32-r3.ebuild rename sdk_container/src/third_party/portage-stable/sys-apps/util-linux/{util-linux-2.32_rc2.ebuild => util-linux-2.32.ebuild} (100%) diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-apps/util-linux-2.32_rc2 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-apps/util-linux-2.32 similarity index 97% rename from sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-apps/util-linux-2.32_rc2 rename to sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-apps/util-linux-2.32 index 77d1ec17da..867978f0a4 100644 --- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-apps/util-linux-2.32_rc2 +++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-apps/util-linux-2.32 @@ -4,10 +4,11 @@ DESCRIPTION=Various useful Linux utilities EAPI=6 HOMEPAGE=https://www.kernel.org/pub/linux/utils/util-linux/ IUSE=build caps +cramfs fdformat kill ncurses nls pam python +readline selinux slang static-libs +suid systemd test tty-helpers udev unicode python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 +KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux LICENSE=GPL-2 LGPL-2.1 BSD-4 MIT public-domain RDEPEND=caps? ( sys-libs/libcap-ng ) cramfs? ( sys-libs/zlib:= ) ncurses? ( >=sys-libs/ncurses-5.2-r2:0=[unicode?] ) pam? ( sys-libs/pam ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) readline? ( sys-libs/readline:0= ) selinux? ( >=sys-libs/libselinux-2.2.2-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) slang? ( sys-libs/slang ) !build? ( systemd? ( sys-apps/systemd ) ) udev? ( virtual/libudev:= ) kill? ( !sys-apps/coreutils[kill] !sys-process/procps[kill] ) !net-wireless/rfkill !sys-process/schedutils !sys-apps/setarch !=sys-libs/ncurses-5.2-r2:0=[unicode?] ) nls? ( virtual/libintl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pam? ( sys-libs/pam ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) readline? ( sys-libs/readline:0= ) selinux? ( >=sys-libs/libselinux-2.2.2-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) slang? ( sys-libs/slang ) !build? ( systemd? ( sys-apps/systemd ) ) udev? ( virtual/libudev:= ) virtual/pkgconfig nls? ( sys-devel/gettext ) test? ( sys-devel/bc ) virtual/os-headers >=app-portage/elt-patches-20170422 virtual/pkgconfig +DESCRIPTION=Various useful Linux utilities +EAPI=6 +HOMEPAGE=https://www.kernel.org/pub/linux/utils/util-linux/ https://github.com/karelzak/util-linux +IUSE=build caps +cramfs fdformat kill ncurses nls pam python +readline selinux slang static-libs +suid systemd test tty-helpers udev unicode userland_GNU python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 +KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux +LICENSE=GPL-2 LGPL-2.1 BSD-4 MIT public-domain +RDEPEND=caps? ( sys-libs/libcap-ng ) cramfs? ( sys-libs/zlib:= ) ncurses? ( >=sys-libs/ncurses-5.2-r2:0=[unicode?] ) nls? ( virtual/libintl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pam? ( sys-libs/pam ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) readline? ( sys-libs/readline:0= ) selinux? ( >=sys-libs/libselinux-2.2.2-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) slang? ( sys-libs/slang ) !build? ( systemd? ( sys-apps/systemd ) ) udev? ( virtual/libudev:= ) kill? ( !sys-apps/coreutils[kill] !sys-process/procps[kill] ) !net-wireless/rfkill !sys-process/schedutils !sys-apps/setarch !=sys-libs/ncurses-5.2-r2:0=[unicode?] ) pam? ( sys-libs/pam ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) readline? ( sys-libs/readline:0= ) selinux? ( >=sys-libs/libselinux-2.2.2-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) slang? ( sys-libs/slang ) !build? ( systemd? ( sys-apps/systemd ) ) udev? ( virtual/libudev:= ) virtual/pkgconfig nls? ( sys-devel/gettext ) test? ( sys-devel/bc ) virtual/os-headers >=app-portage/elt-patches-20170422 virtual/pkgconfig >=dev-vcs/git-1.8.2.1 !=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 +DEPEND=caps? ( sys-libs/libcap-ng ) cramfs? ( sys-libs/zlib:= ) ncurses? ( >=sys-libs/ncurses-5.2-r2:0=[unicode?] ) nls? ( virtual/libintl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pam? ( sys-libs/pam ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) readline? ( sys-libs/readline:0= ) selinux? ( >=sys-libs/libselinux-2.2.2-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) slang? ( sys-libs/slang ) !build? ( systemd? ( sys-apps/systemd ) ) udev? ( virtual/libudev:= ) virtual/pkgconfig nls? ( sys-devel/gettext ) test? ( sys-devel/bc ) virtual/os-headers >=app-portage/elt-patches-20170422 virtual/pkgconfig >=dev-vcs/git-1.8.2.1 !=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 DESCRIPTION=Various useful Linux utilities EAPI=6 -HOMEPAGE=https://www.kernel.org/pub/linux/utils/util-linux/ -IUSE=build caps +cramfs fdformat kill ncurses nls pam python +readline selinux slang static-libs +suid systemd test tty-helpers udev unicode python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 +HOMEPAGE=https://www.kernel.org/pub/linux/utils/util-linux/ https://github.com/karelzak/util-linux +IUSE=build caps +cramfs fdformat kill ncurses nls pam python +readline selinux slang static-libs +suid systemd test tty-helpers udev unicode userland_GNU python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 LICENSE=GPL-2 LGPL-2.1 BSD-4 MIT public-domain -RDEPEND=caps? ( sys-libs/libcap-ng ) cramfs? ( sys-libs/zlib:= ) ncurses? ( >=sys-libs/ncurses-5.2-r2:0=[unicode?] ) pam? ( sys-libs/pam ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) readline? ( sys-libs/readline:0= ) selinux? ( >=sys-libs/libselinux-2.2.2-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) slang? ( sys-libs/slang ) !build? ( systemd? ( sys-apps/systemd ) ) udev? ( virtual/libudev:= ) kill? ( !sys-apps/coreutils[kill] !sys-process/procps[kill] ) !net-wireless/rfkill !sys-process/schedutils !sys-apps/setarch !=sys-libs/ncurses-5.2-r2:0=[unicode?] ) nls? ( virtual/libintl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pam? ( sys-libs/pam ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) readline? ( sys-libs/readline:0= ) selinux? ( >=sys-libs/libselinux-2.2.2-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) slang? ( sys-libs/slang ) !build? ( systemd? ( sys-apps/systemd ) ) udev? ( virtual/libudev:= ) kill? ( !sys-apps/coreutils[kill] !sys-process/procps[kill] ) !net-wireless/rfkill !sys-process/schedutils !sys-apps/setarch ! +Date: Mon, 9 Apr 2018 12:11:36 +0200 +Subject: [PATCH] build: Add missing -lintl linkage to lib{smartcols,uuid} + +Addresses: https://github.com/karelzak/util-linux/pull/615 +Signed-off-by: Karel Zak +--- + libsmartcols/src/Makemodule.am | 2 +- + libuuid/src/Makemodule.am | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/libsmartcols/src/Makemodule.am b/libsmartcols/src/Makemodule.am +index 664aca30b..665b2aa7f 100644 +--- a/libsmartcols/src/Makemodule.am ++++ b/libsmartcols/src/Makemodule.am +@@ -19,7 +19,7 @@ libsmartcols_la_SOURCES= \ + libsmartcols/src/version.c \ + libsmartcols/src/init.c + +-libsmartcols_la_LIBADD = libcommon.la ++libsmartcols_la_LIBADD = $(LDADD) libcommon.la + + libsmartcols_la_CFLAGS = \ + $(AM_CFLAGS) \ +diff --git a/libuuid/src/Makemodule.am b/libuuid/src/Makemodule.am +index 5122622a5..e58fa261c 100644 +--- a/libuuid/src/Makemodule.am ++++ b/libuuid/src/Makemodule.am +@@ -31,7 +31,7 @@ libuuid_la_SOURCES = \ + EXTRA_libuuid_la_DEPENDENCIES = \ + libuuid/src/libuuid.sym + +-libuuid_la_LIBADD = $(SOCKET_LIBS) ++libuuid_la_LIBADD = $(LDADD) $(SOCKET_LIBS) + + libuuid_la_CFLAGS = \ + $(AM_CFLAGS) \ diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/util-linux/metadata.xml b/sdk_container/src/third_party/portage-stable/sys-apps/util-linux/metadata.xml index 9a5be00a83..d41121d081 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/util-linux/metadata.xml +++ b/sdk_container/src/third_party/portage-stable/sys-apps/util-linux/metadata.xml @@ -19,5 +19,6 @@ cpe:/a:andries_brouwer:util-linux + karelzak/util-linux diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/util-linux/util-linux-2.32-r3.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/util-linux/util-linux-2.32-r3.ebuild new file mode 100644 index 0000000000..4fe88effdf --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-apps/util-linux/util-linux-2.32-r3.ebuild @@ -0,0 +1,230 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +PYTHON_COMPAT=( python2_7 python3_{4,5,6} ) + +inherit toolchain-funcs libtool flag-o-matic bash-completion-r1 \ + pam python-single-r1 multilib-minimal multiprocessing systemd + +MY_PV="${PV/_/-}" +MY_P="${PN}-${MY_PV}" + +if [[ ${PV} == 9999 ]] ; then + inherit git-r3 autotools + EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git" +else + [[ "${PV}" = *_rc* ]] || \ + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux" + SRC_URI="mirror://kernel/linux/utils/util-linux/v${PV:0:4}/${MY_P}.tar.xz" +fi + +DESCRIPTION="Various useful Linux utilities" +HOMEPAGE="https://www.kernel.org/pub/linux/utils/util-linux/ https://github.com/karelzak/util-linux" + +LICENSE="GPL-2 LGPL-2.1 BSD-4 MIT public-domain" +SLOT="0" +IUSE="build caps +cramfs fdformat kill ncurses nls pam python +readline selinux slang static-libs +suid systemd test tty-helpers udev unicode userland_GNU" + +# Most lib deps here are related to programs rather than our libs, +# so we rarely need to specify ${MULTILIB_USEDEP}. +RDEPEND="caps? ( sys-libs/libcap-ng ) + cramfs? ( sys-libs/zlib:= ) + ncurses? ( >=sys-libs/ncurses-5.2-r2:0=[unicode?] ) + nls? ( virtual/libintl[${MULTILIB_USEDEP}] ) + pam? ( sys-libs/pam ) + python? ( ${PYTHON_DEPS} ) + readline? ( sys-libs/readline:0= ) + selinux? ( >=sys-libs/libselinux-2.2.2-r4[${MULTILIB_USEDEP}] ) + slang? ( sys-libs/slang ) + !build? ( systemd? ( sys-apps/systemd ) ) + udev? ( virtual/libudev:= )" +DEPEND="${RDEPEND} + virtual/pkgconfig + nls? ( sys-devel/gettext ) + test? ( sys-devel/bc ) + virtual/os-headers" +RDEPEND+=" + kill? ( + !sys-apps/coreutils[kill] + !sys-process/procps[kill] + ) + !net-wireless/rfkill + !sys-process/schedutils + !sys-apps/setarch + ! "${T}"/fallocate.${ABI}.c + #define _GNU_SOURCE + #include + main() { return fallocate(0, 0, 0, 0); } + EOF + append-lfs-flags + $(tc-getCC) ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} "${T}"/fallocate.${ABI}.c -o /dev/null >/dev/null 2>&1 \ + || export ac_cv_func_fallocate=no + rm -f "${T}"/fallocate.${ABI}.c +} + +multilib_src_configure() { + lfs_fallocate_test + # The scanf test in a run-time test which fails while cross-compiling. + # Blindly assume a POSIX setup since we require libmount, and libmount + # itself fails when the scanf test fails. #531856 + tc-is-cross-compiler && export scanf_cv_alloc_modifier=ms + export ac_cv_header_security_pam_misc_h=$(multilib_native_usex pam) #485486 + export ac_cv_header_security_pam_appl_h=$(multilib_native_usex pam) #545042 + + local myeconfargs=( + --enable-fs-paths-extra="${EPREFIX}/usr/sbin:${EPREFIX}/bin:${EPREFIX}/usr/bin" + --with-bashcompletiondir="$(get_bashcompdir)" + $(multilib_native_use_enable suid makeinstall-chown) + $(multilib_native_use_enable suid makeinstall-setuid) + $(multilib_native_use_with python) + $(multilib_native_use_with readline) + $(multilib_native_use_with slang) + $(multilib_native_use_with systemd) + $(multilib_native_use_with udev) + $(multilib_native_usex ncurses "$(use_with unicode ncursesw)" '--without-ncursesw') + $(multilib_native_usex ncurses "$(use_with !unicode ncurses)" '--without-ncurses') + $(tc-has-tls || echo --disable-tls) + $(use_enable nls) + $(use_enable unicode widechar) + $(use_enable static-libs static) + $(use_with selinux) + $(usex ncurses '' '--without-tinfo') + ) + # build programs only on GNU, on *BSD we want libraries only + if multilib_is_native_abi && use userland_GNU; then + myeconfargs+=( + --disable-chfn-chsh + --disable-login + --disable-nologin + --disable-su + --enable-agetty + --enable-bash-completion + --enable-line + --enable-partx + --enable-raw + --enable-rename + --enable-rfkill + --enable-schedutils + --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" + $(use_enable caps setpriv) + $(use_enable cramfs) + $(use_enable fdformat) + $(use_enable tty-helpers mesg) + $(use_enable tty-helpers wall) + $(use_enable tty-helpers write) + $(use_enable kill) + ) + else + myeconfargs+=( + --disable-all-programs + --disable-bash-completion + --without-systemdsystemunitdir + # build libraries + --enable-libuuid + --enable-libblkid + --enable-libsmartcols + --enable-libfdisk + ) + if use userland_GNU; then + # those libraries don't work on *BSD + myeconfargs+=( + --enable-libmount + ) + fi + fi + ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" +} + +multilib_src_test() { + emake check TS_OPTS="--parallel=$(makeopts_jobs) --nonroot" +} + +multilib_src_install() { + emake DESTDIR="${D}" install + + if multilib_is_native_abi && use userland_GNU; then + # need the libs in / + gen_usr_ldscript -a blkid fdisk mount smartcols uuid + + use python && python_optimize + fi +} + +multilib_src_install_all() { + dodoc AUTHORS NEWS README* Documentation/{TODO,*.txt,releases/*} + + # e2fsprogs-libs didnt install .la files, and .pc work fine + find "${ED}" -name "*.la" -delete || die + + if ! use userland_GNU; then + # manpage collisions + # TODO: figure out a good way to keep them + rm "${ED%/}"/usr/share/man/man3/uuid* || die + fi + + if use pam; then + newpamd "${FILESDIR}/runuser.pamd" runuser + newpamd "${FILESDIR}/runuser-l.pamd" runuser-l + fi +} + +pkg_postinst() { + if ! use tty-helpers; then + elog "The mesg/wall/write tools have been disabled due to USE=-tty-helpers." + fi + + if [[ -z ${REPLACING_VERSIONS} ]]; then + elog "The agetty util now clears the terminal by default. You" + elog "might want to add --noclear to your /etc/inittab lines." + fi +} diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/util-linux/util-linux-2.32_rc2.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/util-linux/util-linux-2.32.ebuild similarity index 100% rename from sdk_container/src/third_party/portage-stable/sys-apps/util-linux/util-linux-2.32_rc2.ebuild rename to sdk_container/src/third_party/portage-stable/sys-apps/util-linux/util-linux-2.32.ebuild diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/util-linux/util-linux-9999.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/util-linux/util-linux-9999.ebuild index 6fcbc94b07..a41435eb9a 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/util-linux/util-linux-9999.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-apps/util-linux/util-linux-9999.ebuild @@ -16,22 +16,23 @@ if [[ ${PV} == 9999 ]] ; then EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git" else [[ "${PV}" = *_rc* ]] || \ - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux" SRC_URI="mirror://kernel/linux/utils/util-linux/v${PV:0:4}/${MY_P}.tar.xz" fi DESCRIPTION="Various useful Linux utilities" -HOMEPAGE="https://www.kernel.org/pub/linux/utils/util-linux/" +HOMEPAGE="https://www.kernel.org/pub/linux/utils/util-linux/ https://github.com/karelzak/util-linux" LICENSE="GPL-2 LGPL-2.1 BSD-4 MIT public-domain" SLOT="0" -IUSE="build caps +cramfs fdformat kill ncurses nls pam python +readline selinux slang static-libs +suid systemd test tty-helpers udev unicode" +IUSE="build caps +cramfs fdformat kill ncurses nls pam python +readline selinux slang static-libs +suid systemd test tty-helpers udev unicode userland_GNU" # Most lib deps here are related to programs rather than our libs, # so we rarely need to specify ${MULTILIB_USEDEP}. RDEPEND="caps? ( sys-libs/libcap-ng ) cramfs? ( sys-libs/zlib:= ) ncurses? ( >=sys-libs/ncurses-5.2-r2:0=[unicode?] ) + nls? ( virtual/libintl[${MULTILIB_USEDEP}] ) pam? ( sys-libs/pam ) python? ( ${PYTHON_DEPS} ) readline? ( sys-libs/readline:0= ) @@ -73,6 +74,13 @@ src_prepare() { -e "s|UUIDD_SOCKET=\"\$(mktemp -u \"\${TS_OUTDIR}/uuiddXXXXXXXXXXXXX\")\"|UUIDD_SOCKET=\"\$(mktemp -u \"${T}/uuiddXXXXXXXXXXXXX.sock\")\"|g" \ tests/ts/uuid/uuidd || die "Failed to fix uuidd test" + if ! use userland_GNU; then + # test runner is using GNU-specific xargs call + sed -i -e 's:xargs:gxargs:' tests/run.sh || die + # test requires util-linux uuidgen (which we don't build) + rm tests/ts/uuid/oids || die + fi + if [[ ${PV} == 9999 ]] ; then po/update-potfiles eautoreconf @@ -110,31 +118,10 @@ multilib_src_configure() { export ac_cv_header_security_pam_appl_h=$(multilib_native_usex pam) #545042 local myeconfargs=( - --disable-chfn-chsh - --disable-login - --disable-nologin - --disable-su - --docdir='${datarootdir}'/doc/${PF} - --enable-agetty - --enable-bash-completion --enable-fs-paths-extra="${EPREFIX}/usr/sbin:${EPREFIX}/bin:${EPREFIX}/usr/bin" - --enable-line - --enable-partx - --enable-raw - --enable-rename - --enable-rfkill - --enable-schedutils --with-bashcompletiondir="$(get_bashcompdir)" - --with-systemdsystemunitdir=$(multilib_native_usex systemd "$(systemd_get_systemunitdir)" "no") - $(multilib_native_use_enable caps setpriv) - $(multilib_native_use_enable cramfs) - $(multilib_native_use_enable fdformat) - $(multilib_native_use_enable nls) $(multilib_native_use_enable suid makeinstall-chown) $(multilib_native_use_enable suid makeinstall-setuid) - $(multilib_native_use_enable tty-helpers mesg) - $(multilib_native_use_enable tty-helpers wall) - $(multilib_native_use_enable tty-helpers write) $(multilib_native_use_with python) $(multilib_native_use_with readline) $(multilib_native_use_with slang) @@ -143,42 +130,67 @@ multilib_src_configure() { $(multilib_native_usex ncurses "$(use_with unicode ncursesw)" '--without-ncursesw') $(multilib_native_usex ncurses "$(use_with !unicode ncurses)" '--without-ncurses') $(tc-has-tls || echo --disable-tls) + $(use_enable nls) $(use_enable unicode widechar) - $(use_enable kill) $(use_enable static-libs static) $(use_with selinux) $(usex ncurses '' '--without-tinfo') ) + # build programs only on GNU, on *BSD we want libraries only + if multilib_is_native_abi && use userland_GNU; then + myeconfargs+=( + --disable-chfn-chsh + --disable-login + --disable-nologin + --disable-su + --enable-agetty + --enable-bash-completion + --enable-line + --enable-partx + --enable-raw + --enable-rename + --enable-rfkill + --enable-schedutils + --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" + $(use_enable caps setpriv) + $(use_enable cramfs) + $(use_enable fdformat) + $(use_enable tty-helpers mesg) + $(use_enable tty-helpers wall) + $(use_enable tty-helpers write) + $(use_enable kill) + ) + else + myeconfargs+=( + --disable-all-programs + --disable-bash-completion + --without-systemdsystemunitdir + # build libraries + --enable-libuuid + --enable-libblkid + --enable-libsmartcols + --enable-libfdisk + ) + if use userland_GNU; then + # those libraries don't work on *BSD + myeconfargs+=( + --enable-libmount + ) + fi + fi ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" } -multilib_src_compile() { - if multilib_is_native_abi; then - default - else - # build libraries only - emake -f Makefile -f - mylibs \ - <<< 'mylibs: $(usrlib_exec_LTLIBRARIES) $(pkgconfig_DATA)' - fi -} - multilib_src_test() { - multilib_is_native_abi && emake check TS_OPTS="--parallel=$(makeopts_jobs) --nonroot" + emake check TS_OPTS="--parallel=$(makeopts_jobs) --nonroot" } multilib_src_install() { - if multilib_is_native_abi; then - default - else - emake DESTDIR="${D}" install-usrlib_execLTLIBRARIES \ - install-pkgconfigDATA install-uuidincHEADERS \ - install-nodist_blkidincHEADERS install-nodist_mountincHEADERS \ - install-nodist_smartcolsincHEADERS install-nodist_fdiskincHEADERS - fi + emake DESTDIR="${D}" install - if multilib_is_native_abi; then + if multilib_is_native_abi && use userland_GNU; then # need the libs in / - gen_usr_ldscript -a blkid mount smartcols uuid + gen_usr_ldscript -a blkid fdisk mount smartcols uuid use python && python_optimize fi @@ -190,6 +202,12 @@ multilib_src_install_all() { # e2fsprogs-libs didnt install .la files, and .pc work fine find "${ED}" -name "*.la" -delete || die + if ! use userland_GNU; then + # manpage collisions + # TODO: figure out a good way to keep them + rm "${ED%/}"/usr/share/man/man3/uuid* || die + fi + if use pam; then newpamd "${FILESDIR}/runuser.pamd" runuser newpamd "${FILESDIR}/runuser-l.pamd" runuser-l From 5aaa269672ab8d35fcdf41dff2ddc61c48667c6f Mon Sep 17 00:00:00 2001 From: David Michael Date: Mon, 14 May 2018 15:04:55 -0400 Subject: [PATCH 14/21] bump(app-shells/bash-completion): sync with upstream --- .../app-shells/bash-completion/Manifest | 19 +--- .../bash-completion-2.1_p20141224-r1.ebuild | 94 ------------------ .../bash-completion-2.4-r1.ebuild | 4 +- .../bash-completion-2.4.ebuild | 98 ------------------- ...5.ebuild => bash-completion-2.7-r3.ebuild} | 47 +++++++-- ...-r2.ebuild => bash-completion-9999.ebuild} | 67 ++++++++++--- ...ash-completion-2.1-escape-characters.patch | 27 ----- .../app-shells/bash-completion/metadata.xml | 23 ++--- .../bash-completion-2.1_p20141224-r1 | 13 --- .../md5-cache/app-shells/bash-completion-2.4 | 13 --- .../app-shells/bash-completion-2.4-r1 | 4 +- .../md5-cache/app-shells/bash-completion-2.5 | 13 --- ...mpletion-2.3-r2 => bash-completion-2.7-r3} | 12 ++- .../md5-cache/app-shells/bash-completion-9999 | 13 +++ 14 files changed, 131 insertions(+), 316 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/app-shells/bash-completion/bash-completion-2.1_p20141224-r1.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/app-shells/bash-completion/bash-completion-2.4.ebuild rename sdk_container/src/third_party/portage-stable/app-shells/bash-completion/{bash-completion-2.5.ebuild => bash-completion-2.7-r3.ebuild} (67%) rename sdk_container/src/third_party/portage-stable/app-shells/bash-completion/{bash-completion-2.3-r2.ebuild => bash-completion-9999.ebuild} (59%) delete mode 100644 sdk_container/src/third_party/portage-stable/app-shells/bash-completion/files/bash-completion-2.1-escape-characters.patch delete mode 100644 sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-shells/bash-completion-2.1_p20141224-r1 delete mode 100644 sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-shells/bash-completion-2.4 delete mode 100644 sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-shells/bash-completion-2.5 rename sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-shells/{bash-completion-2.3-r2 => bash-completion-2.7-r3} (56%) create mode 100644 sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-shells/bash-completion-9999 diff --git a/sdk_container/src/third_party/portage-stable/app-shells/bash-completion/Manifest b/sdk_container/src/third_party/portage-stable/app-shells/bash-completion/Manifest index 35dec0a658..47fa687144 100644 --- a/sdk_container/src/third_party/portage-stable/app-shells/bash-completion/Manifest +++ b/sdk_container/src/third_party/portage-stable/app-shells/bash-completion/Manifest @@ -1,16 +1,3 @@ -AUX bash-completion-2.1-escape-characters-r1.patch 1084 SHA256 b8e96b91f7d03e6e6de7e105dd8100206058b2ad44f09055521b4fab9befb245 SHA512 b7cb548024fbc68e87d781208a378299c399d2661121290c500d62cd66855acc02848710b44c363917c3c4923e063212a2b56c9b0c08deb71aba308d75939cab WHIRLPOOL c2697d7a54614692e8b40c3ca55554a25ccf34e5914a362ce9a256d783be3f4d398dd1d948b8b81130ed8662045177a824fdd5b8c7f0166872c33d4274eb4a9d -AUX bash-completion-2.1-escape-characters.patch 1082 SHA256 cfa2ffac3da8dc110967464a6af0f029992192b8eff345756f8a0a11a871eb29 SHA512 1352c100ae7cb9d3683a33c8f3fe333a81d897faf16e6a76559c973f90f12d6e53a2998935d755b5518e1ed4912d079ed0bada3d4e97bb97d294ab2f8d58feae WHIRLPOOL 5f729a02426a080c171fa8e72993673e889ecb878db56b7d9fb0fbd2674ec815a2b2793ebc2e8bd3291a7fd458e2225fe9a135a210666e249cadea463aea272d -DIST bash-completion-2.1_p20141224.tar.xz 257964 SHA256 a76ffdbc9f49f48e290f0e6f3d46060d51c770f91e25b35b014bc16fec76f517 SHA512 94649aad8dbf0f170422605a5f36c5cab61e45ce402a92f89a6eba3bd5d2e976087b35cd0a9b6d4d29ba608cee3bb27b692088c884b766447ee9eafa99c2814a WHIRLPOOL 0ea12dfc8f432ffed598aee65c7080de570ebe9783415c7ebe4bd5d152fc645a132fae3a28986c029d13a4b939e15053204d73ae9b207f4ad62b9c117bf59cba -DIST bash-completion-2.3.tar.xz 272252 SHA256 b2e081af317f3da4fff3a332bfdbebeb5514ebc6c2d2a9cf781180acab15e8e9 SHA512 396c060fa39aa05866d26b573d6b9eebdb96e41a17ef723e95f8b01bbda32b0b83bf9e4d978a4f0a1c0590787ae797bb3b6417b95b877f8447037cb873ccf38a WHIRLPOOL fe5ebae1c77dfba504e8f79b130ba0bc80d882a045b980a23f4642e77dfb7bb79b529c1573b13fc0986f486c41696bb94fadef677e0cabfdffe7aeea6e8ff5c0 -DIST bash-completion-2.4.tar.xz 276148 SHA256 c0f76b5202fec9ef8ffba82f5605025ca003f27cfd7a85115f838ba5136890f6 SHA512 b852e0a38417dfc3754a91dae2d107f99a3c2970d835a4bbaa80f2a4db8d670bc3820ddc6ada26f68070f22fb4c1db7abe50ad489b1c0f8497b1e6e91be27627 WHIRLPOOL f38f148dcbca1ee47ec6fa33637ea0673c03816b607bd638605832fb76ec7fb5f24cba35cb559e8a5b06636b1ec0f225e420615b6721074fc405cb79b505b07b -DIST bash-completion-2.5.tar.xz 276732 SHA256 b0b9540c65532825eca030f1241731383f89b2b65e80f3492c5dd2f0438c95cf SHA512 44ca2cbf38190c2bfa1e98021c1de36dbef0e55f9fe7840e83bd7f91b4c9afc92afa9bb03d53dbc6d9f9b468ac63ff1021a60e456fc239010010d75687eff3da WHIRLPOOL b488571aca9d8b027214c2964ec789ef616659a098a2bd65a921075d94a8014b51a802040535e44c7831b159a5094b6879935f726ee97409b575c36cd01dbc13 -DIST bashcomp-2.0.1.tar.bz2 4078 SHA256 142348b61b32fb3f1580ac90b684b1014d6d177f371baadb503340c507f9a992 SHA512 8ac8982f418a2d71dffcf027ffe0b7eefa3ee49413a726a8ee9e758975d8f86c687a64b55cd94e09b7936d1c6990285ddc90a3c2b1989af44322937c5c4fb8d7 WHIRLPOOL b6daa0a93282e9df73635cbdddde97c473fd22aa3baf035c3ffcb5966152e20b26d85979fe8a5ecf9128157422f3f60dc27c82c843b9a0e6e80b7de7da596250 -DIST bashcomp-2.0.2.tar.gz 3625 SHA256 6ede58bfbe99f0dca1eb9236492aa20a6755e5731526de56e15d1e2b220165c9 SHA512 46bc1bcc32263135f44be68569459a409250dd2c81c18190735f11e13a26508e9d3cb91d24a8fe7b21bdea678347873b7ac1b67d5e8c78c8444011f85dfdcdce WHIRLPOOL 4b6cb989235d5fed8fd9986c1419ab337df38384fe2b307fd78f08f8696f4a2328845ed4f27913a36e9a544e973690bc0dd2af73816e272c3faf27ff2eafa585 -EBUILD bash-completion-2.1_p20141224-r1.ebuild 2995 SHA256 d1c30de8d90fcd960a2a2919b30888c9c277138688371824e8585ffbb7cc7f5a SHA512 2fc900e06669e301612c7488d982396a843955c74911f400a4d47da5df2a53a464e8751ee18b9b5caf6d3ae5555191ca22681b1dbfede621b323a5f8ec01b869 WHIRLPOOL 02c6679fb1237372b7d039b41eea9de29c5eb28d74c4d88935c9d974b0d72b7b1749a6caa04db68e5903f6cbf2efa64b86b58c24be412e40bce9a6335504bf63 -EBUILD bash-completion-2.3-r2.ebuild 3219 SHA256 802e5ebc7fc23a6efcbf75b89f274dab2c0b31ea0cc4492d82bda5befdabb715 SHA512 0bf3de6b02f03162e1a575368da1b2b0c3a0dc0c60330907d79e86911b2099c714766630ab63e9746c5399020997a5b53ff0794ca6631c3a5a35764e251c59b2 WHIRLPOOL 76ac7dd678df77aac01c4e1733873351bf09a0ca4758c9330df21de0801e51c89ddd7ff66d17186c235b01a1e019e8964148aad842262d8c2cfa29a33e4208f4 -EBUILD bash-completion-2.4-r1.ebuild 3173 SHA256 09d54454ec4c629c21747d071a2c31e432289c207d96b3eebc8cc651ec2fef2a SHA512 5421a782dff1e908fdaafa97b58bcacdaa250ce6d0a701765506bd3384a5f32983bc86e4733336913462102c842b8168fb9e30450180820ce0c6239582467cce WHIRLPOOL b2d3d4d43181c63fa2c49358c6a5d47f310fd6cf578167180aa43eb49784bfa8f0852954460118a34001f00f585459ce975003fb8612931c2b312ab37f038d75 -EBUILD bash-completion-2.4.ebuild 3161 SHA256 6ce31c89554f2f58393d10ceb9210ba5ee9fd90bee28509b79a541964f9b70d2 SHA512 f10698650577d080d5af602a87f9b9e3c8204d602a188f439faf99bb782da4b798edfcdabd8c16fe032fd09d18503932b14f3baabb565a0781f86f209b7dde25 WHIRLPOOL 72e6e7b0c24aa70a70706351045a7fa98024ebe3190e713aca42f20ee47016057847333bea45990bdd3a71f96f6c42b04c2d74fa17aac5de308cc4f8f33e05ad -EBUILD bash-completion-2.5.ebuild 3183 SHA256 2d5e15afb28616799eb7b6129f1c112009155685b7c15fe0dc8214820ae21ae0 SHA512 a3a790e199dfba8150c2f5abdc120e5c3b8b41814f996c034e432b4633b211f79eaf056a3622823b36ea0a259cb9ee3ce09210e3e631250fdd6cc315a2642e0a WHIRLPOOL 35e91efe36b01564a3e913980c5990ee5cd1dcf0f0826d360adc42dc3b3cd07ad011e348c6d3f380a450e351b006dbd847ee7b79469312502bdb4a10e5fce34e -MISC ChangeLog 6192 SHA256 7aa78e4d3347e97e9a2676ad90b03dcfbf6bb185ce6f53050786420a7e58b42d SHA512 d689eca6fe0572923dbc618aa95d7a4b43a92654d6485ca14ae974581c3728dfeac45f139788b22b56d17ae86e063316e474f8ce10a7092e43abaad840579c2c WHIRLPOOL de6bc49d153a04b105d21a4de5def31dc028638190a4b51d66d241abaea7206d5704ddba15bef9a5f74acbce2a0b134d9bb38deacac896e9ab4efd16ccc22ddc -MISC ChangeLog-2015 49155 SHA256 df2d7ecd84a601d6a713409dd0ea3f8c2dacadf9b2f637769c6e8787d66cee1d SHA512 31fec84312c20ff1612f57f1bac506937c128b13005246ba36eaa449c1aff7712cc3645952fb9eebf3a24483590010fb5a954d43f238f47cd759911830fe5205 WHIRLPOOL 1463d6fa3480fd139341ade021e1e70884dd72e5f22aa16cb74eb11c8c4b606014b0b4f6369db06fcc9c76e354016d196a2b206fb0681c5b71237aa37991c914 -MISC metadata.xml 1285 SHA256 efb4f76c8b2dfe1e809c94fd10aac8b3a4e3ada43ceb33f95193ba246a482529 SHA512 e935bab45ac355ca0a05df6f6f9aaf8e20ef73fa3ce4f2bde83b331cccaa7ae7756a6a62a075b148194b556da8f41f4cf2aa72f271958333d026913ddbfcc133 WHIRLPOOL 6e76587fa0d9e19603fb1bd27100c076ed00840f994bd2b73b9208f438503874dcdc02be6a9c986666cf6d00fb9068d6a6f6dbd1de7662e282be11652412ac83 +DIST bash-completion-2.4.tar.xz 276148 BLAKE2B 1ca38db1d1ad9f0bf7d1aa4e49cba1c82a6a575b05118099b609da12bf2e369637be907cba1d46e1e33fface482ebd7c63d70d56c948e45ef71725780ffb2171 SHA512 b852e0a38417dfc3754a91dae2d107f99a3c2970d835a4bbaa80f2a4db8d670bc3820ddc6ada26f68070f22fb4c1db7abe50ad489b1c0f8497b1e6e91be27627 +DIST bash-completion-2.7.tar.xz 280048 BLAKE2B 88b09f451fd4e14daf8e139951a4b65aaa9d9b1d86dceade388a726ac7f3caff2546597695c3f0cbd5dd64e20472d0cf3e98e0f367898b81d696d4ccb8f2fb73 SHA512 514709ad2e5f6bd4e20027c7049a1144c1854a37b653d5c11fad1cdf7a46d0e1afca725d6ce75d49691149e0de57be85747f704ac1c429ef4cea114bfbff8fcd +DIST bashcomp-2.0.2.tar.gz 3625 BLAKE2B ebd835e23634e8a7491467ad66c53941763cea43bad75fe24982d3885be2d2ba132e5273a655fec34705224315d7a3f0248c030fb7685fc613ac4f489cde5bf5 SHA512 46bc1bcc32263135f44be68569459a409250dd2c81c18190735f11e13a26508e9d3cb91d24a8fe7b21bdea678347873b7ac1b67d5e8c78c8444011f85dfdcdce diff --git a/sdk_container/src/third_party/portage-stable/app-shells/bash-completion/bash-completion-2.1_p20141224-r1.ebuild b/sdk_container/src/third_party/portage-stable/app-shells/bash-completion/bash-completion-2.1_p20141224-r1.ebuild deleted file mode 100644 index f6fab6beb5..0000000000 --- a/sdk_container/src/third_party/portage-stable/app-shells/bash-completion/bash-completion-2.1_p20141224-r1.ebuild +++ /dev/null @@ -1,94 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -BASHCOMP_P=bashcomp-2.0.1 -inherit versionator - -DESCRIPTION="Programmable Completion for bash" -HOMEPAGE="http://bash-completion.alioth.debian.org/" -SRC_URI="https://dev.gentoo.org/~mgorny/dist/${P}.tar.xz - https://dev.gentoo.org/~mgorny/dist/${BASHCOMP_P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris" -IUSE="" - -RDEPEND=">=app-shells/bash-4.3_p30-r1 - sys-apps/miscfiles - !app-eselect/eselect-bashcomp" -DEPEND="app-arch/xz-utils" -PDEPEND=">=app-shells/gentoo-bashcomp-20140911" - -# Remove unwanted completions. -STRIP_COMPLETIONS=( - # Slackware package stuff, quite generic names cause collisions - # (e.g. with sys-apps/pacman) - explodepkg installpkg makepkg pkgtool removepkg upgradepkg - - # Debian/Red Hat network stuff - ifdown ifup ifstatus - - # Installed in app-editors/vim-core - xxd - - # Now-dead symlinks to deprecated completions - hd ncal -) - -src_prepare() { - epatch "${WORKDIR}/${BASHCOMP_P}/${P}"-*.patch - # Bug 543100 - epatch "${FILESDIR}/${PN}-2.1-escape-characters.patch" -} - -src_test() { :; } # Skip testsuite because of interactive shell wrt #477066 - -src_install() { - # work-around race conditions, bug #526996 - mkdir -p "${ED}"/usr/share/bash-completion/{completions,helpers} || die - - emake DESTDIR="${D}" profiledir="${EPREFIX}"/etc/bash/bashrc.d install - - local file - for file in "${STRIP_COMPLETIONS[@]}"; do - rm "${ED}"/usr/share/bash-completion/completions/${file} || die - done - # remove deprecated completions (moved to other packages) - rm "${ED}"/usr/share/bash-completion/completions/_* || die - - dodoc AUTHORS CHANGES README - - # install the eselect module - insinto /usr/share/eselect/modules - doins "${WORKDIR}/${BASHCOMP_P}/bashcomp.eselect" - doman "${WORKDIR}/${BASHCOMP_P}/bashcomp.eselect.5" -} - -pkg_postinst() { - local v - for v in ${REPLACING_VERSIONS}; do - if ! version_is_at_least 2.1-r90 ${v}; then - ewarn "For bash-completion autoloader to work, all completions need to" - ewarn "be installed in /usr/share/bash-completion/completions. You may" - ewarn "need to rebuild packages that installed completions in the old" - ewarn "location. You can do this using:" - ewarn - ewarn "$ find ${EPREFIX}/usr/share/bash-completion -maxdepth 1 -type f '!' -name 'bash_completion' -exec emerge -1v {} +" - ewarn - ewarn "After the rebuild, you should remove the old setup symlinks:" - ewarn - ewarn "$ find ${EPREFIX}/etc/bash_completion.d -type l -delete" - fi - done - - if has_version 'app-shells/zsh'; then - elog - elog "If you are interested in using the provided bash completion functions with" - elog "zsh, valuable tips on the effective use of bashcompinit are available:" - elog " http://www.zsh.org/mla/workers/2003/msg00046.html" - elog - fi -} diff --git a/sdk_container/src/third_party/portage-stable/app-shells/bash-completion/bash-completion-2.4-r1.ebuild b/sdk_container/src/third_party/portage-stable/app-shells/bash-completion/bash-completion-2.4-r1.ebuild index cf649cac40..5b1db28a22 100644 --- a/sdk_container/src/third_party/portage-stable/app-shells/bash-completion/bash-completion-2.4-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-shells/bash-completion/bash-completion-2.4-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -13,7 +13,7 @@ SRC_URI="https://github.com/scop/bash-completion/releases/download/${PV}/${P}.ta LICENSE="GPL-2" SLOT="0" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris" +KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~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" IUSE="" RDEPEND=">=app-shells/bash-4.3_p30-r1 diff --git a/sdk_container/src/third_party/portage-stable/app-shells/bash-completion/bash-completion-2.4.ebuild b/sdk_container/src/third_party/portage-stable/app-shells/bash-completion/bash-completion-2.4.ebuild deleted file mode 100644 index 3464ccba3e..0000000000 --- a/sdk_container/src/third_party/portage-stable/app-shells/bash-completion/bash-completion-2.4.ebuild +++ /dev/null @@ -1,98 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -BASHCOMP_P=bashcomp-2.0.2 -inherit versionator - -DESCRIPTION="Programmable Completion for bash" -HOMEPAGE="https://github.com/scop/bash-completion" -SRC_URI="https://github.com/scop/bash-completion/releases/download/${PV}/${P}.tar.xz - https://bitbucket.org/mgorny/bashcomp2/downloads/${BASHCOMP_P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris" -IUSE="" - -RDEPEND=">=app-shells/bash-4.3_p30-r1 - sys-apps/miscfiles - !app-eselect/eselect-bashcomp" -DEPEND="app-arch/xz-utils" -PDEPEND=">=app-shells/gentoo-bashcomp-20140911" - -# Remove unwanted completions. -STRIP_COMPLETIONS=( - # Slackware package stuff, quite generic names cause collisions - # (e.g. with sys-apps/pacman) - explodepkg installpkg makepkg pkgtool removepkg upgradepkg - - # Debian/Red Hat network stuff - ifdown ifup ifstatus - - # Installed in app-editors/vim-core - xxd - - # Now-dead symlinks to deprecated completions - hd ncal - - # Installed by sys-apps/util-linux-2.28 - mount umount mount.linux umount.linux -) - -src_prepare() { - eapply "${WORKDIR}/${BASHCOMP_P}/${PN}"-2.1_p*.patch - # Bug 543100 - eapply "${FILESDIR}/${PN}-2.1-escape-characters.patch" - eapply_user -} - -src_test() { :; } # Skip testsuite because of interactive shell wrt #477066 - -src_install() { - # work-around race conditions, bug #526996 - mkdir -p "${ED}"/usr/share/bash-completion/{completions,helpers} || die - - emake DESTDIR="${D}" profiledir="${EPREFIX}"/etc/bash/bashrc.d install - - local file - for file in "${STRIP_COMPLETIONS[@]}"; do - rm "${ED}"/usr/share/bash-completion/completions/${file} || die - done - # remove deprecated completions (moved to other packages) - rm "${ED}"/usr/share/bash-completion/completions/_* || die - - dodoc AUTHORS CHANGES CONTRIBUTING.md README.md - - # install the eselect module - insinto /usr/share/eselect/modules - doins "${WORKDIR}/${BASHCOMP_P}/bashcomp.eselect" - doman "${WORKDIR}/${BASHCOMP_P}/bashcomp.eselect.5" -} - -pkg_postinst() { - local v - for v in ${REPLACING_VERSIONS}; do - if ! version_is_at_least 2.1-r90 ${v}; then - ewarn "For bash-completion autoloader to work, all completions need to" - ewarn "be installed in /usr/share/bash-completion/completions. You may" - ewarn "need to rebuild packages that installed completions in the old" - ewarn "location. You can do this using:" - ewarn - ewarn "$ find ${EPREFIX}/usr/share/bash-completion -maxdepth 1 -type f '!' -name 'bash_completion' -exec emerge -1v {} +" - ewarn - ewarn "After the rebuild, you should remove the old setup symlinks:" - ewarn - ewarn "$ find ${EPREFIX}/etc/bash_completion.d -type l -delete" - fi - done - - if has_version 'app-shells/zsh'; then - elog - elog "If you are interested in using the provided bash completion functions with" - elog "zsh, valuable tips on the effective use of bashcompinit are available:" - elog " http://www.zsh.org/mla/workers/2003/msg00046.html" - elog - fi -} diff --git a/sdk_container/src/third_party/portage-stable/app-shells/bash-completion/bash-completion-2.5.ebuild b/sdk_container/src/third_party/portage-stable/app-shells/bash-completion/bash-completion-2.7-r3.ebuild similarity index 67% rename from sdk_container/src/third_party/portage-stable/app-shells/bash-completion/bash-completion-2.5.ebuild rename to sdk_container/src/third_party/portage-stable/app-shells/bash-completion/bash-completion-2.7-r3.ebuild index 0585f5e0e9..94afac9d52 100644 --- a/sdk_container/src/third_party/portage-stable/app-shells/bash-completion/bash-completion-2.5.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-shells/bash-completion/bash-completion-2.7-r3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -13,13 +13,23 @@ SRC_URI="https://github.com/scop/bash-completion/releases/download/${PV}/${P}.ta LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris" -IUSE="" +KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~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" +IUSE="test" +# Multiple test failures, need to investigate the exact problem +RESTRICT="test" +# completion collision with net-fs/mc RDEPEND=">=app-shells/bash-4.3_p30-r1 sys-apps/miscfiles - !app-eselect/eselect-bashcomp" -DEPEND="app-arch/xz-utils" + !app-eselect/eselect-bashcomp + !!net-fs/mc" +DEPEND="app-arch/xz-utils + test? ( + ${RDEPEND} + app-misc/dtach + dev-util/dejagnu + dev-tcltk/tcllib + )" PDEPEND=">=app-shells/gentoo-bashcomp-20140911" # Remove unwanted completions. @@ -39,6 +49,9 @@ STRIP_COMPLETIONS=( # Installed by sys-apps/util-linux-2.28 mount umount mount.linux umount.linux + + # Installed by sys-apps/util-linux-2.31 + rfkill ) src_prepare() { @@ -46,9 +59,31 @@ src_prepare() { # Bug 543100, update bug 601194 eapply "${FILESDIR}/${PN}-2.1-escape-characters-r1.patch" eapply_user + + # Remove implicit completions for vim. + # https://bugs.gentoo.org/649986 + sed -i -e 's/vi vim gvim rvim view rview rgvim rgview gview//' \ + bash_completion || die + rm test/completion/vi.exp || die } -src_test() { :; } # Skip testsuite because of interactive shell wrt #477066 +src_test() { + # Tests need an interactive shell, #477066 + # idea stolen from: + # http://pkgs.fedoraproject.org/cgit/rpms/bash-completion.git/tree/bash-completion.spec + + # real-time output of the log ;-) + touch "${T}/dtach-test.log" || die + tail -f "${T}/dtach-test.log" & + local tail_pid=${!} + + nonfatal dtach -N "${T}/dtach.sock" \ + bash -c 'emake check &> "${T}"/dtach-test.log; echo ${?} > "${T}"/dtach-test.out' + + kill "${tail_pid}" + [[ -f ${T}/dtach-test.out ]] || die "Unable to run tests" + [[ $(<"${T}"/dtach-test.out) == 0 ]] || die "Tests failed" +} src_install() { # work-around race conditions, bug #526996 diff --git a/sdk_container/src/third_party/portage-stable/app-shells/bash-completion/bash-completion-2.3-r2.ebuild b/sdk_container/src/third_party/portage-stable/app-shells/bash-completion/bash-completion-9999.ebuild similarity index 59% rename from sdk_container/src/third_party/portage-stable/app-shells/bash-completion/bash-completion-2.3-r2.ebuild rename to sdk_container/src/third_party/portage-stable/app-shells/bash-completion/bash-completion-9999.ebuild index 2087fda87c..1ef70643b1 100644 --- a/sdk_container/src/third_party/portage-stable/app-shells/bash-completion/bash-completion-2.3-r2.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-shells/bash-completion/bash-completion-9999.ebuild @@ -1,25 +1,33 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 BASHCOMP_P=bashcomp-2.0.2 -inherit versionator +EGIT_REPO_URI="https://github.com/scop/bash-completion" +inherit autotools git-r3 versionator DESCRIPTION="Programmable Completion for bash" HOMEPAGE="https://github.com/scop/bash-completion" -SRC_URI="https://github.com/scop/bash-completion/releases/download/${PV}/${P}.tar.xz - https://bitbucket.org/mgorny/bashcomp2/downloads/${BASHCOMP_P}.tar.gz" +SRC_URI="https://bitbucket.org/mgorny/bashcomp2/downloads/${BASHCOMP_P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris" -IUSE="" +KEYWORDS="" +IUSE="test" +# completion collision with net-fs/mc RDEPEND=">=app-shells/bash-4.3_p30-r1 sys-apps/miscfiles - !app-eselect/eselect-bashcomp" -DEPEND="app-arch/xz-utils" + !app-eselect/eselect-bashcomp + !!net-fs/mc" +DEPEND="app-arch/xz-utils + test? ( + ${RDEPEND} + app-misc/dtach + dev-util/dejagnu + dev-tcltk/tcllib + )" PDEPEND=">=app-shells/gentoo-bashcomp-20140911" # Remove unwanted completions. @@ -37,21 +45,47 @@ STRIP_COMPLETIONS=( # Now-dead symlinks to deprecated completions hd ncal - # Installed by sys-apps/util-linux-2.28 - mount umount mount.linux umount.linux + # Installed by sys-apps/util-linux-2.28 (and now deprecated) + _mount _umount _mount.linux _umount.linux - # Dumb symlink to mplayer, removed upstream in git - mpv + # Deprecated in favor of sys-apps/util-linux-2.31 + _rfkill ) +src_unpack() { + git-r3_src_unpack + default +} + src_prepare() { eapply "${WORKDIR}/${BASHCOMP_P}/${PN}"-2.1_p*.patch - # Bug 543100 - eapply "${FILESDIR}/${PN}-2.1-escape-characters.patch" eapply_user + + eautoreconf } -src_test() { :; } # Skip testsuite because of interactive shell wrt #477066 +src_test() { + # Tests need an interactive shell, #477066 + # idea stolen from: + # http://pkgs.fedoraproject.org/cgit/rpms/bash-completion.git/tree/bash-completion.spec + + # real-time output of the log ;-) + touch "${T}/dtach-test.log" || die + tail -f "${T}/dtach-test.log" & + local tail_pid=${!} + + # override the default expect timeout and buffer size to avoid tests + # failing randomly due to cold cache, busy system or just more output + # than upstream anticipated (they run tests on pristine docker + # installs of binary distros) + nonfatal dtach -N "${T}/dtach.sock" \ + bash -c 'emake check RUNTESTFLAGS="OPT_TIMEOUT=300 OPT_BUFFER_SIZE=1000000" \ + &> "${T}"/dtach-test.log; echo ${?} > "${T}"/dtach-test.out' + + kill "${tail_pid}" + [[ -f ${T}/dtach-test.out ]] || die "Unable to run tests" + [[ $(<"${T}"/dtach-test.out) == 0 ]] || die "Tests failed" +} src_install() { # work-around race conditions, bug #526996 @@ -61,7 +95,8 @@ src_install() { local file for file in "${STRIP_COMPLETIONS[@]}"; do - rm "${ED}"/usr/share/bash-completion/completions/${file} || die + rm "${ED}"/usr/share/bash-completion/completions/${file} || + die "stripping ${file} failed" done # remove deprecated completions (moved to other packages) rm "${ED}"/usr/share/bash-completion/completions/_* || die diff --git a/sdk_container/src/third_party/portage-stable/app-shells/bash-completion/files/bash-completion-2.1-escape-characters.patch b/sdk_container/src/third_party/portage-stable/app-shells/bash-completion/files/bash-completion-2.1-escape-characters.patch deleted file mode 100644 index 5e0de75982..0000000000 --- a/sdk_container/src/third_party/portage-stable/app-shells/bash-completion/files/bash-completion-2.1-escape-characters.patch +++ /dev/null @@ -1,27 +0,0 @@ ---- bash-completion-2.1/bash_completion.orig 2014-03-09 17:38:14 +0000 -+++ bash-completion-2.1/bash_completion 2014-03-13 23:26:44 +0000 -@@ -536,13 +536,23 @@ - # @param $2 Name of variable to return result to - _quote_readline_by_ref() - { -- if [[ $1 == \'* ]]; then -+ if [ -z "$1" ]; then -+ # avoid quoting if empty -+ printf -v $2 %s "$1" -+ elif [[ $1 == \'* ]]; then - # Leave out first character - printf -v $2 %s "${1:1}" -+ elif [[ $1 == ~* ]]; then -+ # avoid escaping first ~ -+ printf -v $2 ~%q "${1:1}" - else - printf -v $2 %q "$1" - fi - -+ # Replace double escaping ( \\ ) by single ( \ ) -+ # This happens always when argument is already escaped at cmdline, -+ # and passed to this function as e.g.: file\ with\ spaces -+ [[ ${!2} == *\\* ]] && printf -v $2 %s "${1//\\\\/\\}" - # If result becomes quoted like this: $'string', re-evaluate in order to - # drop the additional quoting. See also: http://www.mail-archive.com/ - # bash-completion-devel@lists.alioth.debian.org/msg01942.html diff --git a/sdk_container/src/third_party/portage-stable/app-shells/bash-completion/metadata.xml b/sdk_container/src/third_party/portage-stable/app-shells/bash-completion/metadata.xml index 5ceec3abea..2bb3ef2362 100644 --- a/sdk_container/src/third_party/portage-stable/app-shells/bash-completion/metadata.xml +++ b/sdk_container/src/third_party/portage-stable/app-shells/bash-completion/metadata.xml @@ -1,4 +1,4 @@ - + @@ -10,17 +10,18 @@ Gentoo Shell Tools Project - Since v2.04, bash has allowed you to intelligently program and extend its - standard completion behavior to achieve complex command lines with just a - few keystrokes. Imagine typing ssh [Tab] and being able to complete on hosts - from your ~/.ssh/known_hosts files. Or typing man 3 str [Tab] and getting a - list of all string handling functions in the UNIX manual. mount system: - [Tab] would complete on all exported file-systems from the host called - system, while make [Tab] would complete on all targets in Makefile. This - project was conceived to produce programmable completion routines for the - most common Linux/UNIX commands, reducing the amount of typing sysadmins and - programmers need to do on a daily basis. + Since v2.04, bash has allowed you to intelligently program and extend its + standard completion behavior to achieve complex command lines with just a + few keystrokes. Imagine typing ssh [Tab] and being able to complete on hosts + from your ~/.ssh/known_hosts files. Or typing man 3 str [Tab] and getting a + list of all string handling functions in the UNIX manual. mount system: + [Tab] would complete on all exported file-systems from the host called + system, while make [Tab] would complete on all targets in Makefile. This + project was conceived to produce programmable completion routines for the + most common Linux/UNIX commands, reducing the amount of typing sysadmins and + programmers need to do on a daily basis. + mgorny/bashcomp2 scop/bash-completion diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-shells/bash-completion-2.1_p20141224-r1 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-shells/bash-completion-2.1_p20141224-r1 deleted file mode 100644 index a7bd8e2ea0..0000000000 --- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-shells/bash-completion-2.1_p20141224-r1 +++ /dev/null @@ -1,13 +0,0 @@ -DEFINED_PHASES=install postinst prepare test -DEPEND=app-arch/xz-utils -DESCRIPTION=Programmable Completion for bash -EAPI=5 -HOMEPAGE=http://bash-completion.alioth.debian.org/ -KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris -LICENSE=GPL-2 -PDEPEND=>=app-shells/gentoo-bashcomp-20140911 -RDEPEND=>=app-shells/bash-4.3_p30-r1 sys-apps/miscfiles !app-eselect/eselect-bashcomp -SLOT=0 -SRC_URI=https://dev.gentoo.org/~mgorny/dist/bash-completion-2.1_p20141224.tar.xz https://dev.gentoo.org/~mgorny/dist/bashcomp-2.0.1.tar.bz2 -_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 185a06792159ca143528e7010368e8af versionator c80ccf29e90adea7c5cae94b42eb76d0 -_md5_=bfd1a35b2dba033efbfb7f1b3f9a9355 diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-shells/bash-completion-2.4 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-shells/bash-completion-2.4 deleted file mode 100644 index ab5b51b6ad..0000000000 --- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-shells/bash-completion-2.4 +++ /dev/null @@ -1,13 +0,0 @@ -DEFINED_PHASES=install postinst prepare test -DEPEND=app-arch/xz-utils -DESCRIPTION=Programmable Completion for bash -EAPI=6 -HOMEPAGE=https://github.com/scop/bash-completion -KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris -LICENSE=GPL-2 -PDEPEND=>=app-shells/gentoo-bashcomp-20140911 -RDEPEND=>=app-shells/bash-4.3_p30-r1 sys-apps/miscfiles !app-eselect/eselect-bashcomp -SLOT=0 -SRC_URI=https://github.com/scop/bash-completion/releases/download/2.4/bash-completion-2.4.tar.xz https://bitbucket.org/mgorny/bashcomp2/downloads/bashcomp-2.0.2.tar.gz -_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 185a06792159ca143528e7010368e8af versionator c80ccf29e90adea7c5cae94b42eb76d0 -_md5_=7d781c34d30aa6136bea6ca25da107f4 diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-shells/bash-completion-2.4-r1 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-shells/bash-completion-2.4-r1 index f7b05a13ab..139728513a 100644 --- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-shells/bash-completion-2.4-r1 +++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-shells/bash-completion-2.4-r1 @@ -3,11 +3,11 @@ DEPEND=app-arch/xz-utils DESCRIPTION=Programmable Completion for bash EAPI=6 HOMEPAGE=https://github.com/scop/bash-completion -KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris +KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~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 LICENSE=GPL-2 PDEPEND=>=app-shells/gentoo-bashcomp-20140911 RDEPEND=>=app-shells/bash-4.3_p30-r1 sys-apps/miscfiles !app-eselect/eselect-bashcomp SLOT=0 SRC_URI=https://github.com/scop/bash-completion/releases/download/2.4/bash-completion-2.4.tar.xz https://bitbucket.org/mgorny/bashcomp2/downloads/bashcomp-2.0.2.tar.gz _eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 185a06792159ca143528e7010368e8af versionator c80ccf29e90adea7c5cae94b42eb76d0 -_md5_=e21494b4c669c55bbef0e5ee5e9d8645 +_md5_=157578ac0d328d1a0b4b30e5d2c28de0 diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-shells/bash-completion-2.5 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-shells/bash-completion-2.5 deleted file mode 100644 index f962050bd8..0000000000 --- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-shells/bash-completion-2.5 +++ /dev/null @@ -1,13 +0,0 @@ -DEFINED_PHASES=install postinst prepare test -DEPEND=app-arch/xz-utils -DESCRIPTION=Programmable Completion for bash -EAPI=6 -HOMEPAGE=https://github.com/scop/bash-completion -KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris -LICENSE=GPL-2 -PDEPEND=>=app-shells/gentoo-bashcomp-20140911 -RDEPEND=>=app-shells/bash-4.3_p30-r1 sys-apps/miscfiles !app-eselect/eselect-bashcomp -SLOT=0 -SRC_URI=https://github.com/scop/bash-completion/releases/download/2.5/bash-completion-2.5.tar.xz https://bitbucket.org/mgorny/bashcomp2/downloads/bashcomp-2.0.2.tar.gz -_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 185a06792159ca143528e7010368e8af versionator c80ccf29e90adea7c5cae94b42eb76d0 -_md5_=50687892d595a8439d50c50e7998f402 diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-shells/bash-completion-2.3-r2 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-shells/bash-completion-2.7-r3 similarity index 56% rename from sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-shells/bash-completion-2.3-r2 rename to sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-shells/bash-completion-2.7-r3 index f4cb08d02c..269cb99fa0 100644 --- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-shells/bash-completion-2.3-r2 +++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-shells/bash-completion-2.7-r3 @@ -1,13 +1,15 @@ DEFINED_PHASES=install postinst prepare test -DEPEND=app-arch/xz-utils +DEPEND=app-arch/xz-utils test? ( >=app-shells/bash-4.3_p30-r1 sys-apps/miscfiles !app-eselect/eselect-bashcomp !!net-fs/mc app-misc/dtach dev-util/dejagnu dev-tcltk/tcllib ) DESCRIPTION=Programmable Completion for bash EAPI=6 HOMEPAGE=https://github.com/scop/bash-completion -KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris +IUSE=test +KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 ~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 LICENSE=GPL-2 PDEPEND=>=app-shells/gentoo-bashcomp-20140911 -RDEPEND=>=app-shells/bash-4.3_p30-r1 sys-apps/miscfiles !app-eselect/eselect-bashcomp +RDEPEND=>=app-shells/bash-4.3_p30-r1 sys-apps/miscfiles !app-eselect/eselect-bashcomp !!net-fs/mc +RESTRICT=test SLOT=0 -SRC_URI=https://github.com/scop/bash-completion/releases/download/2.3/bash-completion-2.3.tar.xz https://bitbucket.org/mgorny/bashcomp2/downloads/bashcomp-2.0.2.tar.gz +SRC_URI=https://github.com/scop/bash-completion/releases/download/2.7/bash-completion-2.7.tar.xz https://bitbucket.org/mgorny/bashcomp2/downloads/bashcomp-2.0.2.tar.gz _eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 185a06792159ca143528e7010368e8af versionator c80ccf29e90adea7c5cae94b42eb76d0 -_md5_=8a7263236d226baf4c3cabaf4c0ba7c8 +_md5_=d88b101a900f6d3e2af1457d396f68fd diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-shells/bash-completion-9999 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-shells/bash-completion-9999 new file mode 100644 index 0000000000..ecde198ba0 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-shells/bash-completion-9999 @@ -0,0 +1,13 @@ +DEFINED_PHASES=install postinst prepare test unpack +DEPEND=app-arch/xz-utils test? ( >=app-shells/bash-4.3_p30-r1 sys-apps/miscfiles !app-eselect/eselect-bashcomp !!net-fs/mc app-misc/dtach dev-util/dejagnu dev-tcltk/tcllib ) >=app-portage/elt-patches-20170422 !=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1 +DESCRIPTION=Programmable Completion for bash +EAPI=6 +HOMEPAGE=https://github.com/scop/bash-completion +IUSE=test +LICENSE=GPL-2 +PDEPEND=>=app-shells/gentoo-bashcomp-20140911 +RDEPEND=>=app-shells/bash-4.3_p30-r1 sys-apps/miscfiles !app-eselect/eselect-bashcomp !!net-fs/mc +SLOT=0 +SRC_URI=https://bitbucket.org/mgorny/bashcomp2/downloads/bashcomp-2.0.2.tar.gz +_eclasses_=autotools dc412f38566b91012efd58b9c203e6c3 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 git-r3 52a888802d25387c2c74cb845d1219bc libtool 0081a71a261724730ec4c248494f044d ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 185a06792159ca143528e7010368e8af versionator c80ccf29e90adea7c5cae94b42eb76d0 +_md5_=77df6238b974a1ba068f88b51d37efb8 From c284a26bef90910f40cbe3cecb48dcc494f77423 Mon Sep 17 00:00:00 2001 From: David Michael Date: Mon, 14 May 2018 15:11:19 -0400 Subject: [PATCH 15/21] bump(dev-db/sqlite): sync with upstream --- .../portage-stable/dev-db/sqlite/ChangeLog | 311 --- .../dev-db/sqlite/ChangeLog-2015 | 2233 ----------------- .../portage-stable/dev-db/sqlite/Manifest | 41 +- ...QLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER.patch | 443 ---- ...QLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER.patch | 232 -- .../sqlite-3.11.0-nonfull_tarball-build.patch | 38 - ...sqlite-3.16.0-nonfull_tarball-build.patch} | 2 +- ...=> sqlite-3.20.0-full_tarball-build.patch} | 63 +- ....20.1-full_tarball-csv-unsigned_char.patch | 33 + ...3.20.1-full_tarball-tests-big-endian.patch | 95 + ...=> sqlite-3.21.0-full_archive-build.patch} | 101 +- .../sqlite-3.21.0-nonfull_archive-build.patch | 14 + .../sqlite-3.22.0-full_archive-build.patch | 405 +++ .../sqlite-3.22.0-full_archive-headers.patch | 15 + .../sqlite-3.22.0-full_archive-tests.patch | 249 ++ .../sqlite-3.23.0-full_archive-build.patch | 407 +++ ...ble-valued_functions_within_triggers.patch | 24 + .../sqlite-3.23.1-full_archive-tests.patch | 224 ++ ...ble-valued_functions_within_triggers.patch | 14 + .../portage-stable/dev-db/sqlite/metadata.xml | 30 +- .../dev-db/sqlite/sqlite-3.11.1.ebuild | 239 -- ...-3.13.0.ebuild => sqlite-3.20.1-r1.ebuild} | 62 +- ...ite-3.12.2.ebuild => sqlite-3.21.0.ebuild} | 96 +- ...ite-3.12.1.ebuild => sqlite-3.22.0.ebuild} | 117 +- ...ite-3.12.0.ebuild => sqlite-3.23.1.ebuild} | 123 +- .../metadata/md5-cache/dev-db/sqlite-3.12.1 | 13 - .../metadata/md5-cache/dev-db/sqlite-3.12.2 | 13 - .../metadata/md5-cache/dev-db/sqlite-3.13.0 | 13 - .../{sqlite-3.11.1 => sqlite-3.20.1-r1} | 8 +- .../dev-db/{sqlite-3.12.0 => sqlite-3.21.0} | 8 +- .../metadata/md5-cache/dev-db/sqlite-3.22.0 | 13 + .../metadata/md5-cache/dev-db/sqlite-3.23.1 | 13 + 32 files changed, 1951 insertions(+), 3741 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/dev-db/sqlite/ChangeLog delete mode 100644 sdk_container/src/third_party/portage-stable/dev-db/sqlite/ChangeLog-2015 delete mode 100644 sdk_container/src/third_party/portage-stable/dev-db/sqlite/files/sqlite-3.11.0-full_tarball-SQLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER.patch delete mode 100644 sdk_container/src/third_party/portage-stable/dev-db/sqlite/files/sqlite-3.11.0-nonfull_tarball-SQLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER.patch delete mode 100644 sdk_container/src/third_party/portage-stable/dev-db/sqlite/files/sqlite-3.11.0-nonfull_tarball-build.patch rename sdk_container/src/third_party/portage-stable/dev-db/sqlite/files/{sqlite-3.12.0-nonfull_tarball-build.patch => sqlite-3.16.0-nonfull_tarball-build.patch} (95%) rename sdk_container/src/third_party/portage-stable/dev-db/sqlite/files/{sqlite-3.13.0-full_tarball-build.patch => sqlite-3.20.0-full_tarball-build.patch} (70%) create mode 100644 sdk_container/src/third_party/portage-stable/dev-db/sqlite/files/sqlite-3.20.1-full_tarball-csv-unsigned_char.patch create mode 100644 sdk_container/src/third_party/portage-stable/dev-db/sqlite/files/sqlite-3.20.1-full_tarball-tests-big-endian.patch rename sdk_container/src/third_party/portage-stable/dev-db/sqlite/files/{sqlite-3.11.0-full_tarball-build.patch => sqlite-3.21.0-full_archive-build.patch} (58%) create mode 100644 sdk_container/src/third_party/portage-stable/dev-db/sqlite/files/sqlite-3.21.0-nonfull_archive-build.patch create mode 100644 sdk_container/src/third_party/portage-stable/dev-db/sqlite/files/sqlite-3.22.0-full_archive-build.patch create mode 100644 sdk_container/src/third_party/portage-stable/dev-db/sqlite/files/sqlite-3.22.0-full_archive-headers.patch create mode 100644 sdk_container/src/third_party/portage-stable/dev-db/sqlite/files/sqlite-3.22.0-full_archive-tests.patch create mode 100644 sdk_container/src/third_party/portage-stable/dev-db/sqlite/files/sqlite-3.23.0-full_archive-build.patch create mode 100644 sdk_container/src/third_party/portage-stable/dev-db/sqlite/files/sqlite-3.23.1-full_archive-prohibit_bound_parameters_in_arguments_to_table-valued_functions_within_triggers.patch create mode 100644 sdk_container/src/third_party/portage-stable/dev-db/sqlite/files/sqlite-3.23.1-full_archive-tests.patch create mode 100644 sdk_container/src/third_party/portage-stable/dev-db/sqlite/files/sqlite-3.23.1-nonfull_archive-prohibit_bound_parameters_in_arguments_to_table-valued_functions_within_triggers.patch delete mode 100644 sdk_container/src/third_party/portage-stable/dev-db/sqlite/sqlite-3.11.1.ebuild rename sdk_container/src/third_party/portage-stable/dev-db/sqlite/{sqlite-3.13.0.ebuild => sqlite-3.20.1-r1.ebuild} (76%) rename sdk_container/src/third_party/portage-stable/dev-db/sqlite/{sqlite-3.12.2.ebuild => sqlite-3.21.0.ebuild} (67%) rename sdk_container/src/third_party/portage-stable/dev-db/sqlite/{sqlite-3.12.1.ebuild => sqlite-3.22.0.ebuild} (60%) rename sdk_container/src/third_party/portage-stable/dev-db/sqlite/{sqlite-3.12.0.ebuild => sqlite-3.23.1.ebuild} (58%) delete mode 100644 sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-db/sqlite-3.12.1 delete mode 100644 sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-db/sqlite-3.12.2 delete mode 100644 sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-db/sqlite-3.13.0 rename sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-db/{sqlite-3.11.1 => sqlite-3.20.1-r1} (81%) rename sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-db/{sqlite-3.12.0 => sqlite-3.21.0} (80%) create mode 100644 sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-db/sqlite-3.22.0 create mode 100644 sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-db/sqlite-3.23.1 diff --git a/sdk_container/src/third_party/portage-stable/dev-db/sqlite/ChangeLog b/sdk_container/src/third_party/portage-stable/dev-db/sqlite/ChangeLog deleted file mode 100644 index f2c38f30c8..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-db/sqlite/ChangeLog +++ /dev/null @@ -1,311 +0,0 @@ -# ChangeLog for dev-db/sqlite -# Copyright 1999-2016 Gentoo Foundation; Distributed under the GPL v2 -# (auto-generated from git log) - -*sqlite-3.8.10.2 (09 Aug 2015) -*sqlite-3.8.10.1 (09 Aug 2015) -*sqlite-2.8.16-r5 (09 Aug 2015) - - 09 Aug 2015; Robin H. Johnson +files/maketcllib.sh, - +files/sqlite-2.8.15-alignement-fix.patch, +files/sqlite-2.8.16-exit.patch, - +files/sqlite-2.8.16-multilib.patch, - +files/sqlite-3.8.1-autoconf-dlopen_check.patch, - +files/sqlite-3.8.1-src-dlopen_check.patch, - +files/sqlite-3.8.1-tests-icu-52.patch, +metadata.xml, - +sqlite-2.8.16-r5.ebuild, +sqlite-3.8.10.1.ebuild, +sqlite-3.8.10.2.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 - -*sqlite-3.8.11.1 (25 Aug 2015) - - 25 Aug 2015; Mike Gilbert +sqlite-3.8.11.1.ebuild: - Version bump. - - 25 Aug 2015; Mike Gilbert sqlite-3.8.11.1.ebuild: - Downgrade accidental stable keywords - - Package-Manager: portage-2.2.20_p40 - -*sqlite-3.9.1 (21 Oct 2015) - - 21 Oct 2015; Mike Gilbert +sqlite-3.9.1.ebuild: - Version bump. - - 23 Oct 2015; Mike Gilbert sqlite-3.9.1.ebuild: - Fix building with USE="-tcl -test tools". - -*sqlite-3.9.2 (03 Nov 2015) - - 03 Nov 2015; Mike Gilbert +sqlite-3.9.2.ebuild: - Version bump. - - 14 Dec 2015; Agostino Sarubbo sqlite-3.9.2.ebuild: - amd64 stable wrt bug #567998 - - Package-Manager: portage-2.2.24 - RepoMan-Options: --include-arches="amd64" - Signed-off-by: Agostino Sarubbo - - 19 Dec 2015; Markus Meier sqlite-3.9.2.ebuild: - arm stable, bug #567998 - - Package-Manager: portage-2.2.26 - RepoMan-Options: --include-arches="arm" - - 20 Dec 2015; Jeroen Roovers sqlite-3.9.2.ebuild: - Stable for HPPA PPC64 (bug #567998). - - Package-Manager: portage-2.2.26 - RepoMan-Options: --ignore-arches - - 25 Dec 2015; Agostino Sarubbo sqlite-3.9.2.ebuild: - x86 stable wrt bug #567998 - - Package-Manager: portage-2.2.24 - RepoMan-Options: --include-arches="x86" - Signed-off-by: Agostino Sarubbo - - 26 Dec 2015; Agostino Sarubbo sqlite-3.9.2.ebuild: - ppc stable wrt bug #567998 - - Package-Manager: portage-2.2.24 - RepoMan-Options: --include-arches="ppc" - Signed-off-by: Agostino Sarubbo - - 27 Dec 2015; Mikle Kolyada sqlite-3.9.2.ebuild: - sparc stable wrt bug #567998 - - Package-Manager: portage-2.2.24 - -*sqlite-3.10.0 (09 Jan 2016) - - 09 Jan 2016; Ian Delaney +sqlite-3.10.0.ebuild: - Version bump. - - 10 Jan 2016; Agostino Sarubbo sqlite-3.9.2.ebuild: - alpha stable wrt bug #567998 - - Package-Manager: portage-2.2.26 - RepoMan-Options: --include-arches="alpha" - Signed-off-by: Agostino Sarubbo - - 11 Jan 2016; Agostino Sarubbo sqlite-3.9.2.ebuild: - ia64 stable wrt bug #567998 - - Package-Manager: portage-2.2.26 - RepoMan-Options: --include-arches="ia64" - Signed-off-by: Agostino Sarubbo - - 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) - -*sqlite-3.10.2 (01 Feb 2016) - - 01 Feb 2016; Mike Gilbert +sqlite-3.10.2.ebuild: - Version bump. - - 20 Feb 2016; Pacho Ramos - -files/sqlite-2.8.15-alignement-fix.patch, -files/sqlite-2.8.16-exit.patch, - -files/sqlite-2.8.16-multilib.patch, -sqlite-2.8.16-r5.ebuild: - Drop masked for removal version (#249418) - - Package-Manager: portage-2.2.27 - -*sqlite-3.11.0 (03 Mar 2016) - - 03 Mar 2016; Mike Gilbert +files/sqlite-3.11.0-full_tar - ball-SQLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER.patch, - +files/sqlite-3.11.0-full_tarball-build.patch, +files/sqlite-3.11.0-nonfull_ - tarball-SQLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER.patch, - +files/sqlite-3.11.0-nonfull_tarball-build.patch, +sqlite-3.11.0.ebuild: - Version bump (3.11.0). - - Link executables against libsqlite3.so instead of statically including code - from sqlite3.c. - Backport SQLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER from 3.12.0. - -*sqlite-3.11.1 (04 Mar 2016) - - 04 Mar 2016; Mike Gilbert +sqlite-3.11.1.ebuild: - Version bump (3.11.1). - - 06 Mar 2016; Jeroen Roovers sqlite-3.11.1.ebuild: - Stable for PPC64 (bug #574420). - - Package-Manager: portage-2.2.27 - RepoMan-Options: --ignore-arches - - 06 Mar 2016; Agostino Sarubbo sqlite-3.11.1.ebuild: - amd64 stable wrt bug #574420 - - Package-Manager: portage-2.2.26 - RepoMan-Options: --include-arches="amd64" - Signed-off-by: Agostino Sarubbo - - 06 Mar 2016; Jeroen Roovers sqlite-3.11.1.ebuild: - Stable for HPPA (bug #574420). - - Package-Manager: portage-2.2.27 - RepoMan-Options: --ignore-arches - - 12 Mar 2016; Markus Meier sqlite-3.11.1.ebuild: - arm stable, bug #574420 - - Package-Manager: portage-2.2.27 - RepoMan-Options: --include-arches="arm" - - 15 Mar 2016; Agostino Sarubbo sqlite-3.11.1.ebuild: - x86 stable wrt bug #574420 - - Package-Manager: portage-2.2.26 - RepoMan-Options: --include-arches="x86" - Signed-off-by: Agostino Sarubbo - - 15 Mar 2016; Tobias Klausmann sqlite-3.11.1.ebuild: - 3.11.1-r0: add alpha keyword - - Gentoo-Bug: 574420 - - Package-Manager: portage-2.2.28 - - 16 Mar 2016; Agostino Sarubbo sqlite-3.11.1.ebuild: - ppc stable wrt bug #574420 - - Package-Manager: portage-2.2.26 - RepoMan-Options: --include-arches="ppc" - Signed-off-by: Agostino Sarubbo - - 19 Mar 2016; Agostino Sarubbo sqlite-3.11.1.ebuild: - sparc stable wrt bug #574420 - - Package-Manager: portage-2.2.26 - RepoMan-Options: --include-arches="sparc" - Signed-off-by: Agostino Sarubbo - - 20 Mar 2016; Agostino Sarubbo sqlite-3.11.1.ebuild: - ia64 stable wrt bug #574420 - - Package-Manager: portage-2.2.26 - RepoMan-Options: --include-arches="ia64" - Signed-off-by: Agostino Sarubbo - - 31 Mar 2016; Steev Klimaszewski sqlite-3.11.1.ebuild: - Stabilize arm64 wrt bug #574420 - - Package-Manager: portage-2.2.28 - -*sqlite-3.12.0 (02 Apr 2016) - - 02 Apr 2016; Mike Gilbert - +files/sqlite-3.12.0-nonfull_tarball-build.patch, +sqlite-3.12.0.ebuild: - Version bump (3.12.0). - - 04 Apr 2016; Jeroen Roovers sqlite-3.12.0.ebuild: - Stable for HPPA PPC64 (bug #578940). - - Package-Manager: portage-2.2.28 - RepoMan-Options: --ignore-arches - - 08 Apr 2016; Agostino Sarubbo sqlite-3.12.0.ebuild: - amd64 stable wrt bug #578940 - - Package-Manager: portage-2.2.26 - RepoMan-Options: --include-arches="amd64" - Signed-off-by: Agostino Sarubbo - -*sqlite-3.12.1 (09 Apr 2016) - - 09 Apr 2016; Mike Gilbert +sqlite-3.12.1.ebuild: - Version bump (3.12.1). - - 11 Apr 2016; Agostino Sarubbo sqlite-3.12.0.ebuild: - x86 stable wrt bug #578940 - - Package-Manager: portage-2.2.26 - RepoMan-Options: --include-arches="x86" - Signed-off-by: Agostino Sarubbo - - 19 Apr 2016; Markus Meier sqlite-3.12.0.ebuild: - arm stable, bug #578940 - - Package-Manager: portage-2.2.28 - RepoMan-Options: --include-arches="arm" - -*sqlite-3.12.2 (20 Apr 2016) - - 20 Apr 2016; Mike Gilbert +sqlite-3.12.2.ebuild: - Version bump (3.12.2). - - 28 Apr 2016; Mike Gilbert -files/maketcllib.sh, - -files/sqlite-3.8.1-autoconf-dlopen_check.patch, - -files/sqlite-3.8.1-src-dlopen_check.patch, - -files/sqlite-3.8.1-tests-icu-52.patch, -sqlite-3.8.10.1.ebuild, - -sqlite-3.8.10.2.ebuild, -sqlite-3.8.11.1.ebuild, -sqlite-3.9.1.ebuild, - -sqlite-3.9.2.ebuild, -sqlite-3.10.0.ebuild, -sqlite-3.10.2.ebuild, - -sqlite-3.11.0.ebuild: - Delete old versions. - - 20 May 2016; Tobias Klausmann sqlite-3.12.0.ebuild: - 3.12.0-r0: add alpha keyword - - Gentoo-Bug: 578940 - - Package-Manager: portage-2.3.0_rc1 - -*sqlite-3.13.0 (30 May 2016) - - 30 May 2016; Mike Gilbert - +files/sqlite-3.13.0-full_tarball-build.patch, +sqlite-3.13.0.ebuild: - Version bump (3.13.0). - diff --git a/sdk_container/src/third_party/portage-stable/dev-db/sqlite/ChangeLog-2015 b/sdk_container/src/third_party/portage-stable/dev-db/sqlite/ChangeLog-2015 deleted file mode 100644 index 947bddf1f4..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-db/sqlite/ChangeLog-2015 +++ /dev/null @@ -1,2233 +0,0 @@ -# ChangeLog for dev-db/sqlite -# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/ChangeLog,v 1.584 2015/07/30 12:27:08 ago Exp $ - - 30 Jul 2015; Agostino Sarubbo sqlite-3.8.10.2.ebuild: - Stable for sparc, wrt bug #552698 - - 23 Jul 2015; Pacho Ramos sqlite-3.8.10.2.ebuild: - ppc stable wrt bug #552698 - - 20 Jul 2015; Mike Frysinger sqlite-3.8.10.2.ebuild: - Mark arm64/m68k/s390/sh stable #552698. - - 16 Jul 2015; Mikle Kolyada sqlite-3.8.10.2.ebuild: - ia64 stable wrt bug #552698 - - 03 Jul 2015; Mikle Kolyada sqlite-3.8.10.2.ebuild: - arm stable wrt bug #552698 - - 03 Jul 2015; Agostino Sarubbo sqlite-3.8.10.2.ebuild: - Stable for alpha, wrt bug #552698 - - 27 Jun 2015; Jeroen Roovers sqlite-3.8.10.2.ebuild: - Stable for HPPA PPC64 (bug #552698). - - 26 Jun 2015; Agostino Sarubbo sqlite-3.8.10.2.ebuild: - Stable for x86, wrt bug #552698 - - 23 Jun 2015; Agostino Sarubbo sqlite-3.8.10.2.ebuild: - Stable for amd64, wrt bug #552698 - - 04 Jun 2015; Mike Gilbert -sqlite-3.8.6.ebuild, - -sqlite-3.8.7.1.ebuild, -sqlite-3.8.7.2.ebuild, -sqlite-3.8.7.3.ebuild, - -sqlite-3.8.7.4.ebuild, -sqlite-3.8.7.ebuild, -sqlite-3.8.8.1.ebuild, - -sqlite-3.8.8.2.ebuild, -sqlite-3.8.8.3.ebuild, -sqlite-3.8.9.ebuild: - Remove old. - - 02 Jun 2015; Jack Morgan sqlite-3.8.10.1.ebuild: - sparc stable wrt bug #549258 - - 27 May 2015; Agostino Sarubbo sqlite-3.8.10.1.ebuild: - Stable for arm, wrt bug #549258 - - 27 May 2015; Agostino Sarubbo sqlite-3.8.9.ebuild: - Stable for arm, wrt bug #546626 - -*sqlite-3.8.10.2 (23 May 2015) - - 23 May 2015; Mike Gilbert +sqlite-3.8.10.2.ebuild: - Version bump. Ebuild by Arfrever. - - 20 May 2015; Matt Turner sqlite-3.8.10.1.ebuild: - alpha stable, bug 549258. - - 19 May 2015; Agostino Sarubbo sqlite-3.8.10.1.ebuild: - Stable for x86, wrt bug #549258 - - 15 May 2015; Jack Morgan sqlite-3.8.10.1.ebuild: - ia64 stable wrt bug #549258 - - 15 May 2015; Ian Delaney sqlite-3.8.10.1.ebuild: - Fix parallel building with USE="-tcl -test -tools" (bug #549412). - Patch by Arfrever. - - 15 May 2015; Pacho Ramos sqlite-3.8.10.1.ebuild: - ppc stable wrt bug #549258 - - 15 May 2015; Ian Delaney sqlite-3.8.10.1.ebuild: - Use pread(), pread64(), pwrite() and pwrite64() (bug #549080). Update - dependencies, CPPFLAGS, configure options. Patch by Arfrever. - - 15 May 2015; Justin Lecher metadata.xml, - sqlite-3.8.10.1.ebuild: - Add REQUIERED_USE for tools -> tcl, bug #549308 - - 13 May 2015; Agostino Sarubbo sqlite-3.8.10.1.ebuild: - Stable for amd64, wrt bug #549258 - - 13 May 2015; Jeroen Roovers sqlite-3.8.10.1.ebuild: - Stable for HPPA PPC64 (bug #549258). - -*sqlite-3.8.10.1 (12 May 2015) - - 12 May 2015; Mike Gilbert +sqlite-3.8.10.1.ebuild, - metadata.xml: - Version bump. Add "tools" USE flag. Ebuild by Arfrever. - - 29 Apr 2015; Agostino Sarubbo sqlite-3.8.9.ebuild: - Stable for sparc, wrt bug #546626 - - 28 Apr 2015; Agostino Sarubbo sqlite-3.8.9.ebuild: - Stable for ia64, wrt bug #546626 - - 28 Apr 2015; Agostino Sarubbo sqlite-3.8.9.ebuild: - Stable for alpha, wrt bug #546626 - - 21 Apr 2015; Jeroen Roovers sqlite-3.8.9.ebuild: - Stable for PPC64 (bug #546626). - - 21 Apr 2015; Pacho Ramos sqlite-3.8.9.ebuild: - ppc stable wrt bug #546626 - - 17 Apr 2015; Agostino Sarubbo sqlite-3.8.9.ebuild: - Stable for x86, wrt bug #546626 - - 17 Apr 2015; Agostino Sarubbo sqlite-3.8.9.ebuild: - Stable for amd64, wrt bug #546626 - - 17 Apr 2015; Jeroen Roovers sqlite-3.8.9.ebuild: - Stable for HPPA (bug #546626). - -*sqlite-3.8.9 (16 Apr 2015) - - 16 Apr 2015; Mike Gilbert +sqlite-3.8.9.ebuild: - Version bump. Ebuild by Arfrever. - - 25 Mar 2015; Justin Lecher sqlite-3.8.6.ebuild: - Fix tcl/tk slotting - - 20 Mar 2015; Justin Lecher sqlite-3.8.6.ebuild, - sqlite-3.8.7.1.ebuild, sqlite-3.8.7.2.ebuild, sqlite-3.8.7.3.ebuild, - sqlite-3.8.7.4.ebuild, sqlite-3.8.7.ebuild, sqlite-3.8.8.1.ebuild, - sqlite-3.8.8.2.ebuild, sqlite-3.8.8.3.ebuild: - Fix tcl/tk slotting; fix SLOT operators - -*sqlite-3.8.8.3 (11 Mar 2015) - - 11 Mar 2015; Mike Gilbert +sqlite-3.8.8.3.ebuild: - Version bump. Ebuild by Arfrever. - - 02 Mar 2015; Agostino Sarubbo sqlite-3.8.7.4.ebuild: - Stable for ppc, wrt bug #536142 - -*sqlite-3.8.8.2 (14 Feb 2015) - - 14 Feb 2015; Mike Gilbert +sqlite-3.8.8.2.ebuild: - Version bump by Arfrever. - - 22 Jan 2015; Markus Meier sqlite-3.8.7.4.ebuild: - arm stable, bug #536142 - -*sqlite-3.8.8.1 (20 Jan 2015) - - 20 Jan 2015; Mike Gilbert +sqlite-3.8.8.1.ebuild: - Version bump. Ebuild by Arfrever. - - 16 Jan 2015; Patrick Lauer sqlite-3.8.7.4.ebuild: - Stable for amd64 and x86 #536142 - - 13 Jan 2015; Jeroen Roovers sqlite-3.8.7.4.ebuild: - Stable for HPPA (bug #536142). - -*sqlite-3.8.7.4 (12 Dec 2014) - - 12 Dec 2014; Mike Gilbert +sqlite-3.8.7.4.ebuild: - Version bump. Ebuild by Arfrever. - -*sqlite-3.8.7.3 (08 Dec 2014) - - 08 Dec 2014; Mike Gilbert +sqlite-3.8.7.3.ebuild: - Version bump. Ebuild by Arfrever. - -*sqlite-3.8.7.2 (19 Nov 2014) - - 19 Nov 2014; Mike Gilbert +sqlite-3.8.7.2.ebuild: - Version bump. Ebuild by Arfrever. - - 18 Nov 2014; Mike Gilbert -sqlite-3.8.2.ebuild, - -sqlite-3.8.3.1.ebuild, -sqlite-3.8.3.ebuild, -sqlite-3.8.4.1.ebuild, - -sqlite-3.8.4.3.ebuild, -sqlite-3.8.4.ebuild, -sqlite-3.8.5.ebuild: - Remove old. - -*sqlite-3.8.7.1 (05 Nov 2014) - - 05 Nov 2014; Mike Gilbert +sqlite-3.8.7.1.ebuild: - Version bump. Ebuild by Arfrever. - - 02 Nov 2014; Agostino Sarubbo sqlite-3.8.6.ebuild: - Stable for alpha, wrt bug #523484 - - 29 Oct 2014; Agostino Sarubbo sqlite-3.8.6.ebuild: - Stable for sparc, wrt bug #523484 - - 28 Oct 2014; Agostino Sarubbo sqlite-3.8.6.ebuild: - Stable for ia64, wrt bug #523484 - -*sqlite-3.8.7 (18 Oct 2014) - - 18 Oct 2014; Mike Gilbert +sqlite-3.8.7.ebuild: - Version bump. Ebuild by Arfrever. - - 10 Oct 2014; Agostino Sarubbo sqlite-3.8.6.ebuild: - Stable for x86, wrt bug #523484 - - 09 Oct 2014; Agostino Sarubbo sqlite-3.8.6.ebuild: - Stable for amd64, wrt bug #523484 - - 04 Oct 2014; Anthony G. Basile sqlite-3.8.6.ebuild: - Stable on ppc and ppc64, bug #523484 - - 04 Oct 2014; Markus Meier sqlite-3.8.6.ebuild: - arm stable, bug #523484 - - 23 Sep 2014; Jeroen Roovers sqlite-3.8.6.ebuild: - Stable for HPPA (bug #523484). - -*sqlite-3.8.6 (16 Aug 2014) - - 16 Aug 2014; Mike Gilbert +sqlite-3.8.6.ebuild: - Version bump. Ebuild by Arfrever. - - 14 Aug 2014; Pawel Hajdan jr sqlite-3.8.5.ebuild: - x86 stable wrt bug #518610 - - 10 Aug 2014; Sergei Trofimovich sqlite-2.8.16-r5.ebuild: - QA: drop trailing '.' from DESCRIPTION - - 09 Aug 2014; Markus Meier sqlite-3.8.5.ebuild: - arm stable, bug #518610 - - 05 Aug 2014; Jeroen Roovers sqlite-3.8.5.ebuild: - Stable for HPPA (bug #518610). - - 22 Jul 2014; Pacho Ramos sqlite-3.8.4.3.ebuild: - amd64/x86 stable, bug #512452 - - 18 Jul 2014; Matt Turner sqlite-3.8.4.3.ebuild: - alpha stable, bug 512452. - - 22 Jun 2014; Akinori Hattori sqlite-3.8.4.3.ebuild: - ia64 stable wrt bug #512452 - - 19 Jun 2014; Markus Meier sqlite-3.8.4.3.ebuild: - arm stable, bug #512452 - - 14 Jun 2014; Pawel Hajdan jr sqlite-3.8.3.1.ebuild: - x86 stable wrt bug #504218 - -*sqlite-3.8.5 (06 Jun 2014) - - 06 Jun 2014; Mike Gilbert +sqlite-3.8.5.ebuild: - Version bump by Arfrever. - - 06 Jun 2014; Jeroen Roovers sqlite-3.8.4.3.ebuild: - Stable for HPPA (bug #512452). - -*sqlite-3.8.4.3 (05 Apr 2014) - - 05 Apr 2014; Mike Gilbert +sqlite-3.8.4.3.ebuild: - Version bump. Ebuild by Arfrever. - - 26 Mar 2014; Markus Meier sqlite-3.8.3.1.ebuild: - arm stable, bug #504218 - -*sqlite-3.8.4.1 (11 Mar 2014) - - 11 Mar 2014; Mike Gilbert +sqlite-3.8.4.1.ebuild: - Version bump. Ebuild by Arfrever. - -*sqlite-3.8.4 (11 Mar 2014) - - 11 Mar 2014; Mike Gilbert +sqlite-3.8.4.ebuild: - Version bump. Ebuild by Arfrever. - - 11 Mar 2014; Jeroen Roovers sqlite-3.8.3.1.ebuild: - Stable for HPPA (bug #504218). - -*sqlite-3.8.3.1 (11 Feb 2014) - - 11 Feb 2014; Mike Gilbert +sqlite-3.8.3.1.ebuild: - Version bump. Ebuild by Arfrever. - - 09 Feb 2014; Mike Gilbert sqlite-3.8.3.ebuild: - Fix emul-linux-x86-baselibs blocker. - -*sqlite-3.8.3 (09 Feb 2014) - - 09 Feb 2014; Mike Gilbert +sqlite-3.8.3.ebuild: - Version bump. Add multilib support (bug #496014). Ebuild by Arfrever. - - 01 Feb 2014; Mike Frysinger sqlite-3.8.2.ebuild: - Mark s390/sh stable. - - 27 Jan 2014; Mike Gilbert metadata.xml: - Remove description of 'extensions' use flag. - - 26 Jan 2014; Mike Gilbert -sqlite-3.7.16.2.ebuild, - -sqlite-3.7.17.ebuild, -sqlite-3.8.0.1.ebuild, -sqlite-3.8.0.2.ebuild, - -sqlite-3.8.0.ebuild, -sqlite-3.8.1.ebuild: - Remove old per Arfrever. - - 26 Jan 2014; Agostino Sarubbo sqlite-3.8.2.ebuild: - Stable for sparc, wrt bug #497736 - - 19 Jan 2014; Agostino Sarubbo sqlite-3.8.2.ebuild: - Stable for ppc64, wrt bug #497736 - - 19 Jan 2014; Mike Frysinger sqlite-3.8.2.ebuild: - Add arm64 love. - - 18 Jan 2014; Agostino Sarubbo sqlite-3.8.2.ebuild: - Stable for alpha, wrt bug #497736 - - 16 Jan 2014; Markus Meier sqlite-3.8.2.ebuild: - arm stable, bug #497736 - - 15 Jan 2014; Agostino Sarubbo sqlite-3.8.2.ebuild: - Stable for ia64, wrt bug #497736 - - 14 Jan 2014; Agostino Sarubbo sqlite-3.8.2.ebuild: - Stable for ppc, wrt bug #497736 - - 14 Jan 2014; Agostino Sarubbo sqlite-3.8.2.ebuild: - Stable for x86, wrt bug #497736 - - 12 Jan 2014; Pacho Ramos sqlite-3.8.2.ebuild: - amd64 stable, bug #497736 - - 11 Jan 2014; Jeroen Roovers sqlite-3.8.2.ebuild: - Stable for HPPA (bug #497736). - -*sqlite-3.8.2 (08 Dec 2013) - - 08 Dec 2013; Mike Gilbert +sqlite-3.8.2.ebuild: - Version bump. Ebuild by Arfrever. - -*sqlite-3.8.1 (17 Oct 2013) - - 17 Oct 2013; Mike Gilbert - +files/sqlite-3.8.1-autoconf-dlopen_check.patch, - +files/sqlite-3.8.1-src-dlopen_check.patch, - +files/sqlite-3.8.1-tests-icu-52.patch, +sqlite-3.8.1.ebuild: - Version bump. Ebuild and patches by Arfrever. - - 06 Sep 2013; Agostino Sarubbo sqlite-3.7.17.ebuild: - Stable for sparc, wrt bug #479580 - -*sqlite-3.8.0.2 (04 Sep 2013) - - 04 Sep 2013; Mike Gilbert +sqlite-3.8.0.2.ebuild: - Version bump. Ebuild by Arfrever. - -*sqlite-3.8.0.1 (01 Sep 2013) - - 01 Sep 2013; Mike Gilbert +sqlite-3.8.0.1.ebuild: - Version bump. Ebuild by Arfrever. - - 29 Aug 2013; Michael Palimaka sqlite-3.8.0.ebuild: - Remove unnecessary epunt_cxx wrt bug #482902. - -*sqlite-3.8.0 (28 Aug 2013) - - 28 Aug 2013; Mike Gilbert +sqlite-3.8.0.ebuild: - Version bump. Delete "extensions" USE flag and unconditionally enable support - for extensions. Ebuild by Arfrever. - - 18 Aug 2013; Agostino Sarubbo sqlite-3.7.17.ebuild: - Stable for x86, wrt bug #479580 - - 13 Aug 2013; Agostino Sarubbo sqlite-3.7.17.ebuild: - Stable for alpha, wrt bug #479580 - - 10 Aug 2013; Agostino Sarubbo sqlite-3.7.17.ebuild: - Stable for arm, wrt bug #479580 - - 10 Aug 2013; Agostino Sarubbo sqlite-3.7.17.ebuild: - Stable for ppc, wrt bug #479580 - - 06 Aug 2013; Jeroen Roovers sqlite-3.7.17.ebuild: - Stable for HPPA (bug #479580). - - 04 Aug 2013; Agostino Sarubbo sqlite-3.7.17.ebuild: - Stable for ppc64, wrt bug #479580 - - 04 Aug 2013; Agostino Sarubbo sqlite-3.7.17.ebuild: - Stable for ia64, wrt bug #479580 - - 03 Aug 2013; Agostino Sarubbo sqlite-3.7.17.ebuild: - Stable for amd64, wrt bug #479580 - - 09 Jun 2013; Mike Frysinger metadata.xml: - Add upstream CPE tag (security info) from ChromiumOS. - - 03 Jun 2013; Mike Gilbert metadata.xml: - Remove unused use flag descriptions. - - 03 Jun 2013; Mike Gilbert -sqlite-3.7.14.1.ebuild, - -sqlite-3.7.15.2.ebuild, -sqlite-3.7.16.1.ebuild, -sqlite-3.7.16.ebuild: - Remove old per Arfrever. - -*sqlite-3.7.17 (21 May 2013) - - 21 May 2013; Mike Gilbert +sqlite-3.7.17.ebuild: - Version bump. Ebuild by Arfrever. - - 20 May 2013; Agostino Sarubbo sqlite-3.7.16.2.ebuild: - Stable for s390, wrt bug #468218 - - 14 May 2013; Agostino Sarubbo sqlite-3.7.16.2.ebuild: - Stable for x86, wrt bug #468218 - - 08 May 2013; Agostino Sarubbo sqlite-3.7.16.2.ebuild: - Stable for sh, wrt bug #468218 - - 07 May 2013; Agostino Sarubbo sqlite-3.7.16.2.ebuild: - Stable for ppc64, wrt bug #468218 - - 07 May 2013; Agostino Sarubbo sqlite-3.7.16.2.ebuild: - Stable for sparc, wrt bug #468218 - - 07 May 2013; Agostino Sarubbo sqlite-3.7.16.2.ebuild: - Stable for ia64, wrt bug #468218 - - 05 May 2013; Agostino Sarubbo sqlite-3.7.16.2.ebuild: - Stable for alpha, wrt bug #468218 - - 05 May 2013; Agostino Sarubbo sqlite-3.7.16.2.ebuild: - Stable for arm, wrt bug #468218 - - 03 May 2013; Jeroen Roovers sqlite-3.7.16.2.ebuild: - Stable for HPPA (bug #468218). - - 03 May 2013; Agostino Sarubbo sqlite-3.7.16.2.ebuild: - Stable for ppc, wrt bug #468218 - - 02 May 2013; Agostino Sarubbo sqlite-3.7.16.2.ebuild: - Stable for amd64, wrt bug #468218 - -*sqlite-3.7.16.2 (12 Apr 2013) - - 12 Apr 2013; Mike Gilbert +sqlite-3.7.16.2.ebuild: - Version bump. Ebuild by Arfrever. - -*sqlite-3.7.16.1 (29 Mar 2013) - - 29 Mar 2013; Mike Gilbert +sqlite-3.7.16.1.ebuild: - Version bump. Ebuild by Arfrever. - -*sqlite-3.7.16 (19 Mar 2013) - - 19 Mar 2013; Mike Gilbert +sqlite-3.7.16.ebuild: - Version bump. Delete "fts3", "soundex", "threadsafe" and "unlock-notify" USE - flags and enable given features unconditionally. Ebuild by Arfrever. - - 12 Mar 2013; Mike Gilbert sqlite-3.7.15.2.ebuild: - Restore epunt_cxx() in amalgamation tarballs. Patch by Arfrever. - - 01 Mar 2013; Agostino Sarubbo sqlite-3.7.15.2.ebuild: - Stable for sh, wrt bug #458800 - - 28 Feb 2013; Jeroen Roovers sqlite-3.7.15.2.ebuild: - Stable for HPPA (bug #458800). - - 26 Feb 2013; Agostino Sarubbo sqlite-3.7.15.2.ebuild: - Stable for s390, wrt bug #458800 - - 26 Feb 2013; Agostino Sarubbo sqlite-3.7.15.2.ebuild: - Stable for alpha, wrt bug #458800 - - 24 Feb 2013; Agostino Sarubbo sqlite-3.7.15.2.ebuild: - Stable for arm, wrt bug #458800 - - 24 Feb 2013; Agostino Sarubbo sqlite-3.7.15.2.ebuild: - Stable for sparc, wrt bug #458800 - - 24 Feb 2013; Agostino Sarubbo sqlite-3.7.15.2.ebuild: - Stable for ia64, wrt bug #458800 - - 24 Feb 2013; Agostino Sarubbo sqlite-3.7.15.2.ebuild: - Stable for x86, wrt bug #458800 - - 24 Feb 2013; Agostino Sarubbo sqlite-3.7.15.2.ebuild: - Stable for amd64, wrt bug #458800 - - 23 Feb 2013; Agostino Sarubbo sqlite-3.7.15.2.ebuild: - Stable for ppc64, wrt bug #458800 - - 23 Feb 2013; Mike Gilbert sqlite-3.7.15.2.ebuild: - Drop epunt_cxx, bug 458906. - - 23 Feb 2013; Agostino Sarubbo sqlite-3.7.15.2.ebuild: - Stable for ppc, wrt bug #458800 - - 20 Feb 2013; Zac Medico sqlite-3.7.15.2.ebuild: - Add ~arm-linux keyword. - - 20 Jan 2013; Mike Gilbert -sqlite-3.7.12.1.ebuild, - -sqlite-3.7.13.ebuild, -sqlite-3.7.15.1.ebuild, -sqlite-3.7.15.ebuild: - Remove old per Arfrever. - - 18 Jan 2013; Mike Gilbert sqlite-3.7.15.2.ebuild: - Fix regression introduced by Sergey Popov in version bump unauthorized by - Arfrever. Install updated documentation. Use := dependency for dev-lang/tcl. - -*sqlite-3.7.15.2 (17 Jan 2013) - - 17 Jan 2013; Sergey Popov +sqlite-3.7.15.2.ebuild: - Version bump, wrt bug #452606 - - 05 Jan 2013; Sergey Popov sqlite-3.7.15.1.ebuild: - Add support for building static library, wrt bug #417907. Thanks to ari - edelkind for discovering this issue - and providing patch - - 01 Jan 2013; Raúl Porcel sqlite-3.7.14.1.ebuild: - s390/sh stable wrt #446522 - - 30 Dec 2012; Agostino Sarubbo sqlite-3.7.14.1.ebuild: - Stable for alpha, wrt bug #446522 - - 29 Dec 2012; Agostino Sarubbo sqlite-3.7.14.1.ebuild: - Stable for sparc, wrt bug #446522 - - 23 Dec 2012; Markus Meier sqlite-3.7.14.1.ebuild: - arm stable, bug #446522 - -*sqlite-3.7.15.1 (20 Dec 2012) - - 20 Dec 2012; Markos Chandras +sqlite-3.7.15.1.ebuild: - Version bump. Ebuild by Arfrever. - - 18 Dec 2012; Agostino Sarubbo sqlite-3.7.14.1.ebuild: - Stable for ia64, wrt bug #446522 - - 16 Dec 2012; Agostino Sarubbo sqlite-3.7.14.1.ebuild: - Stable for ppc, wrt bug #446522 - - 16 Dec 2012; Agostino Sarubbo sqlite-3.7.14.1.ebuild: - Stable for x86, wrt bug #446522 - - 15 Dec 2012; Jeroen Roovers sqlite-3.7.14.1.ebuild: - Stable for HPPA (bug #446522). - -*sqlite-3.7.15 (12 Dec 2012) - - 12 Dec 2012; Markos Chandras +sqlite-3.7.15.ebuild: - Version bump. Ebuild by Arfrever - - 10 Dec 2012; Agostino Sarubbo sqlite-3.7.14.1.ebuild: - Stable for ppc64, wrt bug #446522 - - 09 Dec 2012; sqlite-3.7.14.1.ebuild: - Stable for amd64, wrt bug #446522 - - 08 Dec 2012; Agostino Sarubbo sqlite-3.7.13.ebuild: - Stable for ppc64, wrt bug #428080 - - 10 Oct 2012; Mike Gilbert sqlite-3.7.14.1.ebuild: - Update dependencies. Patch by Arfrever. - - 10 Oct 2012; Mike Gilbert -sqlite-3.7.14.ebuild: - Remove at Arfrever's request. - -*sqlite-3.7.14.1 (06 Oct 2012) - - 06 Oct 2012; Mike Gilbert +sqlite-3.7.14.1.ebuild: - Version bump. Ebuild by Arfrever. - - 04 Oct 2012; Ulrich Müller sqlite-2.8.16-r5.ebuild, - sqlite-3.7.12.1.ebuild, sqlite-3.7.13.ebuild, sqlite-3.7.14.ebuild: - LICENSE is public-domain, bug 437228. - -*sqlite-3.7.14 (05 Sep 2012) - - 05 Sep 2012; Mike Gilbert +sqlite-3.7.14.ebuild, - -sqlite-3.7.10.ebuild, -sqlite-3.7.11.ebuild, -sqlite-3.7.12.ebuild: - Version bump. Ebuild by Arfrever. - - 27 Aug 2012; Raúl Porcel sqlite-3.7.13.ebuild: - alpha/ia64/s390/sh/sparc stable wrt #428080 - - 08 Aug 2012; Brent Baude sqlite-3.7.13.ebuild: - Marking sqlite-3.7.13 ppc for bug 428080 - - 04 Aug 2012; Agostino Sarubbo sqlite-3.7.13.ebuild: - Stable for amd64, wrt bug #428080 - - 02 Aug 2012; Markus Meier sqlite-3.7.13.ebuild: - arm stable, bug #428080 - - 27 Jul 2012; Jeroen Roovers sqlite-3.7.13.ebuild: - Stable for HPPA (bug #428080). - - 27 Jul 2012; Jeff Horelick sqlite-3.7.13.ebuild: - marked x86 per bug 428080 - - 16 Jul 2012; Anthony G. Basile sqlite-3.7.12.1.ebuild: - Stable ppc64, bug #420827 - - 15 Jul 2012; Raúl Porcel sqlite-3.7.12.1.ebuild: - alpha/ia64/s390/sh/sparc stable wrt #420827 - - 28 Jun 2012; Brent Baude sqlite-3.7.12.1.ebuild: - Marking sqlite-3.7.12.1 ppc for bug 420827 - - 27 Jun 2012; Jeroen Roovers sqlite-3.7.12.1.ebuild: - Stable for HPPA (bug #420827). - - 17 Jun 2012; Markus Meier sqlite-3.7.12.1.ebuild: - arm stable, bug #420827 - - 12 Jun 2012; Jeff Horelick sqlite-3.7.12.1.ebuild: - marked x86 per bug 420827 - - 12 Jun 2012; Agostino Sarubbo sqlite-3.7.12.1.ebuild: - Stable for amd64, wrt bug #420827 - -*sqlite-3.7.13 (12 Jun 2012) - - 12 Jun 2012; Mike Gilbert +sqlite-3.7.13.ebuild: - Version bump. Ebuild by Arfrever. - - 04 Jun 2012; Zac Medico sqlite-2.8.16-r5.ebuild: - inherit multilib for get_libdir - - 30 May 2012; Alexis Ballier sqlite-2.8.16-r5.ebuild: - keyword ~amd64-fbsd - -*sqlite-3.7.12.1 (22 May 2012) - - 22 May 2012; Mike Gilbert +sqlite-3.7.12.1.ebuild: - Version bump. Ebuild by Arfrever. - -*sqlite-3.7.12 (15 May 2012) - - 15 May 2012; Mike Gilbert +sqlite-3.7.12.ebuild, - -files/sqlite-3.7.7.1-interix-amalgamation.patch, -sqlite-3.7.7.1-r1.ebuild, - -sqlite-3.7.7.1.ebuild, -sqlite-3.7.8.ebuild, -sqlite-3.7.9.ebuild: - Version bump. Ebuild by Arfrever. - - 26 Apr 2012; Alexis Ballier sqlite-3.7.11.ebuild: - keyword ~amd64-fbsd - - 01 Apr 2012; Raúl Porcel sqlite-3.7.10.ebuild: - alpha/ia64/s390/sh/sparc stable wrt #408385 - - 28 Mar 2012; Markus Meier sqlite-3.7.10.ebuild: - arm stable, bug #408385 - - 22 Mar 2012; Jeff Horelick sqlite-3.7.10.ebuild: - marked x86 per bug 408385 - - 22 Mar 2012; Jeroen Roovers sqlite-3.7.10.ebuild: - Stable for HPPA (bug #408385). - -*sqlite-3.7.11 (20 Mar 2012) - - 20 Mar 2012; Mike Gilbert +sqlite-3.7.11.ebuild: - Version bump. Ebuild by Arfrever. - - 20 Mar 2012; Samuli Suominen sqlite-2.8.16-r5.ebuild: - Respect environment LDFLAGS. - - 20 Mar 2012; Samuli Suominen sqlite-2.8.16-r5.ebuild: - Revert ${ED} to ${D} because of EAPI="0" by Agostino Sarubbo - - 20 Mar 2012; Samuli Suominen sqlite-2.8.16-r5.ebuild, - +files/sqlite-2.8.16-exit.patch: - Include stdlib.h for function exit() in temp.c generation. - - 20 Mar 2012; Agostino Sarubbo sqlite-3.7.10.ebuild: - Stable for amd64, wrt bug #408385 - - 16 Mar 2012; Brent Baude sqlite-3.7.10.ebuild: - Marking sqlite-3.7.10 ppc for bug 408385 - - 16 Mar 2012; Brent Baude sqlite-3.7.10.ebuild: - Marking sqlite-3.7.10 ppc64 for bug 408385 - - 05 Mar 2012; Markos Chandras metadata.xml: - Remove betelgeuse - -*sqlite-3.7.10 (18 Jan 2012) - - 18 Jan 2012; Markos Chandras +sqlite-3.7.10.ebuild: - Version bump. Ebuild by Arfrever - -*sqlite-3.7.9 (05 Nov 2011) - - 05 Nov 2011; Markos Chandras +sqlite-3.7.9.ebuild: - Version bump. Ebuild by Arfrever - -*sqlite-3.7.8 (20 Sep 2011) - - 20 Sep 2011; Mike Gilbert +sqlite-3.7.8.ebuild: - Version bump. Ebuild by Arfrever. - - 17 Sep 2011; Pacho Ramos metadata.xml: - Add Arfrever as proxy maintainer as requested by him. - - 13 Sep 2011; Pacho Ramos metadata.xml: - Drop maintainer due retirement, bug #246793 - -*sqlite-3.7.7.1-r1 (09 Sep 2011) -*sqlite-2.8.16-r5 (09 Sep 2011) - - 09 Sep 2011; Tomáš Chvátal - -sqlite-2.8.16-r4.ebuild, +sqlite-2.8.16-r5.ebuild, - -files/sqlite-3.6.22-dlopen.patch, - -files/sqlite-3.6.22-interix-fixes-amalgamation.patch, -sqlite-3.7.5.ebuild, - -files/sqlite-3.7.5-SQLITE_OMIT_WAL.patch, -files/sqlite-3.7.5-utimes.patch, - -sqlite-3.7.6.ebuild, -sqlite-3.7.6.2.ebuild, -sqlite-3.7.6.3.ebuild, - +sqlite-3.7.7.1-r1.ebuild: - Disable static libraries. Remove libtool archives. Use eapi4 on 3 series - ebuild. Remove overshadowed versions. - - 03 Sep 2011; Raúl Porcel sqlite-3.7.7.1.ebuild: - alpha/ia64/s390/sh/sparc stable wrt #372745 - - 28 Aug 2011; Markus Meier sqlite-3.7.7.1.ebuild: - arm stable, bug #372745 - - 26 Aug 2011; Fabian Groffen sqlite-3.7.7.1.ebuild: - Update comment for eautoreconf, it also fixes issues on Solaris, bug - #379281 - - 26 Aug 2011; Markos Chandras sqlite-3.7.7.1.ebuild: - Stable on amd64 wrt bug #372745 - - 26 Aug 2011; Thomas Kahle sqlite-3.7.7.1.ebuild: - x86 stable per bug 372745 - - 26 Aug 2011; Markus Duft sqlite-3.7.7.1.ebuild: - introduce eautoreconf for prefix platforms that need newer libtool - - 25 Aug 2011; Kacper Kowalik sqlite-3.7.7.1.ebuild: - ppc/ppc64 stable wrt #372745 - - 25 Aug 2011; Jeroen Roovers sqlite-3.7.7.1.ebuild: - Stable for HPPA (bug #372745). - - 07 Aug 2011; Raúl Porcel sqlite-3.7.6.3.ebuild: - alpha/ia64/s390/sh/sparc stable wrt #372307 - - 20 Jul 2011; Mark Loeser sqlite-3.7.6.3.ebuild: - Stable for ppc64; bug #372307 - - 11 Jul 2011; Markus Duft sqlite-3.7.7.1.ebuild, - +files/sqlite-3.7.7.1-interix-amalgamation.patch: - added build fix for systems missing ESTALE (interix) - -*sqlite-3.7.7.1 (01 Jul 2011) - - 01 Jul 2011; Markos Chandras +sqlite-3.7.7.1.ebuild: - Version bump. Requested by Arfrever - - 26 Jun 2011; Markus Meier sqlite-3.7.6.3.ebuild: - arm stable, bug #372307 - - 24 Jun 2011; Brent Baude sqlite-3.7.6.3.ebuild: - Marking sqlite-3.7.6.3 ppc for bug 372307 - - 20 Jun 2011; Markos Chandras sqlite-3.7.6.3.ebuild: - Stable on amd64 wrt bug #372307 - - 20 Jun 2011; Pawel Hajdan jr sqlite-3.7.6.3.ebuild: - x86 stable wrt bug #372307 - -*sqlite-3.7.6.3 (19 May 2011) - - 19 May 2011; Arfrever Frehtes Taifersar Arahesis - +sqlite-3.7.6.3.ebuild: - Version bump. - -*sqlite-3.7.6.2 (18 Apr 2011) - - 18 Apr 2011; Arfrever Frehtes Taifersar Arahesis - +sqlite-3.7.6.2.ebuild: - Version bump. - -*sqlite-3.7.6 (12 Apr 2011) - - 12 Apr 2011; Arfrever Frehtes Taifersar Arahesis - +sqlite-3.7.6.ebuild: - Version bump. - - 22 Mar 2011; Brent Baude sqlite-3.7.5.ebuild: - Marking sqlite-3.7.5 ppc64 and ppc for bug 357849 - - 20 Mar 2011; Raúl Porcel sqlite-3.7.5.ebuild: - alpha/ia64/s390/sh/sparc stable wrt #357849 - - 19 Mar 2011; Pawel Hajdan jr sqlite-3.7.5.ebuild: - x86 stable wrt bug #357849 - - 18 Mar 2011; Markus Meier sqlite-3.7.5.ebuild: - arm stable, bug #357849 - - 11 Mar 2011; Jeroen Roovers sqlite-3.7.5.ebuild: - Stable for HPPA (bug #357849). - - 09 Mar 2011; Markos Chandras sqlite-3.7.5.ebuild: - Stable on amd64 wrt bug #357849 - - 27 Feb 2011; Arfrever Frehtes Taifersar Arahesis - sqlite-3.7.5.ebuild, +files/sqlite-3.7.5-SQLITE_OMIT_WAL.patch: - Fix building with SQLITE_OMIT_WAL defined (bug #353967). - - 27 Feb 2011; Tobias Klausmann sqlite-3.7.3.ebuild: - Stable on alpha, bug #348079 - -*sqlite-3.7.5 (06 Feb 2011) - - 06 Feb 2011; Arfrever Frehtes Taifersar Arahesis - +sqlite-3.7.5.ebuild, +files/sqlite-3.7.5-utimes.patch: - Version bump (bug #353772). Fix building on FreeMiNT (bug #344353). Fixed - building of tests with USE="-threadsafe" (bug #348435). - - 13 Dec 2010; Jeroen Roovers sqlite-3.7.3.ebuild: - Stable for HPPA PPC (bug #348079). - -*sqlite-3.7.4 (12 Dec 2010) - - 12 Dec 2010; Arfrever Frehtes Taifersar Arahesis - -files/sandbox-fix2.patch, -sqlite-3.6.22-r2.ebuild, -sqlite-3.6.23.1.ebuild, - -sqlite-3.6.23.1-r1.ebuild, -sqlite-3.7.0.ebuild, +sqlite-3.7.4.ebuild, - +files/sqlite-3.7.4-utimes.patch: - Version bump. - - 28 Nov 2010; Brent Baude sqlite-3.7.3.ebuild: - Marking sqlite-3.7.3 ppc64 for bug 342323 - - 14 Nov 2010; Raúl Porcel sqlite-3.7.2.ebuild: - alpha/ia64/s390/sh/sparc stable wrt #342323 - - 01 Nov 2010; Arfrever Frehtes Taifersar Arahesis - sqlite-3.7.3.ebuild, +files/sqlite-3.7.3-icu_tests.patch: - Fix tests with USE="icu" (bug #342469). - -*sqlite-3.7.3 (31 Oct 2010) - - 31 Oct 2010; Petteri Räty +sqlite-3.7.3.ebuild: - Version bump. Enables extensions use flag by default as that's the - upstream default. Fixes bug #341257 and bug #335506. Tests still fail with - icu use flag like in 3.7.2. - - 30 Oct 2010; Markus Meier sqlite-3.7.2.ebuild: - arm stable, bug #342323 - - 30 Oct 2010; Mark Loeser sqlite-3.7.2.ebuild: - Stable for ppc64; bug #342847 - - 25 Oct 2010; Christian Faulhammer sqlite-3.7.2.ebuild: - x86 stable, bug 342323 - - 24 Oct 2010; Brent Baude sqlite-3.7.2.ebuild: - stable ppc, bug 342323 - - 23 Oct 2010; Markos Chandras sqlite-3.7.2.ebuild: - Stable on amd64 wrt bug #342323 - - 23 Oct 2010; Jeroen Roovers sqlite-3.7.2.ebuild: - Stable for HPPA (bug #341821). - - 10 Sep 2010; Arfrever Frehtes Taifersar Arahesis - metadata.xml: - Restore previous maintainer. - - 06 Sep 2010; Brent Baude sqlite-3.6.23.1.ebuild: - Marking sqlite-3.6.23.1 ppc64 for bug 320467 - - 30 Aug 2010; Petteri Räty sqlite-3.7.2.ebuild: - Fix running tests with USE=-tcl. Fixes bug #335179. - -*sqlite-3.7.2 (29 Aug 2010) - - 29 Aug 2010; Petteri Räty +sqlite-3.7.2.ebuild: - Version bump. Fixes bug #332747. - - 19 Aug 2010; Jeroen Roovers metadata.xml: - Remove arfrever. - - 14 Aug 2010; Raúl Porcel sqlite-3.6.23.1.ebuild: - ia64/s390/sh/sparc stable wrt #320467 - -*sqlite-3.7.0 (23 Jul 2010) - - 23 Jul 2010; Arfrever Frehtes Taifersar Arahesis - -sqlite-3.6.20-r1.ebuild, -files/sqlite-3.6.20-fts3.patch, - -sqlite-3.6.21.ebuild, -sqlite-3.6.23.ebuild, +sqlite-3.7.0.ebuild: - Version bump. - - 23 Jul 2010; Tobias Klausmann - sqlite-3.6.23.1.ebuild: - Stable on alpha, bug #320467 - - 21 Jul 2010; Markus Meier sqlite-3.6.23.1.ebuild: - arm stable, bug #320467 - - 26 Jun 2010; sqlite-3.6.23.1.ebuild: - ppc stable #320467 - -*sqlite-3.6.23.1-r1 (26 Jun 2010) - - 26 Jun 2010; Lars Wendler - +sqlite-3.6.23.1-r1.ebuild, metadata.xml: - non-maintainer commit: Added new local "unlock-notify" USE flag which - enables SQLITE_ENABLE_UNLOCK_NOTIFY (bug #323651). This is needed by - future mozilla products. Change added with kind permission from - Betelgeuse. - - 04 Jun 2010; Pawel Hajdan jr - sqlite-3.6.23.1.ebuild: - x86 stable wrt bug #320467 - - 30 May 2010; Markos Chandras sqlite-3.6.23.1.ebuild: - Stable on amd64 wrt bug #320467 - - 20 May 2010; Jeroen Roovers sqlite-3.6.23.1.ebuild: - Stable for HPPA (bug #320467). - -*sqlite-3.6.23.1 (18 Apr 2010) - - 18 Apr 2010; Arfrever Frehtes Taifersar Arahesis - +sqlite-3.6.23.1.ebuild: - Version bump. - - 19 Mar 2010; Fabian Groffen sqlite-3.6.23.ebuild: - Fix compilation on older Mac OS X systems by disabling new locking methods - that require features from Snow Leopard (10.6) - - 14 Mar 2010; Raúl Porcel sqlite-3.6.21.ebuild, - sqlite-3.6.22-r2.ebuild: - alpha/arm/ia64/s390/sh/sparc stable wrt #300145 - -*sqlite-3.6.23 (13 Mar 2010) - - 13 Mar 2010; Arfrever Frehtes Taifersar Arahesis - +sqlite-3.6.23.ebuild: - Version bump. - - 09 Mar 2010; Joseph Jezak sqlite-3.6.22-r2.ebuild: - Marked ppc stable for bug #307045. - - 08 Mar 2010; Brent Baude sqlite-3.6.22-r2.ebuild: - Marking sqlite-3.6.22-r2 ppc64 for bug 307045 - - 07 Mar 2010; Markus Meier sqlite-3.6.22-r2.ebuild: - amd64 stable, bug #307045 - - 05 Mar 2010; Christian Faulhammer - sqlite-3.6.22-r2.ebuild: - stable x86, security bug 307045 - -*sqlite-3.6.22-r2 (11 Feb 2010) - - 11 Feb 2010; Petteri Räty - +sqlite-3.6.22-r2.ebuild, metadata.xml: - Add use flag for secure delete functionality in sqlite. Fixes bug #303058. - - 11 Feb 2010; Christian Faulhammer sqlite-3.6.21.ebuild: - stable x86, bug 300145 - - 04 Feb 2010; Markus Duft sqlite-3.6.22-r1.ebuild: - fixed #300674 by enabling tcl with +test - fixed x86-interix prefix build by eautoreconfing - - 22 Jan 2010; Brent Baude sqlite-3.6.21.ebuild: - stable ppc, bug 300145 - -*sqlite-3.6.22-r1 (22 Jan 2010) - - 22 Jan 2010; Ben de Groot +sqlite-3.6.22-r1.ebuild, - +files/sqlite-3.6.22-dlopen.patch: - Adding dlopen.patch from Alexandre Rostovtsev in bug 300836 to fix link - failure with extensions enabled. - - 15 Jan 2010; Markus Duft sqlite-3.6.22.ebuild, - +files/sqlite-3.6.22-interix-fixes.patch, - +files/sqlite-3.6.22-interix-fixes-amalgamation.patch, - -files/sqlite-3.6.22-interix-no-estale.patch, - -files/sqlite-3.6.22-interix-utime-s.patch: - fixed interix patches for non-amalgamation builds - completely missed - those before. - - 14 Jan 2010; Jeremy Olexa sqlite-3.6.22.ebuild: - Disable interix patches until bug 300940 is resolved. Sorry. - - 14 Jan 2010; Markus Duft sqlite-3.6.22.ebuild, - +files/sqlite-3.6.22-interix-no-estale.patch, - +files/sqlite-3.6.22-interix-utime-s.patch: - fix build for ~x86-interix. interix misses ESTALE, and some versions miss - utimes() too. utime() as replacement should work on all platforms. - - 10 Jan 2010; Fabian Groffen sqlite-3.6.22.ebuild: - Run elibtoolize for FreeMiNT - - 10 Jan 2010; Arfrever Frehtes Taifersar Arahesis - sqlite-3.6.22.ebuild, metadata.xml: - Add "extensions" USE flag (bug #233994). - - 10 Jan 2010; Brent Baude sqlite-3.6.21.ebuild: - Marking sqlite-3.6.21 ppc64 for bug 300145 - - 09 Jan 2010; Christian Faulhammer sqlite-3.6.22.ebuild: - keyword ~x86-freebsd - - 08 Jan 2010; Fabian Groffen sqlite-3.6.22.ebuild: - Transfer Prefix keywords, make ebuild Prefix aware, fix compilation on - static-only platforms (bug #299294) - -*sqlite-3.6.22 (07 Jan 2010) - - 07 Jan 2010; Arfrever Frehtes Taifersar Arahesis - +sqlite-3.6.22.ebuild: - Version bump. - - 03 Jan 2010; Petteri Räty sqlite-3.6.21.ebuild: - Turn on fts3 by default because FF3 needs it. - - 02 Jan 2010; Raúl Porcel sqlite-3.6.20-r1.ebuild: - alpha/ia64/sparc stable - - 02 Jan 2010; Markus Meier sqlite-3.6.20-r1.ebuild: - arm stable, bug #297658 - - 27 Dec 2009; Christian Faulhammer - sqlite-3.6.20-r1.ebuild: - stable x86, bug 297658 - - 23 Dec 2009; Pacho Ramos sqlite-3.6.20-r1.ebuild: - amd64 stable, bug 297658 - - 22 Dec 2009; Jeroen Roovers sqlite-3.6.20-r1.ebuild: - Stable for PPC (bug #297658). - - 22 Dec 2009; Jeroen Roovers sqlite-3.6.20-r1.ebuild: - Stable for HPPA (bug #297532). - - 20 Dec 2009; Arfrever Frehtes Taifersar Arahesis - sqlite-3.6.21.ebuild: - Fix building with USE="icu -tcl -test" (bug #297534). - - 20 Dec 2009; Brent Baude sqlite-3.6.20-r1.ebuild: - Marking sqlite-3.6.20-r1 ppc64 for bug 297532 - - 20 Dec 2009; Brent Baude sqlite-3.6.20.ebuild: - Marking sqlite-3.6.20 ppc64 for bug 297532 - - 19 Dec 2009; Petteri Räty sqlite-3.6.21.ebuild: - Fix a couple QA issues with the last commit. - - 19 Dec 2009; Petteri Räty sqlite-3.6.21.ebuild: - Make building work without tcl installed using the amalgamation tarball - from upstream. Fixes tests to work with -tcl. Thanks to Andrew - . Fixes bug #297113 and bug #297332. - - 12 Dec 2009; Arfrever Frehtes Taifersar Arahesis - sqlite-3.6.21.ebuild: - Fix building and dependencies (bug #296245). SQLite's build system - requires TCL at build time for so called amalgamation build. SQLite's - upstream doesn't support non-amalgamation build. - -*sqlite-3.6.21 (08 Dec 2009) - - 08 Dec 2009; Arfrever Frehtes Taifersar Arahesis - +sqlite-3.6.21.ebuild: - Version bump. - - 29 Nov 2009; Raúl Porcel sqlite-3.6.19.ebuild: - alpha/ia64/s390/sh/sparc stable wrt #291913 - - 22 Nov 2009; Petteri Räty - sqlite-3.6.20-r1.ebuild, +files/sqlite-3.6.20-fts3.patch: - Fix bug #293405 so that fts3 support compiles when tcl is not installed. - The patch is applied only when tcl is not installed because otherwise the - build breaks. Because mozilla needs the support doing it like this so that - we get the fix in tree faster. Patch originally from anarchy. - - 17 Nov 2009; Brent Baude sqlite-3.6.19.ebuild: - Marking sqlite-3.6.19 ppc64 for bug 291913 - - 16 Nov 2009; Markus Meier sqlite-3.6.19.ebuild: - amd64/arm/x86 stable, bug #291913 - -*sqlite-3.6.20-r1 (15 Nov 2009) - - 15 Nov 2009; Petteri Räty - +sqlite-3.6.20-r1.ebuild, metadata.xml: - Add support for the fts3 module requested in bug #207701. - - 11 Nov 2009; Jeroen Roovers sqlite-3.6.19.ebuild: - Stable for HPPA (bug #291913). - - 08 Nov 2009; Mounir Lamouri sqlite-3.6.19.ebuild: - Stable for ppc, bug 291913 - -*sqlite-3.6.20 (04 Nov 2009) - - 04 Nov 2009; Arfrever Frehtes Taifersar Arahesis - +sqlite-3.6.20.ebuild: - Version bump. - - 31 Oct 2009; Brent Baude sqlite-3.6.18.ebuild: - Marking sqlite-3.6.18 ppc64 for bug 289415 - - 29 Oct 2009; Markus Meier sqlite-3.6.18.ebuild: - amd64/x86 stable, bug #289415 - - 27 Oct 2009; Tobias Klausmann sqlite-3.6.18.ebuild: - Stable on alpha, bug #289415 - - 26 Oct 2009; Jeroen Roovers sqlite-3.6.18.ebuild: - Stable for HPPA (bug #289415). - - 24 Oct 2009; Arfrever Frehtes Taifersar Arahesis - sqlite-3.6.19.ebuild, +files/sqlite-3.6.19-icu.test.patch: - Fix tests from icu.test. - - 24 Oct 2009; nixnut sqlite-3.6.18.ebuild: - ppc stable #289415 - -*sqlite-3.6.19 (17 Oct 2009) - - 17 Oct 2009; Arfrever Frehtes Taifersar Arahesis - -sqlite-3.6.16.ebuild, +sqlite-3.6.19.ebuild: - Version bump. - - 30 Sep 2009; Tobias Klausmann sqlite-3.6.17.ebuild: - Stable on alpha, bug #284340 - - 27 Sep 2009; nixnut sqlite-3.6.17.ebuild: - ppc stable #284340 - - 25 Sep 2009; Brent Baude sqlite-3.6.17.ebuild: - Marking sqlite-3.6.17 ppc64 for bug 284340 - - 18 Sep 2009; Jeroen Roovers sqlite-3.6.17.ebuild: - Stable for HPPA (bug #284340). - - 14 Sep 2009; Markus Meier sqlite-3.6.17.ebuild: - amd64/arm stable, bug #284340 - - 14 Sep 2009; Christian Faulhammer sqlite-3.6.17.ebuild: - stable x86, bug 284340 - -*sqlite-3.6.18 (11 Sep 2009) - - 11 Sep 2009; Arfrever Frehtes Taifersar Arahesis - +sqlite-3.6.18.ebuild: - Version bump. Add support for R-trees (bug #257646). Add "icu" USE flag. - - 08 Sep 2009; Arfrever Frehtes Taifersar Arahesis - sqlite-3.6.17.ebuild: - Add "readline" USE flag (bug #282225). - - 05 Sep 2009; Markus Meier sqlite-3.6.16.ebuild: - amd64 stable, bug #279398 - - 31 Aug 2009; Brent Baude sqlite-3.6.16.ebuild: - Marking sqlite-3.6.16 ppc64 for bug 279398 - - 29 Aug 2009; nixnut sqlite-3.6.16.ebuild: - ppc stable #279398 - - 28 Aug 2009; Tobias Klausmann sqlite-3.6.16.ebuild: - Stable on alpha, bug #279398 - - 20 Aug 2009; Arfrever Frehtes Taifersar Arahesis - sqlite-3.6.17.ebuild: - Fix building when dev-lang/tcl isn't installed (bug #281294). - - 17 Aug 2009; Jeroen Roovers sqlite-3.6.16.ebuild: - Stable for HPPA (bug #279398). - - 14 Aug 2009; Christian Faulhammer sqlite-3.6.16.ebuild: - stable x86, bug 279398 - - 12 Aug 2009; Arfrever Frehtes Taifersar Arahesis - sqlite-3.6.17.ebuild, +files/sqlite-3.6.17-fix_installation.patch: - Don't rebuild SQLite in src_install(). - -*sqlite-3.6.17 (10 Aug 2009) - - 10 Aug 2009; Arfrever Frehtes Taifersar Arahesis - -sqlite-3.6.13.ebuild, -sqlite-3.6.15.ebuild, +sqlite-3.6.17.ebuild: - Version bump. - - 27 Jul 2009; Arfrever Frehtes Taifersar Arahesis - sqlite-3.6.16.ebuild, +files/sqlite-3.6.16-tkt3922.test.patch: - Disable failing tests which were absent in previous versions. Don't check - FEATURES (bug #278870). - - 27 Jul 2009; nixnut sqlite-3.6.14.2.ebuild: - ppc stable #275592 - - 21 Jul 2009; Jeroen Roovers sqlite-3.6.14.2.ebuild: - Stable for HPPA (bug #275592). - - 11 Jul 2009; sqlite-3.6.14.2.ebuild: - Marked stable on AMD64 for bug #275592; tested on a dual Opteron 2354. - - 01 Jul 2009; Raúl Porcel sqlite-3.6.14.2.ebuild: - arm/ia64/s390/sh stable wrt #275592 - - 30 Jun 2009; Christian Faulhammer - sqlite-3.6.14.2.ebuild: - stable x86, bug 275592 - - 28 Jun 2009; Tobias Klausmann - sqlite-3.6.14.2.ebuild: - Stable on alpha, bug #275592 - -*sqlite-3.6.16 (27 Jun 2009) - - 27 Jun 2009; Arfrever Frehtes Taifersar Arahesis - -files/sandbox-fix1.patch, -files/sqlite-3.3.3-tcl-fix.patch, - -sqlite-3.6.12.ebuild, -sqlite-3.6.14.ebuild, - -files/sqlite-3-test-fix-3.3.4.patch, -sqlite-3.6.14.1.ebuild, - +sqlite-3.6.16.ebuild, -files/sqlite-64bit-test-fix.patch, - -files/sqlite-64bit-test-fix2.patch: - Version bump. - - 27 Jun 2009; Brent Baude sqlite-3.6.14.2.ebuild: - Marking sqlite-3.6.14.2 ppc64 for bug 275592 - - 27 Jun 2009; Ferris McCormick sqlite-3.6.14.2.ebuild: - Sparc stable, Bug #275592. - -*sqlite-3.6.15 (21 Jun 2009) - - 21 Jun 2009; Arfrever Frehtes Taifersar Arahesis - +sqlite-3.6.15.ebuild: - Version bump. Documentation seems to be no longer available. - - 28 May 2009; Ferris McCormick sqlite-3.6.14.2.ebuild: - re-keyword for ~sparc, Bug #270867 Comment #8, #10. - - 28 May 2009; Ferris McCormick - -files/sqlite-3.6.14.2-fix_alignment.patch: - Re-add the patch without the header change. - - 28 May 2009; Arfrever Frehtes Taifersar Arahesis - sqlite-3.6.14.2.ebuild, +files/sqlite-3.6.14.2-fix_alignment.patch: - Fix alignment (bug #270867). - -*sqlite-3.6.14.2 (26 May 2009) - - 26 May 2009; Arfrever Frehtes Taifersar Arahesis - +sqlite-3.6.14.2.ebuild: - Version bump. - - 24 May 2009; Markus Meier sqlite-3.6.13.ebuild: - x86 stable, bug #269998 - - 24 May 2009; Thomas Anderson - sqlite-3.6.13.ebuild: - stable amd64, bug 269998 - - 22 May 2009; Raúl Porcel sqlite-3.6.12.ebuild, - sqlite-3.6.14.ebuild, sqlite-3.6.14.1.ebuild: - Mark -sparc the versions that sigbus - -*sqlite-3.6.14.1 (20 May 2009) - - 20 May 2009; Arfrever Frehtes Taifersar Arahesis - -sqlite-3.6.11.ebuild, -files/sqlite-3.6.11-reference.patch, - +sqlite-3.6.14.1.ebuild: - Version bump. - - 19 May 2009; Brent Baude sqlite-3.6.13.ebuild: - stable ppc64, bug 269998 - - 16 May 2009; nixnut sqlite-3.6.13.ebuild: - ppc stable #269998 - - 16 May 2009; Tobias Klausmann sqlite-3.6.13.ebuild: - Stable on alpha, bug #269998 - - 09 May 2009; Arfrever Frehtes Taifersar Arahesis - sqlite-3.6.14.ebuild: - Fix building (bug #269075). - - 09 May 2009; Jeroen Roovers sqlite-3.6.13.ebuild: - Stable for HPPA (bug #267528). - -*sqlite-3.6.14 (08 May 2009) - - 08 May 2009; Arfrever Frehtes Taifersar Arahesis - -sqlite-3.6.6.2.ebuild, -sqlite-3.6.10.ebuild, - -files/sqlite-3.6.10-tcl-install.patch, +sqlite-3.6.14.ebuild: - Version bump. - - 07 May 2009; Raúl Porcel sqlite-3.6.13.ebuild: - arm/ia64/s390/sh/sparc stable wrt #267528 - - 04 May 2009; Brent Baude sqlite-3.6.12.ebuild: - Marking sqlite-3.6.12 ppc64 for bug 267528 - - 03 May 2009; Tobias Klausmann ChangeLog: - Stable on alpha, bug #267528 - - 03 May 2009; Markus Meier sqlite-3.6.12.ebuild: - amd64/x86 stable, bug #267528 - - 02 May 2009; nixnut sqlite-3.6.12.ebuild: - ppc stable #267528 - - 27 Apr 2009; Jeroen Roovers sqlite-3.6.11: - Stable for HPPA (bug #264514). - - 18 Apr 2009; Arfrever Frehtes Taifersar Arahesis - sqlite-3.6.13: - Enable column metadata (bug #266651). - -*sqlite-3.6.13 (14 Apr 2009) - - 14 Apr 2009; Arfrever Frehtes Taifersar Arahesis - metadata.xml, +sqlite-3.6.13.ebuild: - Version bump. - - 07 Apr 2009; Tobias Klausmann sqlite-3.6.11.ebuild: - Stable on alpha, bug #264514 - - 05 Apr 2009; Markus Meier sqlite-3.6.11.ebuild: - amd64/x86 stable, bug #264514 - - 04 Apr 2009; Arfrever Frehtes Taifersar Arahesis - sqlite-3.6.11.ebuild, sqlite-3.6.12.ebuild: - Fix typo in src_test(). - - 04 Apr 2009; Brent Baude sqlite-3.6.11.ebuild: - Marking sqlite-3.6.11 ppc for bug 264514 - - 04 Apr 2009; Brent Baude sqlite-3.6.11.ebuild: - stable ppc64, bug 264514 - - 01 Apr 2009; Mike Frysinger sqlite-3.6.12.ebuild: - Upstream changed the released tarball. - -*sqlite-3.6.12 (01 Apr 2009) - - 01 Apr 2009; Mike Frysinger +sqlite-3.6.12.ebuild: - Version bump. - - 31 Mar 2009; Mike Frysinger sqlite-3.6.11.ebuild: - Cleanup ebuild a bit and avoid running autotools. - -*sqlite-3.6.11 (01 Mar 2009) - - 01 Mar 2009; Thomas Sachau (Tommy[D]) - +files/sqlite-3.6.11-reference.patch, +sqlite-3.6.11.ebuild: - Version bump - - 26 Feb 2009; Brent Baude sqlite-3.6.10.ebuild: - stable ppc64, bug 259462 - - 21 Feb 2009; Jeroen Roovers sqlite-3.6.10.ebuild: - Stable for HPPA (bug #259462). - - 20 Feb 2009; Raúl Porcel sqlite-3.6.10.ebuild: - alpha/arm/ia64/s390/sh/x86 stable wrt #259462 - - 19 Feb 2009; nixnut sqlite-3.6.10.ebuild: - ppc stable #259462 - - 18 Feb 2009; Mike Frysinger - files/sqlite-3.6.10-tcl-install.patch: - Fix installing when sqlite isnt installed already. - - 18 Feb 2009; Ferris McCormick sqlite-3.6.10.ebuild: - Sparc stable, Bug #259462. - - 18 Feb 2009; Petteri Räty -sqlite-3.4.1.ebuild, - -sqlite-3.5.3.ebuild, -sqlite-3.5.6.ebuild, -sqlite-3.5.9.ebuild, - -sqlite-3.6.8.ebuild: - Remove old versions. - - 31 Jan 2009; Tobias Klausmann sqlite-3.6.6.2.ebuild: - Stable on alpha, bug #254864 - - 31 Jan 2009; Jeroen Roovers sqlite-3.6.6.2.ebuild: - Stable for HPPA (bug #254864). - - 26 Jan 2009; Mike Frysinger - +files/sqlite-3.6.10-tcl-install.patch, sqlite-3.6.10.ebuild: - Fixup tcl lib install by using libtool rather than manual copy. - - 23 Jan 2009; Raúl Porcel sqlite-3.6.6.2.ebuild: - arm/ia64/s390/sh stable wrt #254684 - -*sqlite-3.6.10 (18 Jan 2009) - - 18 Jan 2009; Petteri Räty +sqlite-3.6.10.ebuild: - Version bump. Fixes bug #255406. - - 18 Jan 2009; Markus Meier sqlite-3.6.6.2.ebuild: - amd64/x86 stable, bug #254864 - - 18 Jan 2009; Tobias Klausmann sqlite-3.6.6.2.ebuild: - Stable on alpha, bug #254864 - - 18 Jan 2009; Tobias Klausmann ChangeLog: - Stable on alpha, bug #254864 - - 16 Jan 2009; Steve Dibb ChangeLog: - amd64 stable, bug 254864 - - 13 Jan 2009; Brent Baude sqlite-3.6.6.2.ebuild: - Marking sqlite-3.6.6.2 ppc for bug 254864 - - 13 Jan 2009; Brent Baude sqlite-3.6.6.2.ebuild: - Marking sqlite-3.6.6.2 ppc64 for bug 254864 - - 13 Jan 2009; Ferris McCormick sqlite-3.6.6.2.ebuild: - Sparc stable, bug #254864. - -*sqlite-3.6.8 (13 Jan 2009) - - 13 Jan 2009; Petteri Räty +sqlite-3.6.8.ebuild: - Version bump. Fixes bug #251461. - - 04 Dec 2008; Petteri Räty sqlite-3.6.6.2.ebuild: - Add link to upstream bug on doc naming schema. - - 04 Dec 2008; Zac Medico sqlite-3.6.6.2.ebuild: - Bug #249737 - Fix incorrect path in dohtml call. - -*sqlite-3.6.6.2 (03 Dec 2008) - - 03 Dec 2008; Tomas Chvatal -sqlite-3.6.2.ebuild, - +sqlite-3.6.6.2.ebuild: - Version bump, remove problematic one. Fixes bug #238978. - -*sqlite-3.6.2 (15 Sep 2008) - - 15 Sep 2008; Petteri Räty +sqlite-3.6.2.ebuild: - Version bump. Fixes bug #234414 and bug #237222. Can possibly break code - building against sqlite, see upstream release notes. - - 05 Aug 2008; Ulrich Mueller metadata.xml: - Add USE flag description to metadata wrt GLEP 56. - - 07 Jul 2008; Raúl Porcel sqlite-3.5.9.ebuild: - alpha/ia64 stable wrt #230643 - - 05 Jul 2008; Thomas Anderson sqlite-3.5.9.ebuild: - stable amd64, bug 230643 - - 05 Jul 2008; Jeroen Roovers sqlite-3.5.9.ebuild: - Stable for HPPA (bug #230643). - - 05 Jul 2008; Ferris McCormick sqlite-3.5.9.ebuild: - Sparc stable --- Bug #230643 --- good for about 6 weeks now. - - 05 Jul 2008; Brent Baude sqlite-3.5.9.ebuild: - stable ppc64, bug 230643 - - 05 Jul 2008; Brent Baude sqlite-3.5.9.ebuild: - stable ppc, bug 230643 - - 05 Jul 2008; Christian Faulhammer sqlite-3.5.9.ebuild: - stable x86, bug 230643 - -*sqlite-3.5.9 (22 May 2008) - - 22 May 2008; Petteri Räty +sqlite-3.5.9.ebuild: - Version bump. Fixes bug #209796, bug #214015 and bug #213504." - - 21 Mar 2008; Brent Baude sqlite-3.5.6.ebuild: - stable ppc64, bug 213500 - - 16 Mar 2008; Kenneth Prugh sqlite-3.5.6.ebuild: - amd64 stable, bug #213500 - - 16 Mar 2008; Raúl Porcel sqlite-3.5.6.ebuild: - alpha/ia64 stable wrt #213500 - - 16 Mar 2008; Jeroen Roovers sqlite-3.5.6.ebuild: - Stable for HPPA (bug #213500). - - 16 Mar 2008; Dawid Węgliński sqlite-3.5.6.ebuild: - Stable on x86 (bug #213500) - - 15 Mar 2008; Ferris McCormick sqlite-3.5.6.ebuild: - Sparc stable --- Bug #213500 --- All 45751 tests good and running well for - over 30 days. - - 15 Mar 2008; Tobias Scherbaum sqlite-3.5.6.ebuild: - ppc stable, bug #213500 - - 11 Mar 2008; Petteri Räty -sqlite-3.5.4.ebuild: - Remove package.masked ebuild. - - 11 Mar 2008; Petteri Räty -sqlite-3.3.17.ebuild, - sqlite-3.5.3.ebuild, sqlite-3.5.6.ebuild: - Add DEPEND on app-arch/unzip for use doc. Fixes bug #213055. Remove old - stable mips version because we don't have a stable tcl any more. - - 14 Feb 2008; Santiago M. Mola sqlite-3.5.3.ebuild: - amd64 stable wrt bug #205556 - -*sqlite-3.5.6 (10 Feb 2008) - - 10 Feb 2008; Petteri Räty +sqlite-3.5.6.ebuild: - Version bump. Fixes bug #209592. - - 15 Jan 2008; Jeroen Roovers sqlite-3.5.3.ebuild: - Stable for HPPA (bug #205556). - - 15 Jan 2008; Raúl Porcel sqlite-3.5.3.ebuild: - alpha/ia64/sparc stable wrt #205556 - - 13 Jan 2008; Christian Faulhammer sqlite-3.5.3.ebuild: - stable x86, bug 205556 - - 13 Jan 2008; Brent Baude sqlite-3.5.3.ebuild: - Marking sqlite-3.5.3 ppc64 for bug 205556 - - 13 Jan 2008; nixnut sqlite-3.5.3.ebuild: - Stable on ppc wrt bug 205556 - - 13 Jan 2008; Petteri Räty sqlite-3.5.4.ebuild: - Fix doc bundle installation for 3.5.4. Upstream changed the directory name. - - 08 Jan 2008; Petteri Räty sqlite-3.5.3.ebuild, - sqlite-3.5.4.ebuild: - Fix doc use flag. The documentation comes in a separate tarball since 3.5. - Fixes bug #203107. - - 08 Jan 2008; Petteri Räty -sqlite-3.3.12.ebuild, - -sqlite-3.4.2.ebuild: - Remove obsolete versions. - -*sqlite-3.5.4 (17 Dec 2007) - - 17 Dec 2007; Petteri Räty +sqlite-3.5.4.ebuild: - Version bump. - -*sqlite-3.5.3 (07 Dec 2007) - - 07 Dec 2007; Petteri Räty +sqlite-3.5.3.ebuild: - Version bump. Fixes bug #194806. Thanks to Arfrever Frehtes Taifersar - Arahesis . Now uses EAPI 1 for default use flag - values so change the nothreadsafe use flag to threadsafe. - - 18 Nov 2007; Tobias Scherbaum sqlite-3.4.1.ebuild: - ppc stable, bug #194812 - - 12 Nov 2007; Raúl Porcel sqlite-3.4.1.ebuild: - alpha stable wrt security #194812 - - 18 Oct 2007; Christoph Mende sqlite-3.4.1.ebuild: - Stable on amd64 wrt bug #194812 - - 16 Oct 2007; Markus Rothe sqlite-3.4.1.ebuild: - Stable on ppc64; bug #194812 - -*sqlite-3.4.2 (12 Oct 2007) - - 12 Oct 2007; Robin H. Johnson +sqlite-3.4.2.ebuild: - Upstream version bump with fix for potential database corruption. - - 06 Oct 2007; Jeroen Roovers sqlite-3.4.1.ebuild: - Stable for HPPA (bug #194812). - - 06 Oct 2007; Raúl Porcel sqlite-3.4.1.ebuild: - ia64/x86 stable wrt #194812 - - 05 Oct 2007; Ferris McCormick sqlite-3.4.1.ebuild: - Sparc stable --- Bug #194812 --- running for over 2 months. - - 20 Sep 2007; Anant Narayanan ChangeLog: - Fix digest - - 24 Jul 2007; Raúl Porcel sqlite-3.3.17.ebuild: - ia64 stable - -*sqlite-3.4.1 (24 Jul 2007) - - 24 Jul 2007; Petteri Räty +sqlite-3.4.1.ebuild: - Version bump. Fixes bug #185574. - - 02 Jul 2007; Petteri Räty - -sqlite-3.3.5-r1.ebuild: - Remove old version. - - 28 Jun 2007; Joshua Kinard sqlite-3.3.17.ebuild: - Stable on mips, per #182013. - - 15 Jun 2007; Tobias Scherbaum - sqlite-3.3.17.ebuild: - ppc stable, bug #182013 - - 15 Jun 2007; Raúl Porcel sqlite-3.3.17.ebuild: - ia64 stable wrt #182013 - - 15 Jun 2007; Markus Rothe sqlite-3.3.17.ebuild: - Stable on ppc64; bug #182013 - - 15 Jun 2007; Christoph Mende sqlite-3.3.17.ebuild: - Stable on amd64 wrt bug 182013 - - 14 Jun 2007; Petteri Räty - sqlite-2.8.16-r4.ebuild, sqlite-3.3.5-r1.ebuild, sqlite-3.3.12.ebuild: - Fix the rest of the ebuilds wrt tcl and test suite. - - 14 Jun 2007; Petteri Räty sqlite-3.3.17.ebuild: - Fix the test broken RESTRICT atom that Cardoe added. The tcl use flag must - be on, not off for the test suite to work. - - 14 Jun 2007; Raúl Porcel sqlite-3.3.17.ebuild: - alpha/ia64/x86 stable wrt #182013 - - 14 Jun 2007; Jeroen Roovers sqlite-3.3.17.ebuild: - Stable for HPPA (bug #182013). - - 14 Jun 2007; Ferris McCormick sqlite-3.3.17.ebuild: - Sparc stable --- Bug #182013 --- Seems to have worked well for 6 weeks. - - 14 Jun 2007; Jose Luis Rivero sqlite-3.3.12.ebuild: - Stable on alpha wrt bug #176942 - - 23 May 2007; Doug Goldstein sqlite-2.8.16-r4.ebuild, - sqlite-3.3.5-r1.ebuild, sqlite-3.3.12.ebuild, sqlite-3.3.17.ebuild: - Fixing FEATURES=test to be properly RESTRICTed as per ferringb's fixes - - 08 May 2007; Roy Marples sqlite-2.8.16-r4.ebuild: - Added ~sparc-fbsd keyword. - - 06 May 2007; Markus Rothe sqlite-3.3.12.ebuild: - Stable on ppc64; bug #176942 - - 05 May 2007; nixnut sqlite-3.3.12.ebuild: - Stable on ppc wrt bug 176942 - - 04 May 2007; Jeroen Roovers sqlite-3.3.12.ebuild: - Stable for HPPA (bug #176942). - - 04 May 2007; Gustavo Zacarias sqlite-3.3.12.ebuild: - Stable on sparc wrt #176942 - - 04 May 2007; Raúl Porcel sqlite-3.3.12.ebuild: - ia64 + x86 stable wrt #176942 - -*sqlite-3.3.17 (03 May 2007) - - 03 May 2007; Petteri Räty metadata.xml, - +sqlite-3.3.17.ebuild: - Version bump. Makes the soundex function available with the soundex local - use flag. Fixes bug #168304 and bug #143794. Add myself to metadata.xml - until someone else takes over. - - 03 May 2007; Steve Dibb sqlite-3.3.12.ebuild: - amd64 stable, bug 176942 - - 10 Mar 2007; Luca Longinotti - -files/sqlite-3.2.1-data-corruption.patch, - -files/sqlite3-configure-debug.patch, -files/sqlite-3.2.1-tcl-fix.patch, - -files/sqlite-3-test-fix.patch, metadata.xml, -sqlite-2.8.16-r1.ebuild, - sqlite-2.8.16-r4.ebuild, -sqlite-3.2.1-r3.ebuild, sqlite-3.3.5-r1.ebuild, - -sqlite-3.3.6.ebuild, sqlite-3.3.12.ebuild: - Cleanup/fixup ebuilds, remove old ebuilds and patches, fix bug #156299. - - 02 Feb 2007; Petteri Räty sqlite-3.3.12.ebuild: - The optional tcl support in sqlite must be enabled in sqlite to run tests. - Just having tcl is not enough. - -*sqlite-3.3.12 (02 Feb 2007) - - 02 Feb 2007; Petteri Räty +sqlite-3.3.12.ebuild: - Version bump. Fixes bug #157214 and bug #159197. - - 31 Jan 2007; Marius Mauch sqlite-2.8.16-r4.ebuild: - Replacing einfo with elog - - 01 Jan 2007; Petteri Räty - sqlite-2.8.16-r1.ebuild, sqlite-3.2.1-r3.ebuild, sqlite-3.3.5-r1.ebuild, - sqlite-3.3.6.ebuild: - Remove virtual/libc from DEPEND. - - 01 Jan 2007; Petteri Räty -sqlite-2.8.15.ebuild, - -sqlite-2.8.16-r3.ebuild, -sqlite-3.2.7-r1.ebuild, -sqlite-3.3.4.ebuild, - -sqlite-3.3.5.ebuild: - Removed old versions. - - 01 Jan 2007; Petteri Räty metadata.xml: - Removed arj as he is retired - - 15 Nov 2006; Diego Pettenò sqlite-3.3.6.ebuild: - Run elibtoolize. - - 11 Nov 2006; Alexander H. Færøy - sqlite-2.8.16-r4.ebuild: - Stable on MIPS. Bug 118429. - - 27 Oct 2006; Roy Marples sqlite-3.3.6.ebuild: - Added ~sparc-fbsd keyword. - - 21 Oct 2006; Bryan Østergaard - sqlite-2.8.16-r4.ebuild: - Stable on Alpha. - - 05 Oct 2006; Ilya A. Volynets-Evenbach - sqlite-3.3.5-r1.ebuild: - Stable on mips - - 23 Aug 2006; Gustavo Zacarias - sqlite-2.8.16-r4.ebuild, sqlite-3.3.5-r1.ebuild: - Stable on hppa wrt #118429 - - 08 Aug 2006; Chris Gianelloni - sqlite-2.8.16-r4.ebuild, sqlite-3.3.5-r1.ebuild: - Stable on amd64 and x86 wrt bug #118429. - - 01 Aug 2006; Torsten Veller sqlite-3.3.5-r1.ebuild, - sqlite-3.3.6.ebuild: - Fixed typo in src_test: usepriv -> userpriv - - 28 Jul 2006; Doug Goldstein sqlite-2.8.16-r1.ebuild, - sqlite-2.8.16-r3.ebuild, sqlite-2.8.16-r4.ebuild, sqlite-3.3.4.ebuild, - sqlite-3.3.5.ebuild, sqlite-3.3.5-r1.ebuild, sqlite-3.3.6.ebuild: - USE flag change. tcltk -> tcl per bug #17808 - - 22 Jul 2006; Tobias Scherbaum - sqlite-2.8.16-r4.ebuild, sqlite-3.3.5-r1.ebuild: - ppc stable, bug #118429 - - 12 Jul 2006; Aron Griffis sqlite-2.8.16-r4.ebuild, - sqlite-3.3.5-r1.ebuild: - Mark 3.3.5-r1 2.8.16-r4 stable on ia64 #118429 - - 26 Jun 2006; Javier Villavicencio - sqlite-2.8.16-r4.ebuild, sqlite-3.3.6.ebuild: - Add ~x86-fbsd keyword. - -*sqlite-3.3.6 (23 Jun 2006) - - 23 Jun 2006; Anders Rune Jensen +sqlite-3.3.6.ebuild: - New version fixes #137466 - - 21 Jun 2006; Markus Rothe sqlite-2.8.16-r4.ebuild, - sqlite-3.3.5-r1.ebuild: - Stable on ppc64; bug #118429 - - 20 Jun 2006; Ferris McCormick sqlite-3.3.5-r1.ebuild: - Stable on sparc at developer's request --- Bug #118429 (works as expected with - no problems noted). - - 20 Jun 2006; Ferris McCormick sqlite-2.8.16-r4.ebuild: - Stable on sparc --- Bug #118429 --- has worked fine for me for six or seven - weeks. - - 11 Jun 2006; Fabian Groffen sqlite-2.8.16-r1.ebuild: - Marked ppc-macos stable for progressive users (bug #109044) - - 06 May 2006; Seemant Kulleen sqlite-2.8.16-r3.ebuild, - sqlite-2.8.16-r4.ebuild, sqlite-3.3.4.ebuild, sqlite-3.3.5.ebuild, - sqlite-3.3.5-r1.ebuild: - Skip tests gracefully, based on my changes last time. Also, migrate those - changes to the two sqlite-2 ebuilds. - - 04 May 2006; Seemant Kulleen sqlite-3.3.4.ebuild, - sqlite-3.3.5.ebuild, sqlite-3.3.5-r1.ebuild: - Two fixes: 1. no need to die, because a test can't run due to USE flag - combinations. A warning will suffice. 2. Replaced spaces with tabs for - indenting - -*sqlite-3.3.5-r1 (04 May 2006) -*sqlite-2.8.16-r4 (04 May 2006) - - 04 May 2006; Anders Rune Jensen - +sqlite-3.3.5-r1.ebuild, +sqlite-2.8.16-r4.ebuild: - Last change required a bump. So here it is. - - 04 May 2006; Anders Rune Jensen sqlite-3.3.5.ebuild, - sqlite-2.8.16-r3.ebuild: - Use alternatives to install lemon binary. Thanks tove in #118429 for the - tip - - 13 Apr 2006; Anders Rune Jensen sqlite-3.3.5.ebuild: - Fix bug #129764 (compile with debug fails). - -*sqlite-3.3.5 (12 Apr 2006) - - 12 Apr 2006; Anders Rune Jensen +sqlite-3.3.5.ebuild, - -sqlite-3.3.3.ebuild, -sqlite-3.3.3-r1.ebuild, -sqlite-2.8.13.ebuild, - -sqlite-2.8.14.ebuild, -sqlite-2.8.16-r2.ebuild, -sqlite-3.2.7.ebuild: - New version. Remove old versions. - -*sqlite-3.3.4 (13 Feb 2006) - - 13 Feb 2006; Anders Rune Jensen +sqlite-3.3.4.ebuild: - New version. Bugfix release. - -*sqlite-3.3.3-r1 (05 Feb 2006) -*sqlite-2.8.16-r3 (05 Feb 2006) - - 05 Feb 2006; Anders Rune Jensen - +sqlite-3.3.3-r1.ebuild, +sqlite-2.8.16-r3.ebuild: - Make test work. Fixes #121489, #118429, #111774, #105524, #69640, - #36076. Fixed multilib-strict problems in 3.3.3 and enabled thread - sharing (new feature in 3.3) - -*sqlite-3.3.3 (02 Feb 2006) - - 02 Feb 2006; Anders Rune Jensen +sqlite-3.3.3.ebuild: - New release. Fixes #121313 - - 19 Nov 2005; Rene Nussbaumer - sqlite-2.8.16-r1.ebuild: - Stable on hppa. - - 17 Nov 2005; Guy Martin sqlite-2.8.15.ebuild, - sqlite-2.8.16-r1.ebuild, sqlite-2.8.16-r2.ebuild: - Added cd ${S} to fix patching on hppa. - - 07 Nov 2005; Anders Rune Jensen sqlite-3.2.7.ebuild: - Removed stable mark on amd64. Has problems with multilib-strict - -*sqlite-3.2.7-r1 (06 Nov 2005) -*sqlite-2.8.16-r2 (06 Nov 2005) - - 06 Nov 2005; Anders Rune Jensen - +sqlite-3.2.7-r1.ebuild, +sqlite-2.8.16-r2.ebuild: - Fix #102117 - - 06 Nov 2005; Anders Rune Jensen sqlite-3.2.7.ebuild: - Marked stable on amd64. Fixes #106703 - - 12 Oct 2005; Anders Rune Jensen -sqlite-3.2.1-r1, - -sqlite-3.2.1-r2, -sqlite-3.2.2, -sqlite-3.2.5, -sqlite-3.2.6, - -sqlite-2.8.16: - Remove old versions - -*sqlite-3.2.7 (07 Oct 2005) - - 07 Oct 2005; Anders Rune Jensen +sqlite-3.2.7.ebuild: - New release. - - 20 Sep 2005; Anders Rune Jensen metadata.xml: - Remove coredumb since he has been inactive for quite a while. - -*sqlite-3.2.6 (18 Sep 2005) - - 18 Sep 2005; Anders Rune Jensen +sqlite-3.2.6.ebuild: - New release. - -*sqlite-3.2.5 (18 Sep 2005) - - 18 Sep 2005; Anders Rune Jensen +sqlite-3.2.5.ebuild: - New release. - - 22 Aug 2005; Aaron Walker sqlite-3.2.1-r3.ebuild, - sqlite-3.2.2.ebuild: - Added ~mips. - - 03 Jul 2005; Bryan Østergaard sqlite-3.2.1-r3.ebuild: - Stable on alpha. - - 18 Jun 2005; Michael Hanselmann - sqlite-3.2.1-r3.ebuild: - Stable on ppc. - -*sqlite-3.2.2 (18 Jun 2005) - - 18 Jun 2005; Anders Rune Jensen +sqlite-3.2.2.ebuild: - New release. - - 21 May 2005; Guy Martin sqlite-3.2.1-r3.ebuild: - Stable on hppa. - - 21 May 2005; Markus Rothe sqlite-3.2.1-r3.ebuild: - Stable on ppc64 - - 26 Apr 2005; Gustavo Zacarias - sqlite-3.2.1-r3.ebuild: - Stable on sparc - - 24 Apr 2005; Anders Rune Jensen - sqlite-3.2.1-r3.ebuild: - Stable on x86 and amd64. - -*sqlite-3.2.1-r3 (24 Apr 2005) - - 24 Apr 2005; Anders Rune Jensen - +sqlite-3.2.1-r3.ebuild, +files/sqlite-3.2.1-tcl-fix: - Fix #90258. Thanks to Ferris McCormick for suggestions. - - 24 Apr 2005; Anders Rune Jensen files/sqlite-3.2.1-data-corruption.patch: - Fix patch to work with cvs. - -*sqlite-3.2.1-r2 (24 Apr 2005) - - 24 Apr 2005; Anders Rune Jensen +sqlite-3.2.1-r2.ebuild: - Fix integer data corruption. Fixes #89504. - - 18 Apr 2005; Michael Hanselmann - sqlite-3.2.1-r1.ebuild: - Stable on ppc. - - 18 Apr 2005; Gustavo Zacarias - sqlite-3.2.1-r1.ebuild: - Stable on sparc - - 17 Apr 2005; Anders Rune Jensen sqlite-3.2.1-r1.ebuild: - Stable on x86 and amd64. - - 14 Apr 2005; Bryan Østergaard - sqlite-2.8.16-r1.ebuild: - Stable on alpha. - - 09 Apr 2005; Michael Hanselmann - sqlite-2.8.16-r1.ebuild: - Stable on ppc. - - 09 Apr 2005; Markus Rothe sqlite-3.2.1-r1.ebuild: - Added ~ppc64 to KEYWORDS - - 08 Apr 2005; Markus Rothe sqlite-2.8.16-r1.ebuild: - Stable on ppc64 - - 05 Apr 2005; Anders Rune Jensen - sqlite-2.8.16-r1.ebuild, sqlite-3.2.1-r1.ebuild: - Add useflag doc to install html documentation. This removes the - dependency on tcl by default. Thanks to Clinton James for the - suggestion. Add doc flag to 3.2.1-r1 as 3.2.1 now supports generating - documentation again. - - 04 Apr 2005; Gustavo Zacarias - sqlite-2.8.16-r1.ebuild: - Stable on sparc - - 02 Apr 2005; Anders Rune Jensen -sqlite-3.2.1.ebuild, - -sqlite-3.1.6.ebuild, -sqlite-3.1.5.ebuild, -sqlite-3.1.3.ebuild, - -sqlite-3.1.2.ebuild, -sqlite-3.0.8-r1.ebuild, -sqlite-3.0.8.ebuild, - -sqlite-3.0.7.ebuild, -sqlite-3.0.6.ebuild, -sqlite-3.2.0.ebuild, - +sqlite-2.8.16-r1, +sqlite-3.2.1-r1: - Mark 2.8.16-r1 stable on x86 and amd64. Fix #85744. Remove old broken - sqlite3 versions. Fix manpage installation with sqlite3. Fix #36076 by - including patch from Sean Woods to build TCL libs. - -*sqlite-3.2.1 (29 Mar 2005) - - 29 Mar 2005; Anders Rune Jensen +sqlite-3.2.1.ebuild: - New version. Fixes #86858. - -*sqlite-3.2.0 (24 Mar 2005) - - 24 Mar 2005; Anders Rune Jensen +sqlite-3.2.0.ebuild: - New version. Fixes #86395. - -*sqlite-3.1.6 (19 Mar 2005) - - 19 Mar 2005; Anders Rune Jensen +sqlite-3.1.6.ebuild: - New version which fixes another corruption bug. I don't think 3.x - will be going stable anytime soon. - -*sqlite-3.1.5 (12 Mar 2005) - - 12 Mar 2005; Anders Rune Jensen +sqlite-3.1.5.ebuild: - New version. - - 04 Mar 2005; Kito sqlite-3.1.3.ebuild: - ~ppc-macos keyword - -*sqlite-3.1.3 (02 Mar 2005) - - 02 Mar 2005; Anders Rune Jensen +sqlite-3.1.3.ebuild: - New version. - - 19 Feb 2005; Anders Rune Jensen sqlite-3.1.2.ebuild: - Fix #82438. - - 17 Feb 2005; Jeremy Huddleston - +files/sqlite-2.8.16-multilib.patch, sqlite-2.8.16.ebuild, - sqlite-3.1.2.ebuild: - Stop using einstall. Multilib fixes. - -*sqlite-3.1.2 (15 Feb 2005) - - 15 Feb 2005; Anders Rune Jensen +sqlite-3.1.2.ebuild: - New stable release of the 3.1 series. - -*sqlite-2.8.16 (15 Feb 2005) - - 15 Feb 2005; Anders Rune Jensen +sqlite-2.8.16.ebuild: - new version. Fixes critical bug. - - 29 Dec 2004; Ciaran McCreesh : - Change encoding to UTF-8 for GLEP 31 compliance - - 20 Dec 2004; Dylan Carlson sqlite-2.8.15.ebuild: - Stable on amd64. - - 12 Dec 2004; Bryan Østergaard sqlite-2.8.15.ebuild: - Stable on alpha. - -*sqlite-3.0.8-r1 (04 Dec 2004) - - 04 Dec 2004; Armando Di Cianno +sqlite-3.0.8-r1.ebuild: - I have added a sqlite-3.0.8-r1 which incorporates a "nothreadsafe" USE flag, - and thus enables thread safety by default. I would have rather not have added - a "noflag" and bump the package, but this at least enforces proper behavior of - the library, if one where to upgrade sqlite. This had to be done as the - package was broken for me and many others without thread safety. - - 11 Nov 2004; Jeremy Huddleston - sqlite-3.0.8.ebuild: - Readding archs that were mistakenly dropped during version bumps. - - 09 Nov 2004; Aron Griffis sqlite-3.0.8.ebuild: - add ~alpha and ~ia64 - - 09 Nov 2004; Anders Rune Jensen sqlite-2.8.15.ebuild: - Stable for x86. - - 09 Nov 2004; Anders Rune Jensen -sqlite-3.0.5.ebuild, - -sqlite-2.8.11.ebuild, -sqlite-2.8.12.ebuild, -sqlite-2.8.3.ebuild: - Remove old versions. - - 09 Nov 2004; Ferris McCormick sqlite-2.8.15.ebuild: - Stable for sparc. - - 07 Nov 2004; Joshua Kinard sqlite-2.8.15.ebuild: - Marked stable on mips. - - 01 Nov 2004; Lars Weiler sqlite-2.8.15.ebuild: - Stable on ppc for PHP5, Bug #60442. - -*sqlite-3.0.8 (29 Oct 2004) - 29 Oct 2004; Anders Rune Jensen +sqlite-3.0.8.ebuild: - New release. - - 17 Oct 2004; Dylan Carlson sqlite-2.8.14.ebuild: - stable on amd64. - - 12 Oct 2004; Guy Martin - files/sqlite-2.8.15-alignement-fix.patch: - Woops, typo in the patch. - - 11 Oct 2004; Guy Martin sqlite-2.8.15.ebuild: - Added a alignement fix for hppa. Stable on hppa. - - 09 Oct 2004; Jason Wever sqlite-3.0.7.ebuild: - Added ~sparc keyword. - -*sqlite-3.0.7 (03 Oct 2004) - 03 Oct 2004; Anders Rune Jensen +sqlite-3.0.7.ebuild: - New release. 3.0 is now considered stable by the sqlite hackers. - - 13 Sep 2004; David Holm sqlite-3.0.6.ebuild: - Added to ~ppc. - - 12 Sep 2004; Jeremy Huddleston sqlite-3.0.6.ebuild: - Added ~amd64. - - 10 Sep 2004; Hasan Khalil sqlite-2.8.15.ebuild: - Stable on macos. - - 06 Sep 2004; Bryan Østergaard sqlite-2.8.14.ebuild: - Stable on alpha. - -*sqlite-3.0.6 (05 Sep 2004) - 05 Sep 2004; Anders Rune Jensen +sqlite-3.0.6.ebuild, - -sqlite-3.0.4.ebuild: - New beta release. - -*sqlite-3.0.5 (02 Sep 2004) - 02 Sep 2004; Anders Rune Jensen +sqlite-3.0.5.ebuild, - -sqlite-3.0.3.ebuild: - New beta release. - -*sqlite-3.0.4 (23 Aug 2004) - 23 Aug 2004; Anders Rune Jensen +sqlite-3.0.4.ebuild: - New beta release. - - 17 Aug 2004; Ferris McCormick sqlite-2.8.14.ebuild: - stable for sparc. - - 05 Aug 2004; Anders Rune Jensen metadata.xml: - Add myself as co-maintainer - -*sqlite-3.0.3 (05 Aug 2004) - - 05 Aug 2004; Anders Rune Jensen sqlite-3.0.3.ebuild: - New beta release. Added to portage to help people upgrade their - programs to support the new branch. It's not backwards compatible with - 2.x, so I changed all ebuilds which depends on sqlite to - =dev-db/sqlite-2*. Removed all other archs than x86 as I suspect it - would be a good idea to let the arch people test it also. Many thanks - to Doug Gorley for the bugreport and ebuild. - Closes #58854. - -*sqlite-2.8.15 (05 Aug 2004) - - 05 Aug 2004; Anders Rune Jensen sqlite-2.8.15.ebuild: - new version. - - 05 Aug 2004; Anders Rune Jensen sqlite-2.8.14.ebuild: - mark as stable for x86. - - 03 Aug 2004; sqlite-2.8.14.ebuild: - stable on ia64 - - 08 Jul 2004; Travis Tilley sqlite-2.8.14.ebuild: - adding back missing ~amd64 keyword - -*sqlite-2.8.14 (06 Jul 2004) - - 06 Jul 2004; Anders Rune Jensen sqlite-2.8.14.ebuild: - new version. - - 06 Jul 2004; Anders Rune Jensen sqlite-2.8.13.ebuild: - mark as stable on all platforms. Last stable was 2.8.11. - - 29 Jun 2004; Aron Griffis sqlite-2.8.11.ebuild, - sqlite-2.8.12.ebuild, sqlite-2.8.13.ebuild, sqlite-2.8.3.ebuild: - sync IUSE (+nls), glibc -> libc, trim trailing whitespace - - 19 Jun 2004; Tom Gall sqlite-2.8.13.ebuild: - stable on ppc64 bug #54453 - - 03 Jun 2004; Stephen P. Becker sqlite-2.8.11.ebuild: - Stable on mips. - -*sqlite-2.8.3 (25 May 2004) - - 25 May 2004; Michael Sterrett sqlite-2.8.3.ebuild: - restore sqlite-2.8.3 for ppc - - 28 Mar 2004; Guy Martin sqlite-2.8.11.ebuild: - Marked stable on hppa. - -*sqlite-2.8.13 (16 Mar 2004) - - 16 Mar 2004; Tal Peer sqlite-2.8.13.ebuild: - Version bump. - - 05 Mar 2004; sqlite-2.8.11.ebuild, - sqlite-2.8.12.ebuild: - Mark 2.8.11 stable on alpha and ia64; add ~ia64 to 2.8.12 - - 02 Mar 2004; Ciaran McCreesh sqlite-2.8.11.ebuild: - Stable on sparc - -*sqlite-2.8.12 (29 Feb 2004) - - 29 Feb 2004; sqlite-2.8.11.ebuild, sqlite-2.8.12.ebuild: - Version bump, fixes bug #42242 (sorry for delay :) - Moved 2.8.11 to x86 stable. - - 17 Feb 2004; Aron Griffis sqlite-2.8.6.ebuild: - stable on alpha and ia64 - -*sqlite-2.8.11 (16 Jan 2004) - - 16 Jan 2004; Tal Peer metadata.xml, - sqlite-2.8.11.ebuild: - Version bump, closes #35547 - - 17 Dec 2003; Guy Martin sqlite-2.8.3.ebuild: - Marked stable on hppa. - - 13 Dec 2003; Brad House sqlite-2.8.6.ebuild: - mark stable on amd64 - -*sqlite-2.8.6 (30 Sep 2003) - - 30 Sep 2003; Masatomo Nakano sqlite-2.8.6.ebuild: - Version bump. - -*sqlite-2.8.5 (26 Jul 2003) - - 26 Jul 2003; Tal Peer sqlite-2.8.5.ebuild: - Version bump. - -*sqlite-2.8.3 (18 Jun 2003) - - 18 Jun 2003; Robin Johnson sqlite-2.8.3.ebuild: - Version bump. - -*sqlite-2.8.2 (20 May 2003) - - 20 May 2003; Robin Johnson sqlite-2.8.2.ebuild: - Version bump. Added some configure flags suggested by a user for stability. - -*sqlite-2.8.0 (22 Apr 2003) - - 22 Apr 2003: Robin Johnson sqlite-2.8.0.ebuild: - bug #19477 - submission by Tal Peer - Simplified ebuild a lot - Added manpage installataion back into his ebuild - -*sqlite-2.7.3 (05 Nov 2002) - - 06 Dec 2002; Rodney Rees : changed sparc ~sparc keywords - - 11 Nov 2002: Stefan Jones : - Added sparc keywords - - 05 Nov 2002; Daniel Ahlberg : - Version bump. - -*sqlite-2.6.3 (18 Aug 2002) - - 11 Nov 2002: Stefan Jones : - Added sparc keywords - - 19 Oct 2002; Calum Selkirk sqlite-2.6.3.ebuild : - - Added ppc to KEYWORDS. - - 22 Jul 2002; Ryan Phillips * : - - Fixes for repoman - - 18 Aug 2002; Ryan Phillips sqlite-2.6.3.ebuild : - - Updated version. Submitted by Bardur Arantsson - -*sqlite-2.6.1 (30 Jul 2002) - - 30 Jul 2002; Ryan Phillips sqlite-2.6.1.ebuild : - - Updated version - -*sqlite-2.4.2 (21 Mar 2002) - - 21 Mar 2002; G.Bevin sqlite-2.4.2.ebuild - files/digest-sqlite-2.4.2 - - Version upgrade. - -*sqlite-2.2.5 (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/sdk_container/src/third_party/portage-stable/dev-db/sqlite/Manifest b/sdk_container/src/third_party/portage-stable/dev-db/sqlite/Manifest index 9bf9067333..bc2fef0a18 100644 --- a/sdk_container/src/third_party/portage-stable/dev-db/sqlite/Manifest +++ b/sdk_container/src/third_party/portage-stable/dev-db/sqlite/Manifest @@ -1,29 +1,12 @@ -AUX sqlite-3.11.0-full_tarball-SQLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER.patch 14405 SHA256 ddce4fdc675e54a0a8a0537a315876cb881e5ae1f0c0193cea28f09b10bc7954 SHA512 4586762f41c6eeca64621e53a7369b9258a88880e52db2e8a98f02f46fe5db5d93cf3104ff8e2c99880c633bba2ce59bcb30552091efb34f6eb19f078fe3eedd WHIRLPOOL b95894b95a0f68378e61d59817de9709dc929f04625ff39a838dbeda57a07ddb636ac614b46e1c22bb0f071440a04c51b98a38d38d93b1d167022be3ee4d0080 -AUX sqlite-3.11.0-full_tarball-build.patch 4933 SHA256 9b76ab242a0486a94f9efeac6f6cab3364c4a5bd47c2b51be098d5db53015118 SHA512 303c419cbcff868249ae4691865f04b732faf0df09d49102ee35fd37df085a5a0e9e4e7ce7c856bb80af3177670ba0bac08ded1244dd452883ac32dab4727877 WHIRLPOOL 5abb65e9255b643af210fbd79d0f414b6393a026252f3faa4d12f40cf238295dfee3e922635879271916a7e817b8330fb459ea8c225dc13a9812d3161a6f5742 -AUX sqlite-3.11.0-nonfull_tarball-SQLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER.patch 8426 SHA256 097b2714ddddc7af74ecb8baa68ac1f7b18b73539aaab5315d1fcba52a6c222e SHA512 0ae94f82b016035b2ec415ab271701b7f48e21f0749c1f98dcf1e86f8fba6c5551121fa70791a8c0b1156dccbcf160f05d4f5e0003f53bc820ceff91eb9745f8 WHIRLPOOL b8eb1ccc0cbdf32bf572348aa93119f194b549d9b60d1a9aaf8e91b727bcd53d520247e2f3126c1acb5621338a9f35b32d0695e080a354cfc5a6dde29e181db9 -AUX sqlite-3.11.0-nonfull_tarball-build.patch 1325 SHA256 080dc8d6b7bc465326215bfa08592d5b5bdb7793c095141efa992de4d687f0d3 SHA512 07ef0eacb494a3bcec81cf6a10e86d7bb88b18807226efdffb35f28cd95032b92851db14fc8a1f465312201a866e5d4e1af02f863e89a16b718c6352680036b9 WHIRLPOOL 8bc0bef6f4ebd714ec4ce12660a956fc106f4f25d5514cc578114a4ac64d011ecd7e4597eb93793c79621e03c18a9f70e11c62c26c496eee4a4bdfe23ba9f813 -AUX sqlite-3.12.0-nonfull_tarball-build.patch 403 SHA256 8cc4b6d013c432fe59f4ee10f3b98a2c8ba3471a44f68c92e555e4884b9fe2ce SHA512 6c82a7be2d5f6e898469d8aed78470773617b9d77a9d491454e4b7b29abd6b29bb2854b96318f98eb71215deaa9bc7d753ac57cb52f73cf0aec12a23afdc8294 WHIRLPOOL 94dbe52c9cee7a07df5a647c95044fc3b356b2d2bfbbd0cc0566a31363e26f2990e0eb2ffaacaaf8922d5db4bc1268dba153860cf5f8d79b75ce9c5db3fa37de -AUX sqlite-3.13.0-full_tarball-build.patch 5192 SHA256 76841d686bb96fbc68ac6fcc773bcf02ad432c900d18c3a4dcd8b5df396dddd1 SHA512 95d421b92cfee4772fea26f699b92a6cafdcbe087370d003960c14f75a714b23d24b15a9c8e31552d224fdaef89d871464519077b211b89e8b97bc1fb53c5428 WHIRLPOOL 8b5c5878c5690ae367f39032dba7cb9a38eb6e446e60f1db74b0272b29003ffaccde872dbec418a6a5fbcced1bc965ce2130b5da78f7151efa9d7a0f574e7e58 -DIST sqlite-autoconf-3110100.tar.gz 2359545 SHA256 533ff1d0271c2e666f01591271cef01a31648563affa0c95e80ef735077d4377 SHA512 c3efd2693e6a9526a2901d9879982a421e81e7e979aef65a160e71b255339344079a1943395480d5c37a1acc6243a8d45f45fa688f7e996774da38a3a99e71a1 WHIRLPOOL b8062e2030dffd8b44cc0eba32c93312b8ae20064004c460321a4251806037fe62ec5ef83499e491cb248786b9302f0495de0c0624128d0063cbff71b77b8864 -DIST sqlite-autoconf-3120000.tar.gz 2374101 SHA256 53ecdbb5287af673eca3710c5f6c2305e73bb2d034f2a28770bea2be92ed269e SHA512 84a9107ca9045ddc724d7e37dfe2b1dc00a106769260c7bd429a95beedc46a906985b65e0b2bf597de23dd56d132b9ef6888a8c4e5f8a731c8a5c026b971d89e WHIRLPOOL 4ec76b383670f2ee9c50870587696a3c86357161344851b487f54a03c668dac8c4272738b44e5a4048dd00bf2b3122904c53b6d2195f9b48aef3ad928f34b85b -DIST sqlite-autoconf-3120100.tar.gz 2374576 SHA256 1c038519862b3983b0475f3ed3143ce4bbfcd21bfbd0741192f415838c831a7c SHA512 eb0b892bb6a1783df9b712d5f78c9f5fb5aa8ff1b1735fd2806e96b1c04e2a5f87b2e47469185195611a5cf6c446ec32935e9ae0b01734383a8fefc1bcaf5842 WHIRLPOOL 0284241a3fd6dbee16ba5fe4c1a0dc15b1b3134bd39ba8a2219c2da4e426e3572809459bbdc8bbf3fa4ea055406b85c547d8e7f05afcb57baa712653ce0d6f64 -DIST sqlite-autoconf-3120200.tar.gz 2374804 SHA256 fd00770c9afd39db555c78400e52f55e8bd6568c78be23561abb472a22d09abb SHA512 e56b8d5b8fb41d27437659db669259198663c266c0b3faf44ba9b130441550fb79bd040e6488f56280b33230d9cf4e51c7906f968ffdd36206354bfabc4b6eb4 WHIRLPOOL bd1231f0cce91281c9e42338ae698a06446078d2070f4f16b5472ed4004dbf1913339a3f0e5a34d87d0e71390a130c347f3c97353967530b65b23e1492664b7e -DIST sqlite-autoconf-3130000.tar.gz 2459805 SHA256 e2797026b3310c9d08bd472f6d430058c6dd139ff9d4e30289884ccd9744086b SHA512 c2547ff9a144c46829344058b4f8dcc5b8c9c823cbc667be2944dc7beecb9cc213858cc9ce302a763200278397d9a0fc6bb35c542028a124ef0980fedd574c2f WHIRLPOOL b9bcfb2eecf30719f7a673d569949b4e497c9682de08ca6f0ccc6c67a8f1541a51e88108bebde94a14802516b114c9f8cad83fbdbb130774b3082a8107657255 -DIST sqlite-doc-3110100.zip 5386958 SHA256 3f127c51c7936d13de96255b00a6be3862693ff025f61a1d3d17d3d57ee295d0 SHA512 b8fe71a852ce2fa3d7da27c09e3a1e8d019a9c55eb7e5516425754148f8d8a6cc88571d006768d5fd5b2c72aa513544bfc0ce4208f376099f8f08b7fee480d06 WHIRLPOOL 8cf7b3495ff184622dbf2842931d6b77061dc166c9d66e6bb6e400525c59ccc5b689b22cea45dad0fa7a7117692a1c16fea46aa4789084ce8c4de3655e973812 -DIST sqlite-doc-3120000.zip 5402611 SHA256 346d9d56a0193d9396948192b7eca9e45c2adfeea6bbf71df62502830da510f3 SHA512 7879d006e528d692ea5718f27d03e2dfe2a5e54aa135be983b992836102720df4dc690d84795115a25ed19a663e895a3f3f8a59d0de079c451d215e07081281e WHIRLPOOL 00f5bc4b82af1ba8d43ae4d0761dacd2e608009812a12fee9aedd333baec9b36f74542c60de4acacd19f5ef898d3bd57dfb705f3b21219ba3862ca91c2f76402 -DIST sqlite-doc-3120100.zip 5410493 SHA256 dbe53c076922c711a467dde57432583fbf9a12eac57cb75f6116a310880eb088 SHA512 d0117618d97744255248b9160816203147ba2afdb0bea5fe02d5e464541e09bc9147189317c6f849cc56059d6ae96e3e4b2a30cd8d0bc7b0e1ecacb573cfcdd4 WHIRLPOOL e3f054eda83301b9e4b5170bf9c56895756e4ac78a1c6256467c990fafccaeadec5f7ca54f1bf118bcb950f25db63df6c0972a138d36a10a0a9cfdf688eb207b -DIST sqlite-doc-3120200.zip 5416790 SHA256 67c640c4b01b961016717db61e3e43c63c33248c78ce0de9f10b88ea7ce97670 SHA512 4ded937565b2d9b63ae55495d4b536bc0056e0d9aa7119ee54ddea127c42ba7de17986db7b85c172043fab1112132cbc126a102b248770fca6cde9a8fda438ae WHIRLPOOL 7eefecb6d0450c85ec3f30cdeb853117f4067e1bace7d3c0524e5c6cb13d2e31772211aec8562f972491da413d9bd79022bc29c16968b086562e7f17bff984eb -DIST sqlite-doc-3130000.zip 5550186 SHA256 510606a9cdd89814b2d44e7b7f284ebb0a58153e1800de6daadfab445190f79c SHA512 0bf4544a07bd92533bc248dc16ed43c4fcad870ab535591618d3006f38c2741a8c0ed1da082444ea1af2f57936575c678bc12b651252426b908660023b36cd39 WHIRLPOOL 78fd5de701224e39d07fbb03a9193dff45237845b215d83f27a623f289d9da0df7082d53115e90474856b775d350ee3f9d2970ca2c1a4a33b24543de06fd3b9a -DIST sqlite-src-3110100.zip 9294249 SHA256 ade6aa93fd1d52dec0d8712f9ba4df59ecc6ec442f32ef28631c3b9341aadf97 SHA512 350c3019922a6adc1b7372f5e27c810a08f4bf576ea4e07d46bc59e1939a919d1bda1a29581f4df258f577202d79253292f719ca56ba30d1e7a1a2d801b65a48 WHIRLPOOL 3f7cc7baa7c59930e2e676d859478a68fddd392ccc4747630aa68c3909eb0b633d6031e9a998c1a741054594935dd52b3143ce05b574ff1b14f20f6ededc0a6e -DIST sqlite-src-3120000.zip 9367749 SHA256 d891e7ffd56cd97d069a6ed99d7e85cbe655b0a97ca6b5398c7806e888642df1 SHA512 9669e33e328b826f4692725ec09e21d85f4f2c386c624a81b0535f41ca7d2f996ebf5018db8ecdfdac18cff39a881a953111801499705dfb599f00e3bb5d10e4 WHIRLPOOL 865aaecbe331ec93b1a8c5b965c3edc43d35994c2db79d336febb27860ee91d68753d3ea274b4639f3e05d3f0a589fb21aedac33bc2120a4de8d094383d7b923 -DIST sqlite-src-3120100.zip 9368459 SHA256 49b9819683f8f7329a78d2008e3f7c4e02126b556b95e5dfe3be102b9e741cff SHA512 6d0d7230343ca460215b5764d4a546631ddc2bcfc0777051379fb4632ccf9c36a53d26eda6811823156be166643c001c994a0f52498c6196ed13b34e931d55e1 WHIRLPOOL e41fd7a1ba870efb5421657975990c1d7e1ecc27023882771474a62e82b2ae305bc3d0b8556e0627de886d35e1b375fec223b3f70582d64fc5345c525b293131 -DIST sqlite-src-3120200.zip 9370396 SHA256 2c16caa653e57f3c71873aa88797c97117981d6b0974254ce24d933dd27f9a86 SHA512 6cc9718c23ca3f65a42cc715eb67c8d174ecf0e397457efb6bfc5bd2efc9a51ea2f84266d31826068bf46efc550eb277b3c8e93cb85c5d23645e8b8ae4e2fc07 WHIRLPOOL ffdbbc384189f0d62a93ee8219051ff936b7c0c2fd39449f6ff72a734ab219f23f049648de7c0ec510a74aad85ba07ef0c8bebea4c3b83e043464744d2c039f4 -DIST sqlite-src-3130000.zip 9506412 SHA256 b46b62dc27abbde52db69d8e2a710469b9af613ba251eb98e412d4f3827f915b SHA512 4cb7531105869ff7db5c08aa8e4d303fa3d80c8c67e21d9a835a09f7dddb4c9dbba837e2030dd4af6bcdb00a305b057cbd6430e11b3f2ae5e470f27b69b6c1e6 WHIRLPOOL 901f6cd343daaa62970f8d768e3c6ccb0b1da75fb5643b27e76f60d224005a08955fde9df5b8bb63250ab27994e2428ce19e21b4a1ccabec47cd4b8df4a13657 -EBUILD sqlite-3.11.1.ebuild 7518 SHA256 de50b5c26c744cfc34ea505f429a340f365efa800370497567c73d94e1c86ff7 SHA512 f95373f37c6b85781f86480fc5214b05e309b37864a6bf1366c021b7d17b6239d3bb17ecd1b2843099646bf0f266c2bbc8c917ab7f4eb1ffd541b39a6306112b WHIRLPOOL 52336e092edb6070ed61f662ca16fdb4557a32888bd6656a68072b985e18459573f506a318afd5f329aba6320fc57436cf1476b3a7dc56a7689d4c105f2b30dc -EBUILD sqlite-3.12.0.ebuild 6986 SHA256 11a23d8e75c03c4e3515ddb20682d384504bebbdef896dc17c1e09460b2c1528 SHA512 504211d84f97e8da2f4d53c9de8afd89955410a9c91cb0fa5dc48726b4d6b314e1a48f1b6e40f8b6ba2cdec3f517a2b5623fe01e21f417780dfa640bb80b97b1 WHIRLPOOL f1fd886f3ad3ec224283a19287e9f5dbbab4796ce19fd1d57ba0bf76b3ffb2a9228500e5a7a4b6829032142bbc29c37d6cc793a6b9021ae8f2b9b81260eb40f5 -EBUILD sqlite-3.12.1.ebuild 6992 SHA256 6f2e0de7c7bfc1673bd97a0b9a5c0526bea85e08dc8ce742b46d1e0dc44c767e SHA512 2677c1c39a10715c41e0802a5e6df356bbd66f15eeebfd862f26b203e23b472520ac06a5ec823565b57f61e27817cb856de86a7e3861525acc228954eab1c205 WHIRLPOOL afc6c37f03fa6d4d5a5e5d5c7954f37af324e6426505e7653b1fd759f6f6c747278ddeaa48e5d8b9300839267cd140ea074d5be82970ead538588773a0f34a49 -EBUILD sqlite-3.12.2.ebuild 6992 SHA256 6f2e0de7c7bfc1673bd97a0b9a5c0526bea85e08dc8ce742b46d1e0dc44c767e SHA512 2677c1c39a10715c41e0802a5e6df356bbd66f15eeebfd862f26b203e23b472520ac06a5ec823565b57f61e27817cb856de86a7e3861525acc228954eab1c205 WHIRLPOOL afc6c37f03fa6d4d5a5e5d5c7954f37af324e6426505e7653b1fd759f6f6c747278ddeaa48e5d8b9300839267cd140ea074d5be82970ead538588773a0f34a49 -EBUILD sqlite-3.13.0.ebuild 7145 SHA256 e06db96b44d4622e92145f3d0e45a6c7aa41a9eab0c005a56ce11ca25a451b44 SHA512 420723f7fa7676f2b5f72968b75b27cc9fb88879a999ef4e4f4986b473a54477ae5d25859863d4a0682d20b6f219b903ded98ae38039fd9409d8f9b506b7cd2e WHIRLPOOL e727c4325f6e34fe096f3064a9f62a4362a2bad909a7ee0ab5e02735797b7a80772aa0b1e66d58413d993b951d66909b50c5234c523a41d8cacb90af1bc0e761 -MISC ChangeLog 10282 SHA256 54f018e6b56f9b11f23c362a1c94c1ea3dba338ce10f4a771526c6600d67f05f SHA512 88736ab0a9b46ca8d8593e72769267d4ca1454f5b502be243d9e9862c07d8d303891c173fddc61712e9a4ec825fb6fc77b67be8cf4829a540f3ea77a32eea478 WHIRLPOOL 684ac1be5f7af9f917640edada5a366f1591c47a867d3c18170f4e4585bdd11e31a84c3611310bc4e71c28df63128041169e673ec117ff64e92a213877eede68 -MISC ChangeLog-2015 77763 SHA256 c33481b0e8ff18658a72ce845ef033f46d7e2e47fd368f276485936b8249e366 SHA512 ae9ede8a42eb81bdbfd39c201aaed8a295c2eb61999d7961aed59f1d439241b57ffff0548b11317abdf2342a2e35daeb8ba98dea3fbd1904653192c3e2b3c86c WHIRLPOOL 892423e0771ee903650e396b9eb63ca76abe782ce5d3f2e1f993d0c65f3ee1b23e38a743557e09f7d11c6466ffe7c8bf7fb4a372ed58e33c1397d9c9b24f1783 -MISC metadata.xml 745 SHA256 0430582d0c0d1d5687f3e488e11f0b0c60f91fa51196df62c5ccd4a57b79912b SHA512 06ed7007e3ded9f29fadc70c583e9795a8ab5c27578159bb060b39c0cf7de6b4bca06ff0ceeab6710c50db96a44c976c52af2352ee7928211a46d5eca071b849 WHIRLPOOL 7c9f0a1ab683d8c10a5eccebdd88f1f470c72ae4b547fc0a465da4cd6c640d0b8658d9767dfd6e16bdfbb54219edc584b0c7e80ed6b4e963032b7aaeeab672d5 +DIST sqlite-autoconf-3200100.tar.gz 2565638 BLAKE2B bd1d32c211ea906cb2dbf78ea54d364db1a642d8a3b2751a427521a9da3391a2cd23c1ecdc5ff70b68f4166c583e69373f566cb04847295542185ab598e79c1b SHA512 56e3d326ea2225cadc628c3518d46d9f7c4bafa0e3612f2b7ab0dc0d79fcbb7e095f6d84a9a48e1c6d83adcdc8706ad5ac4404f0f622c7fe38cfde3a7e7e69f0 +DIST sqlite-autoconf-3210000.tar.gz 2568942 BLAKE2B 83a7095fd5fd5447a3c16816ceb9f51f393de9689942bd4eb4c6eafe357a1dd1783500f8faf2765fa6628da6a39f550237b661af1337ac063ca285f5f0a5218e SHA512 8f00708965eacef171620c49538f75768d350ec3f2bfef412a5c70af865ab03b6a64ce1e65d9fdb3d66f4d00262a30fc162b01fd69f63c05c14d5243374b6298 +DIST sqlite-autoconf-3220000.tar.gz 2644649 BLAKE2B e73fd7846362e6cc07eb96ea18e8883c1473c2b07c6e0c89e7e65726c5a6556b50bac71904a5b3a431ba40ff72b32e55c3e5ab7461567b5643560a0790a9a4dd SHA512 13e791bb1d7ba7edb5d84f4945f36ce2e03898a5bb1612d28799ef35a100f32e85cbb38f4ef65a7b43d020e5d48bf09b2e79cbb2003cc8aca2b09458b8c5d5bc +DIST sqlite-autoconf-3230100.tar.gz 2675362 BLAKE2B 2dd075f0dc05425563a8e679bb463724296294b5845746f06b51a24c9601be203ee0f2213f43eaca0757fcbb54b777cee746d873c98f377a0b010d8066d7fcb5 SHA512 52cae7ed0678b763d40373ae260672b906861379428529a58a017cbc82419a6b109e0b2ac7ff5532e6d941693cc4ab68e6563f424b92b3b27c8916859a6e4826 +DIST sqlite-doc-3200100.zip 5759028 BLAKE2B a633672b739160873e64b89e1350c85b0002fd8f268b6ae0f5189de12f411125fbb309585175727b8915fe1468b3e70e7c33239826232c3e7bc8c1c59132bec0 SHA512 518ca59644cecfcd67f511268112e421c5d7bbd77ef1e33304bf306ef110becf1e2a7fe37c506ec6892edb9d5c6ee77657b374c2e061f49890d18af062dea2b3 +DIST sqlite-doc-3210000.zip 5800635 BLAKE2B c9e15fe7373045783d05bd7b0a70f980e3c8a3c0ec4243f85fe338788830a58e82f1c6b3c053efe75caa33e99a6162e2f9831e4f5b9577c0bf90a305ee2f0381 SHA512 799c7279166b489d1a5acc9410808c2d4b78e64037fc15b60764180fe1c698f35e27e86793140302f560cfa583baa2c33e416d5c9e1842ec58c6cb6093729334 +DIST sqlite-doc-3220000.zip 5856836 BLAKE2B 1be73848040f3ae9734a44c94e4c36cae269d79abb20467f9f8368754e1ae07f4c25490be985b44d08f427e281fc268c6569dc0f5bbb6254621c62798507d687 SHA512 f9141d3907e5c1a3008d3b7e111e46e7ff1f010358eb682d3e1187a67deb7cca7ba1d5fbc5b19da26ee8df3a0c71a098fd0e8d8ca89c25e5ad2b3e12ba7dc312 +DIST sqlite-doc-3230100.zip 8882546 BLAKE2B 1e80647e3789b9130a93e881933fb1260794d9ccf359969a16bdeb0df5a51787eaf8404641c4b760bedd45063d46f8874fd74a4da1fef0234f3d8e92db754d76 SHA512 d3a42621480a928446c5f71d0f2ee68e245b071971da38438f9070bd5bcbe1930ea5bd20e06c68543df75badd2e4565abc94420df50b7152c9cd129587471471 +DIST sqlite-src-3200100.zip 10575637 BLAKE2B e45bad50d728e749c258546dd75a9d647ca35584092c663fed176fdd69164623bbe58afd15cd74fcd32a0cec893cffdb0f096873188c42ec5595ef7d635c79ad SHA512 845a0d64c9356aadf178c04dd716bbd37a7353526b06cfa8e8f65653cf6a1893a5c5e8c78d20b43910c34d9167272cf517749c91ed0ba7686977e3d0327e8939 +DIST sqlite-src-3210000.zip 10577695 BLAKE2B 21f110d4cdda95864a39b9b9b65985d29e1409ed38a9bda692d33dde845c115476cd77dc3b9cd1b7359ff383dc3050cbf0437b113ea128392aef50dd3b778d46 SHA512 3a054422da80d750fd5ab297f9d2728f4e7b55fa790a72d55da8c381835571992d56b349e50d4680b04c9e2e44d6fa83009c2df3ffa045f43ff9059bb8736894 +DIST sqlite-src-3220000.zip 10721627 BLAKE2B ed4cf93c36c095edeccd6ee4dac5419c516264a42eb9d6d2e333b1d4a134c6198dfcd2bbae41dff811616f0dc7f9e9bb487f9c5b5f631fcb5885540a84bf527a SHA512 e35defb0ffcc10100399051bc734746de40fa3dc5cd673eac470fb58cd8bd6d911b6dacb5e8489e2dd79c6ae75faaeb8c02384f64c4595963e62bd3faeb9446c +DIST sqlite-src-3230100.zip 10849436 BLAKE2B 6bed0a45c83ddb51d665835d174f623b30b1c3b81562fdea2317b58d876a0852136fe4f8a3ebc7679676f366e19c84d0ad2f54d3d8c73712145099975f80cf1a SHA512 69a87b76860c3b172d9e68b0fc0b8c157b606375e2b7d793ce4bd4b898ef737cd721189bc6a3342c749e224e60fa96203d449668c49dff2ebdc682b49630a59b diff --git a/sdk_container/src/third_party/portage-stable/dev-db/sqlite/files/sqlite-3.11.0-full_tarball-SQLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER.patch b/sdk_container/src/third_party/portage-stable/dev-db/sqlite/files/sqlite-3.11.0-full_tarball-SQLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER.patch deleted file mode 100644 index 9aaf24452b..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-db/sqlite/files/sqlite-3.11.0-full_tarball-SQLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER.patch +++ /dev/null @@ -1,443 +0,0 @@ -https://www.sqlite.org/cgi/src/info/374b5108087a2eae - ---- ext/fts3/fts3_tokenizer.c -+++ ext/fts3/fts3_tokenizer.c -@@ -30,6 +30,18 @@ - #include - - /* -+** Return true if the two-argument version of fts3_tokenizer() -+** has been activated via a prior call to sqlite3_db_config(db, -+** SQLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER, 1, 0); -+*/ -+static int fts3TokenizerEnabled(sqlite3_context *context){ -+ sqlite3 *db = sqlite3_context_db_handle(context); -+ int isEnabled = 0; -+ sqlite3_db_config(db,SQLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER,-1,&isEnabled); -+ return isEnabled; -+} -+ -+/* - ** Implementation of the SQL scalar function for accessing the underlying - ** hash table. This function may be called as follows: - ** -@@ -49,7 +61,7 @@ - ** is a blob containing the pointer stored as the hash data corresponding - ** to string (after the hash-table is updated, if applicable). - */ --static void scalarFunc( -+static void fts3TokenizerFunc( - sqlite3_context *context, - int argc, - sqlite3_value **argv -@@ -67,27 +79,23 @@ - nName = sqlite3_value_bytes(argv[0])+1; - - if( argc==2 ){ --#ifdef SQLITE_ENABLE_FTS3_TOKENIZER -- void *pOld; -- int n = sqlite3_value_bytes(argv[1]); -- if( zName==0 || n!=sizeof(pPtr) ){ -- sqlite3_result_error(context, "argument type mismatch", -1); -- return; -- } -- pPtr = *(void **)sqlite3_value_blob(argv[1]); -- pOld = sqlite3Fts3HashInsert(pHash, (void *)zName, nName, pPtr); -- if( pOld==pPtr ){ -- sqlite3_result_error(context, "out of memory", -1); -+ if( fts3TokenizerEnabled(context) ){ -+ void *pOld; -+ int n = sqlite3_value_bytes(argv[1]); -+ if( zName==0 || n!=sizeof(pPtr) ){ -+ sqlite3_result_error(context, "argument type mismatch", -1); -+ return; -+ } -+ pPtr = *(void **)sqlite3_value_blob(argv[1]); -+ pOld = sqlite3Fts3HashInsert(pHash, (void *)zName, nName, pPtr); -+ if( pOld==pPtr ){ -+ sqlite3_result_error(context, "out of memory", -1); -+ } -+ }else{ -+ sqlite3_result_error(context, "fts3tokenize disabled", -1); - return; - } --#else -- sqlite3_result_error(context, "fts3tokenize: " -- "disabled - rebuild with -DSQLITE_ENABLE_FTS3_TOKENIZER", -1 -- ); -- return; --#endif /* SQLITE_ENABLE_FTS3_TOKENIZER */ -- }else -- { -+ }else{ - if( zName ){ - pPtr = sqlite3Fts3HashFind(pHash, zName, nName); - } -@@ -98,7 +106,6 @@ - return; - } - } -- - sqlite3_result_blob(context, (void *)&pPtr, sizeof(pPtr), SQLITE_TRANSIENT); - } - -@@ -336,7 +343,6 @@ - Tcl_DecrRefCount(pRet); - } - --#ifdef SQLITE_ENABLE_FTS3_TOKENIZER - static - int registerTokenizer( - sqlite3 *db, -@@ -358,7 +364,6 @@ - - return sqlite3_finalize(pStmt); - } --#endif /* SQLITE_ENABLE_FTS3_TOKENIZER */ - - - static -@@ -431,13 +436,13 @@ - assert( 0==strcmp(sqlite3_errmsg(db), "unknown tokenizer: nosuchtokenizer") ); - - /* Test the storage function */ --#ifdef SQLITE_ENABLE_FTS3_TOKENIZER -- rc = registerTokenizer(db, "nosuchtokenizer", p1); -- assert( rc==SQLITE_OK ); -- rc = queryTokenizer(db, "nosuchtokenizer", &p2); -- assert( rc==SQLITE_OK ); -- assert( p2==p1 ); --#endif -+ if( fts3TokenizerEnabled(context) ){ -+ rc = registerTokenizer(db, "nosuchtokenizer", p1); -+ assert( rc==SQLITE_OK ); -+ rc = queryTokenizer(db, "nosuchtokenizer", &p2); -+ assert( rc==SQLITE_OK ); -+ assert( p2==p1 ); -+ } - - sqlite3_result_text(context, "ok", -1, SQLITE_STATIC); - } -@@ -453,7 +458,7 @@ - ** sqlite3Fts3HashInit(pHash, FTS3_HASH_STRING, 1); - ** - ** This function adds a scalar function (see header comment above --** scalarFunc() in this file for details) and, if ENABLE_TABLE is -+** fts3TokenizerFunc() in this file for details) and, if ENABLE_TABLE is - ** defined at compilation time, a temporary virtual table (see header - ** comment above struct HashTableVtab) to the database schema. Both - ** provide read/write access to the contents of *pHash. -@@ -482,10 +487,10 @@ - #endif - - if( SQLITE_OK==rc ){ -- rc = sqlite3_create_function(db, zName, 1, any, p, scalarFunc, 0, 0); -+ rc = sqlite3_create_function(db, zName, 1, any, p, fts3TokenizerFunc, 0, 0); - } - if( SQLITE_OK==rc ){ -- rc = sqlite3_create_function(db, zName, 2, any, p, scalarFunc, 0, 0); -+ rc = sqlite3_create_function(db, zName, 2, any, p, fts3TokenizerFunc, 0, 0); - } - #ifdef SQLITE_TEST - if( SQLITE_OK==rc ){ ---- src/main.c -+++ src/main.c -@@ -797,8 +797,9 @@ - int op; /* The opcode */ - u32 mask; /* Mask of the bit in sqlite3.flags to set/clear */ - } aFlagOp[] = { -- { SQLITE_DBCONFIG_ENABLE_FKEY, SQLITE_ForeignKeys }, -- { SQLITE_DBCONFIG_ENABLE_TRIGGER, SQLITE_EnableTrigger }, -+ { SQLITE_DBCONFIG_ENABLE_FKEY, SQLITE_ForeignKeys }, -+ { SQLITE_DBCONFIG_ENABLE_TRIGGER, SQLITE_EnableTrigger }, -+ { SQLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER, SQLITE_Fts3Tokenizer }, - }; - unsigned int i; - rc = SQLITE_ERROR; /* IMP: R-42790-23372 */ -@@ -2815,6 +2816,9 @@ - #if defined(SQLITE_ENABLE_OVERSIZE_CELL_CHECK) - | SQLITE_CellSizeCk - #endif -+#if defined(SQLITE_ENABLE_FTS3_TOKENIZER) -+ | SQLITE_Fts3Tokenizer -+#endif - ; - sqlite3HashInit(&db->aCollSeq); - #ifndef SQLITE_OMIT_VIRTUALTABLE ---- src/sqlite.h.in -+++ src/sqlite.h.in -@@ -1904,11 +1904,25 @@ - ** following this call. The second parameter may be a NULL pointer, in - ** which case the trigger setting is not reported back. - ** -+**
SQLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER
-+**
^This option is used to enable or disable the two-argument -+** version of the [fts3_tokenizer()] function which is part of the -+** [FTS3] full-text search engine extension. -+** There should be two additional arguments. -+** The first argument is an integer which is 0 to disable fts3_tokenizer() or -+** positive to enable fts3_tokenizer() or negative to leave the setting -+** unchanged. -+** The second parameter is a pointer to an integer into which -+** is written 0 or 1 to indicate whether fts3_tokenizer is disabled or enabled -+** following this call. The second parameter may be a NULL pointer, in -+** which case the new setting is not reported back.
-+** - ** - */ --#define SQLITE_DBCONFIG_LOOKASIDE 1001 /* void* int int */ --#define SQLITE_DBCONFIG_ENABLE_FKEY 1002 /* int int* */ --#define SQLITE_DBCONFIG_ENABLE_TRIGGER 1003 /* int int* */ -+#define SQLITE_DBCONFIG_LOOKASIDE 1001 /* void* int int */ -+#define SQLITE_DBCONFIG_ENABLE_FKEY 1002 /* int int* */ -+#define SQLITE_DBCONFIG_ENABLE_TRIGGER 1003 /* int int* */ -+#define SQLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER 1004 /* int int* */ - - - /* ---- src/sqliteInt.h -+++ src/sqliteInt.h -@@ -1317,6 +1317,7 @@ - #define SQLITE_VdbeEQP 0x04000000 /* Debug EXPLAIN QUERY PLAN */ - #define SQLITE_Vacuum 0x08000000 /* Currently in a VACUUM */ - #define SQLITE_CellSizeCk 0x10000000 /* Check btree cell sizes on load */ -+#define SQLITE_Fts3Tokenizer 0x20000000 /* Enable fts3_tokenizer(2) */ - - - /* ---- src/test1.c -+++ src/test1.c -@@ -6921,6 +6921,53 @@ - } - - /* -+** tclcmd: sqlite3_db_config DB SETTING VALUE -+** -+** Invoke sqlite3_db_config() for one of the setting values. -+*/ -+static int test_sqlite3_db_config( -+ void *clientData, -+ Tcl_Interp *interp, -+ int objc, -+ Tcl_Obj *CONST objv[] -+){ -+ static const struct { -+ const char *zName; -+ int eVal; -+ } aSetting[] = { -+ { "FKEY", SQLITE_DBCONFIG_ENABLE_FKEY }, -+ { "TRIGGER", SQLITE_DBCONFIG_ENABLE_TRIGGER }, -+ { "FTS3_TOKENIZER", SQLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER }, -+ }; -+ int i; -+ int v; -+ const char *zSetting; -+ sqlite3 *db; -+ -+ if( objc!=4 ){ -+ Tcl_WrongNumArgs(interp, 1, objv, "DB SETTING VALUE"); -+ return TCL_ERROR; -+ } -+ if( getDbPointer(interp, Tcl_GetString(objv[1]), &db) ) return TCL_ERROR; -+ zSetting = Tcl_GetString(objv[2]); -+ if( sqlite3_strglob("SQLITE_*", zSetting)==0 ) zSetting += 7; -+ if( sqlite3_strglob("DBCONFIG_*", zSetting)==0 ) zSetting += 9; -+ if( sqlite3_strglob("ENABLE_*", zSetting)==0 ) zSetting += 7; -+ for(i=0; i=ArraySize(aSetting) ){ -+ Tcl_SetObjResult(interp, -+ Tcl_NewStringObj("unknown sqlite3_db_config setting", -1)); -+ return TCL_ERROR; -+ } -+ if( Tcl_GetIntFromObj(interp, objv[3], &v) ) return TCL_ERROR; -+ sqlite3_db_config(db, aSetting[i].eVal, v, &v); -+ Tcl_SetObjResult(interp, Tcl_NewIntObj(v)); -+ return TCL_OK; -+} -+ -+/* - ** Register commands with the TCL interpreter. - */ - int Sqlitetest1_Init(Tcl_Interp *interp){ -@@ -6989,6 +7036,7 @@ - Tcl_ObjCmdProc *xProc; - void *clientData; - } aObjCmd[] = { -+ { "sqlite3_db_config", test_sqlite3_db_config, 0 }, - { "bad_behavior", test_bad_behavior, (void*)&iZero }, - { "register_dbstat_vtab", test_register_dbstat_vtab }, - { "sqlite3_connection_pointer", get_sqlite_pointer, 0 }, ---- src/test_config.c -+++ src/test_config.c -@@ -370,12 +370,6 @@ - Tcl_SetVar2(interp, "sqlite_options", "fts3", "0", TCL_GLOBAL_ONLY); - #endif - --#ifdef SQLITE_ENABLE_FTS3_TOKENIZER -- Tcl_SetVar2(interp, "sqlite_options", "fts3_tokenizer", "1", TCL_GLOBAL_ONLY); --#else -- Tcl_SetVar2(interp, "sqlite_options", "fts3_tokenizer", "0", TCL_GLOBAL_ONLY); --#endif -- - #ifdef SQLITE_ENABLE_FTS5 - Tcl_SetVar2(interp, "sqlite_options", "fts5", "1", TCL_GLOBAL_ONLY); - #else ---- test/fts3atoken.test -+++ test/fts3atoken.test -@@ -56,40 +56,41 @@ - # - # 5: Test that the table created to use tokenizer 'blah' is usable. - # --ifcapable fts3_tokenizer { -- do_test fts3atoken-1.1 { -- catchsql { -- CREATE VIRTUAL TABLE t1 USING fts3(content, tokenize blah); -- } -- } {1 {unknown tokenizer: blah}} -- do_test fts3atoken-1.2 { -- execsql { -- SELECT fts3_tokenizer('blah', fts3_tokenizer('simple')) IS NULL; -- } -- } {0} -- do_test fts3atoken-1.3 { -- execsql { -- SELECT fts3_tokenizer('blah') == fts3_tokenizer('simple'); -- } -- } {1} -- do_test fts3atoken-1.4 { -- catchsql { -- CREATE VIRTUAL TABLE t1 USING fts3(content, tokenize blah); -- } -- } {0 {}} -- do_test fts3atoken-1.5 { -- execsql { -- INSERT INTO t1(content) VALUES('There was movement at the station'); -- INSERT INTO t1(content) VALUES('For the word has passed around'); -- INSERT INTO t1(content) VALUES('That the colt from ol regret had got'); -- SELECT content FROM t1 WHERE content MATCH 'movement' -- } -- } {{There was movement at the station}} --} else { -- do_catchsql_test 1.6 { -+sqlite3_db_config db SQLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER 1 -+do_test fts3atoken-1.1 { -+ catchsql { -+ CREATE VIRTUAL TABLE t1 USING fts3(content, tokenize blah); -+ } -+} {1 {unknown tokenizer: blah}} -+do_test fts3atoken-1.2 { -+ execsql { - SELECT fts3_tokenizer('blah', fts3_tokenizer('simple')) IS NULL; -- } {1 {fts3tokenize: disabled - rebuild with -DSQLITE_ENABLE_FTS3_TOKENIZER}} --} -+ } -+} {0} -+do_test fts3atoken-1.3 { -+ execsql { -+ SELECT fts3_tokenizer('blah') == fts3_tokenizer('simple'); -+ } -+} {1} -+do_test fts3atoken-1.4 { -+ catchsql { -+ CREATE VIRTUAL TABLE t1 USING fts3(content, tokenize blah); -+ } -+} {0 {}} -+do_test fts3atoken-1.5 { -+ execsql { -+ INSERT INTO t1(content) VALUES('There was movement at the station'); -+ INSERT INTO t1(content) VALUES('For the word has passed around'); -+ INSERT INTO t1(content) VALUES('That the colt from ol regret had got'); -+ SELECT content FROM t1 WHERE content MATCH 'movement' -+ } -+} {{There was movement at the station}} -+ -+sqlite3_db_config db SQLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER 0 -+do_catchsql_test 1.6 { -+ SELECT fts3_tokenizer('blah', fts3_tokenizer('simple')) IS NULL; -+} {1 {fts3tokenize disabled}} -+ - - #-------------------------------------------------------------------------- - # Test cases fts3atoken-2.* test error cases in the scalar function based -@@ -212,14 +213,14 @@ - do_catchsql_test 6.2.1 { - SELECT fts3_tokenizer(NULL); - } {1 {unknown tokenizer: }} --ifcapable fts3_tokenizer { -- do_catchsql_test 6.2.2 { -- SELECT fts3_tokenizer(NULL, X'1234567812345678'); -- } {1 {argument type mismatch}} -- do_catchsql_test 6.2.3 { -- SELECT fts3_tokenizer(NULL, X'12345678'); -- } {1 {argument type mismatch}} --} -+ -+sqlite3_db_config db SQLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER 1 -+do_catchsql_test 6.2.2 { -+ SELECT fts3_tokenizer(NULL, X'1234567812345678'); -+} {1 {argument type mismatch}} -+do_catchsql_test 6.2.3 { -+ SELECT fts3_tokenizer(NULL, X'12345678'); -+} {1 {argument type mismatch}} - - - finish_test ---- test/fts4langid.test -+++ test/fts4langid.test -@@ -358,31 +358,30 @@ - } - } - --ifcapable fts3_tokenizer { -- do_test 4.1.0 { -- reset_db -- set ptr [fts3_test_tokenizer] -- execsql { SELECT fts3_tokenizer('testtokenizer', $ptr) } -- build_multilingual_db_2 db -- } {} -- do_execsql_test 4.1.1 { -- SELECT docid FROM t4 WHERE t4 MATCH 'quick'; -- } {0} -- do_execsql_test 4.1.2 { -- SELECT docid FROM t4 WHERE t4 MATCH 'quick' AND lid=1; -- } {} -- do_execsql_test 4.1.3 { -- SELECT docid FROM t4 WHERE t4 MATCH 'Quick' AND lid=1; -- } {1} -- for {set i 0} {$i < 50} {incr i} { -- do_execsql_test 4.1.4.$i { -- SELECT count(*) FROM t4 WHERE t4 MATCH 'fox' AND lid=$i; -- } [expr 0==($i%2)] -- } -- do_catchsql_test 4.1.5 { -- INSERT INTO t4(content, lid) VALUES('hello world', 101) -- } {1 {SQL logic error or missing database}} -+do_test 4.1.0 { -+ reset_db -+ set ptr [fts3_test_tokenizer] -+ sqlite3_db_config db SQLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER 1 -+ execsql { SELECT fts3_tokenizer('testtokenizer', $ptr) } -+ build_multilingual_db_2 db -+} {} -+do_execsql_test 4.1.1 { -+ SELECT docid FROM t4 WHERE t4 MATCH 'quick'; -+} {0} -+do_execsql_test 4.1.2 { -+ SELECT docid FROM t4 WHERE t4 MATCH 'quick' AND lid=1; -+} {} -+do_execsql_test 4.1.3 { -+ SELECT docid FROM t4 WHERE t4 MATCH 'Quick' AND lid=1; -+} {1} -+for {set i 0} {$i < 50} {incr i} { -+ do_execsql_test 4.1.4.$i { -+ SELECT count(*) FROM t4 WHERE t4 MATCH 'fox' AND lid=$i; -+ } [expr 0==($i%2)] - } -+do_catchsql_test 4.1.5 { -+ INSERT INTO t4(content, lid) VALUES('hello world', 101) -+} {1 {SQL logic error or missing database}} - - #------------------------------------------------------------------------- - # Test cases 5.* diff --git a/sdk_container/src/third_party/portage-stable/dev-db/sqlite/files/sqlite-3.11.0-nonfull_tarball-SQLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER.patch b/sdk_container/src/third_party/portage-stable/dev-db/sqlite/files/sqlite-3.11.0-nonfull_tarball-SQLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER.patch deleted file mode 100644 index 0ed2517c4c..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-db/sqlite/files/sqlite-3.11.0-nonfull_tarball-SQLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER.patch +++ /dev/null @@ -1,232 +0,0 @@ -https://www.sqlite.org/cgi/src/info/374b5108087a2eae - ---- sqlite3.c -+++ sqlite3.c -@@ -2121,11 +2121,25 @@ - ** following this call. The second parameter may be a NULL pointer, in - ** which case the trigger setting is not reported back. - ** -+**
SQLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER
-+**
^This option is used to enable or disable the two-argument -+** version of the [fts3_tokenizer()] function which is part of the -+** [FTS3] full-text search engine extension. -+** There should be two additional arguments. -+** The first argument is an integer which is 0 to disable fts3_tokenizer() or -+** positive to enable fts3_tokenizer() or negative to leave the setting -+** unchanged. -+** The second parameter is a pointer to an integer into which -+** is written 0 or 1 to indicate whether fts3_tokenizer is disabled or enabled -+** following this call. The second parameter may be a NULL pointer, in -+** which case the new setting is not reported back.
-+** - ** - */ --#define SQLITE_DBCONFIG_LOOKASIDE 1001 /* void* int int */ --#define SQLITE_DBCONFIG_ENABLE_FKEY 1002 /* int int* */ --#define SQLITE_DBCONFIG_ENABLE_TRIGGER 1003 /* int int* */ -+#define SQLITE_DBCONFIG_LOOKASIDE 1001 /* void* int int */ -+#define SQLITE_DBCONFIG_ENABLE_FKEY 1002 /* int int* */ -+#define SQLITE_DBCONFIG_ENABLE_TRIGGER 1003 /* int int* */ -+#define SQLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER 1004 /* int int* */ - - - /* -@@ -12206,6 +12220,7 @@ - #define SQLITE_VdbeEQP 0x04000000 /* Debug EXPLAIN QUERY PLAN */ - #define SQLITE_Vacuum 0x08000000 /* Currently in a VACUUM */ - #define SQLITE_CellSizeCk 0x10000000 /* Check btree cell sizes on load */ -+#define SQLITE_Fts3Tokenizer 0x20000000 /* Enable fts3_tokenizer(2) */ - - - /* -@@ -133589,8 +133604,9 @@ - int op; /* The opcode */ - u32 mask; /* Mask of the bit in sqlite3.flags to set/clear */ - } aFlagOp[] = { -- { SQLITE_DBCONFIG_ENABLE_FKEY, SQLITE_ForeignKeys }, -- { SQLITE_DBCONFIG_ENABLE_TRIGGER, SQLITE_EnableTrigger }, -+ { SQLITE_DBCONFIG_ENABLE_FKEY, SQLITE_ForeignKeys }, -+ { SQLITE_DBCONFIG_ENABLE_TRIGGER, SQLITE_EnableTrigger }, -+ { SQLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER, SQLITE_Fts3Tokenizer }, - }; - unsigned int i; - rc = SQLITE_ERROR; /* IMP: R-42790-23372 */ -@@ -135607,6 +135623,9 @@ - #if defined(SQLITE_ENABLE_OVERSIZE_CELL_CHECK) - | SQLITE_CellSizeCk - #endif -+#if defined(SQLITE_ENABLE_FTS3_TOKENIZER) -+ | SQLITE_Fts3Tokenizer -+#endif - ; - sqlite3HashInit(&db->aCollSeq); - #ifndef SQLITE_OMIT_VIRTUALTABLE -@@ -146857,6 +146876,18 @@ - /* #include */ - - /* -+** Return true if the two-argument version of fts3_tokenizer() -+** has been activated via a prior call to sqlite3_db_config(db, -+** SQLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER, 1, 0); -+*/ -+static int fts3TokenizerEnabled(sqlite3_context *context){ -+ sqlite3 *db = sqlite3_context_db_handle(context); -+ int isEnabled = 0; -+ sqlite3_db_config(db,SQLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER,-1,&isEnabled); -+ return isEnabled; -+} -+ -+/* - ** Implementation of the SQL scalar function for accessing the underlying - ** hash table. This function may be called as follows: - ** -@@ -146876,7 +146907,7 @@ - ** is a blob containing the pointer stored as the hash data corresponding - ** to string (after the hash-table is updated, if applicable). - */ --static void scalarFunc( -+static void fts3TokenizerFunc( - sqlite3_context *context, - int argc, - sqlite3_value **argv -@@ -146894,27 +146925,23 @@ - nName = sqlite3_value_bytes(argv[0])+1; - - if( argc==2 ){ --#ifdef SQLITE_ENABLE_FTS3_TOKENIZER -- void *pOld; -- int n = sqlite3_value_bytes(argv[1]); -- if( zName==0 || n!=sizeof(pPtr) ){ -- sqlite3_result_error(context, "argument type mismatch", -1); -- return; -- } -- pPtr = *(void **)sqlite3_value_blob(argv[1]); -- pOld = sqlite3Fts3HashInsert(pHash, (void *)zName, nName, pPtr); -- if( pOld==pPtr ){ -- sqlite3_result_error(context, "out of memory", -1); -+ if( fts3TokenizerEnabled(context) ){ -+ void *pOld; -+ int n = sqlite3_value_bytes(argv[1]); -+ if( zName==0 || n!=sizeof(pPtr) ){ -+ sqlite3_result_error(context, "argument type mismatch", -1); -+ return; -+ } -+ pPtr = *(void **)sqlite3_value_blob(argv[1]); -+ pOld = sqlite3Fts3HashInsert(pHash, (void *)zName, nName, pPtr); -+ if( pOld==pPtr ){ -+ sqlite3_result_error(context, "out of memory", -1); -+ } -+ }else{ -+ sqlite3_result_error(context, "fts3tokenize disabled", -1); - return; - } --#else -- sqlite3_result_error(context, "fts3tokenize: " -- "disabled - rebuild with -DSQLITE_ENABLE_FTS3_TOKENIZER", -1 -- ); -- return; --#endif /* SQLITE_ENABLE_FTS3_TOKENIZER */ -- }else -- { -+ }else{ - if( zName ){ - pPtr = sqlite3Fts3HashFind(pHash, zName, nName); - } -@@ -146925,7 +146952,6 @@ - return; - } - } -- - sqlite3_result_blob(context, (void *)&pPtr, sizeof(pPtr), SQLITE_TRANSIENT); - } - -@@ -147163,7 +147189,6 @@ - Tcl_DecrRefCount(pRet); - } - --#ifdef SQLITE_ENABLE_FTS3_TOKENIZER - static - int registerTokenizer( - sqlite3 *db, -@@ -147185,7 +147210,6 @@ - - return sqlite3_finalize(pStmt); - } --#endif /* SQLITE_ENABLE_FTS3_TOKENIZER */ - - - static -@@ -147258,13 +147282,13 @@ - assert( 0==strcmp(sqlite3_errmsg(db), "unknown tokenizer: nosuchtokenizer") ); - - /* Test the storage function */ --#ifdef SQLITE_ENABLE_FTS3_TOKENIZER -- rc = registerTokenizer(db, "nosuchtokenizer", p1); -- assert( rc==SQLITE_OK ); -- rc = queryTokenizer(db, "nosuchtokenizer", &p2); -- assert( rc==SQLITE_OK ); -- assert( p2==p1 ); --#endif -+ if( fts3TokenizerEnabled(context) ){ -+ rc = registerTokenizer(db, "nosuchtokenizer", p1); -+ assert( rc==SQLITE_OK ); -+ rc = queryTokenizer(db, "nosuchtokenizer", &p2); -+ assert( rc==SQLITE_OK ); -+ assert( p2==p1 ); -+ } - - sqlite3_result_text(context, "ok", -1, SQLITE_STATIC); - } -@@ -147280,7 +147304,7 @@ - ** sqlite3Fts3HashInit(pHash, FTS3_HASH_STRING, 1); - ** - ** This function adds a scalar function (see header comment above --** scalarFunc() in this file for details) and, if ENABLE_TABLE is -+** fts3TokenizerFunc() in this file for details) and, if ENABLE_TABLE is - ** defined at compilation time, a temporary virtual table (see header - ** comment above struct HashTableVtab) to the database schema. Both - ** provide read/write access to the contents of *pHash. -@@ -147309,10 +147333,10 @@ - #endif - - if( SQLITE_OK==rc ){ -- rc = sqlite3_create_function(db, zName, 1, any, p, scalarFunc, 0, 0); -+ rc = sqlite3_create_function(db, zName, 1, any, p, fts3TokenizerFunc, 0, 0); - } - if( SQLITE_OK==rc ){ -- rc = sqlite3_create_function(db, zName, 2, any, p, scalarFunc, 0, 0); -+ rc = sqlite3_create_function(db, zName, 2, any, p, fts3TokenizerFunc, 0, 0); - } - #ifdef SQLITE_TEST - if( SQLITE_OK==rc ){ ---- sqlite3.h -+++ sqlite3.h -@@ -1904,11 +1904,25 @@ - ** following this call. The second parameter may be a NULL pointer, in - ** which case the trigger setting is not reported back. - ** -+**
SQLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER
-+**
^This option is used to enable or disable the two-argument -+** version of the [fts3_tokenizer()] function which is part of the -+** [FTS3] full-text search engine extension. -+** There should be two additional arguments. -+** The first argument is an integer which is 0 to disable fts3_tokenizer() or -+** positive to enable fts3_tokenizer() or negative to leave the setting -+** unchanged. -+** The second parameter is a pointer to an integer into which -+** is written 0 or 1 to indicate whether fts3_tokenizer is disabled or enabled -+** following this call. The second parameter may be a NULL pointer, in -+** which case the new setting is not reported back.
-+** - ** - */ --#define SQLITE_DBCONFIG_LOOKASIDE 1001 /* void* int int */ --#define SQLITE_DBCONFIG_ENABLE_FKEY 1002 /* int int* */ --#define SQLITE_DBCONFIG_ENABLE_TRIGGER 1003 /* int int* */ -+#define SQLITE_DBCONFIG_LOOKASIDE 1001 /* void* int int */ -+#define SQLITE_DBCONFIG_ENABLE_FKEY 1002 /* int int* */ -+#define SQLITE_DBCONFIG_ENABLE_TRIGGER 1003 /* int int* */ -+#define SQLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER 1004 /* int int* */ - - - /* diff --git a/sdk_container/src/third_party/portage-stable/dev-db/sqlite/files/sqlite-3.11.0-nonfull_tarball-build.patch b/sdk_container/src/third_party/portage-stable/dev-db/sqlite/files/sqlite-3.11.0-nonfull_tarball-build.patch deleted file mode 100644 index e0b477ce33..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-db/sqlite/files/sqlite-3.11.0-nonfull_tarball-build.patch +++ /dev/null @@ -1,38 +0,0 @@ -Link executables against libsqlite3.so. -Fix building with dlopen() not available. - ---- Makefile.am -+++ Makefile.am -@@ -1,15 +1,16 @@ - --AM_CFLAGS = @THREADSAFE_FLAGS@ @DYNAMIC_EXTENSION_FLAGS@ @FTS5_FLAGS@ @JSON1_FLAGS@ -DSQLITE_ENABLE_FTS3 -DSQLITE_ENABLE_RTREE -+AM_CFLAGS = @THREADSAFE_FLAGS@ @DYNAMIC_EXTENSION_FLAGS@ @FTS5_FLAGS@ @JSON1_FLAGS@ -DSQLITE_ENABLE_EXPLAIN_COMMENTS -DSQLITE_ENABLE_FTS3 -DSQLITE_ENABLE_RTREE - - lib_LTLIBRARIES = libsqlite3.la - libsqlite3_la_SOURCES = sqlite3.c - libsqlite3_la_LDFLAGS = -no-undefined -version-info 8:6:8 - - bin_PROGRAMS = sqlite3 --sqlite3_SOURCES = shell.c sqlite3.c sqlite3.h --sqlite3_LDADD = @READLINE_LIBS@ -+sqlite3_SOURCES = shell.c sqlite3.h -+EXTRA_sqlite3_SOURCES = sqlite3.c -+sqlite3_LDADD = @EXTRA_SHELL_OBJ@ @READLINE_LIBS@ - sqlite3_DEPENDENCIES = @EXTRA_SHELL_OBJ@ --sqlite3_CFLAGS = $(AM_CFLAGS) -DSQLITE_ENABLE_EXPLAIN_COMMENTS -+sqlite3_CFLAGS = $(AM_CFLAGS) - - include_HEADERS = sqlite3.h sqlite3ext.h - ---- configure.ac -+++ configure.ac -@@ -89,6 +89,9 @@ - [], [enable_dynamic_extensions=yes]) - if test x"$enable_dynamic_extensions" != "xno"; then - AC_SEARCH_LIBS(dlopen, dl) -+ if test "${ac_cv_search_dlopen}" = "no" ; then -+ DYNAMIC_EXTENSION_FLAGS=-DSQLITE_OMIT_LOAD_EXTENSION=1 -+ fi - else - DYNAMIC_EXTENSION_FLAGS=-DSQLITE_OMIT_LOAD_EXTENSION=1 - fi diff --git a/sdk_container/src/third_party/portage-stable/dev-db/sqlite/files/sqlite-3.12.0-nonfull_tarball-build.patch b/sdk_container/src/third_party/portage-stable/dev-db/sqlite/files/sqlite-3.16.0-nonfull_tarball-build.patch similarity index 95% rename from sdk_container/src/third_party/portage-stable/dev-db/sqlite/files/sqlite-3.12.0-nonfull_tarball-build.patch rename to sdk_container/src/third_party/portage-stable/dev-db/sqlite/files/sqlite-3.16.0-nonfull_tarball-build.patch index fe9f70ac00..81ef29d8a5 100644 --- a/sdk_container/src/third_party/portage-stable/dev-db/sqlite/files/sqlite-3.12.0-nonfull_tarball-build.patch +++ b/sdk_container/src/third_party/portage-stable/dev-db/sqlite/files/sqlite-3.16.0-nonfull_tarball-build.patch @@ -2,7 +2,7 @@ Fix building with dlopen() not available. --- configure.ac +++ configure.ac -@@ -89,6 +89,9 @@ +@@ -102,6 +102,9 @@ [], [enable_dynamic_extensions=yes]) if test x"$enable_dynamic_extensions" != "xno"; then AC_SEARCH_LIBS(dlopen, dl) diff --git a/sdk_container/src/third_party/portage-stable/dev-db/sqlite/files/sqlite-3.13.0-full_tarball-build.patch b/sdk_container/src/third_party/portage-stable/dev-db/sqlite/files/sqlite-3.20.0-full_tarball-build.patch similarity index 70% rename from sdk_container/src/third_party/portage-stable/dev-db/sqlite/files/sqlite-3.13.0-full_tarball-build.patch rename to sdk_container/src/third_party/portage-stable/dev-db/sqlite/files/sqlite-3.20.0-full_tarball-build.patch index c2f97622fa..cc95be3ee6 100644 --- a/sdk_container/src/third_party/portage-stable/dev-db/sqlite/files/sqlite-3.13.0-full_tarball-build.patch +++ b/sdk_container/src/third_party/portage-stable/dev-db/sqlite/files/sqlite-3.20.0-full_tarball-build.patch @@ -4,16 +4,15 @@ Fix building with dlopen() not available. --- Makefile.in +++ Makefile.in -@@ -555,7 +555,7 @@ - # Extra compiler options for various shell tools +@@ -565,6 +565,7 @@ # SHELL_OPT = -DSQLITE_ENABLE_JSON1 -DSQLITE_ENABLE_FTS4 --SHELL_OPT += -DSQLITE_ENABLE_EXPLAIN_COMMENTS -+SHELL_OPT += -DSQLITE_ENABLE_EXPLAIN_COMMENTS -DSQLITE_ENABLE_DBSTAT_VTAB - FUZZERSHELL_OPT = -DSQLITE_ENABLE_JSON1 - FUZZCHECK_OPT = -DSQLITE_ENABLE_JSON1 -DSQLITE_ENABLE_MEMSYS5 - -@@ -576,18 +576,18 @@ + # SHELL_OPT += -DSQLITE_ENABLE_FTS5 ++SHELL_OPT += -DSQLITE_ENABLE_DBSTAT_VTAB + SHELL_OPT += -DSQLITE_ENABLE_EXPLAIN_COMMENTS + SHELL_OPT += -DSQLITE_ENABLE_UNKNOWN_SQL_FUNCTION + SHELL_OPT += -DSQLITE_ENABLE_STMTVTAB +@@ -591,25 +592,25 @@ libtclsqlite3.la: tclsqlite.lo libsqlite3.la $(LTLINK) -no-undefined -o $@ tclsqlite.lo \ @@ -32,14 +31,25 @@ Fix building with dlopen() not available. + $(TOP)/src/shell.c libsqlite3.la \ + $(LIBREADLINE) --sqldiff$(TEXE): $(TOP)/tool/sqldiff.c sqlite3.c sqlite3.h -- $(LTLINK) -o $@ $(TOP)/tool/sqldiff.c sqlite3.c $(TLIBS) +-sqldiff$(TEXE): $(TOP)/tool/sqldiff.c sqlite3.lo sqlite3.h +- $(LTLINK) -o $@ $(TOP)/tool/sqldiff.c sqlite3.lo $(TLIBS) +sqldiff$(TEXE): $(TOP)/tool/sqldiff.c libsqlite3.la + $(LTLINK) -o $@ $(TOP)/tool/sqldiff.c libsqlite3.la +-dbhash$(TEXE): $(TOP)/tool/dbhash.c sqlite3.lo sqlite3.h +- $(LTLINK) -o $@ $(TOP)/tool/dbhash.c sqlite3.lo $(TLIBS) ++dbhash$(TEXE): $(TOP)/tool/dbhash.c libsqlite3.la ++ $(LTLINK) -o $@ $(TOP)/tool/dbhash.c libsqlite3.la + +-scrub$(TEXE): $(TOP)/ext/misc/scrub.c sqlite3.lo ++scrub$(TEXE): $(TOP)/ext/misc/scrub.c libsqlite3.la + $(LTLINK) -o $@ -I. -DSCRUB_STANDALONE \ +- $(TOP)/ext/misc/scrub.c sqlite3.lo $(TLIBS) ++ $(TOP)/ext/misc/scrub.c libsqlite3.la + srcck1$(BEXE): $(TOP)/tool/srcck1.c $(BCC) -o srcck1$(BEXE) $(TOP)/tool/srcck1.c -@@ -656,7 +656,7 @@ +@@ -685,7 +686,7 @@ # Rule to build the amalgamation # sqlite3.lo: sqlite3.c @@ -48,7 +58,7 @@ Fix building with dlopen() not available. # Rules to build the LEMON compiler generator # -@@ -1082,13 +1082,13 @@ +@@ -1115,13 +1116,13 @@ # Fuzz testing fuzztest: fuzzcheck$(TEXE) $(FUZZDATA) @@ -63,16 +73,16 @@ Fix building with dlopen() not available. - valgrind ./fuzzcheck$(TEXE) --cell-size-check --limit-mem 10M --timeout 600 $(FUZZDATA) + valgrind ./fuzzcheck$(TEXE) --cell-size-check --limit-mem 10M --timeout 3600 $(FUZZDATA) - # Minimal testing that runs in less than 3 minutes + # The veryquick.test TCL tests. # -@@ -1114,32 +1114,32 @@ +@@ -1151,36 +1152,35 @@ smoketest: $(TESTPROGS) fuzzcheck$(TEXE) ./testfixture$(TEXE) $(TOP)/test/main.test $(TESTOPTS) -sqlite3_analyzer.c: sqlite3.c $(TOP)/src/tclsqlite.c $(TOP)/tool/spaceanal.tcl +sqlite3_analyzer.c: $(TOP)/src/tclsqlite.c $(TOP)/tool/spaceanal.tcl echo "#define TCLSH 2" > $@ - echo "#define SQLITE_ENABLE_DBSTAT_VTAB 1" >> $@ +- echo "#define SQLITE_ENABLE_DBSTAT_VTAB 1" >> $@ - cat sqlite3.c $(TOP)/src/tclsqlite.c >> $@ + cat $(TOP)/src/tclsqlite.c >> $@ echo "static const char *tclsh_main_loop(void){" >> $@ @@ -85,6 +95,12 @@ Fix building with dlopen() not available. +sqlite3_analyzer$(TEXE): sqlite3_analyzer.c libsqlite3.la + $(LTLINK) sqlite3_analyzer.c -o $@ libsqlite3.la $(LIBTCL) +-dbdump$(TEXE): $(TOP)/ext/misc/dbdump.c sqlite3.lo ++dbdump$(TEXE): $(TOP)/ext/misc/dbdump.c libsqlite3.la + $(LTLINK) -DDBDUMP_STANDALONE -o $@ \ +- $(TOP)/ext/misc/dbdump.c sqlite3.lo $(TLIBS) ++ $(TOP)/ext/misc/dbdump.c libsqlite3.la + -showdb$(TEXE): $(TOP)/tool/showdb.c sqlite3.lo - $(LTLINK) -o $@ $(TOP)/tool/showdb.c sqlite3.lo $(TLIBS) +showdb$(TEXE): $(TOP)/tool/showdb.c libsqlite3.la @@ -112,20 +128,25 @@ Fix building with dlopen() not available. rollback-test$(TEXE): $(TOP)/tool/rollback-test.c sqlite3.lo $(LTLINK) -o $@ $(TOP)/tool/rollback-test.c sqlite3.lo $(TLIBS) -@@ -1153,8 +1153,8 @@ - speedtest1$(TEXE): $(TOP)/test/speedtest1.c sqlite3.lo - $(LTLINK) -o $@ $(TOP)/test/speedtest1.c sqlite3.lo $(TLIBS) +@@ -1199,11 +1199,11 @@ + kvtest$(TEXE): $(TOP)/test/kvtest.c sqlite3.c + $(LTLINK) $(KV_OPT) -o $@ $(TOP)/test/kvtest.c sqlite3.c $(TLIBS) -rbu$(EXE): $(TOP)/ext/rbu/rbu.c $(TOP)/ext/rbu/sqlite3rbu.c sqlite3.lo - $(LTLINK) -I. -o $@ $(TOP)/ext/rbu/rbu.c sqlite3.lo $(TLIBS) +rbu$(EXE): $(TOP)/ext/rbu/rbu.c libsqlite3.la + $(LTLINK) -I. -o $@ $(TOP)/ext/rbu/rbu.c libsqlite3.la - loadfts$(EXE): $(TOP)/tool/loadfts.c libsqlite3.la - $(LTLINK) $(TOP)/tool/loadfts.c libsqlite3.la -o $@ $(TLIBS) +-loadfts$(EXE): $(TOP)/tool/loadfts.c libsqlite3.la +- $(LTLINK) $(TOP)/tool/loadfts.c libsqlite3.la -o $@ $(TLIBS) ++loadfts$(EXE): $(TOP)/tool/loadfts.c libsqlite3.la ++ $(LTLINK) $(TOP)/tool/loadfts.c libsqlite3.la -o $@ + + # This target will fail if the SQLite amalgamation contains any exported + # symbols that do not begin with "sqlite3_". It is run as part of the --- configure.ac +++ configure.ac -@@ -570,6 +570,9 @@ +@@ -584,6 +584,9 @@ if test "${use_loadextension}" = "yes" ; then OPT_FEATURE_FLAGS="" AC_SEARCH_LIBS(dlopen, dl) diff --git a/sdk_container/src/third_party/portage-stable/dev-db/sqlite/files/sqlite-3.20.1-full_tarball-csv-unsigned_char.patch b/sdk_container/src/third_party/portage-stable/dev-db/sqlite/files/sqlite-3.20.1-full_tarball-csv-unsigned_char.patch new file mode 100644 index 0000000000..86236c4b4b --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-db/sqlite/files/sqlite-3.20.1-full_tarball-csv-unsigned_char.patch @@ -0,0 +1,33 @@ +https://sqlite.org/src/info/42f0777555675875 + +--- ext/misc/csv.c ++++ ext/misc/csv.c +@@ -78,7 +78,7 @@ + int nAlloc; /* Space allocated for z[] */ + int nLine; /* Current line number */ + int bNotFirst; /* True if prior text has been seen */ +- char cTerm; /* Character that terminated the most recent field */ ++ int cTerm; /* Character that terminated the most recent field */ + size_t iIn; /* Next unread character in the input buffer */ + size_t nIn; /* Number of characters in the input buffer */ + char *zIn; /* The input buffer */ +@@ -166,7 +166,7 @@ + if( p->in!=0 ) return csv_getc_refill(p); + return EOF; + } +- return p->zIn[p->iIn++]; ++ return ((unsigned char*)p->zIn)[p->iIn++]; + } + + /* Increase the size of p->z and append character c to the end. +--- test/releasetest.tcl ++++ test/releasetest.tcl +@@ -114,7 +114,7 @@ + } + "Debug-One" { + --disable-shared +- -O2 ++ -O2 -funsigned-char + -DSQLITE_DEBUG=1 + -DSQLITE_MEMDEBUG=1 + -DSQLITE_MUTEX_NOOP=1 diff --git a/sdk_container/src/third_party/portage-stable/dev-db/sqlite/files/sqlite-3.20.1-full_tarball-tests-big-endian.patch b/sdk_container/src/third_party/portage-stable/dev-db/sqlite/files/sqlite-3.20.1-full_tarball-tests-big-endian.patch new file mode 100644 index 0000000000..427021d2f7 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-db/sqlite/files/sqlite-3.20.1-full_tarball-tests-big-endian.patch @@ -0,0 +1,95 @@ +https://www.sqlite.org/src/info/87ccdf9cbb928455 + +--- test/fts3conf.test ++++ test/fts3conf.test +@@ -136,47 +136,49 @@ + do_execsql_test 2.2.3 { SELECT * FROM t1 } {{a b c} {a b c}} + fts3_integrity 2.2.4 db t1 + +-do_execsql_test 3.1 { +- CREATE VIRTUAL TABLE t3 USING fts4; +- REPLACE INTO t3(docid, content) VALUES (1, 'one two'); +- SELECT quote(matchinfo(t3, 'na')) FROM t3 WHERE t3 MATCH 'one' +-} {X'0100000002000000'} +- +-do_execsql_test 3.2 { +- REPLACE INTO t3(docid, content) VALUES (2, 'one two three four'); +- SELECT quote(matchinfo(t3, 'na')) FROM t3 WHERE t3 MATCH 'four' +-} {X'0200000003000000'} +- +-do_execsql_test 3.3 { +- REPLACE INTO t3(docid, content) VALUES (1, 'one two three four five six'); +- SELECT quote(matchinfo(t3, 'na')) FROM t3 WHERE t3 MATCH 'six' +-} {X'0200000005000000'} +- +-do_execsql_test 3.4 { +- UPDATE OR REPLACE t3 SET docid = 2 WHERE docid=1; +- SELECT quote(matchinfo(t3, 'na')) FROM t3 WHERE t3 MATCH 'six' +-} {X'0100000006000000'} +- +-do_execsql_test 3.5 { +- UPDATE OR REPLACE t3 SET docid = 3 WHERE docid=2; +- SELECT quote(matchinfo(t3, 'na')) FROM t3 WHERE t3 MATCH 'six' +-} {X'0100000006000000'} +- +-do_execsql_test 3.6 { +- REPLACE INTO t3(docid, content) VALUES (3, 'one two'); +- SELECT quote(matchinfo(t3, 'na')) FROM t3 WHERE t3 MATCH 'one' +-} {X'0100000002000000'} +- +-do_execsql_test 3.7 { +- REPLACE INTO t3(docid, content) VALUES (NULL, 'one two three four'); +- REPLACE INTO t3(docid, content) VALUES (NULL, 'one two three four five six'); +- SELECT docid FROM t3; +-} {3 4 5} +- +-do_execsql_test 3.8 { +- UPDATE OR REPLACE t3 SET docid = 5, content='three four' WHERE docid = 4; +- SELECT quote(matchinfo(t3, 'na')) FROM t3 WHERE t3 MATCH 'one' +-} {X'0200000002000000'} ++if {$tcl_platform(byteOrder)=="littleEndian"} { ++ do_execsql_test 3.1 { ++ CREATE VIRTUAL TABLE t3 USING fts4; ++ REPLACE INTO t3(docid, content) VALUES (1, 'one two'); ++ SELECT quote(matchinfo(t3, 'na')) FROM t3 WHERE t3 MATCH 'one' ++ } {X'0100000002000000'} ++ ++ do_execsql_test 3.2 { ++ REPLACE INTO t3(docid, content) VALUES (2, 'one two three four'); ++ SELECT quote(matchinfo(t3, 'na')) FROM t3 WHERE t3 MATCH 'four' ++ } {X'0200000003000000'} ++ ++ do_execsql_test 3.3 { ++ REPLACE INTO t3(docid, content) VALUES (1, 'one two three four five six'); ++ SELECT quote(matchinfo(t3, 'na')) FROM t3 WHERE t3 MATCH 'six' ++ } {X'0200000005000000'} ++ ++ do_execsql_test 3.4 { ++ UPDATE OR REPLACE t3 SET docid = 2 WHERE docid=1; ++ SELECT quote(matchinfo(t3, 'na')) FROM t3 WHERE t3 MATCH 'six' ++ } {X'0100000006000000'} ++ ++ do_execsql_test 3.5 { ++ UPDATE OR REPLACE t3 SET docid = 3 WHERE docid=2; ++ SELECT quote(matchinfo(t3, 'na')) FROM t3 WHERE t3 MATCH 'six' ++ } {X'0100000006000000'} ++ ++ do_execsql_test 3.6 { ++ REPLACE INTO t3(docid, content) VALUES (3, 'one two'); ++ SELECT quote(matchinfo(t3, 'na')) FROM t3 WHERE t3 MATCH 'one' ++ } {X'0100000002000000'} ++ ++ do_execsql_test 3.7 { ++ REPLACE INTO t3(docid, content) VALUES(NULL,'one two three four'); ++ REPLACE INTO t3(docid, content) VALUES(NULL,'one two three four five six'); ++ SELECT docid FROM t3; ++ } {3 4 5} ++ ++ do_execsql_test 3.8 { ++ UPDATE OR REPLACE t3 SET docid = 5, content='three four' WHERE docid = 4; ++ SELECT quote(matchinfo(t3, 'na')) FROM t3 WHERE t3 MATCH 'one' ++ } {X'0200000002000000'} ++} + + #------------------------------------------------------------------------- + # Test that the xSavepoint is invoked correctly if the first write diff --git a/sdk_container/src/third_party/portage-stable/dev-db/sqlite/files/sqlite-3.11.0-full_tarball-build.patch b/sdk_container/src/third_party/portage-stable/dev-db/sqlite/files/sqlite-3.21.0-full_archive-build.patch similarity index 58% rename from sdk_container/src/third_party/portage-stable/dev-db/sqlite/files/sqlite-3.11.0-full_tarball-build.patch rename to sdk_container/src/third_party/portage-stable/dev-db/sqlite/files/sqlite-3.21.0-full_archive-build.patch index 4745f05b6d..dfc01c88b5 100644 --- a/sdk_container/src/third_party/portage-stable/dev-db/sqlite/files/sqlite-3.11.0-full_tarball-build.patch +++ b/sdk_container/src/third_party/portage-stable/dev-db/sqlite/files/sqlite-3.21.0-full_archive-build.patch @@ -2,18 +2,9 @@ Link executables against libsqlite3.so. Increase timeout for fuzzcheck. Fix building with dlopen() not available. ---- Makefile.in -+++ Makefile.in -@@ -550,7 +550,7 @@ - # Extra compiler options for various shell tools - # - SHELL_OPT = -DSQLITE_ENABLE_JSON1 -DSQLITE_ENABLE_FTS4 --SHELL_OPT += -DSQLITE_ENABLE_EXPLAIN_COMMENTS -+SHELL_OPT += -DSQLITE_ENABLE_EXPLAIN_COMMENTS -DSQLITE_ENABLE_DBSTAT_VTAB - FUZZERSHELL_OPT = -DSQLITE_ENABLE_JSON1 - FUZZCHECK_OPT = -DSQLITE_ENABLE_JSON1 -DSQLITE_ENABLE_MEMSYS5 - -@@ -571,18 +571,18 @@ +--- /Makefile.in ++++ /Makefile.in +@@ -600,25 +600,25 @@ libtclsqlite3.la: tclsqlite.lo libsqlite3.la $(LTLINK) -no-undefined -o $@ tclsqlite.lo \ @@ -23,23 +14,34 @@ Fix building with dlopen() not available. -version-info "8:6:8" \ -avoid-version --sqlite3$(TEXE): $(TOP)/src/shell.c sqlite3.c +-sqlite3$(TEXE): shell.c sqlite3.c - $(LTLINK) $(READLINE_FLAGS) $(SHELL_OPT) -o $@ \ -- $(TOP)/src/shell.c sqlite3.c \ +- shell.c sqlite3.c \ - $(LIBREADLINE) $(TLIBS) -rpath "$(libdir)" -+sqlite3$(TEXE): $(TOP)/src/shell.c libsqlite3.la ++sqlite3$(TEXE): shell.c libsqlite3.la + $(LTLINK) $(READLINE_FLAGS) -o $@ \ -+ $(TOP)/src/shell.c libsqlite3.la \ ++ shell.c libsqlite3.la \ + $(LIBREADLINE) --sqldiff$(TEXE): $(TOP)/tool/sqldiff.c sqlite3.c sqlite3.h -- $(LTLINK) -o $@ $(TOP)/tool/sqldiff.c sqlite3.c $(TLIBS) +-sqldiff$(TEXE): $(TOP)/tool/sqldiff.c sqlite3.lo sqlite3.h +- $(LTLINK) -o $@ $(TOP)/tool/sqldiff.c sqlite3.lo $(TLIBS) +sqldiff$(TEXE): $(TOP)/tool/sqldiff.c libsqlite3.la + $(LTLINK) -o $@ $(TOP)/tool/sqldiff.c libsqlite3.la +-dbhash$(TEXE): $(TOP)/tool/dbhash.c sqlite3.lo sqlite3.h +- $(LTLINK) -o $@ $(TOP)/tool/dbhash.c sqlite3.lo $(TLIBS) ++dbhash$(TEXE): $(TOP)/tool/dbhash.c libsqlite3.la ++ $(LTLINK) -o $@ $(TOP)/tool/dbhash.c libsqlite3.la + +-scrub$(TEXE): $(TOP)/ext/misc/scrub.c sqlite3.lo ++scrub$(TEXE): $(TOP)/ext/misc/scrub.c libsqlite3.la + $(LTLINK) -o $@ -I. -DSCRUB_STANDALONE \ +- $(TOP)/ext/misc/scrub.c sqlite3.lo $(TLIBS) ++ $(TOP)/ext/misc/scrub.c libsqlite3.la + srcck1$(BEXE): $(TOP)/tool/srcck1.c $(BCC) -o srcck1$(BEXE) $(TOP)/tool/srcck1.c -@@ -650,7 +650,7 @@ +@@ -694,7 +694,7 @@ # Rule to build the amalgamation # sqlite3.lo: sqlite3.c @@ -48,7 +50,7 @@ Fix building with dlopen() not available. # Rules to build the LEMON compiler generator # -@@ -1074,13 +1074,13 @@ +@@ -1145,13 +1145,13 @@ # Fuzz testing fuzztest: fuzzcheck$(TEXE) $(FUZZDATA) @@ -63,28 +65,27 @@ Fix building with dlopen() not available. - valgrind ./fuzzcheck$(TEXE) --cell-size-check --limit-mem 10M --timeout 600 $(FUZZDATA) + valgrind ./fuzzcheck$(TEXE) --cell-size-check --limit-mem 10M --timeout 3600 $(FUZZDATA) - # Minimal testing that runs in less than 3 minutes + # The veryquick.test TCL tests. # -@@ -1106,29 +1106,29 @@ +@@ -1181,30 +1181,30 @@ smoketest: $(TESTPROGS) fuzzcheck$(TEXE) ./testfixture$(TEXE) $(TOP)/test/main.test $(TESTOPTS) --sqlite3_analyzer.c: sqlite3.c $(TOP)/src/tclsqlite.c $(TOP)/tool/spaceanal.tcl -+sqlite3_analyzer.c: $(TOP)/src/tclsqlite.c $(TOP)/tool/spaceanal.tcl - echo "#define TCLSH 2" > $@ - echo "#define SQLITE_ENABLE_DBSTAT_VTAB 1" >> $@ -- cat sqlite3.c $(TOP)/src/tclsqlite.c >> $@ -+ cat $(TOP)/src/tclsqlite.c >> $@ - echo "static const char *tclsh_main_loop(void){" >> $@ - echo "static const char *zMainloop = " >> $@ - $(TCLSH_CMD) $(TOP)/tool/tostr.tcl $(TOP)/tool/spaceanal.tcl >> $@ - echo "; return zMainloop; }" >> $@ +-sqlite3_analyzer.c: sqlite3.c $(TOP)/src/tclsqlite.c $(TOP)/tool/spaceanal.tcl $(TOP)/tool/mkccode.tcl $(TOP)/tool/sqlite3_analyzer.c.in ++sqlite3_analyzer.c: $(TOP)/src/tclsqlite.c $(TOP)/tool/spaceanal.tcl $(TOP)/tool/mkccode.tcl $(TOP)/tool/sqlite3_analyzer.c.in + $(TCLSH_CMD) $(TOP)/tool/mkccode.tcl $(TOP)/tool/sqlite3_analyzer.c.in >sqlite3_analyzer.c -sqlite3_analyzer$(TEXE): sqlite3_analyzer.c - $(LTLINK) sqlite3_analyzer.c -o $@ $(LIBTCL) $(TLIBS) +sqlite3_analyzer$(TEXE): sqlite3_analyzer.c libsqlite3.la + $(LTLINK) sqlite3_analyzer.c -o $@ libsqlite3.la $(LIBTCL) +-dbdump$(TEXE): $(TOP)/ext/misc/dbdump.c sqlite3.lo ++dbdump$(TEXE): $(TOP)/ext/misc/dbdump.c libsqlite3.la + $(LTLINK) -DDBDUMP_STANDALONE -o $@ \ +- $(TOP)/ext/misc/dbdump.c sqlite3.lo $(TLIBS) ++ $(TOP)/ext/misc/dbdump.c libsqlite3.la + -showdb$(TEXE): $(TOP)/tool/showdb.c sqlite3.lo - $(LTLINK) -o $@ $(TOP)/tool/showdb.c sqlite3.lo $(TLIBS) +showdb$(TEXE): $(TOP)/tool/showdb.c libsqlite3.la @@ -105,22 +106,32 @@ Fix building with dlopen() not available. +showwal$(TEXE): $(TOP)/tool/showwal.c + $(LTLINK) -o $@ $(TOP)/tool/showwal.c +-changeset$(TEXE): $(TOP)/ext/session/changeset.c sqlite3.lo +- $(LTLINK) -o $@ $(TOP)/ext/session/changeset.c sqlite3.lo $(TLIBS) ++changeset$(TEXE): $(TOP)/ext/session/changeset.c libsqlite3.la ++ $(LTLINK) -o $@ $(TOP)/ext/session/changeset.c libsqlite3.la + rollback-test$(TEXE): $(TOP)/tool/rollback-test.c sqlite3.lo $(LTLINK) -o $@ $(TOP)/tool/rollback-test.c sqlite3.lo $(TLIBS) -@@ -1142,8 +1142,8 @@ - speedtest1$(TEXE): $(TOP)/test/speedtest1.c sqlite3.lo - $(LTLINK) -o $@ $(TOP)/test/speedtest1.c sqlite3.lo $(TLIBS) +@@ -1223,11 +1223,11 @@ + kvtest$(TEXE): $(TOP)/test/kvtest.c sqlite3.c + $(LTLINK) $(KV_OPT) -o $@ $(TOP)/test/kvtest.c sqlite3.c $(TLIBS) -rbu$(EXE): $(TOP)/ext/rbu/rbu.c $(TOP)/ext/rbu/sqlite3rbu.c sqlite3.lo - $(LTLINK) -I. -o $@ $(TOP)/ext/rbu/rbu.c sqlite3.lo $(TLIBS) +rbu$(EXE): $(TOP)/ext/rbu/rbu.c libsqlite3.la + $(LTLINK) -I. -o $@ $(TOP)/ext/rbu/rbu.c libsqlite3.la - loadfts$(EXE): $(TOP)/tool/loadfts.c libsqlite3.la - $(LTLINK) $(TOP)/tool/loadfts.c libsqlite3.la -o $@ $(TLIBS) ---- configure.ac -+++ configure.ac -@@ -570,6 +570,9 @@ +-loadfts$(EXE): $(TOP)/tool/loadfts.c libsqlite3.la +- $(LTLINK) $(TOP)/tool/loadfts.c libsqlite3.la -o $@ $(TLIBS) ++loadfts$(EXE): $(TOP)/tool/loadfts.c libsqlite3.la ++ $(LTLINK) $(TOP)/tool/loadfts.c libsqlite3.la -o $@ + + # This target will fail if the SQLite amalgamation contains any exported + # symbols that do not begin with "sqlite3_". It is run as part of the +--- /configure.ac ++++ /configure.ac +@@ -584,6 +584,9 @@ if test "${use_loadextension}" = "yes" ; then OPT_FEATURE_FLAGS="" AC_SEARCH_LIBS(dlopen, dl) @@ -130,3 +141,13 @@ Fix building with dlopen() not available. else OPT_FEATURE_FLAGS="-DSQLITE_OMIT_LOAD_EXTENSION=1" fi +--- /tool/sqlite3_analyzer.c.in ++++ /tool/sqlite3_analyzer.c.in +@@ -14,7 +14,6 @@ + #define SQLITE_DEFAULT_MEMSTATUS 0 + #define SQLITE_MAX_EXPR_DEPTH 0 + #define SQLITE_OMIT_LOAD_EXTENSION 1 +-INCLUDE sqlite3.c + INCLUDE $ROOT/src/tclsqlite.c + + const char *sqlite3_analyzer_init_proc(Tcl_Interp *interp){ diff --git a/sdk_container/src/third_party/portage-stable/dev-db/sqlite/files/sqlite-3.21.0-nonfull_archive-build.patch b/sdk_container/src/third_party/portage-stable/dev-db/sqlite/files/sqlite-3.21.0-nonfull_archive-build.patch new file mode 100644 index 0000000000..06ea8b2905 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-db/sqlite/files/sqlite-3.21.0-nonfull_archive-build.patch @@ -0,0 +1,14 @@ +Fix building with dlopen() not available. + +--- /configure.ac ++++ /configure.ac +@@ -102,6 +102,9 @@ + [], [enable_dynamic_extensions=yes]) + if test x"$enable_dynamic_extensions" != "xno"; then + AC_SEARCH_LIBS(dlopen, dl) ++ if test "${ac_cv_search_dlopen}" = "no" ; then ++ DYNAMIC_EXTENSION_FLAGS=-DSQLITE_OMIT_LOAD_EXTENSION=1 ++ fi + else + DYNAMIC_EXTENSION_FLAGS=-DSQLITE_OMIT_LOAD_EXTENSION=1 + fi diff --git a/sdk_container/src/third_party/portage-stable/dev-db/sqlite/files/sqlite-3.22.0-full_archive-build.patch b/sdk_container/src/third_party/portage-stable/dev-db/sqlite/files/sqlite-3.22.0-full_archive-build.patch new file mode 100644 index 0000000000..5e1236a4e9 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-db/sqlite/files/sqlite-3.22.0-full_archive-build.patch @@ -0,0 +1,405 @@ +Move some code to libsqlite3.so to avoid duplication. +Link executables against libsqlite3.so. +Increase timeout for fuzzcheck. +Fix building with dlopen() not available. + +--- /Makefile.in ++++ /Makefile.in +@@ -307,6 +307,9 @@ + # Source code for extensions + # + SRC += \ ++ $(TOP)/ext/expert/sqlite3expert.c \ ++ $(TOP)/ext/expert/sqlite3expert.h ++SRC += \ + $(TOP)/ext/fts1/fts1.c \ + $(TOP)/ext/fts1/fts1.h \ + $(TOP)/ext/fts1/fts1_hash.c \ +@@ -355,8 +358,11 @@ + $(TOP)/ext/rbu/sqlite3rbu.h \ + $(TOP)/ext/rbu/sqlite3rbu.c + SRC += \ ++ $(TOP)/ext/misc/appendvfs.c \ + $(TOP)/ext/misc/json1.c \ +- $(TOP)/ext/misc/stmt.c ++ $(TOP)/ext/misc/sqlar.c \ ++ $(TOP)/ext/misc/stmt.c \ ++ $(TOP)/ext/misc/zipfile.c + + # Generated source code files + # +@@ -425,7 +431,6 @@ + # Statically linked extensions + # + TESTSRC += \ +- $(TOP)/ext/expert/sqlite3expert.c \ + $(TOP)/ext/expert/test_expert.c \ + $(TOP)/ext/misc/amatch.c \ + $(TOP)/ext/misc/carray.c \ +@@ -447,8 +452,7 @@ + $(TOP)/ext/misc/spellfix.c \ + $(TOP)/ext/misc/totype.c \ + $(TOP)/ext/misc/unionvtab.c \ +- $(TOP)/ext/misc/wholenumber.c \ +- $(TOP)/ext/misc/zipfile.c ++ $(TOP)/ext/misc/wholenumber.c + + # Source code to the library files needed by the test fixture + # +@@ -610,25 +614,25 @@ + + libtclsqlite3.la: tclsqlite.lo libsqlite3.la + $(LTLINK) -no-undefined -o $@ tclsqlite.lo \ +- libsqlite3.la @TCL_STUB_LIB_SPEC@ $(TLIBS) \ ++ libsqlite3.la @TCL_STUB_LIB_SPEC@ \ + -rpath "$(TCLLIBDIR)" \ + -version-info "8:6:8" \ + -avoid-version + +-sqlite3$(TEXE): shell.c sqlite3.c +- $(LTLINK) $(READLINE_FLAGS) $(SHELL_OPT) -o $@ \ +- shell.c sqlite3.c \ +- $(LIBREADLINE) $(TLIBS) -rpath "$(libdir)" ++sqlite3$(TEXE): shell.c libsqlite3.la ++ $(LTLINK) $(READLINE_FLAGS) -o $@ \ ++ shell.c libsqlite3.la \ ++ $(LIBREADLINE) + +-sqldiff$(TEXE): $(TOP)/tool/sqldiff.c sqlite3.lo sqlite3.h +- $(LTLINK) -o $@ $(TOP)/tool/sqldiff.c sqlite3.lo $(TLIBS) ++sqldiff$(TEXE): $(TOP)/tool/sqldiff.c libsqlite3.la ++ $(LTLINK) -o $@ $(TOP)/tool/sqldiff.c libsqlite3.la + +-dbhash$(TEXE): $(TOP)/tool/dbhash.c sqlite3.lo sqlite3.h +- $(LTLINK) -o $@ $(TOP)/tool/dbhash.c sqlite3.lo $(TLIBS) ++dbhash$(TEXE): $(TOP)/tool/dbhash.c libsqlite3.la ++ $(LTLINK) -o $@ $(TOP)/tool/dbhash.c libsqlite3.la + +-scrub$(TEXE): $(TOP)/ext/misc/scrub.c sqlite3.lo ++scrub$(TEXE): $(TOP)/ext/misc/scrub.c libsqlite3.la + $(LTLINK) -o $@ -I. -DSCRUB_STANDALONE \ +- $(TOP)/ext/misc/scrub.c sqlite3.lo $(TLIBS) ++ $(TOP)/ext/misc/scrub.c libsqlite3.la + + srcck1$(BEXE): $(TOP)/tool/srcck1.c + $(BCC) -o srcck1$(BEXE) $(TOP)/tool/srcck1.c +@@ -704,7 +708,7 @@ + # Rule to build the amalgamation + # + sqlite3.lo: sqlite3.c +- $(LTCOMPILE) $(TEMP_STORE) -c sqlite3.c ++ $(LTCOMPILE) $(SHELL_OPT) $(TEMP_STORE) -c sqlite3.c + + # Rules to build the LEMON compiler generator + # +@@ -995,14 +999,9 @@ + # Source files that go into making shell.c + SHELL_SRC = \ + $(TOP)/src/shell.c.in \ +- $(TOP)/ext/misc/appendvfs.c \ + $(TOP)/ext/misc/shathree.c \ + $(TOP)/ext/misc/fileio.c \ + $(TOP)/ext/misc/completion.c \ +- $(TOP)/ext/misc/sqlar.c \ +- $(TOP)/ext/expert/sqlite3expert.c \ +- $(TOP)/ext/expert/sqlite3expert.h \ +- $(TOP)/ext/misc/zipfile.c \ + $(TOP)/src/test_windirent.c + + shell.c: $(SHELL_SRC) $(TOP)/tool/mkshellc.tcl +@@ -1161,13 +1160,13 @@ + + # Fuzz testing + fuzztest: fuzzcheck$(TEXE) $(FUZZDATA) +- ./fuzzcheck$(TEXE) $(FUZZDATA) ++ ./fuzzcheck$(TEXE) --timeout 3600 $(FUZZDATA) + + fastfuzztest: fuzzcheck$(TEXE) $(FUZZDATA) +- ./fuzzcheck$(TEXE) --limit-mem 100M $(FUZZDATA) ++ ./fuzzcheck$(TEXE) --limit-mem 100M --timeout 3600 $(FUZZDATA) + + valgrindfuzz: fuzzcheck$(TEXT) $(FUZZDATA) +- valgrind ./fuzzcheck$(TEXE) --cell-size-check --limit-mem 10M --timeout 600 $(FUZZDATA) ++ valgrind ./fuzzcheck$(TEXE) --cell-size-check --limit-mem 10M --timeout 3600 $(FUZZDATA) + + # The veryquick.test TCL tests. + # +@@ -1197,24 +1196,23 @@ + smoketest: $(TESTPROGS) fuzzcheck$(TEXE) + ./testfixture$(TEXE) $(TOP)/test/main.test $(TESTOPTS) + +-sqlite3_analyzer.c: sqlite3.c $(TOP)/src/tclsqlite.c $(TOP)/tool/spaceanal.tcl $(TOP)/tool/mkccode.tcl $(TOP)/tool/sqlite3_analyzer.c.in ++sqlite3_analyzer.c: $(TOP)/src/tclsqlite.c $(TOP)/tool/spaceanal.tcl $(TOP)/tool/mkccode.tcl $(TOP)/tool/sqlite3_analyzer.c.in + $(TCLSH_CMD) $(TOP)/tool/mkccode.tcl $(TOP)/tool/sqlite3_analyzer.c.in >sqlite3_analyzer.c + +-sqlite3_analyzer$(TEXE): sqlite3_analyzer.c +- $(LTLINK) sqlite3_analyzer.c -o $@ $(LIBTCL) $(TLIBS) ++sqlite3_analyzer$(TEXE): sqlite3_analyzer.c libsqlite3.la ++ $(LTLINK) sqlite3_analyzer.c -o $@ libsqlite3.la $(LIBTCL) + +-sqltclsh.c: sqlite3.c $(TOP)/src/tclsqlite.c $(TOP)/tool/sqltclsh.tcl $(TOP)/ext/misc/appendvfs.c $(TOP)/tool/mkccode.tcl $(TOP)/tool/sqltclsh.c.in ++sqltclsh.c: $(TOP)/src/tclsqlite.c $(TOP)/tool/sqltclsh.tcl $(TOP)/tool/mkccode.tcl $(TOP)/tool/sqltclsh.c.in + $(TCLSH_CMD) $(TOP)/tool/mkccode.tcl $(TOP)/tool/sqltclsh.c.in >sqltclsh.c + +-sqltclsh$(TEXE): sqltclsh.c +- $(LTLINK) sqltclsh.c -o $@ $(LIBTCL) $(TLIBS) ++sqltclsh$(TEXE): sqltclsh.c libsqlite3.la ++ $(LTLINK) sqltclsh.c -o $@ libsqlite3.la $(LIBTCL) + +-sqlite3_expert$(TEXE): $(TOP)/ext/expert/sqlite3expert.h $(TOP)/ext/expert/sqlite3expert.c $(TOP)/ext/expert/expert.c sqlite3.c +- $(LTLINK) $(TOP)/ext/expert/sqlite3expert.h $(TOP)/ext/expert/sqlite3expert.c $(TOP)/ext/expert/expert.c sqlite3.c -o sqlite3_expert $(TLIBS) ++sqlite3_expert$(TEXE): $(TOP)/ext/expert/sqlite3expert.h $(TOP)/ext/expert/expert.c libsqlite3.la ++ $(LTLINK) $(TOP)/ext/expert/expert.c -o sqlite3_expert libsqlite3.la + + CHECKER_DEPS =\ + $(TOP)/tool/mkccode.tcl \ +- sqlite3.c \ + $(TOP)/src/tclsqlite.c \ + $(TOP)/ext/repair/sqlite3_checker.tcl \ + $(TOP)/ext/repair/checkindex.c \ +@@ -1225,30 +1223,30 @@ + sqlite3_checker.c: $(CHECKER_DEPS) + $(TCLSH_CMD) $(TOP)/tool/mkccode.tcl $(TOP)/ext/repair/sqlite3_checker.c.in >$@ + +-sqlite3_checker$(TEXE): sqlite3_checker.c +- $(LTLINK) sqlite3_checker.c -o $@ $(LIBTCL) $(TLIBS) ++sqlite3_checker$(TEXE): sqlite3_checker.c libsqlite3.la ++ $(LTLINK) sqlite3_checker.c -o $@ libsqlite3.la $(LIBTCL) + +-dbdump$(TEXE): $(TOP)/ext/misc/dbdump.c sqlite3.lo ++dbdump$(TEXE): $(TOP)/ext/misc/dbdump.c libsqlite3.la + $(LTLINK) -DDBDUMP_STANDALONE -o $@ \ +- $(TOP)/ext/misc/dbdump.c sqlite3.lo $(TLIBS) ++ $(TOP)/ext/misc/dbdump.c libsqlite3.la + +-showdb$(TEXE): $(TOP)/tool/showdb.c sqlite3.lo +- $(LTLINK) -o $@ $(TOP)/tool/showdb.c sqlite3.lo $(TLIBS) ++showdb$(TEXE): $(TOP)/tool/showdb.c libsqlite3.la ++ $(LTLINK) -o $@ $(TOP)/tool/showdb.c libsqlite3.la + +-showstat4$(TEXE): $(TOP)/tool/showstat4.c sqlite3.lo +- $(LTLINK) -o $@ $(TOP)/tool/showstat4.c sqlite3.lo $(TLIBS) ++showstat4$(TEXE): $(TOP)/tool/showstat4.c libsqlite3.la ++ $(LTLINK) -o $@ $(TOP)/tool/showstat4.c libsqlite3.la + +-showjournal$(TEXE): $(TOP)/tool/showjournal.c sqlite3.lo +- $(LTLINK) -o $@ $(TOP)/tool/showjournal.c sqlite3.lo $(TLIBS) ++showjournal$(TEXE): $(TOP)/tool/showjournal.c ++ $(LTLINK) -o $@ $(TOP)/tool/showjournal.c + +-showwal$(TEXE): $(TOP)/tool/showwal.c sqlite3.lo +- $(LTLINK) -o $@ $(TOP)/tool/showwal.c sqlite3.lo $(TLIBS) ++showwal$(TEXE): $(TOP)/tool/showwal.c ++ $(LTLINK) -o $@ $(TOP)/tool/showwal.c + + showshm$(TEXE): $(TOP)/tool/showshm.c + $(LTLINK) -o $@ $(TOP)/tool/showshm.c + +-changeset$(TEXE): $(TOP)/ext/session/changeset.c sqlite3.lo +- $(LTLINK) -o $@ $(TOP)/ext/session/changeset.c sqlite3.lo $(TLIBS) ++changeset$(TEXE): $(TOP)/ext/session/changeset.c libsqlite3.la ++ $(LTLINK) -o $@ $(TOP)/ext/session/changeset.c libsqlite3.la + + rollback-test$(TEXE): $(TOP)/tool/rollback-test.c sqlite3.lo + $(LTLINK) -o $@ $(TOP)/tool/rollback-test.c sqlite3.lo $(TLIBS) +@@ -1267,11 +1265,11 @@ + kvtest$(TEXE): $(TOP)/test/kvtest.c sqlite3.c + $(LTLINK) $(KV_OPT) -o $@ $(TOP)/test/kvtest.c sqlite3.c $(TLIBS) + +-rbu$(EXE): $(TOP)/ext/rbu/rbu.c $(TOP)/ext/rbu/sqlite3rbu.c sqlite3.lo +- $(LTLINK) -I. -o $@ $(TOP)/ext/rbu/rbu.c sqlite3.lo $(TLIBS) ++rbu$(EXE): $(TOP)/ext/rbu/rbu.c libsqlite3.la ++ $(LTLINK) -I. -o $@ $(TOP)/ext/rbu/rbu.c libsqlite3.la + +-loadfts$(EXE): $(TOP)/tool/loadfts.c libsqlite3.la +- $(LTLINK) $(TOP)/tool/loadfts.c libsqlite3.la -o $@ $(TLIBS) ++loadfts$(EXE): $(TOP)/tool/loadfts.c libsqlite3.la ++ $(LTLINK) $(TOP)/tool/loadfts.c libsqlite3.la -o $@ + + # This target will fail if the SQLite amalgamation contains any exported + # symbols that do not begin with "sqlite3_". It is run as part of the +--- /configure.ac ++++ /configure.ac +@@ -590,6 +590,9 @@ + if test "${use_loadextension}" = "yes" ; then + OPT_FEATURE_FLAGS="" + AC_SEARCH_LIBS(dlopen, dl) ++ if test "${ac_cv_search_dlopen}" = "no" ; then ++ OPT_FEATURE_FLAGS="-DSQLITE_OMIT_LOAD_EXTENSION=1" ++ fi + else + OPT_FEATURE_FLAGS="-DSQLITE_OMIT_LOAD_EXTENSION=1" + fi +--- /ext/misc/sqlar.c ++++ /ext/misc/sqlar.c +@@ -14,6 +14,8 @@ + ** for working with sqlar archives and used by the shell tool's built-in + ** sqlar support. + */ ++#ifdef SQLITE_HAVE_ZLIB ++ + #include "sqlite3ext.h" + SQLITE_EXTENSION_INIT1 + #include +@@ -119,3 +121,5 @@ + } + return rc; + } ++ ++#endif /* SQLITE_HAVE_ZLIB */ +--- /ext/misc/zipfile.c ++++ /ext/misc/zipfile.c +@@ -24,6 +24,8 @@ + ** * No support for zip64 extensions + ** * Only the "inflate/deflate" (zlib) compression method is supported + */ ++#ifdef SQLITE_HAVE_ZLIB ++ + #include "sqlite3ext.h" + SQLITE_EXTENSION_INIT1 + #include +@@ -1665,3 +1667,5 @@ + (void)pzErrMsg; /* Unused parameter */ + return zipfileRegister(db); + } ++ ++#endif /* SQLITE_HAVE_ZLIB */ +--- /ext/repair/sqlite3_checker.c.in ++++ /ext/repair/sqlite3_checker.c.in +@@ -2,6 +2,7 @@ + ** Read an SQLite database file and analyze its space utilization. Generate + ** text on standard output. + */ ++#define SQLITE_CORE 1 + #define TCLSH_INIT_PROC sqlite3_checker_init_proc + #define SQLITE_ENABLE_DBPAGE_VTAB 1 + #define SQLITE_ENABLE_JSON1 1 +@@ -14,7 +15,7 @@ + #define SQLITE_OMIT_SHARED_CACHE 1 + #define SQLITE_DEFAULT_MEMSTATUS 0 + #define SQLITE_MAX_EXPR_DEPTH 0 +-INCLUDE sqlite3.c ++#include "sqlite3.h" + INCLUDE $ROOT/src/tclsqlite.c + INCLUDE $ROOT/ext/misc/btreeinfo.c + INCLUDE $ROOT/ext/repair/checkindex.c +--- /src/shell.c.in ++++ /src/shell.c.in +@@ -61,6 +61,7 @@ + #include + #include + #include "sqlite3.h" ++#include "ext/expert/sqlite3expert.h" + typedef sqlite3_int64 i64; + typedef sqlite3_uint64 u64; + typedef unsigned char u8; +@@ -124,6 +125,10 @@ + # define SHELL_USE_LOCAL_GETLINE 1 + #endif + ++#ifdef SQLITE_HAVE_ZLIB ++#include ++#endif ++ + + #if defined(_WIN32) || defined(WIN32) + # include +@@ -963,13 +968,6 @@ + INCLUDE ../ext/misc/shathree.c + INCLUDE ../ext/misc/fileio.c + INCLUDE ../ext/misc/completion.c +-INCLUDE ../ext/misc/appendvfs.c +-#ifdef SQLITE_HAVE_ZLIB +-INCLUDE ../ext/misc/zipfile.c +-INCLUDE ../ext/misc/sqlar.c +-#endif +-INCLUDE ../ext/expert/sqlite3expert.h +-INCLUDE ../ext/expert/sqlite3expert.c + + #if defined(SQLITE_ENABLE_SESSION) + /* +@@ -3467,7 +3465,9 @@ + sqlite3_shathree_init(p->db, 0, 0); + sqlite3_completion_init(p->db, 0, 0); + #ifdef SQLITE_HAVE_ZLIB ++ extern int sqlite3_zipfile_init(sqlite3 *, char **, const sqlite3_api_routines *); + sqlite3_zipfile_init(p->db, 0, 0); ++ extern int sqlite3_sqlar_init(sqlite3 *, char **, const sqlite3_api_routines *); + sqlite3_sqlar_init(p->db, 0, 0); + #endif + sqlite3_create_function(p->db, "shell_add_schema", 3, SQLITE_UTF8, 0, +@@ -5316,6 +5316,7 @@ + } + sqlite3_fileio_init(cmd.db, 0, 0); + #ifdef SQLITE_HAVE_ZLIB ++ extern int sqlite3_sqlar_init(sqlite3 *, char **, const sqlite3_api_routines *); + sqlite3_sqlar_init(cmd.db, 0, 0); + #endif + sqlite3_create_function(cmd.db, "shell_putsnl", 1, SQLITE_UTF8, cmd.p, +@@ -8222,6 +8223,7 @@ + #endif + } + data.out = stdout; ++ extern int sqlite3_appendvfs_init(sqlite3 *, char **, const sqlite3_api_routines *); + sqlite3_appendvfs_init(0,0,0); + + /* Go ahead and open the database file if it already exists. If the +--- /tool/mksqlite3c.tcl ++++ /tool/mksqlite3c.tcl +@@ -116,6 +116,7 @@ + rtree.h + sqlite3session.h + sqlite3.h ++ sqlite3expert.h + sqlite3ext.h + sqlite3rbu.h + sqliteicu.h +@@ -399,6 +400,10 @@ + json1.c + fts5.c + stmt.c ++ appendvfs.c ++ sqlar.c ++ sqlite3expert.c ++ zipfile.c + } { + copy_file tsrc/$file + } +--- /tool/sqlite3_analyzer.c.in ++++ /tool/sqlite3_analyzer.c.in +@@ -14,9 +14,6 @@ + #define SQLITE_DEFAULT_MEMSTATUS 0 + #define SQLITE_MAX_EXPR_DEPTH 0 + #define SQLITE_OMIT_LOAD_EXTENSION 1 +-#ifndef USE_EXTERNAL_SQLITE +-INCLUDE sqlite3.c +-#endif + INCLUDE $ROOT/src/tclsqlite.c + + const char *sqlite3_analyzer_init_proc(Tcl_Interp *interp){ +--- /tool/sqltclsh.c.in ++++ /tool/sqltclsh.c.in +@@ -27,19 +27,17 @@ + #define SQLITE_OMIT_SHARED_CACHE 1 + #define SQLITE_DEFAULT_MEMSTATUS 0 + #define SQLITE_MAX_EXPR_DEPTH 0 +-INCLUDE sqlite3.c +-INCLUDE $ROOT/ext/misc/appendvfs.c +-#ifdef SQLITE_HAVE_ZLIB +-INCLUDE $ROOT/ext/misc/zipfile.c +-INCLUDE $ROOT/ext/misc/sqlar.c +-#endif ++#include "sqlite3.h" + INCLUDE $ROOT/src/tclsqlite.c + + const char *sqlite3_tclapp_init_proc(Tcl_Interp *interp){ + (void)interp; ++ extern int sqlite3_appendvfs_init(sqlite3 *,char **, const sqlite3_api_routines *); + sqlite3_appendvfs_init(0,0,0); + #ifdef SQLITE_HAVE_ZLIB ++ extern int sqlite3_sqlar_init(sqlite3 *, char **, const sqlite3_api_routines *); + sqlite3_auto_extension((void(*)(void))sqlite3_sqlar_init); ++ extern int sqlite3_zipfile_init(sqlite3 *, char **, const sqlite3_api_routines *); + sqlite3_auto_extension((void(*)(void))sqlite3_zipfile_init); + #endif + diff --git a/sdk_container/src/third_party/portage-stable/dev-db/sqlite/files/sqlite-3.22.0-full_archive-headers.patch b/sdk_container/src/third_party/portage-stable/dev-db/sqlite/files/sqlite-3.22.0-full_archive-headers.patch new file mode 100644 index 0000000000..751f00a62b --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-db/sqlite/files/sqlite-3.22.0-full_archive-headers.patch @@ -0,0 +1,15 @@ +https://sqlite.org/src/info/6185d190e250faae + +--- /src/sqlite3ext.h ++++ /src/sqlite3ext.h +@@ -563,8 +563,8 @@ + #define sqlite3_value_pointer sqlite3_api->value_pointer + /* Version 3.22.0 and later */ + #define sqlite3_vtab_nochange sqlite3_api->vtab_nochange +-#define sqlite3_value_nochange sqltie3_api->value_nochange +-#define sqlite3_vtab_collation sqltie3_api->vtab_collation ++#define sqlite3_value_nochange sqlite3_api->value_nochange ++#define sqlite3_vtab_collation sqlite3_api->vtab_collation + #endif /* !defined(SQLITE_CORE) && !defined(SQLITE_OMIT_LOAD_EXTENSION) */ + + #if !defined(SQLITE_CORE) && !defined(SQLITE_OMIT_LOAD_EXTENSION) diff --git a/sdk_container/src/third_party/portage-stable/dev-db/sqlite/files/sqlite-3.22.0-full_archive-tests.patch b/sdk_container/src/third_party/portage-stable/dev-db/sqlite/files/sqlite-3.22.0-full_archive-tests.patch new file mode 100644 index 0000000000..a253028b7f --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-db/sqlite/files/sqlite-3.22.0-full_archive-tests.patch @@ -0,0 +1,249 @@ +https://sqlite.org/src/info/e4766cabdf64d8e9 +https://sqlite.org/src/info/d9e59cfb8476e1ec +https://sqlite.org/src/info/ba0631de60ca38bf +https://sqlite.org/src/info/b685d3231097fb90 + +--- /test/fts3rank.test ++++ /test/fts3rank.test +@@ -14,7 +14,7 @@ + + set testdir [file dirname $argv0] + source $testdir/tester.tcl +-set testprefix fts3expr5 ++set testprefix fts3rank + + # If SQLITE_ENABLE_FTS3 is defined, omit this file. + ifcapable !fts3 { +@@ -56,9 +56,14 @@ + SELECT * FROM t1 ORDER BY rank(x'0000000000000000') DESC, rowid + } {0 {{one two} one {one two} three {one two} two}} + +-do_catchsql_test 1.5 { +- SELECT * FROM t1 ORDER BY rank(x'0100000001000000') DESC, rowid +-} {1 {invalid matchinfo blob passed to function rank()}} ++if {$tcl_platform(byteOrder)=="littleEndian"} { ++ do_catchsql_test 1.5le { ++ SELECT * FROM t1 ORDER BY rank(x'0100000001000000') DESC, rowid ++ } {1 {invalid matchinfo blob passed to function rank()}} ++} else { ++ do_catchsql_test 1.5be { ++ SELECT * FROM t1 ORDER BY rank(x'0000000100000001') DESC, rowid ++ } {1 {invalid matchinfo blob passed to function rank()}} ++} + + finish_test +- +--- /test/func6.test ++++ /test/func6.test +@@ -33,54 +33,125 @@ + CREATE TABLE t2(x TEXT PRIMARY KEY, y) WITHOUT ROWID; + INSERT INTO t2(x,y) SELECT a, b FROM t1; + } ++ ++# Load the contents of $file from disk and return it encoded as a hex ++# string. ++proc loadhex {file} { ++ set fd [open $file] ++ fconfigure $fd -translation binary -encoding binary ++ set data [read $fd] ++ close $fd ++ binary encode hex $data ++} ++ ++# Each argument is either an integer between 0 and 65535, a text value, or ++# an empty string representing an SQL NULL. This command builds an SQLite ++# record containing the values passed as arguments and returns it encoded ++# as a hex string. ++proc hexrecord {args} { ++ set hdr "" ++ set body "" ++ foreach x $args { ++ if {$x==""} { ++ append hdr 00 ++ } elseif {[string is integer $x]==0} { ++ set n [string length $x] ++ append hdr [format %02x [expr $n*2 + 13]] ++ append body [binary encode hex $x] ++ } elseif {$x == 0} { ++ append hdr 08 ++ } elseif {$x == 1} { ++ append hdr 09 ++ } elseif {$x <= 127} { ++ append hdr 01 ++ append body [format %02x $x] ++ } else { ++ append hdr 02 ++ append body [format %04x $x] ++ } ++ } ++ set res [format %02x [expr 1 + [string length $hdr]/2]] ++ append res $hdr ++ append res $body ++} ++ ++# Argument $off is an offset into the database image encoded as a hex string ++# in argument $hexdb. This command returns 0 if the offset contains the hex ++# $hexrec, or throws an exception otherwise. ++# ++proc offset_contains_record {off hexdb hexrec} { ++ set n [string length $hexrec] ++ set off [expr $off*2] ++ if { [string compare $hexrec [string range $hexdb $off [expr $off+$n-1]]] } { ++ error "record not found!" ++ } ++ return 0 ++} ++ ++# This command is the implementation of SQL function "offrec()". The first ++# argument to this is an offset value. The remaining values are used to ++# formulate an SQLite record. If database file test.db does not contain ++# an equivalent record at the specified offset, an exception is thrown. ++# Otherwise, 0 is returned. ++# ++proc offrec {args} { ++ set offset [lindex $args 0] ++ set rec [hexrecord {*}[lrange $args 1 end]] ++ offset_contains_record $offset $::F $rec ++} ++set F [loadhex test.db] ++db func offrec offrec ++ ++# Test the sanity of the tests. ++do_execsql_test func6-105 { ++ SELECT sqlite_offset(d) FROM t1 ORDER BY rowid LIMIT 1; ++} {8179} ++do_test func6-106 { ++ set r [hexrecord abc001 1 999 {}] ++ offset_contains_record 8179 $F $r ++} 0 ++ ++set z100 [string trim [string repeat "0 " 100]] ++ ++# Test offsets within table b-tree t1. + do_execsql_test func6-110 { +- SELECT a, sqlite_offset(d)/4096 + 1, +- sqlite_offset(d)%4096 FROM t1 +- ORDER BY rowid LIMIT 2; +-} {abc001 2 4084 abc002 2 4069} ++ SELECT offrec(sqlite_offset(d), a, b, c, d) FROM t1 ORDER BY rowid ++} $z100 ++ + do_execsql_test func6-120 { + SELECT a, typeof(sqlite_offset(+a)) FROM t1 + ORDER BY rowid LIMIT 2; + } {abc001 null abc002 null} ++ ++# Test offsets within index b-tree t1a. + do_execsql_test func6-130 { +- SELECT a, sqlite_offset(a)/4096+1, +- sqlite_offset(a)%4096 +- FROM t1 +- ORDER BY a LIMIT 2; +-} {abc001 3 4087 abc002 3 4076} ++ SELECT offrec(sqlite_offset(a), a, rowid) FROM t1 ORDER BY a ++} $z100 ++ ++# Test offsets within table b-tree t1 with a temp b-tree ORDER BY. + do_execsql_test func6-140 { +- SELECT a, sqlite_offset(d)/4096+1, +- sqlite_offset(d)%4096 +- FROM t1 +- ORDER BY a LIMIT 2; +-} {abc001 2 4084 abc002 2 4069} ++ SELECT offrec(sqlite_offset(d), a, b, c, d) FROM t1 ORDER BY a ++} $z100 ++ ++# Test offsets from both index t1a and table t1 in the same query. + do_execsql_test func6-150 { +- SELECT a, +- sqlite_offset(a)/4096+1, +- sqlite_offset(a)%4096, +- sqlite_offset(d)/4096+1, +- sqlite_offset(d)%4096 +- FROM t1 +- ORDER BY a LIMIT 2; +-} {abc001 3 4087 2 4084 abc002 3 4076 2 4069} +-do_execsql_test func6-160 { +- SELECT b, +- sqlite_offset(b)/4096+1, +- sqlite_offset(b)%4096, +- sqlite_offset(c)/4096+1, +- sqlite_offset(c)%4096, +- sqlite_offset(d)/4096+1, +- sqlite_offset(d)%4096 +- FROM t1 +- ORDER BY b LIMIT 2; +-} {1 4 4090 4 4090 2 4084 2 4 4081 4 4081 2 4069} ++ SELECT offrec(sqlite_offset(a), a, rowid), ++ offrec(sqlite_offset(d), a, b, c, d) ++ FROM t1 ORDER BY a ++} [concat $z100 $z100] + ++# Test offsets from both index t1bc and table t1 in the same query. ++do_execsql_test func6-160 { ++ SELECT offrec(sqlite_offset(b), b, c, rowid), ++ offrec(sqlite_offset(c), b, c, rowid), ++ offrec(sqlite_offset(d), a, b, c, d) ++ FROM t1 ++ ORDER BY b ++} [concat $z100 $z100 $z100] + ++# Test offsets in WITHOUT ROWID table t2. + do_execsql_test func6-200 { +- SELECT y, sqlite_offset(y)/4096+1, +- sqlite_offset(y)%4096 +- FROM t2 +- ORDER BY x LIMIT 2; +-} {1 5 4087 2 5 4076} ++ SELECT offrec( sqlite_offset(y), x, y ) FROM t2 ORDER BY x ++} $z100 + + finish_test +--- /test/walro2.test ++++ /test/walro2.test +@@ -39,6 +39,18 @@ + } + } + ++# Most systems allocate the *-shm file in 32KB trunks. But on UNIX systems ++# for which the getpagesize() call returns greater than 32K, the *-shm ++# file is allocated in page-sized units (since you cannot mmap part of ++# a page). The following code sets variable $MINSHMSZ to the smallest ++# possible *-shm file (i.e. the greater of 32KB and the system page-size). ++# ++do_execsql_test 0.0 { ++ PRAGMA journal_mode = wal; ++ CREATE TABLE t1(x); ++} {wal} ++set MINSHMSZ [file size test.db-shm] ++ + foreach bZeroShm {0 1} { + set TN [expr $bZeroShm+1] + do_multiclient_test tn { +@@ -169,7 +181,7 @@ + } {a b c d e f g h 1 2} + do_test $TN.3.2.2 { + list [file size test.db-wal] [file size test.db-shm] +- } {0 32768} ++ } [list 0 $MINSHMSZ] + + do_test $TN.3.3.0 { + code2 { sqlite3 db2 test.db } +@@ -182,7 +194,7 @@ + code2 { db2 close } + code1 { db close } + list [file size test.db-wal] [file size test.db-shm] +- } [list [wal_file_size 4 1024] 32768] ++ } [list [wal_file_size 4 1024] $MINSHMSZ] + do_test $TN.3.3.1 { + code1 { sqlite3 db file:test.db?readonly_shm=1 } + sql1 { SELECT * FROM t1 } +@@ -196,7 +208,7 @@ + } + code2 { db2 close } + list [file size test.db-wal] [file size test.db-shm] +- } [list [wal_file_size 4 1024] 32768] ++ } [list [wal_file_size 4 1024] $MINSHMSZ] + do_test $TN.3.3.3 { + sql1 { SELECT * FROM t1 } + } {i ii} diff --git a/sdk_container/src/third_party/portage-stable/dev-db/sqlite/files/sqlite-3.23.0-full_archive-build.patch b/sdk_container/src/third_party/portage-stable/dev-db/sqlite/files/sqlite-3.23.0-full_archive-build.patch new file mode 100644 index 0000000000..f46df1c15a --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-db/sqlite/files/sqlite-3.23.0-full_archive-build.patch @@ -0,0 +1,407 @@ +Move some code to libsqlite3.so to avoid duplication. +Link executables against libsqlite3.so. +Increase timeout for fuzzcheck. +Fix building with dlopen() not available. + +--- /Makefile.in ++++ /Makefile.in +@@ -308,6 +308,9 @@ + # Source code for extensions + # + SRC += \ ++ $(TOP)/ext/expert/sqlite3expert.c \ ++ $(TOP)/ext/expert/sqlite3expert.h ++SRC += \ + $(TOP)/ext/fts1/fts1.c \ + $(TOP)/ext/fts1/fts1.h \ + $(TOP)/ext/fts1/fts1_hash.c \ +@@ -356,8 +359,11 @@ + $(TOP)/ext/rbu/sqlite3rbu.h \ + $(TOP)/ext/rbu/sqlite3rbu.c + SRC += \ ++ $(TOP)/ext/misc/appendvfs.c \ + $(TOP)/ext/misc/json1.c \ +- $(TOP)/ext/misc/stmt.c ++ $(TOP)/ext/misc/sqlar.c \ ++ $(TOP)/ext/misc/stmt.c \ ++ $(TOP)/ext/misc/zipfile.c + + # Generated source code files + # +@@ -426,7 +432,6 @@ + # Statically linked extensions + # + TESTSRC += \ +- $(TOP)/ext/expert/sqlite3expert.c \ + $(TOP)/ext/expert/test_expert.c \ + $(TOP)/ext/misc/amatch.c \ + $(TOP)/ext/misc/carray.c \ +@@ -449,8 +454,7 @@ + $(TOP)/ext/misc/spellfix.c \ + $(TOP)/ext/misc/totype.c \ + $(TOP)/ext/misc/unionvtab.c \ +- $(TOP)/ext/misc/wholenumber.c \ +- $(TOP)/ext/misc/zipfile.c ++ $(TOP)/ext/misc/wholenumber.c + + # Source code to the library files needed by the test fixture + # +@@ -613,25 +617,25 @@ + + libtclsqlite3.la: tclsqlite.lo libsqlite3.la + $(LTLINK) -no-undefined -o $@ tclsqlite.lo \ +- libsqlite3.la @TCL_STUB_LIB_SPEC@ $(TLIBS) \ ++ libsqlite3.la @TCL_STUB_LIB_SPEC@ \ + -rpath "$(TCLLIBDIR)" \ + -version-info "8:6:8" \ + -avoid-version + +-sqlite3$(TEXE): shell.c sqlite3.c +- $(LTLINK) $(READLINE_FLAGS) $(SHELL_OPT) -o $@ \ +- shell.c sqlite3.c \ +- $(LIBREADLINE) $(TLIBS) -rpath "$(libdir)" ++sqlite3$(TEXE): shell.c libsqlite3.la ++ $(LTLINK) $(READLINE_FLAGS) -o $@ \ ++ shell.c libsqlite3.la \ ++ $(LIBREADLINE) + +-sqldiff$(TEXE): $(TOP)/tool/sqldiff.c sqlite3.lo sqlite3.h +- $(LTLINK) -o $@ $(TOP)/tool/sqldiff.c sqlite3.lo $(TLIBS) ++sqldiff$(TEXE): $(TOP)/tool/sqldiff.c libsqlite3.la ++ $(LTLINK) -o $@ $(TOP)/tool/sqldiff.c libsqlite3.la + +-dbhash$(TEXE): $(TOP)/tool/dbhash.c sqlite3.lo sqlite3.h +- $(LTLINK) -o $@ $(TOP)/tool/dbhash.c sqlite3.lo $(TLIBS) ++dbhash$(TEXE): $(TOP)/tool/dbhash.c libsqlite3.la ++ $(LTLINK) -o $@ $(TOP)/tool/dbhash.c libsqlite3.la + +-scrub$(TEXE): $(TOP)/ext/misc/scrub.c sqlite3.lo ++scrub$(TEXE): $(TOP)/ext/misc/scrub.c libsqlite3.la + $(LTLINK) -o $@ -I. -DSCRUB_STANDALONE \ +- $(TOP)/ext/misc/scrub.c sqlite3.lo $(TLIBS) ++ $(TOP)/ext/misc/scrub.c libsqlite3.la + + srcck1$(BEXE): $(TOP)/tool/srcck1.c + $(BCC) -o srcck1$(BEXE) $(TOP)/tool/srcck1.c +@@ -710,7 +714,7 @@ + # Rule to build the amalgamation + # + sqlite3.lo: sqlite3.c +- $(LTCOMPILE) $(TEMP_STORE) -c sqlite3.c ++ $(LTCOMPILE) $(SHELL_OPT) $(TEMP_STORE) -c sqlite3.c + + # Rules to build the LEMON compiler generator + # +@@ -1004,14 +1008,9 @@ + # Source files that go into making shell.c + SHELL_SRC = \ + $(TOP)/src/shell.c.in \ +- $(TOP)/ext/misc/appendvfs.c \ + $(TOP)/ext/misc/shathree.c \ + $(TOP)/ext/misc/fileio.c \ + $(TOP)/ext/misc/completion.c \ +- $(TOP)/ext/misc/sqlar.c \ +- $(TOP)/ext/expert/sqlite3expert.c \ +- $(TOP)/ext/expert/sqlite3expert.h \ +- $(TOP)/ext/misc/zipfile.c \ + $(TOP)/src/test_windirent.c + + shell.c: $(SHELL_SRC) $(TOP)/tool/mkshellc.tcl +@@ -1170,15 +1169,15 @@ + + # Fuzz testing + fuzztest: fuzzcheck$(TEXE) $(FUZZDATA) sessionfuzz$(TEXE) $(TOP)/test/sessionfuzz-data1.db +- ./fuzzcheck$(TEXE) $(FUZZDATA) ++ ./fuzzcheck$(TEXE) --timeout 3600 $(FUZZDATA) + ./sessionfuzz$(TEXE) run $(TOP)/test/sessionfuzz-data1.db + + fastfuzztest: fuzzcheck$(TEXE) $(FUZZDATA) sessionfuzz$(TEXE) $(TOP)/test/sessionfuzz-data1.db +- ./fuzzcheck$(TEXE) --limit-mem 100M $(FUZZDATA) ++ ./fuzzcheck$(TEXE) --limit-mem 100M --timeout 3600 $(FUZZDATA) + ./sessionfuzz$(TEXE) run $(TOP)/test/sessionfuzz-data1.db + + valgrindfuzz: fuzzcheck$(TEXT) $(FUZZDATA) sessionfuzz$(TEXE) $(TOP)/test/sessionfuzz-data1.db +- valgrind ./fuzzcheck$(TEXE) --cell-size-check --limit-mem 10M --timeout 600 $(FUZZDATA) ++ valgrind ./fuzzcheck$(TEXE) --cell-size-check --limit-mem 10M --timeout 3600 $(FUZZDATA) + valgrind ./sessionfuzz$(TEXE) run $(TOP)/test/sessionfuzz-data1.db + + # The veryquick.test TCL tests. +@@ -1209,24 +1208,23 @@ + smoketest: $(TESTPROGS) fuzzcheck$(TEXE) + ./testfixture$(TEXE) $(TOP)/test/main.test $(TESTOPTS) + +-sqlite3_analyzer.c: sqlite3.c $(TOP)/src/tclsqlite.c $(TOP)/tool/spaceanal.tcl $(TOP)/tool/mkccode.tcl $(TOP)/tool/sqlite3_analyzer.c.in ++sqlite3_analyzer.c: $(TOP)/src/tclsqlite.c $(TOP)/tool/spaceanal.tcl $(TOP)/tool/mkccode.tcl $(TOP)/tool/sqlite3_analyzer.c.in + $(TCLSH_CMD) $(TOP)/tool/mkccode.tcl $(TOP)/tool/sqlite3_analyzer.c.in >sqlite3_analyzer.c + +-sqlite3_analyzer$(TEXE): sqlite3_analyzer.c +- $(LTLINK) sqlite3_analyzer.c -o $@ $(LIBTCL) $(TLIBS) ++sqlite3_analyzer$(TEXE): sqlite3_analyzer.c libsqlite3.la ++ $(LTLINK) sqlite3_analyzer.c -o $@ libsqlite3.la $(LIBTCL) + +-sqltclsh.c: sqlite3.c $(TOP)/src/tclsqlite.c $(TOP)/tool/sqltclsh.tcl $(TOP)/ext/misc/appendvfs.c $(TOP)/tool/mkccode.tcl $(TOP)/tool/sqltclsh.c.in ++sqltclsh.c: $(TOP)/src/tclsqlite.c $(TOP)/tool/sqltclsh.tcl $(TOP)/tool/mkccode.tcl $(TOP)/tool/sqltclsh.c.in + $(TCLSH_CMD) $(TOP)/tool/mkccode.tcl $(TOP)/tool/sqltclsh.c.in >sqltclsh.c + +-sqltclsh$(TEXE): sqltclsh.c +- $(LTLINK) sqltclsh.c -o $@ $(LIBTCL) $(TLIBS) ++sqltclsh$(TEXE): sqltclsh.c libsqlite3.la ++ $(LTLINK) sqltclsh.c -o $@ libsqlite3.la $(LIBTCL) + +-sqlite3_expert$(TEXE): $(TOP)/ext/expert/sqlite3expert.h $(TOP)/ext/expert/sqlite3expert.c $(TOP)/ext/expert/expert.c sqlite3.c +- $(LTLINK) $(TOP)/ext/expert/sqlite3expert.h $(TOP)/ext/expert/sqlite3expert.c $(TOP)/ext/expert/expert.c sqlite3.c -o sqlite3_expert $(TLIBS) ++sqlite3_expert$(TEXE): $(TOP)/ext/expert/sqlite3expert.h $(TOP)/ext/expert/expert.c libsqlite3.la ++ $(LTLINK) $(TOP)/ext/expert/expert.c -o sqlite3_expert libsqlite3.la + + CHECKER_DEPS =\ + $(TOP)/tool/mkccode.tcl \ +- sqlite3.c \ + $(TOP)/src/tclsqlite.c \ + $(TOP)/ext/repair/sqlite3_checker.tcl \ + $(TOP)/ext/repair/checkindex.c \ +@@ -1237,30 +1235,30 @@ + sqlite3_checker.c: $(CHECKER_DEPS) + $(TCLSH_CMD) $(TOP)/tool/mkccode.tcl $(TOP)/ext/repair/sqlite3_checker.c.in >$@ + +-sqlite3_checker$(TEXE): sqlite3_checker.c +- $(LTLINK) sqlite3_checker.c -o $@ $(LIBTCL) $(TLIBS) ++sqlite3_checker$(TEXE): sqlite3_checker.c libsqlite3.la ++ $(LTLINK) sqlite3_checker.c -o $@ libsqlite3.la $(LIBTCL) + +-dbdump$(TEXE): $(TOP)/ext/misc/dbdump.c sqlite3.lo ++dbdump$(TEXE): $(TOP)/ext/misc/dbdump.c libsqlite3.la + $(LTLINK) -DDBDUMP_STANDALONE -o $@ \ +- $(TOP)/ext/misc/dbdump.c sqlite3.lo $(TLIBS) ++ $(TOP)/ext/misc/dbdump.c libsqlite3.la + +-showdb$(TEXE): $(TOP)/tool/showdb.c sqlite3.lo +- $(LTLINK) -o $@ $(TOP)/tool/showdb.c sqlite3.lo $(TLIBS) ++showdb$(TEXE): $(TOP)/tool/showdb.c libsqlite3.la ++ $(LTLINK) -o $@ $(TOP)/tool/showdb.c libsqlite3.la + +-showstat4$(TEXE): $(TOP)/tool/showstat4.c sqlite3.lo +- $(LTLINK) -o $@ $(TOP)/tool/showstat4.c sqlite3.lo $(TLIBS) ++showstat4$(TEXE): $(TOP)/tool/showstat4.c libsqlite3.la ++ $(LTLINK) -o $@ $(TOP)/tool/showstat4.c libsqlite3.la + +-showjournal$(TEXE): $(TOP)/tool/showjournal.c sqlite3.lo +- $(LTLINK) -o $@ $(TOP)/tool/showjournal.c sqlite3.lo $(TLIBS) ++showjournal$(TEXE): $(TOP)/tool/showjournal.c ++ $(LTLINK) -o $@ $(TOP)/tool/showjournal.c + +-showwal$(TEXE): $(TOP)/tool/showwal.c sqlite3.lo +- $(LTLINK) -o $@ $(TOP)/tool/showwal.c sqlite3.lo $(TLIBS) ++showwal$(TEXE): $(TOP)/tool/showwal.c ++ $(LTLINK) -o $@ $(TOP)/tool/showwal.c + + showshm$(TEXE): $(TOP)/tool/showshm.c + $(LTLINK) -o $@ $(TOP)/tool/showshm.c + +-changeset$(TEXE): $(TOP)/ext/session/changeset.c sqlite3.lo +- $(LTLINK) -o $@ $(TOP)/ext/session/changeset.c sqlite3.lo $(TLIBS) ++changeset$(TEXE): $(TOP)/ext/session/changeset.c libsqlite3.la ++ $(LTLINK) -o $@ $(TOP)/ext/session/changeset.c libsqlite3.la + + rollback-test$(TEXE): $(TOP)/tool/rollback-test.c sqlite3.lo + $(LTLINK) -o $@ $(TOP)/tool/rollback-test.c sqlite3.lo $(TLIBS) +@@ -1279,11 +1277,11 @@ + kvtest$(TEXE): $(TOP)/test/kvtest.c sqlite3.c + $(LTLINK) $(KV_OPT) -o $@ $(TOP)/test/kvtest.c sqlite3.c $(TLIBS) + +-rbu$(EXE): $(TOP)/ext/rbu/rbu.c $(TOP)/ext/rbu/sqlite3rbu.c sqlite3.lo +- $(LTLINK) -I. -o $@ $(TOP)/ext/rbu/rbu.c sqlite3.lo $(TLIBS) ++rbu$(EXE): $(TOP)/ext/rbu/rbu.c libsqlite3.la ++ $(LTLINK) -I. -o $@ $(TOP)/ext/rbu/rbu.c libsqlite3.la + +-loadfts$(EXE): $(TOP)/tool/loadfts.c libsqlite3.la +- $(LTLINK) $(TOP)/tool/loadfts.c libsqlite3.la -o $@ $(TLIBS) ++loadfts$(EXE): $(TOP)/tool/loadfts.c libsqlite3.la ++ $(LTLINK) $(TOP)/tool/loadfts.c libsqlite3.la -o $@ + + # This target will fail if the SQLite amalgamation contains any exported + # symbols that do not begin with "sqlite3_". It is run as part of the +--- /configure.ac ++++ /configure.ac +@@ -590,6 +590,9 @@ + if test "${use_loadextension}" = "yes" ; then + OPT_FEATURE_FLAGS="" + AC_SEARCH_LIBS(dlopen, dl) ++ if test "${ac_cv_search_dlopen}" = "no" ; then ++ OPT_FEATURE_FLAGS="-DSQLITE_OMIT_LOAD_EXTENSION=1" ++ fi + else + OPT_FEATURE_FLAGS="-DSQLITE_OMIT_LOAD_EXTENSION=1" + fi +--- /ext/misc/sqlar.c ++++ /ext/misc/sqlar.c +@@ -14,6 +14,8 @@ + ** for working with sqlar archives and used by the shell tool's built-in + ** sqlar support. + */ ++#ifdef SQLITE_HAVE_ZLIB ++ + #include "sqlite3ext.h" + SQLITE_EXTENSION_INIT1 + #include +@@ -119,3 +121,5 @@ + } + return rc; + } ++ ++#endif /* SQLITE_HAVE_ZLIB */ +--- /ext/misc/zipfile.c ++++ /ext/misc/zipfile.c +@@ -24,6 +24,8 @@ + ** * No support for zip64 extensions + ** * Only the "inflate/deflate" (zlib) compression method is supported + */ ++#ifdef SQLITE_HAVE_ZLIB ++ + #include "sqlite3ext.h" + SQLITE_EXTENSION_INIT1 + #include +@@ -2175,3 +2177,5 @@ + (void)pzErrMsg; /* Unused parameter */ + return zipfileRegister(db); + } ++ ++#endif /* SQLITE_HAVE_ZLIB */ +--- /ext/repair/sqlite3_checker.c.in ++++ /ext/repair/sqlite3_checker.c.in +@@ -2,6 +2,7 @@ + ** Read an SQLite database file and analyze its space utilization. Generate + ** text on standard output. + */ ++#define SQLITE_CORE 1 + #define TCLSH_INIT_PROC sqlite3_checker_init_proc + #define SQLITE_ENABLE_DBPAGE_VTAB 1 + #define SQLITE_ENABLE_JSON1 1 +@@ -14,7 +15,7 @@ + #define SQLITE_OMIT_SHARED_CACHE 1 + #define SQLITE_DEFAULT_MEMSTATUS 0 + #define SQLITE_MAX_EXPR_DEPTH 0 +-INCLUDE sqlite3.c ++#include "sqlite3.h" + INCLUDE $ROOT/src/tclsqlite.c + INCLUDE $ROOT/ext/misc/btreeinfo.c + INCLUDE $ROOT/ext/repair/checkindex.c +--- /src/shell.c.in ++++ /src/shell.c.in +@@ -61,6 +61,7 @@ + #include + #include + #include "sqlite3.h" ++#include "ext/expert/sqlite3expert.h" + typedef sqlite3_int64 i64; + typedef sqlite3_uint64 u64; + typedef unsigned char u8; +@@ -124,6 +125,10 @@ + # define SHELL_USE_LOCAL_GETLINE 1 + #endif + ++#ifdef SQLITE_HAVE_ZLIB ++#include ++#endif ++ + + #if defined(_WIN32) || defined(WIN32) + # include +@@ -966,13 +971,6 @@ + INCLUDE ../ext/misc/shathree.c + INCLUDE ../ext/misc/fileio.c + INCLUDE ../ext/misc/completion.c +-INCLUDE ../ext/misc/appendvfs.c +-#ifdef SQLITE_HAVE_ZLIB +-INCLUDE ../ext/misc/zipfile.c +-INCLUDE ../ext/misc/sqlar.c +-#endif +-INCLUDE ../ext/expert/sqlite3expert.h +-INCLUDE ../ext/expert/sqlite3expert.c + + #if defined(SQLITE_ENABLE_SESSION) + /* +@@ -3522,7 +3520,9 @@ + sqlite3_shathree_init(p->db, 0, 0); + sqlite3_completion_init(p->db, 0, 0); + #ifdef SQLITE_HAVE_ZLIB ++ extern int sqlite3_zipfile_init(sqlite3 *, char **, const sqlite3_api_routines *); + sqlite3_zipfile_init(p->db, 0, 0); ++ extern int sqlite3_sqlar_init(sqlite3 *, char **, const sqlite3_api_routines *); + sqlite3_sqlar_init(p->db, 0, 0); + #endif + sqlite3_create_function(p->db, "shell_add_schema", 3, SQLITE_UTF8, 0, +@@ -5411,6 +5411,7 @@ + goto end_ar_command; + } + sqlite3_fileio_init(cmd.db, 0, 0); ++ extern int sqlite3_sqlar_init(sqlite3 *, char **, const sqlite3_api_routines *); + sqlite3_sqlar_init(cmd.db, 0, 0); + sqlite3_create_function(cmd.db, "shell_putsnl", 1, SQLITE_UTF8, cmd.p, + shellPutsFunc, 0, 0); +@@ -8367,6 +8368,7 @@ + #endif + } + data.out = stdout; ++ extern int sqlite3_appendvfs_init(sqlite3 *, char **, const sqlite3_api_routines *); + sqlite3_appendvfs_init(0,0,0); + + /* Go ahead and open the database file if it already exists. If the +--- /tool/mksqlite3c.tcl ++++ /tool/mksqlite3c.tcl +@@ -116,6 +116,7 @@ + rtree.h + sqlite3session.h + sqlite3.h ++ sqlite3expert.h + sqlite3ext.h + sqlite3rbu.h + sqliteicu.h +@@ -400,6 +401,10 @@ + json1.c + fts5.c + stmt.c ++ appendvfs.c ++ sqlar.c ++ sqlite3expert.c ++ zipfile.c + } { + copy_file tsrc/$file + } +--- /tool/sqlite3_analyzer.c.in ++++ /tool/sqlite3_analyzer.c.in +@@ -14,9 +14,6 @@ + #define SQLITE_DEFAULT_MEMSTATUS 0 + #define SQLITE_MAX_EXPR_DEPTH 0 + #define SQLITE_OMIT_LOAD_EXTENSION 1 +-#ifndef USE_EXTERNAL_SQLITE +-INCLUDE sqlite3.c +-#endif + INCLUDE $ROOT/src/tclsqlite.c + + const char *sqlite3_analyzer_init_proc(Tcl_Interp *interp){ +--- /tool/sqltclsh.c.in ++++ /tool/sqltclsh.c.in +@@ -27,19 +27,17 @@ + #define SQLITE_OMIT_SHARED_CACHE 1 + #define SQLITE_DEFAULT_MEMSTATUS 0 + #define SQLITE_MAX_EXPR_DEPTH 0 +-INCLUDE sqlite3.c +-INCLUDE $ROOT/ext/misc/appendvfs.c +-#ifdef SQLITE_HAVE_ZLIB +-INCLUDE $ROOT/ext/misc/zipfile.c +-INCLUDE $ROOT/ext/misc/sqlar.c +-#endif ++#include "sqlite3.h" + INCLUDE $ROOT/src/tclsqlite.c + + const char *sqlite3_tclapp_init_proc(Tcl_Interp *interp){ + (void)interp; ++ extern int sqlite3_appendvfs_init(sqlite3 *,char **, const sqlite3_api_routines *); + sqlite3_appendvfs_init(0,0,0); + #ifdef SQLITE_HAVE_ZLIB ++ extern int sqlite3_sqlar_init(sqlite3 *, char **, const sqlite3_api_routines *); + sqlite3_auto_extension((void(*)(void))sqlite3_sqlar_init); ++ extern int sqlite3_zipfile_init(sqlite3 *, char **, const sqlite3_api_routines *); + sqlite3_auto_extension((void(*)(void))sqlite3_zipfile_init); + #endif + diff --git a/sdk_container/src/third_party/portage-stable/dev-db/sqlite/files/sqlite-3.23.1-full_archive-prohibit_bound_parameters_in_arguments_to_table-valued_functions_within_triggers.patch b/sdk_container/src/third_party/portage-stable/dev-db/sqlite/files/sqlite-3.23.1-full_archive-prohibit_bound_parameters_in_arguments_to_table-valued_functions_within_triggers.patch new file mode 100644 index 0000000000..c97679daf7 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-db/sqlite/files/sqlite-3.23.1-full_archive-prohibit_bound_parameters_in_arguments_to_table-valued_functions_within_triggers.patch @@ -0,0 +1,24 @@ +https://sqlite.org/src/info/b7178209152452e8 + +--- /src/attach.c ++++ /src/attach.c +@@ -502,6 +502,9 @@ + if( sqlite3FixSelect(pFix, pItem->pSelect) ) return 1; + if( sqlite3FixExpr(pFix, pItem->pOn) ) return 1; + #endif ++ if( pItem->fg.isTabFunc && sqlite3FixExprList(pFix, pItem->u1.pFuncArg) ){ ++ return 1; ++ } + } + return 0; + } +--- /test/triggerE.test ++++ /test/triggerE.test +@@ -57,6 +57,7 @@ + 7 { BEFORE DELETE ON t1 BEGIN SELECT * FROM t2 ORDER BY ?; END; } + 8 { BEFORE UPDATE ON t1 BEGIN UPDATE t2 SET c = ?; END; } + 9 { BEFORE UPDATE ON t1 BEGIN UPDATE t2 SET c = 1 WHERE d = ?; END; } ++ 10 { AFTER INSERT ON t1 BEGIN SELECT * FROM pragma_stats(?); END; } + } { + catchsql {drop trigger tr1} + do_catchsql_test 1.1.$tn "CREATE TRIGGER tr1 $defn" [list 1 $errmsg] diff --git a/sdk_container/src/third_party/portage-stable/dev-db/sqlite/files/sqlite-3.23.1-full_archive-tests.patch b/sdk_container/src/third_party/portage-stable/dev-db/sqlite/files/sqlite-3.23.1-full_archive-tests.patch new file mode 100644 index 0000000000..ef813f67e7 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-db/sqlite/files/sqlite-3.23.1-full_archive-tests.patch @@ -0,0 +1,224 @@ +https://sqlite.org/src/info/893e6089c875e947 +https://sqlite.org/src/info/576a8f69ae25883f +https://sqlite.org/src/info/de508e831a43f02c + +--- /ext/fts3/fts3.c ++++ /ext/fts3/fts3.c +@@ -3963,7 +3963,7 @@ + + #ifdef SQLITE_TEST + if( rc==SQLITE_OK ){ +- rc = sqlite3Fts3ExprInitTestInterface(db); ++ rc = sqlite3Fts3ExprInitTestInterface(db, pHash); + } + #endif + +--- /ext/fts3/fts3Int.h ++++ /ext/fts3/fts3Int.h +@@ -584,7 +584,7 @@ + ); + void sqlite3Fts3ExprFree(Fts3Expr *); + #ifdef SQLITE_TEST +-int sqlite3Fts3ExprInitTestInterface(sqlite3 *db); ++int sqlite3Fts3ExprInitTestInterface(sqlite3 *db, Fts3Hash*); + int sqlite3Fts3InitTerm(sqlite3 *db); + #endif + +--- /ext/fts3/fts3_expr.c ++++ /ext/fts3/fts3_expr.c +@@ -1109,34 +1109,6 @@ + #include + + /* +-** Function to query the hash-table of tokenizers (see README.tokenizers). +-*/ +-static int queryTestTokenizer( +- sqlite3 *db, +- const char *zName, +- const sqlite3_tokenizer_module **pp +-){ +- int rc; +- sqlite3_stmt *pStmt; +- const char zSql[] = "SELECT fts3_tokenizer(?)"; +- +- *pp = 0; +- rc = sqlite3_prepare_v2(db, zSql, -1, &pStmt, 0); +- if( rc!=SQLITE_OK ){ +- return rc; +- } +- +- sqlite3_bind_text(pStmt, 1, zName, -1, SQLITE_STATIC); +- if( SQLITE_ROW==sqlite3_step(pStmt) ){ +- if( sqlite3_column_type(pStmt, 0)==SQLITE_BLOB ){ +- memcpy((void *)pp, sqlite3_column_blob(pStmt, 0), sizeof(*pp)); +- } +- } +- +- return sqlite3_finalize(pStmt); +-} +- +-/* + ** Return a pointer to a buffer containing a text representation of the + ** expression passed as the first argument. The buffer is obtained from + ** sqlite3_malloc(). It is the responsibility of the caller to use +@@ -1203,12 +1175,12 @@ + ** + ** SELECT fts3_exprtest('simple', 'Bill col2:Bloggs', 'col1', 'col2'); + */ +-static void fts3ExprTest( ++static void fts3ExprTestCommon( ++ int bRebalance, + sqlite3_context *context, + int argc, + sqlite3_value **argv + ){ +- sqlite3_tokenizer_module const *pModule = 0; + sqlite3_tokenizer *pTokenizer = 0; + int rc; + char **azCol = 0; +@@ -1218,7 +1190,9 @@ + int ii; + Fts3Expr *pExpr; + char *zBuf = 0; +- sqlite3 *db = sqlite3_context_db_handle(context); ++ Fts3Hash *pHash = (Fts3Hash*)sqlite3_user_data(context); ++ const char *zTokenizer = 0; ++ char *zErr = 0; + + if( argc<3 ){ + sqlite3_result_error(context, +@@ -1227,23 +1201,17 @@ + return; + } + +- rc = queryTestTokenizer(db, +- (const char *)sqlite3_value_text(argv[0]), &pModule); +- if( rc==SQLITE_NOMEM ){ +- sqlite3_result_error_nomem(context); +- goto exprtest_out; +- }else if( !pModule ){ +- sqlite3_result_error(context, "No such tokenizer module", -1); +- goto exprtest_out; +- } +- +- rc = pModule->xCreate(0, 0, &pTokenizer); +- assert( rc==SQLITE_NOMEM || rc==SQLITE_OK ); +- if( rc==SQLITE_NOMEM ){ +- sqlite3_result_error_nomem(context); +- goto exprtest_out; ++ zTokenizer = (const char*)sqlite3_value_text(argv[0]); ++ rc = sqlite3Fts3InitTokenizer(pHash, zTokenizer, &pTokenizer, &zErr); ++ if( rc!=SQLITE_OK ){ ++ if( rc==SQLITE_NOMEM ){ ++ sqlite3_result_error_nomem(context); ++ }else{ ++ sqlite3_result_error(context, zErr, -1); ++ } ++ sqlite3_free(zErr); ++ return; + } +- pTokenizer->pModule = pModule; + + zExpr = (const char *)sqlite3_value_text(argv[1]); + nExpr = sqlite3_value_bytes(argv[1]); +@@ -1257,7 +1225,7 @@ + azCol[ii] = (char *)sqlite3_value_text(argv[ii+2]); + } + +- if( sqlite3_user_data(context) ){ ++ if( bRebalance ){ + char *zDummy = 0; + rc = sqlite3Fts3ExprParse( + pTokenizer, 0, azCol, 0, nCol, nCol, zExpr, nExpr, &pExpr, &zDummy +@@ -1283,23 +1251,38 @@ + sqlite3Fts3ExprFree(pExpr); + + exprtest_out: +- if( pModule && pTokenizer ){ +- rc = pModule->xDestroy(pTokenizer); ++ if( pTokenizer ){ ++ rc = pTokenizer->pModule->xDestroy(pTokenizer); + } + sqlite3_free(azCol); + } + ++static void fts3ExprTest( ++ sqlite3_context *context, ++ int argc, ++ sqlite3_value **argv ++){ ++ fts3ExprTestCommon(0, context, argc, argv); ++} ++static void fts3ExprTestRebalance( ++ sqlite3_context *context, ++ int argc, ++ sqlite3_value **argv ++){ ++ fts3ExprTestCommon(1, context, argc, argv); ++} ++ + /* + ** Register the query expression parser test function fts3_exprtest() + ** with database connection db. + */ +-int sqlite3Fts3ExprInitTestInterface(sqlite3* db){ ++int sqlite3Fts3ExprInitTestInterface(sqlite3 *db, Fts3Hash *pHash){ + int rc = sqlite3_create_function( +- db, "fts3_exprtest", -1, SQLITE_UTF8, 0, fts3ExprTest, 0, 0 ++ db, "fts3_exprtest", -1, SQLITE_UTF8, (void*)pHash, fts3ExprTest, 0, 0 + ); + if( rc==SQLITE_OK ){ + rc = sqlite3_create_function(db, "fts3_exprtest_rebalance", +- -1, SQLITE_UTF8, (void *)1, fts3ExprTest, 0, 0 ++ -1, SQLITE_UTF8, (void*)pHash, fts3ExprTestRebalance, 0, 0 + ); + } + return rc; +--- /test/fts3expr.test ++++ /test/fts3expr.test +@@ -409,7 +409,7 @@ + } {1 {Usage: fts3_exprtest(tokenizer, expr, col1, ...}} + do_test fts3expr-5.2 { + catchsql { SELECT fts3_exprtest('doesnotexist', 'a b', 'c') } +-} {1 {No such tokenizer module}} ++} {1 {unknown tokenizer: doesnotexist}} + do_test fts3expr-5.3 { + catchsql { SELECT fts3_exprtest('simple', 'a b OR', 'c') } + } {1 {Error parsing expression}} +--- /test/fts3expr4.test ++++ /test/fts3expr4.test +@@ -29,7 +29,8 @@ + } + + proc do_icu_expr_test {tn expr res} { +- uplevel [list do_test $tn [list test_fts3expr icu $expr] [list {*}$res]] ++ set res2 [list {*}$res] ++ uplevel [list do_test $tn [list test_fts3expr "icu en_US" $expr] $res2] + } + + proc do_simple_expr_test {tn expr res} { +--- /test/zipfile2.test ++++ /test/zipfile2.test +@@ -52,17 +52,15 @@ + CREATE VIRTUAL TABLE fff USING zipfile('test''zip'); + } + +-if {$::tcl_platform(platform)=="windows"} { +- set res {1 {cannot open file: testdir}} +-} else { +- set res {1 {error in fread()}} +-} + do_test 2.0 { + forcedelete testdir + file mkdir testdir + execsql { CREATE VIRTUAL TABLE hhh USING zipfile('testdir') } +- catchsql { SELECT * FROM hhh } +-} $res ++ lindex [catchsql { ++ SELECT * FROM hhh; ++ INSERT INTO hhh(name, data) VALUES('1.txt', 'file data'); ++ }] 0 ++} 1 + + + set archive { diff --git a/sdk_container/src/third_party/portage-stable/dev-db/sqlite/files/sqlite-3.23.1-nonfull_archive-prohibit_bound_parameters_in_arguments_to_table-valued_functions_within_triggers.patch b/sdk_container/src/third_party/portage-stable/dev-db/sqlite/files/sqlite-3.23.1-nonfull_archive-prohibit_bound_parameters_in_arguments_to_table-valued_functions_within_triggers.patch new file mode 100644 index 0000000000..c60cd9c90d --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-db/sqlite/files/sqlite-3.23.1-nonfull_archive-prohibit_bound_parameters_in_arguments_to_table-valued_functions_within_triggers.patch @@ -0,0 +1,14 @@ +https://sqlite.org/src/info/b7178209152452e8 + +--- /sqlite3.c ++++ /sqlite3.c +@@ -102780,6 +102780,9 @@ + if( sqlite3FixSelect(pFix, pItem->pSelect) ) return 1; + if( sqlite3FixExpr(pFix, pItem->pOn) ) return 1; + #endif ++ if( pItem->fg.isTabFunc && sqlite3FixExprList(pFix, pItem->u1.pFuncArg) ){ ++ return 1; ++ } + } + return 0; + } diff --git a/sdk_container/src/third_party/portage-stable/dev-db/sqlite/metadata.xml b/sdk_container/src/third_party/portage-stable/dev-db/sqlite/metadata.xml index a3118d8429..ae2540a300 100644 --- a/sdk_container/src/third_party/portage-stable/dev-db/sqlite/metadata.xml +++ b/sdk_container/src/third_party/portage-stable/dev-db/sqlite/metadata.xml @@ -1,19 +1,19 @@ - - arfrever.fta@gmail.com - Arfrever Frehtes Taifersar Arahesis - - - proxy-maint@gentoo.org - Proxy Maintainers - - - Enable overwriting of deleted content with zeros by default (http://sqlite.org/pragma.html#pragma_secure_delete), causing some performance penalty - Install additional tools - - - cpe:/a:sqlite:sqlite - + + arfrever.fta@gmail.com + Arfrever Frehtes Taifersar Arahesis + + + proxy-maint@gentoo.org + Proxy Maintainers + + + Enable overwriting of deleted content with zeros by default (http://sqlite.org/pragma.html#pragma_secure_delete), causing some performance penalty + Install additional tools + + + cpe:/a:sqlite:sqlite + diff --git a/sdk_container/src/third_party/portage-stable/dev-db/sqlite/sqlite-3.11.1.ebuild b/sdk_container/src/third_party/portage-stable/dev-db/sqlite/sqlite-3.11.1.ebuild deleted file mode 100644 index 0e61cfe2fe..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-db/sqlite/sqlite-3.11.1.ebuild +++ /dev/null @@ -1,239 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" - -inherit autotools eutils flag-o-matic multilib multilib-minimal toolchain-funcs versionator - -SRC_PV="$(printf "%u%02u%02u%02u" $(get_version_components))" -DOC_PV="${SRC_PV}" -# DOC_PV="$(printf "%u%02u%02u00" $(get_version_components $(get_version_component_range 1-3)))" - -DESCRIPTION="A SQL Database Engine in a C Library" -HOMEPAGE="https://sqlite.org/" -SRC_URI="doc? ( https://sqlite.org/2016/${PN}-doc-${DOC_PV}.zip ) - tcl? ( https://sqlite.org/2016/${PN}-src-${SRC_PV}.zip ) - test? ( https://sqlite.org/2016/${PN}-src-${SRC_PV}.zip ) - tools? ( https://sqlite.org/2016/${PN}-src-${SRC_PV}.zip ) - !tcl? ( !test? ( !tools? ( https://sqlite.org/2016/${PN}-autoconf-${SRC_PV}.tar.gz ) ) )" - -LICENSE="public-domain" -SLOT="3" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~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="debug doc icu +readline secure-delete static-libs tcl test tools" - -RDEPEND="icu? ( dev-libs/icu:0=[${MULTILIB_USEDEP}] ) - readline? ( sys-libs/readline:0=[${MULTILIB_USEDEP}] ) - tcl? ( dev-lang/tcl:0=[${MULTILIB_USEDEP}] ) - tools? ( dev-lang/tcl:0=[${MULTILIB_USEDEP}] )" -DEPEND="${RDEPEND} - doc? ( app-arch/unzip ) - tcl? ( app-arch/unzip ) - test? ( - app-arch/unzip - dev-lang/tcl:0[${MULTILIB_USEDEP}] - ) - tools? ( app-arch/unzip )" - -full_tarball() { - use tcl || use test || use tools -} - -pkg_setup() { - if full_tarball; then - S="${WORKDIR}/${PN}-src-${SRC_PV}" - else - S="${WORKDIR}/${PN}-autoconf-${SRC_PV}" - fi -} - -src_prepare() { - if full_tarball; then - epatch "${FILESDIR}/${PN}-3.11.0-full_tarball-build.patch" - epatch "${FILESDIR}/${PN}-3.11.0-full_tarball-SQLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER.patch" - - # Fix shell1-5.0 test. - # https://mailinglists.sqlite.org/cgi-bin/mailman/private/sqlite-dev/2015-May/002575.html - sed -e "/if {\$i==0x0D /s/\$i==0x0D /&|| (\$i>=0xE0 \&\& \$i<=0xEF) /" -i test/shell1.test - else - epatch "${FILESDIR}/${PN}-3.11.0-nonfull_tarball-build.patch" - epatch "${FILESDIR}/${PN}-3.11.0-nonfull_tarball-SQLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER.patch" - fi - - eautoreconf - - multilib_copy_sources -} - -multilib_src_configure() { - local CPPFLAGS="${CPPFLAGS}" options=() - - options+=( - --enable-$(full_tarball && echo load-extension || echo dynamic-extensions) - --enable-threadsafe - ) - if ! full_tarball; then - options+=(--disable-static-shell) - fi - - # Support detection of misuse of SQLite API. - # https://sqlite.org/compile.html#enable_api_armor - append-cppflags -DSQLITE_ENABLE_API_ARMOR - - # Support column metadata functions. - # https://sqlite.org/c3ref/column_database_name.html - append-cppflags -DSQLITE_ENABLE_COLUMN_METADATA - - # Support dbstat virtual table. - # https://sqlite.org/dbstat.html - append-cppflags -DSQLITE_ENABLE_DBSTAT_VTAB - - # Support Full-Text Search versions 3, 4 and 5. - # https://sqlite.org/fts3.html - # https://sqlite.org/fts5.html - append-cppflags -DSQLITE_ENABLE_FTS3 -DSQLITE_ENABLE_FTS3_PARENTHESIS -DSQLITE_ENABLE_FTS4 - options+=(--enable-fts5) - - # Support hidden columns. - append-cppflags -DSQLITE_ENABLE_HIDDEN_COLUMNS - - # Support JSON1 extension. - # https://sqlite.org/json1.html - append-cppflags -DSQLITE_ENABLE_JSON1 - - # Support Resumable Bulk Update extension. - # https://sqlite.org/rbu.html - append-cppflags -DSQLITE_ENABLE_RBU - - # Support R*Trees. - # https://sqlite.org/rtree.html - append-cppflags -DSQLITE_ENABLE_RTREE - - # Support scan status functions. - # https://sqlite.org/c3ref/stmt_scanstatus.html - # https://sqlite.org/c3ref/stmt_scanstatus_reset.html - append-cppflags -DSQLITE_ENABLE_STMT_SCANSTATUS - - # Support unlock notification. - # https://sqlite.org/unlock_notify.html - append-cppflags -DSQLITE_ENABLE_UNLOCK_NOTIFY - - # Support soundex() function. - # https://sqlite.org/lang_corefunc.html#soundex - append-cppflags -DSQLITE_SOUNDEX - - # debug USE flag. - if full_tarball; then - options+=($(use_enable debug)) - else - if use debug; then - append-cppflags -DSQLITE_DEBUG - else - append-cppflags -DNDEBUG - fi - fi - - # icu USE flag. - if use icu; then - # Support ICU extension. - # https://sqlite.org/compile.html#enable_icu - append-cppflags -DSQLITE_ENABLE_ICU - if full_tarball; then - sed -e "s/^TLIBS = @LIBS@/& -licui18n -licuuc/" -i Makefile.in || die "sed failed" - else - sed -e "s/^LIBS = @LIBS@/& -licui18n -licuuc/" -i Makefile.in || die "sed failed" - fi - fi - - # readline USE flag. - options+=( - --disable-editline - $(use_enable readline) - ) - if full_tarball && use readline; then - options+=(--with-readline-inc="-I${EPREFIX}/usr/include/readline") - fi - - # secure-delete USE flag. - if use secure-delete; then - # Enable secure_delete pragma by default. - # https://sqlite.org/pragma.html#pragma_secure_delete - append-cppflags -DSQLITE_SECURE_DELETE - fi - - # static-libs USE flag. - options+=($(use_enable static-libs static)) - - # tcl, test, tools USE flags. - if full_tarball; then - options+=(--enable-tcl) - fi - - if [[ "${CHOST}" == *-mint* ]]; then - append-cppflags -DSQLITE_OMIT_WAL - fi - - # Use pread(), pread64(), pwrite(), pwrite64() functions for better performance if they are available. - if $(tc-getCC) ${CPPFLAGS} ${CFLAGS} ${LDFLAGS} -Werror=implicit-function-declaration -x c - -o "${T}/pread_pwrite_test" <<< $'#include \nint main()\n{\n pread(0, NULL, 0, 0);\n pwrite(0, NULL, 0, 0);\n return 0;\n}' &> /dev/null; then - append-cppflags -DUSE_PREAD - fi - if $(tc-getCC) ${CPPFLAGS} ${CFLAGS} ${LDFLAGS} -Werror=implicit-function-declaration -x c - -o "${T}/pread64_pwrite64_test" <<< $'#include \nint main()\n{\n pread64(0, NULL, 0, 0);\n pwrite64(0, NULL, 0, 0);\n return 0;\n}' &> /dev/null; then - append-cppflags -DUSE_PREAD64 - elif $(tc-getCC) ${CPPFLAGS} ${CFLAGS} ${LDFLAGS} -D_LARGEFILE64_SOURCE -Werror=implicit-function-declaration -x c - -o "${T}/pread64_pwrite64_test" <<< $'#include \nint main()\n{\n pread64(0, NULL, 0, 0);\n pwrite64(0, NULL, 0, 0);\n return 0;\n}' &> /dev/null; then - append-cppflags -DUSE_PREAD64 -D_LARGEFILE64_SOURCE - fi - - econf "${options[@]}" -} - -multilib_src_compile() { - emake HAVE_TCL="$(usex tcl 1 "")" TCLLIBDIR="${EPREFIX}/usr/$(get_libdir)/${P}" - - if use tools && multilib_is_native_abi; then - emake rbu showdb showjournal showstat4 showwal sqldiff sqlite3_analyzer - fi -} - -multilib_src_test() { - if [[ "${EUID}" -eq 0 ]]; then - ewarn "Skipping tests due to root permissions" - return - fi - - emake HAVE_TCL="$(usex tcl 1 "")" $(use debug && echo fulltest || echo test) -} - -multilib_src_install() { - emake DESTDIR="${D}" HAVE_TCL="$(usex tcl 1 "")" TCLLIBDIR="${EPREFIX}/usr/$(get_libdir)/${P}" install - - if use tools && multilib_is_native_abi; then - install_tool() { - if [[ -f ".libs/${1}" ]]; then - newbin ".libs/${1}" "${2}" - else - newbin "${1}" "${2}" - fi - } - - install_tool rbu sqlite3-rbu - install_tool showdb sqlite3-show-db - install_tool showjournal sqlite3-show-journal - install_tool showstat4 sqlite3-show-stat4 - install_tool showwal sqlite3-show-wal - install_tool sqldiff sqlite3-diff - install_tool sqlite3_analyzer sqlite3-analyzer - - unset -f install_tool - fi -} - -multilib_src_install_all() { - prune_libtool_files - - doman sqlite3.1 - - if use doc; then - dohtml -A ico,odf,odg,pdf,svg -r "${WORKDIR}/${PN}-doc-${DOC_PV}/" - fi -} diff --git a/sdk_container/src/third_party/portage-stable/dev-db/sqlite/sqlite-3.13.0.ebuild b/sdk_container/src/third_party/portage-stable/dev-db/sqlite/sqlite-3.20.1-r1.ebuild similarity index 76% rename from sdk_container/src/third_party/portage-stable/dev-db/sqlite/sqlite-3.13.0.ebuild rename to sdk_container/src/third_party/portage-stable/dev-db/sqlite/sqlite-3.20.1-r1.ebuild index b01fa9dcdc..b70e5bd845 100644 --- a/sdk_container/src/third_party/portage-stable/dev-db/sqlite/sqlite-3.13.0.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-db/sqlite/sqlite-3.20.1-r1.ebuild @@ -1,8 +1,7 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Id$ -EAPI="5" +EAPI="6" inherit autotools eutils flag-o-matic multilib multilib-minimal toolchain-funcs versionator @@ -12,15 +11,15 @@ DOC_PV="${SRC_PV}" DESCRIPTION="A SQL Database Engine in a C Library" HOMEPAGE="https://sqlite.org/" -SRC_URI="doc? ( https://sqlite.org/2016/${PN}-doc-${DOC_PV}.zip ) - tcl? ( https://sqlite.org/2016/${PN}-src-${SRC_PV}.zip ) - test? ( https://sqlite.org/2016/${PN}-src-${SRC_PV}.zip ) - tools? ( https://sqlite.org/2016/${PN}-src-${SRC_PV}.zip ) - !tcl? ( !test? ( !tools? ( https://sqlite.org/2016/${PN}-autoconf-${SRC_PV}.tar.gz ) ) )" +SRC_URI="doc? ( https://sqlite.org/2017/${PN}-doc-${DOC_PV}.zip ) + tcl? ( https://sqlite.org/2017/${PN}-src-${SRC_PV}.zip ) + test? ( https://sqlite.org/2017/${PN}-src-${SRC_PV}.zip ) + tools? ( https://sqlite.org/2017/${PN}-src-${SRC_PV}.zip ) + !tcl? ( !test? ( !tools? ( https://sqlite.org/2017/${PN}-autoconf-${SRC_PV}.tar.gz ) ) )" LICENSE="public-domain" SLOT="3" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="debug doc icu +readline secure-delete static-libs tcl test tools" RDEPEND="icu? ( dev-libs/icu:0=[${MULTILIB_USEDEP}] ) @@ -50,25 +49,43 @@ pkg_setup() { src_prepare() { if full_tarball; then - epatch "${FILESDIR}/${PN}-3.13.0-full_tarball-build.patch" + eapply -p0 "${FILESDIR}/${PN}-3.20.0-full_tarball-build.patch" + eapply -p0 "${FILESDIR}/${PN}-3.20.1-full_tarball-csv-unsigned_char.patch" + eapply -p0 "${FILESDIR}/${PN}-3.20.1-full_tarball-tests-big-endian.patch" + + eapply_user # Fix AC_CHECK_FUNCS. # https://mailinglists.sqlite.org/cgi-bin/mailman/private/sqlite-dev/2016-March/002762.html - sed -e "s/AC_CHECK_FUNCS(.*)/AC_CHECK_FUNCS([fdatasync fullfsync gmtime_r isnan localtime_r localtime_s malloc_usable_size posix_fallocate pread pread64 pwrite pwrite64 strchrnul usleep utime])/" -i configure.ac + sed -e "s/AC_CHECK_FUNCS(.*)/AC_CHECK_FUNCS([fdatasync fullfsync gmtime_r isnan localtime_r localtime_s malloc_usable_size posix_fallocate pread pread64 pwrite pwrite64 strchrnul usleep utime])/" -i configure.ac || die "sed failed" else - epatch "${FILESDIR}/${PN}-3.12.0-nonfull_tarball-build.patch" + eapply -p0 "${FILESDIR}/${PN}-3.16.0-nonfull_tarball-build.patch" + + eapply_user # Fix AC_CHECK_FUNCS. # https://mailinglists.sqlite.org/cgi-bin/mailman/private/sqlite-dev/2016-March/002762.html sed \ -e "s/AC_CHECK_FUNCS(\[fdatasync.*/AC_CHECK_FUNCS([fdatasync fullfsync gmtime_r isnan localtime_r localtime_s malloc_usable_size posix_fallocate pread pread64 pwrite pwrite64 strchrnul usleep utime])/" \ -e "/AC_CHECK_FUNCS(posix_fallocate)/d" \ - -i configure.ac + -i configure.ac || die "sed failed" fi eautoreconf multilib_copy_sources + + preparation() { + pushd "${BUILD_DIR}" > /dev/null || die + + if full_tarball && [[ "${ABI}" == "x86" ]]; then + # Disable tests broken on x86. + sed -e "/^for {set i 0} {\$i<1000} {incr i} {$/,/^}$/d" -i test/date.test || die "sed failed" + fi + + popd > /dev/null || die + } + multilib_foreach_abi preparation } multilib_src_configure() { @@ -111,6 +128,10 @@ multilib_src_configure() { # https://sqlite.org/json1.html append-cppflags -DSQLITE_ENABLE_JSON1 + # Support memsys5 memory allocator. + # https://sqlite.org/malloc.html#memsys5 + append-cppflags -DSQLITE_ENABLE_MEMSYS5 + # Support Resumable Bulk Update extension. # https://sqlite.org/rbu.html append-cppflags -DSQLITE_ENABLE_RBU @@ -128,6 +149,10 @@ multilib_src_configure() { # https://sqlite.org/sessionintro.html options+=(--enable-session) + # Support unknown() function. + # https://sqlite.org/compile.html#enable_unknown_sql_function + append-cppflags -DSQLITE_ENABLE_UNKNOWN_SQL_FUNCTION + # Support unlock notification. # https://sqlite.org/unlock_notify.html append-cppflags -DSQLITE_ENABLE_UNLOCK_NOTIFY @@ -194,7 +219,7 @@ multilib_src_compile() { emake HAVE_TCL="$(usex tcl 1 "")" TCLLIBDIR="${EPREFIX}/usr/$(get_libdir)/${P}" if use tools && multilib_is_native_abi; then - emake changeset rbu showdb showjournal showstat4 showwal sqldiff sqlite3_analyzer + emake changeset dbdump dbhash rbu scrub showdb showjournal showstat4 showwal sqldiff sqlite3_analyzer fi } @@ -220,7 +245,10 @@ multilib_src_install() { } install_tool changeset sqlite3-changeset + install_tool dbdump sqlite3-db-dump + install_tool dbhash sqlite3-db-hash install_tool rbu sqlite3-rbu + install_tool scrub sqlite3-scrub install_tool showdb sqlite3-show-db install_tool showjournal sqlite3-show-journal install_tool showstat4 sqlite3-show-stat4 @@ -238,6 +266,10 @@ multilib_src_install_all() { doman sqlite3.1 if use doc; then - dohtml -A ico,odf,odg,pdf,svg -r "${WORKDIR}/${PN}-doc-${DOC_PV}/" + rm "${WORKDIR}/${PN}-doc-${DOC_PV}/"*.{db,txt} + ( + docinto html + dodoc -r "${WORKDIR}/${PN}-doc-${DOC_PV}/"* + ) fi } diff --git a/sdk_container/src/third_party/portage-stable/dev-db/sqlite/sqlite-3.12.2.ebuild b/sdk_container/src/third_party/portage-stable/dev-db/sqlite/sqlite-3.21.0.ebuild similarity index 67% rename from sdk_container/src/third_party/portage-stable/dev-db/sqlite/sqlite-3.12.2.ebuild rename to sdk_container/src/third_party/portage-stable/dev-db/sqlite/sqlite-3.21.0.ebuild index d99bf41952..7c2a7737ef 100644 --- a/sdk_container/src/third_party/portage-stable/dev-db/sqlite/sqlite-3.12.2.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-db/sqlite/sqlite-3.21.0.ebuild @@ -1,8 +1,7 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Id$ -EAPI="5" +EAPI="6" inherit autotools eutils flag-o-matic multilib multilib-minimal toolchain-funcs versionator @@ -12,15 +11,15 @@ DOC_PV="${SRC_PV}" DESCRIPTION="A SQL Database Engine in a C Library" HOMEPAGE="https://sqlite.org/" -SRC_URI="doc? ( https://sqlite.org/2016/${PN}-doc-${DOC_PV}.zip ) - tcl? ( https://sqlite.org/2016/${PN}-src-${SRC_PV}.zip ) - test? ( https://sqlite.org/2016/${PN}-src-${SRC_PV}.zip ) - tools? ( https://sqlite.org/2016/${PN}-src-${SRC_PV}.zip ) - !tcl? ( !test? ( !tools? ( https://sqlite.org/2016/${PN}-autoconf-${SRC_PV}.tar.gz ) ) )" +SRC_URI="doc? ( https://sqlite.org/2017/${PN}-doc-${DOC_PV}.zip ) + tcl? ( https://sqlite.org/2017/${PN}-src-${SRC_PV}.zip ) + test? ( https://sqlite.org/2017/${PN}-src-${SRC_PV}.zip ) + tools? ( https://sqlite.org/2017/${PN}-src-${SRC_PV}.zip ) + !tcl? ( !test? ( !tools? ( https://sqlite.org/2017/${PN}-autoconf-${SRC_PV}.tar.gz ) ) )" LICENSE="public-domain" SLOT="3" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="debug doc icu +readline secure-delete static-libs tcl test tools" RDEPEND="icu? ( dev-libs/icu:0=[${MULTILIB_USEDEP}] ) @@ -36,12 +35,12 @@ DEPEND="${RDEPEND} ) tools? ( app-arch/unzip )" -full_tarball() { +full_archive() { use tcl || use test || use tools } pkg_setup() { - if full_tarball; then + if full_archive; then S="${WORKDIR}/${PN}-src-${SRC_PV}" else S="${WORKDIR}/${PN}-autoconf-${SRC_PV}" @@ -49,21 +48,28 @@ pkg_setup() { } src_prepare() { - if full_tarball; then - epatch "${FILESDIR}/${PN}-3.11.0-full_tarball-build.patch" + if full_archive; then + eapply "${FILESDIR}/${PN}-3.21.0-full_archive-build.patch" + + eapply_user # Fix AC_CHECK_FUNCS. # https://mailinglists.sqlite.org/cgi-bin/mailman/private/sqlite-dev/2016-March/002762.html - sed -e "s/AC_CHECK_FUNCS(.*)/AC_CHECK_FUNCS([fdatasync fullfsync gmtime_r isnan localtime_r localtime_s malloc_usable_size posix_fallocate pread pread64 pwrite pwrite64 strchrnul usleep utime])/" -i configure.ac + sed -e "s/AC_CHECK_FUNCS(.*)/AC_CHECK_FUNCS([fdatasync fullfsync gmtime_r isnan localtime_r localtime_s malloc_usable_size posix_fallocate pread pread64 pwrite pwrite64 strchrnul usleep utime])/" -i configure.ac || die "sed failed" + + # https://sqlite.org/src/info/bf09fa683ea42b75 + sed -e "s:cp tsrc/shell\.c tsrc/sqlite3ext\.h \.:cp tsrc/sqlite3ext.h .:" -i Makefile.in || die "sed failed" else - epatch "${FILESDIR}/${PN}-3.12.0-nonfull_tarball-build.patch" + eapply "${FILESDIR}/${PN}-3.21.0-nonfull_archive-build.patch" + + eapply_user # Fix AC_CHECK_FUNCS. # https://mailinglists.sqlite.org/cgi-bin/mailman/private/sqlite-dev/2016-March/002762.html sed \ -e "s/AC_CHECK_FUNCS(\[fdatasync.*/AC_CHECK_FUNCS([fdatasync fullfsync gmtime_r isnan localtime_r localtime_s malloc_usable_size posix_fallocate pread pread64 pwrite pwrite64 strchrnul usleep utime])/" \ -e "/AC_CHECK_FUNCS(posix_fallocate)/d" \ - -i configure.ac + -i configure.ac || die "sed failed" fi eautoreconf @@ -72,13 +78,13 @@ src_prepare() { } multilib_src_configure() { - local CPPFLAGS="${CPPFLAGS}" options=() + local CPPFLAGS="${CPPFLAGS}" CFLAGS="${CFLAGS}" options=() options+=( - --enable-$(full_tarball && echo load-extension || echo dynamic-extensions) + --enable-$(full_archive && echo load-extension || echo dynamic-extensions) --enable-threadsafe ) - if ! full_tarball; then + if ! full_archive; then options+=(--disable-static-shell) fi @@ -90,6 +96,10 @@ multilib_src_configure() { # https://sqlite.org/c3ref/column_database_name.html append-cppflags -DSQLITE_ENABLE_COLUMN_METADATA + # Support sqlite_dbpage virtual table. + # https://sqlite.org/compile.html#enable_dbpage_vtab + append-cppflags -DSQLITE_ENABLE_DBPAGE_VTAB + # Support dbstat virtual table. # https://sqlite.org/dbstat.html append-cppflags -DSQLITE_ENABLE_DBSTAT_VTAB @@ -111,6 +121,10 @@ multilib_src_configure() { # https://sqlite.org/json1.html append-cppflags -DSQLITE_ENABLE_JSON1 + # Support memsys5 memory allocator. + # https://sqlite.org/malloc.html#memsys5 + append-cppflags -DSQLITE_ENABLE_MEMSYS5 + # Support Resumable Bulk Update extension. # https://sqlite.org/rbu.html append-cppflags -DSQLITE_ENABLE_RBU @@ -124,16 +138,32 @@ multilib_src_configure() { # https://sqlite.org/c3ref/stmt_scanstatus_reset.html append-cppflags -DSQLITE_ENABLE_STMT_SCANSTATUS + # Support sqlite_stmt virtual table. + # https://sqlite.org/stmt.html + append-cppflags -DSQLITE_ENABLE_STMTVTAB + + # Support Session extension. + # https://sqlite.org/sessionintro.html + options+=(--enable-session) + + # Support unknown() function. + # https://sqlite.org/compile.html#enable_unknown_sql_function + append-cppflags -DSQLITE_ENABLE_UNKNOWN_SQL_FUNCTION + # Support unlock notification. # https://sqlite.org/unlock_notify.html append-cppflags -DSQLITE_ENABLE_UNLOCK_NOTIFY + # Support LIMIT and ORDER BY clauses on DELETE and UPDATE statements. + # https://sqlite.org/compile.html#enable_update_delete_limit + append-cppflags -DSQLITE_ENABLE_UPDATE_DELETE_LIMIT + # Support soundex() function. # https://sqlite.org/lang_corefunc.html#soundex append-cppflags -DSQLITE_SOUNDEX # debug USE flag. - if full_tarball; then + if full_archive; then options+=($(use_enable debug)) else if use debug; then @@ -148,7 +178,7 @@ multilib_src_configure() { # Support ICU extension. # https://sqlite.org/compile.html#enable_icu append-cppflags -DSQLITE_ENABLE_ICU - if full_tarball; then + if full_archive; then sed -e "s/^TLIBS = @LIBS@/& -licui18n -licuuc/" -i Makefile.in || die "sed failed" else sed -e "s/^LIBS = @LIBS@/& -licui18n -licuuc/" -i Makefile.in || die "sed failed" @@ -160,7 +190,7 @@ multilib_src_configure() { --disable-editline $(use_enable readline) ) - if full_tarball && use readline; then + if full_archive && use readline; then options+=(--with-readline-inc="-I${EPREFIX}/usr/include/readline") fi @@ -175,7 +205,7 @@ multilib_src_configure() { options+=($(use_enable static-libs static)) # tcl, test, tools USE flags. - if full_tarball; then + if full_archive; then options+=(--enable-tcl) fi @@ -183,6 +213,14 @@ multilib_src_configure() { append-cppflags -DSQLITE_OMIT_WAL fi + if [[ "${ABI}" == "x86" ]]; then + if $(tc-getCC) ${CPPFLAGS} ${CFLAGS} -E -P -dM - < /dev/null 2> /dev/null | grep -q "^#define __SSE__ 1$"; then + append-cflags -mfpmath=sse + else + append-cflags -ffloat-store + fi + fi + econf "${options[@]}" } @@ -190,7 +228,7 @@ multilib_src_compile() { emake HAVE_TCL="$(usex tcl 1 "")" TCLLIBDIR="${EPREFIX}/usr/$(get_libdir)/${P}" if use tools && multilib_is_native_abi; then - emake rbu showdb showjournal showstat4 showwal sqldiff sqlite3_analyzer + emake changeset dbdump dbhash rbu scrub showdb showjournal showstat4 showwal sqldiff sqlite3_analyzer fi } @@ -215,7 +253,11 @@ multilib_src_install() { fi } + install_tool changeset sqlite3-changeset + install_tool dbdump sqlite3-db-dump + install_tool dbhash sqlite3-db-hash install_tool rbu sqlite3-rbu + install_tool scrub sqlite3-scrub install_tool showdb sqlite3-show-db install_tool showjournal sqlite3-show-journal install_tool showstat4 sqlite3-show-stat4 @@ -233,6 +275,10 @@ multilib_src_install_all() { doman sqlite3.1 if use doc; then - dohtml -A ico,odf,odg,pdf,svg -r "${WORKDIR}/${PN}-doc-${DOC_PV}/" + rm "${WORKDIR}/${PN}-doc-${DOC_PV}/"*.{db,txt} + ( + docinto html + dodoc -r "${WORKDIR}/${PN}-doc-${DOC_PV}/"* + ) fi } diff --git a/sdk_container/src/third_party/portage-stable/dev-db/sqlite/sqlite-3.12.1.ebuild b/sdk_container/src/third_party/portage-stable/dev-db/sqlite/sqlite-3.22.0.ebuild similarity index 60% rename from sdk_container/src/third_party/portage-stable/dev-db/sqlite/sqlite-3.12.1.ebuild rename to sdk_container/src/third_party/portage-stable/dev-db/sqlite/sqlite-3.22.0.ebuild index d99bf41952..32bb8bfe82 100644 --- a/sdk_container/src/third_party/portage-stable/dev-db/sqlite/sqlite-3.12.1.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-db/sqlite/sqlite-3.22.0.ebuild @@ -1,8 +1,7 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Id$ -EAPI="5" +EAPI="6" inherit autotools eutils flag-o-matic multilib multilib-minimal toolchain-funcs versionator @@ -12,18 +11,19 @@ DOC_PV="${SRC_PV}" DESCRIPTION="A SQL Database Engine in a C Library" HOMEPAGE="https://sqlite.org/" -SRC_URI="doc? ( https://sqlite.org/2016/${PN}-doc-${DOC_PV}.zip ) - tcl? ( https://sqlite.org/2016/${PN}-src-${SRC_PV}.zip ) - test? ( https://sqlite.org/2016/${PN}-src-${SRC_PV}.zip ) - tools? ( https://sqlite.org/2016/${PN}-src-${SRC_PV}.zip ) - !tcl? ( !test? ( !tools? ( https://sqlite.org/2016/${PN}-autoconf-${SRC_PV}.tar.gz ) ) )" +SRC_URI="doc? ( https://sqlite.org/2018/${PN}-doc-${DOC_PV}.zip ) + tcl? ( https://sqlite.org/2018/${PN}-src-${SRC_PV}.zip ) + test? ( https://sqlite.org/2018/${PN}-src-${SRC_PV}.zip ) + tools? ( https://sqlite.org/2018/${PN}-src-${SRC_PV}.zip ) + !tcl? ( !test? ( !tools? ( https://sqlite.org/2018/${PN}-autoconf-${SRC_PV}.tar.gz ) ) )" LICENSE="public-domain" SLOT="3" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="debug doc icu +readline secure-delete static-libs tcl test tools" -RDEPEND="icu? ( dev-libs/icu:0=[${MULTILIB_USEDEP}] ) +RDEPEND="sys-libs/zlib:0=[${MULTILIB_USEDEP}] + icu? ( dev-libs/icu:0=[${MULTILIB_USEDEP}] ) readline? ( sys-libs/readline:0=[${MULTILIB_USEDEP}] ) tcl? ( dev-lang/tcl:0=[${MULTILIB_USEDEP}] ) tools? ( dev-lang/tcl:0=[${MULTILIB_USEDEP}] )" @@ -36,12 +36,12 @@ DEPEND="${RDEPEND} ) tools? ( app-arch/unzip )" -full_tarball() { +full_archive() { use tcl || use test || use tools } pkg_setup() { - if full_tarball; then + if full_archive; then S="${WORKDIR}/${PN}-src-${SRC_PV}" else S="${WORKDIR}/${PN}-autoconf-${SRC_PV}" @@ -49,21 +49,28 @@ pkg_setup() { } src_prepare() { - if full_tarball; then - epatch "${FILESDIR}/${PN}-3.11.0-full_tarball-build.patch" + if full_archive; then + eapply "${FILESDIR}/${PN}-3.22.0-full_archive-build.patch" + eapply "${FILESDIR}/${PN}-3.22.0-full_archive-headers.patch" + eapply "${FILESDIR}/${PN}-3.22.0-full_archive-tests.patch" + + eapply_user # Fix AC_CHECK_FUNCS. # https://mailinglists.sqlite.org/cgi-bin/mailman/private/sqlite-dev/2016-March/002762.html - sed -e "s/AC_CHECK_FUNCS(.*)/AC_CHECK_FUNCS([fdatasync fullfsync gmtime_r isnan localtime_r localtime_s malloc_usable_size posix_fallocate pread pread64 pwrite pwrite64 strchrnul usleep utime])/" -i configure.ac + sed -e "s/AC_CHECK_FUNCS(.*)/AC_CHECK_FUNCS([fdatasync fullfsync gmtime_r isnan localtime_r localtime_s malloc_usable_size posix_fallocate pread pread64 pwrite pwrite64 strchrnul usleep utime])/" -i configure.ac || die "sed failed" else - epatch "${FILESDIR}/${PN}-3.12.0-nonfull_tarball-build.patch" + eapply "${FILESDIR}/${PN}-3.21.0-nonfull_archive-build.patch" + eapply -p2 "${FILESDIR}/${PN}-3.22.0-full_archive-headers.patch" + + eapply_user # Fix AC_CHECK_FUNCS. # https://mailinglists.sqlite.org/cgi-bin/mailman/private/sqlite-dev/2016-March/002762.html sed \ -e "s/AC_CHECK_FUNCS(\[fdatasync.*/AC_CHECK_FUNCS([fdatasync fullfsync gmtime_r isnan localtime_r localtime_s malloc_usable_size posix_fallocate pread pread64 pwrite pwrite64 strchrnul usleep utime])/" \ -e "/AC_CHECK_FUNCS(posix_fallocate)/d" \ - -i configure.ac + -i configure.ac || die "sed failed" fi eautoreconf @@ -72,13 +79,13 @@ src_prepare() { } multilib_src_configure() { - local CPPFLAGS="${CPPFLAGS}" options=() + local CPPFLAGS="${CPPFLAGS}" CFLAGS="${CFLAGS}" options=() options+=( - --enable-$(full_tarball && echo load-extension || echo dynamic-extensions) + --enable-$(full_archive && echo load-extension || echo dynamic-extensions) --enable-threadsafe ) - if ! full_tarball; then + if ! full_archive; then options+=(--disable-static-shell) fi @@ -90,6 +97,10 @@ multilib_src_configure() { # https://sqlite.org/c3ref/column_database_name.html append-cppflags -DSQLITE_ENABLE_COLUMN_METADATA + # Support sqlite_dbpage virtual table. + # https://sqlite.org/compile.html#enable_dbpage_vtab + append-cppflags -DSQLITE_ENABLE_DBPAGE_VTAB + # Support dbstat virtual table. # https://sqlite.org/dbstat.html append-cppflags -DSQLITE_ENABLE_DBSTAT_VTAB @@ -111,6 +122,18 @@ multilib_src_configure() { # https://sqlite.org/json1.html append-cppflags -DSQLITE_ENABLE_JSON1 + # Support memsys5 memory allocator. + # https://sqlite.org/malloc.html#memsys5 + append-cppflags -DSQLITE_ENABLE_MEMSYS5 + + # Support sqlite_offset() function. + # https://sqlite.org/lang_corefunc.html#sqlite_offset + append-cppflags -DSQLITE_ENABLE_OFFSET_SQL_FUNC + + # Support pre-update hook functions. + # https://sqlite.org/c3ref/preupdate_count.html + append-cppflags -DSQLITE_ENABLE_PREUPDATE_HOOK + # Support Resumable Bulk Update extension. # https://sqlite.org/rbu.html append-cppflags -DSQLITE_ENABLE_RBU @@ -124,16 +147,38 @@ multilib_src_configure() { # https://sqlite.org/c3ref/stmt_scanstatus_reset.html append-cppflags -DSQLITE_ENABLE_STMT_SCANSTATUS + # Support sqlite_stmt virtual table. + # https://sqlite.org/stmt.html + append-cppflags -DSQLITE_ENABLE_STMTVTAB + + # Support Session extension. + # https://sqlite.org/sessionintro.html + options+=(--enable-session) + + # Support unknown() function. + # https://sqlite.org/compile.html#enable_unknown_sql_function + append-cppflags -DSQLITE_ENABLE_UNKNOWN_SQL_FUNCTION + # Support unlock notification. # https://sqlite.org/unlock_notify.html append-cppflags -DSQLITE_ENABLE_UNLOCK_NOTIFY + # Support LIMIT and ORDER BY clauses on DELETE and UPDATE statements. + # https://sqlite.org/compile.html#enable_update_delete_limit + append-cppflags -DSQLITE_ENABLE_UPDATE_DELETE_LIMIT + + # Support PRAGMA function_list, PRAGMA module_list and PRAGMA pragma_list statements. + # https://sqlite.org/pragma.html#pragma_function_list + # https://sqlite.org/pragma.html#pragma_module_list + # https://sqlite.org/pragma.html#pragma_pragma_list + append-cppflags -DSQLITE_INTROSPECTION_PRAGMAS + # Support soundex() function. # https://sqlite.org/lang_corefunc.html#soundex append-cppflags -DSQLITE_SOUNDEX # debug USE flag. - if full_tarball; then + if full_archive; then options+=($(use_enable debug)) else if use debug; then @@ -148,7 +193,7 @@ multilib_src_configure() { # Support ICU extension. # https://sqlite.org/compile.html#enable_icu append-cppflags -DSQLITE_ENABLE_ICU - if full_tarball; then + if full_archive; then sed -e "s/^TLIBS = @LIBS@/& -licui18n -licuuc/" -i Makefile.in || die "sed failed" else sed -e "s/^LIBS = @LIBS@/& -licui18n -licuuc/" -i Makefile.in || die "sed failed" @@ -160,7 +205,7 @@ multilib_src_configure() { --disable-editline $(use_enable readline) ) - if full_tarball && use readline; then + if full_archive && use readline; then options+=(--with-readline-inc="-I${EPREFIX}/usr/include/readline") fi @@ -175,7 +220,7 @@ multilib_src_configure() { options+=($(use_enable static-libs static)) # tcl, test, tools USE flags. - if full_tarball; then + if full_archive; then options+=(--enable-tcl) fi @@ -183,6 +228,14 @@ multilib_src_configure() { append-cppflags -DSQLITE_OMIT_WAL fi + if [[ "${ABI}" == "x86" ]]; then + if $(tc-getCC) ${CPPFLAGS} ${CFLAGS} -E -P -dM - < /dev/null 2> /dev/null | grep -q "^#define __SSE__ 1$"; then + append-cflags -mfpmath=sse + else + append-cflags -ffloat-store + fi + fi + econf "${options[@]}" } @@ -190,7 +243,7 @@ multilib_src_compile() { emake HAVE_TCL="$(usex tcl 1 "")" TCLLIBDIR="${EPREFIX}/usr/$(get_libdir)/${P}" if use tools && multilib_is_native_abi; then - emake rbu showdb showjournal showstat4 showwal sqldiff sqlite3_analyzer + emake changeset dbdump dbhash rbu scrub showdb showjournal showshm showstat4 showwal sqldiff sqlite3_analyzer sqlite3_checker sqlite3_expert sqltclsh fi } @@ -215,13 +268,21 @@ multilib_src_install() { fi } + install_tool changeset sqlite3-changeset + install_tool dbdump sqlite3-db-dump + install_tool dbhash sqlite3-db-hash install_tool rbu sqlite3-rbu + install_tool scrub sqlite3-scrub install_tool showdb sqlite3-show-db install_tool showjournal sqlite3-show-journal + install_tool showshm sqlite3-show-shm install_tool showstat4 sqlite3-show-stat4 install_tool showwal sqlite3-show-wal install_tool sqldiff sqlite3-diff install_tool sqlite3_analyzer sqlite3-analyzer + install_tool sqlite3_checker sqlite3-checker + install_tool sqlite3_expert sqlite3-expert + install_tool sqltclsh sqlite3-tclsh unset -f install_tool fi @@ -233,6 +294,10 @@ multilib_src_install_all() { doman sqlite3.1 if use doc; then - dohtml -A ico,odf,odg,pdf,svg -r "${WORKDIR}/${PN}-doc-${DOC_PV}/" + rm "${WORKDIR}/${PN}-doc-${DOC_PV}/"*.{db,txt} + ( + docinto html + dodoc -r "${WORKDIR}/${PN}-doc-${DOC_PV}/"* + ) fi } diff --git a/sdk_container/src/third_party/portage-stable/dev-db/sqlite/sqlite-3.12.0.ebuild b/sdk_container/src/third_party/portage-stable/dev-db/sqlite/sqlite-3.23.1.ebuild similarity index 58% rename from sdk_container/src/third_party/portage-stable/dev-db/sqlite/sqlite-3.12.0.ebuild rename to sdk_container/src/third_party/portage-stable/dev-db/sqlite/sqlite-3.23.1.ebuild index 48c3bc5526..1f72b5dd38 100644 --- a/sdk_container/src/third_party/portage-stable/dev-db/sqlite/sqlite-3.12.0.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-db/sqlite/sqlite-3.23.1.ebuild @@ -1,8 +1,7 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Id$ -EAPI="5" +EAPI="6" inherit autotools eutils flag-o-matic multilib multilib-minimal toolchain-funcs versionator @@ -12,18 +11,19 @@ DOC_PV="${SRC_PV}" DESCRIPTION="A SQL Database Engine in a C Library" HOMEPAGE="https://sqlite.org/" -SRC_URI="doc? ( https://sqlite.org/2016/${PN}-doc-${DOC_PV}.zip ) - tcl? ( https://sqlite.org/2016/${PN}-src-${SRC_PV}.zip ) - test? ( https://sqlite.org/2016/${PN}-src-${SRC_PV}.zip ) - tools? ( https://sqlite.org/2016/${PN}-src-${SRC_PV}.zip ) - !tcl? ( !test? ( !tools? ( https://sqlite.org/2016/${PN}-autoconf-${SRC_PV}.tar.gz ) ) )" +SRC_URI="doc? ( https://sqlite.org/2018/${PN}-doc-${DOC_PV}.zip ) + tcl? ( https://sqlite.org/2018/${PN}-src-${SRC_PV}.zip ) + test? ( https://sqlite.org/2018/${PN}-src-${SRC_PV}.zip ) + tools? ( https://sqlite.org/2018/${PN}-src-${SRC_PV}.zip ) + !tcl? ( !test? ( !tools? ( https://sqlite.org/2018/${PN}-autoconf-${SRC_PV}.tar.gz ) ) )" LICENSE="public-domain" SLOT="3" -KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="debug doc icu +readline secure-delete static-libs tcl test tools" -RDEPEND="icu? ( dev-libs/icu:0=[${MULTILIB_USEDEP}] ) +RDEPEND="sys-libs/zlib:0=[${MULTILIB_USEDEP}] + icu? ( dev-libs/icu:0=[${MULTILIB_USEDEP}] ) readline? ( sys-libs/readline:0=[${MULTILIB_USEDEP}] ) tcl? ( dev-lang/tcl:0=[${MULTILIB_USEDEP}] ) tools? ( dev-lang/tcl:0=[${MULTILIB_USEDEP}] )" @@ -36,12 +36,12 @@ DEPEND="${RDEPEND} ) tools? ( app-arch/unzip )" -full_tarball() { +full_archive() { use tcl || use test || use tools } pkg_setup() { - if full_tarball; then + if full_archive; then S="${WORKDIR}/${PN}-src-${SRC_PV}" else S="${WORKDIR}/${PN}-autoconf-${SRC_PV}" @@ -49,21 +49,28 @@ pkg_setup() { } src_prepare() { - if full_tarball; then - epatch "${FILESDIR}/${PN}-3.11.0-full_tarball-build.patch" + if full_archive; then + eapply "${FILESDIR}/${PN}-3.23.0-full_archive-build.patch" + eapply "${FILESDIR}/${PN}-3.23.1-full_archive-prohibit_bound_parameters_in_arguments_to_table-valued_functions_within_triggers.patch" + eapply "${FILESDIR}/${PN}-3.23.1-full_archive-tests.patch" + + eapply_user # Fix AC_CHECK_FUNCS. # https://mailinglists.sqlite.org/cgi-bin/mailman/private/sqlite-dev/2016-March/002762.html - sed -e "s/AC_CHECK_FUNCS(.*)/AC_CHECK_FUNCS([fdatasync fullfsync gmtime_r isnan localtime_r localtime_s malloc_usable_size posix_fallocate pread pread64 pwrite pwrite64 strchrnul usleep utime])/" -i configure.ac + sed -e "s/AC_CHECK_FUNCS(.*)/AC_CHECK_FUNCS([fdatasync fullfsync gmtime_r isnan localtime_r localtime_s malloc_usable_size posix_fallocate pread pread64 pwrite pwrite64 strchrnul usleep utime])/" -i configure.ac || die "sed failed" else - epatch "${FILESDIR}/${PN}-3.12.0-nonfull_tarball-build.patch" + eapply "${FILESDIR}/${PN}-3.21.0-nonfull_archive-build.patch" + eapply "${FILESDIR}/${PN}-3.23.1-nonfull_archive-prohibit_bound_parameters_in_arguments_to_table-valued_functions_within_triggers.patch" + + eapply_user # Fix AC_CHECK_FUNCS. # https://mailinglists.sqlite.org/cgi-bin/mailman/private/sqlite-dev/2016-March/002762.html sed \ -e "s/AC_CHECK_FUNCS(\[fdatasync.*/AC_CHECK_FUNCS([fdatasync fullfsync gmtime_r isnan localtime_r localtime_s malloc_usable_size posix_fallocate pread pread64 pwrite pwrite64 strchrnul usleep utime])/" \ -e "/AC_CHECK_FUNCS(posix_fallocate)/d" \ - -i configure.ac + -i configure.ac || die "sed failed" fi eautoreconf @@ -72,13 +79,13 @@ src_prepare() { } multilib_src_configure() { - local CPPFLAGS="${CPPFLAGS}" options=() + local CPPFLAGS="${CPPFLAGS}" CFLAGS="${CFLAGS}" options=() options+=( - --enable-$(full_tarball && echo load-extension || echo dynamic-extensions) + --enable-$(full_archive && echo load-extension || echo dynamic-extensions) --enable-threadsafe ) - if ! full_tarball; then + if ! full_archive; then options+=(--disable-static-shell) fi @@ -90,10 +97,20 @@ multilib_src_configure() { # https://sqlite.org/c3ref/column_database_name.html append-cppflags -DSQLITE_ENABLE_COLUMN_METADATA + # Support sqlite_dbpage virtual table. + # https://sqlite.org/compile.html#enable_dbpage_vtab + append-cppflags -DSQLITE_ENABLE_DBPAGE_VTAB + # Support dbstat virtual table. # https://sqlite.org/dbstat.html append-cppflags -DSQLITE_ENABLE_DBSTAT_VTAB + # Support sqlite3_serialize() and sqlite3_deserialize() functions. + # https://sqlite.org/compile.html#enable_deserialize + # https://sqlite.org/c3ref/serialize.html + # https://sqlite.org/c3ref/deserialize.html + append-cppflags -DSQLITE_ENABLE_DESERIALIZE + # Support comments in output of EXPLAIN. # https://sqlite.org/compile.html#enable_explain_comments append-cppflags -DSQLITE_ENABLE_EXPLAIN_COMMENTS @@ -111,6 +128,18 @@ multilib_src_configure() { # https://sqlite.org/json1.html append-cppflags -DSQLITE_ENABLE_JSON1 + # Support memsys5 memory allocator. + # https://sqlite.org/malloc.html#memsys5 + append-cppflags -DSQLITE_ENABLE_MEMSYS5 + + # Support sqlite_offset() function. + # https://sqlite.org/lang_corefunc.html#sqlite_offset + append-cppflags -DSQLITE_ENABLE_OFFSET_SQL_FUNC + + # Support pre-update hook functions. + # https://sqlite.org/c3ref/preupdate_count.html + append-cppflags -DSQLITE_ENABLE_PREUPDATE_HOOK + # Support Resumable Bulk Update extension. # https://sqlite.org/rbu.html append-cppflags -DSQLITE_ENABLE_RBU @@ -124,16 +153,38 @@ multilib_src_configure() { # https://sqlite.org/c3ref/stmt_scanstatus_reset.html append-cppflags -DSQLITE_ENABLE_STMT_SCANSTATUS + # Support sqlite_stmt virtual table. + # https://sqlite.org/stmt.html + append-cppflags -DSQLITE_ENABLE_STMTVTAB + + # Support Session extension. + # https://sqlite.org/sessionintro.html + options+=(--enable-session) + + # Support unknown() function. + # https://sqlite.org/compile.html#enable_unknown_sql_function + append-cppflags -DSQLITE_ENABLE_UNKNOWN_SQL_FUNCTION + # Support unlock notification. # https://sqlite.org/unlock_notify.html append-cppflags -DSQLITE_ENABLE_UNLOCK_NOTIFY + # Support LIMIT and ORDER BY clauses on DELETE and UPDATE statements. + # https://sqlite.org/compile.html#enable_update_delete_limit + append-cppflags -DSQLITE_ENABLE_UPDATE_DELETE_LIMIT + + # Support PRAGMA function_list, PRAGMA module_list and PRAGMA pragma_list statements. + # https://sqlite.org/pragma.html#pragma_function_list + # https://sqlite.org/pragma.html#pragma_module_list + # https://sqlite.org/pragma.html#pragma_pragma_list + append-cppflags -DSQLITE_INTROSPECTION_PRAGMAS + # Support soundex() function. # https://sqlite.org/lang_corefunc.html#soundex append-cppflags -DSQLITE_SOUNDEX # debug USE flag. - if full_tarball; then + if full_archive; then options+=($(use_enable debug)) else if use debug; then @@ -148,7 +199,7 @@ multilib_src_configure() { # Support ICU extension. # https://sqlite.org/compile.html#enable_icu append-cppflags -DSQLITE_ENABLE_ICU - if full_tarball; then + if full_archive; then sed -e "s/^TLIBS = @LIBS@/& -licui18n -licuuc/" -i Makefile.in || die "sed failed" else sed -e "s/^LIBS = @LIBS@/& -licui18n -licuuc/" -i Makefile.in || die "sed failed" @@ -160,7 +211,7 @@ multilib_src_configure() { --disable-editline $(use_enable readline) ) - if full_tarball && use readline; then + if full_archive && use readline; then options+=(--with-readline-inc="-I${EPREFIX}/usr/include/readline") fi @@ -175,7 +226,7 @@ multilib_src_configure() { options+=($(use_enable static-libs static)) # tcl, test, tools USE flags. - if full_tarball; then + if full_archive; then options+=(--enable-tcl) fi @@ -183,6 +234,14 @@ multilib_src_configure() { append-cppflags -DSQLITE_OMIT_WAL fi + if [[ "${ABI}" == "x86" ]]; then + if $(tc-getCC) ${CPPFLAGS} ${CFLAGS} -E -P -dM - < /dev/null 2> /dev/null | grep -q "^#define __SSE__ 1$"; then + append-cflags -mfpmath=sse + else + append-cflags -ffloat-store + fi + fi + econf "${options[@]}" } @@ -190,7 +249,7 @@ multilib_src_compile() { emake HAVE_TCL="$(usex tcl 1 "")" TCLLIBDIR="${EPREFIX}/usr/$(get_libdir)/${P}" if use tools && multilib_is_native_abi; then - emake rbu showdb showjournal showstat4 showwal sqldiff sqlite3_analyzer + emake changeset dbdump dbhash rbu scrub showdb showjournal showshm showstat4 showwal sqldiff sqlite3_analyzer sqlite3_checker sqlite3_expert sqltclsh fi } @@ -215,13 +274,21 @@ multilib_src_install() { fi } + install_tool changeset sqlite3-changeset + install_tool dbdump sqlite3-db-dump + install_tool dbhash sqlite3-db-hash install_tool rbu sqlite3-rbu + install_tool scrub sqlite3-scrub install_tool showdb sqlite3-show-db install_tool showjournal sqlite3-show-journal + install_tool showshm sqlite3-show-shm install_tool showstat4 sqlite3-show-stat4 install_tool showwal sqlite3-show-wal install_tool sqldiff sqlite3-diff install_tool sqlite3_analyzer sqlite3-analyzer + install_tool sqlite3_checker sqlite3-checker + install_tool sqlite3_expert sqlite3-expert + install_tool sqltclsh sqlite3-tclsh unset -f install_tool fi @@ -233,6 +300,10 @@ multilib_src_install_all() { doman sqlite3.1 if use doc; then - dohtml -A ico,odf,odg,pdf,svg -r "${WORKDIR}/${PN}-doc-${DOC_PV}/" + rm "${WORKDIR}/${PN}-doc-${DOC_PV}/"*.{db,txt} + ( + docinto html + dodoc -r "${WORKDIR}/${PN}-doc-${DOC_PV}/"* + ) fi } diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-db/sqlite-3.12.1 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-db/sqlite-3.12.1 deleted file mode 100644 index 14d0f82854..0000000000 --- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-db/sqlite-3.12.1 +++ /dev/null @@ -1,13 +0,0 @@ -DEFINED_PHASES=compile configure install prepare setup test -DEPEND=icu? ( dev-libs/icu:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) readline? ( sys-libs/readline:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tcl? ( dev-lang/tcl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tools? ( dev-lang/tcl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) doc? ( app-arch/unzip ) tcl? ( app-arch/unzip ) test? ( app-arch/unzip dev-lang/tcl:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tools? ( app-arch/unzip ) >=app-portage/elt-patches-20170422 !=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 -DESCRIPTION=A SQL Database Engine in a C Library -EAPI=5 -HOMEPAGE=https://sqlite.org/ -IUSE=debug doc icu +readline secure-delete static-libs tcl test tools abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 -KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris -LICENSE=public-domain -RDEPEND=icu? ( dev-libs/icu:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) readline? ( sys-libs/readline:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tcl? ( dev-lang/tcl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tools? ( dev-lang/tcl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) -SLOT=3 -SRC_URI=doc? ( https://sqlite.org/2016/sqlite-doc-3120100.zip ) tcl? ( https://sqlite.org/2016/sqlite-src-3120100.zip ) test? ( https://sqlite.org/2016/sqlite-src-3120100.zip ) tools? ( https://sqlite.org/2016/sqlite-src-3120100.zip ) !tcl? ( !test? ( !tools? ( https://sqlite.org/2016/sqlite-autoconf-3120100.tar.gz ) ) ) -_eclasses_=autotools dc412f38566b91012efd58b9c203e6c3 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 flag-o-matic 2274fcc1e7ef6affaff5bcd636275417 libtool 0081a71a261724730ec4c248494f044d ltprune 2770eed66a9b8ef944714cd0e968182e multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build eed53a6313267c9fbcd35fc384bd0087 multilib-minimal 9139c3a57e077cb8e0d0f73ceb080b89 toolchain-funcs 185a06792159ca143528e7010368e8af versionator c80ccf29e90adea7c5cae94b42eb76d0 -_md5_=622070ac42b8266ca8faf77bd7b3e6c2 diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-db/sqlite-3.12.2 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-db/sqlite-3.12.2 deleted file mode 100644 index 0313dae64e..0000000000 --- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-db/sqlite-3.12.2 +++ /dev/null @@ -1,13 +0,0 @@ -DEFINED_PHASES=compile configure install prepare setup test -DEPEND=icu? ( dev-libs/icu:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) readline? ( sys-libs/readline:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tcl? ( dev-lang/tcl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tools? ( dev-lang/tcl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) doc? ( app-arch/unzip ) tcl? ( app-arch/unzip ) test? ( app-arch/unzip dev-lang/tcl:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tools? ( app-arch/unzip ) >=app-portage/elt-patches-20170422 !=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 -DESCRIPTION=A SQL Database Engine in a C Library -EAPI=5 -HOMEPAGE=https://sqlite.org/ -IUSE=debug doc icu +readline secure-delete static-libs tcl test tools abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 -KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris -LICENSE=public-domain -RDEPEND=icu? ( dev-libs/icu:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) readline? ( sys-libs/readline:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tcl? ( dev-lang/tcl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tools? ( dev-lang/tcl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) -SLOT=3 -SRC_URI=doc? ( https://sqlite.org/2016/sqlite-doc-3120200.zip ) tcl? ( https://sqlite.org/2016/sqlite-src-3120200.zip ) test? ( https://sqlite.org/2016/sqlite-src-3120200.zip ) tools? ( https://sqlite.org/2016/sqlite-src-3120200.zip ) !tcl? ( !test? ( !tools? ( https://sqlite.org/2016/sqlite-autoconf-3120200.tar.gz ) ) ) -_eclasses_=autotools dc412f38566b91012efd58b9c203e6c3 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 flag-o-matic 2274fcc1e7ef6affaff5bcd636275417 libtool 0081a71a261724730ec4c248494f044d ltprune 2770eed66a9b8ef944714cd0e968182e multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build eed53a6313267c9fbcd35fc384bd0087 multilib-minimal 9139c3a57e077cb8e0d0f73ceb080b89 toolchain-funcs 185a06792159ca143528e7010368e8af versionator c80ccf29e90adea7c5cae94b42eb76d0 -_md5_=622070ac42b8266ca8faf77bd7b3e6c2 diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-db/sqlite-3.13.0 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-db/sqlite-3.13.0 deleted file mode 100644 index 190b182f18..0000000000 --- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-db/sqlite-3.13.0 +++ /dev/null @@ -1,13 +0,0 @@ -DEFINED_PHASES=compile configure install prepare setup test -DEPEND=icu? ( dev-libs/icu:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) readline? ( sys-libs/readline:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tcl? ( dev-lang/tcl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tools? ( dev-lang/tcl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) doc? ( app-arch/unzip ) tcl? ( app-arch/unzip ) test? ( app-arch/unzip dev-lang/tcl:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tools? ( app-arch/unzip ) >=app-portage/elt-patches-20170422 !=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 -DESCRIPTION=A SQL Database Engine in a C Library -EAPI=5 -HOMEPAGE=https://sqlite.org/ -IUSE=debug doc icu +readline secure-delete static-libs tcl test tools abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 -KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris -LICENSE=public-domain -RDEPEND=icu? ( dev-libs/icu:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) readline? ( sys-libs/readline:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tcl? ( dev-lang/tcl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tools? ( dev-lang/tcl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) -SLOT=3 -SRC_URI=doc? ( https://sqlite.org/2016/sqlite-doc-3130000.zip ) tcl? ( https://sqlite.org/2016/sqlite-src-3130000.zip ) test? ( https://sqlite.org/2016/sqlite-src-3130000.zip ) tools? ( https://sqlite.org/2016/sqlite-src-3130000.zip ) !tcl? ( !test? ( !tools? ( https://sqlite.org/2016/sqlite-autoconf-3130000.tar.gz ) ) ) -_eclasses_=autotools dc412f38566b91012efd58b9c203e6c3 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 flag-o-matic 2274fcc1e7ef6affaff5bcd636275417 libtool 0081a71a261724730ec4c248494f044d ltprune 2770eed66a9b8ef944714cd0e968182e multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build eed53a6313267c9fbcd35fc384bd0087 multilib-minimal 9139c3a57e077cb8e0d0f73ceb080b89 toolchain-funcs 185a06792159ca143528e7010368e8af versionator c80ccf29e90adea7c5cae94b42eb76d0 -_md5_=41ed35309f583f6e3974a61df9b60312 diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-db/sqlite-3.11.1 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-db/sqlite-3.20.1-r1 similarity index 81% rename from sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-db/sqlite-3.11.1 rename to sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-db/sqlite-3.20.1-r1 index d93a1fd122..edf89fdfb0 100644 --- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-db/sqlite-3.11.1 +++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-db/sqlite-3.20.1-r1 @@ -1,13 +1,13 @@ DEFINED_PHASES=compile configure install prepare setup test DEPEND=icu? ( dev-libs/icu:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) readline? ( sys-libs/readline:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tcl? ( dev-lang/tcl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tools? ( dev-lang/tcl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) doc? ( app-arch/unzip ) tcl? ( app-arch/unzip ) test? ( app-arch/unzip dev-lang/tcl:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tools? ( app-arch/unzip ) >=app-portage/elt-patches-20170422 !=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 DESCRIPTION=A SQL Database Engine in a C Library -EAPI=5 +EAPI=6 HOMEPAGE=https://sqlite.org/ IUSE=debug doc icu +readline secure-delete static-libs tcl test tools abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 -KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris +KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris LICENSE=public-domain RDEPEND=icu? ( dev-libs/icu:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) readline? ( sys-libs/readline:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tcl? ( dev-lang/tcl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tools? ( dev-lang/tcl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) SLOT=3 -SRC_URI=doc? ( https://sqlite.org/2016/sqlite-doc-3110100.zip ) tcl? ( https://sqlite.org/2016/sqlite-src-3110100.zip ) test? ( https://sqlite.org/2016/sqlite-src-3110100.zip ) tools? ( https://sqlite.org/2016/sqlite-src-3110100.zip ) !tcl? ( !test? ( !tools? ( https://sqlite.org/2016/sqlite-autoconf-3110100.tar.gz ) ) ) +SRC_URI=doc? ( https://sqlite.org/2017/sqlite-doc-3200100.zip ) tcl? ( https://sqlite.org/2017/sqlite-src-3200100.zip ) test? ( https://sqlite.org/2017/sqlite-src-3200100.zip ) tools? ( https://sqlite.org/2017/sqlite-src-3200100.zip ) !tcl? ( !test? ( !tools? ( https://sqlite.org/2017/sqlite-autoconf-3200100.tar.gz ) ) ) _eclasses_=autotools dc412f38566b91012efd58b9c203e6c3 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 flag-o-matic 2274fcc1e7ef6affaff5bcd636275417 libtool 0081a71a261724730ec4c248494f044d ltprune 2770eed66a9b8ef944714cd0e968182e multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build eed53a6313267c9fbcd35fc384bd0087 multilib-minimal 9139c3a57e077cb8e0d0f73ceb080b89 toolchain-funcs 185a06792159ca143528e7010368e8af versionator c80ccf29e90adea7c5cae94b42eb76d0 -_md5_=3029d8964db888682cbda457c5ea8cb9 +_md5_=fc64a40954f10c4fb6c31bf272947fed diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-db/sqlite-3.12.0 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-db/sqlite-3.21.0 similarity index 80% rename from sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-db/sqlite-3.12.0 rename to sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-db/sqlite-3.21.0 index c4e494f1a0..b55927259a 100644 --- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-db/sqlite-3.12.0 +++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-db/sqlite-3.21.0 @@ -1,13 +1,13 @@ DEFINED_PHASES=compile configure install prepare setup test DEPEND=icu? ( dev-libs/icu:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) readline? ( sys-libs/readline:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tcl? ( dev-lang/tcl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tools? ( dev-lang/tcl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) doc? ( app-arch/unzip ) tcl? ( app-arch/unzip ) test? ( app-arch/unzip dev-lang/tcl:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tools? ( app-arch/unzip ) >=app-portage/elt-patches-20170422 !=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 DESCRIPTION=A SQL Database Engine in a C Library -EAPI=5 +EAPI=6 HOMEPAGE=https://sqlite.org/ IUSE=debug doc icu +readline secure-delete static-libs tcl test tools abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 -KEYWORDS=alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris +KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris LICENSE=public-domain RDEPEND=icu? ( dev-libs/icu:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) readline? ( sys-libs/readline:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tcl? ( dev-lang/tcl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tools? ( dev-lang/tcl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) SLOT=3 -SRC_URI=doc? ( https://sqlite.org/2016/sqlite-doc-3120000.zip ) tcl? ( https://sqlite.org/2016/sqlite-src-3120000.zip ) test? ( https://sqlite.org/2016/sqlite-src-3120000.zip ) tools? ( https://sqlite.org/2016/sqlite-src-3120000.zip ) !tcl? ( !test? ( !tools? ( https://sqlite.org/2016/sqlite-autoconf-3120000.tar.gz ) ) ) +SRC_URI=doc? ( https://sqlite.org/2017/sqlite-doc-3210000.zip ) tcl? ( https://sqlite.org/2017/sqlite-src-3210000.zip ) test? ( https://sqlite.org/2017/sqlite-src-3210000.zip ) tools? ( https://sqlite.org/2017/sqlite-src-3210000.zip ) !tcl? ( !test? ( !tools? ( https://sqlite.org/2017/sqlite-autoconf-3210000.tar.gz ) ) ) _eclasses_=autotools dc412f38566b91012efd58b9c203e6c3 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 flag-o-matic 2274fcc1e7ef6affaff5bcd636275417 libtool 0081a71a261724730ec4c248494f044d ltprune 2770eed66a9b8ef944714cd0e968182e multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build eed53a6313267c9fbcd35fc384bd0087 multilib-minimal 9139c3a57e077cb8e0d0f73ceb080b89 toolchain-funcs 185a06792159ca143528e7010368e8af versionator c80ccf29e90adea7c5cae94b42eb76d0 -_md5_=100e8f0dd37d660f82299477a6f960e9 +_md5_=0f46cc520adb76585ebe7b44217c2616 diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-db/sqlite-3.22.0 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-db/sqlite-3.22.0 new file mode 100644 index 0000000000..20da0a3d37 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-db/sqlite-3.22.0 @@ -0,0 +1,13 @@ +DEFINED_PHASES=compile configure install prepare setup test +DEPEND=sys-libs/zlib:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] icu? ( dev-libs/icu:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) readline? ( sys-libs/readline:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tcl? ( dev-lang/tcl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tools? ( dev-lang/tcl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) doc? ( app-arch/unzip ) tcl? ( app-arch/unzip ) test? ( app-arch/unzip dev-lang/tcl:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tools? ( app-arch/unzip ) >=app-portage/elt-patches-20170422 !=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 +DESCRIPTION=A SQL Database Engine in a C Library +EAPI=6 +HOMEPAGE=https://sqlite.org/ +IUSE=debug doc icu +readline secure-delete static-libs tcl test tools abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 +KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris +LICENSE=public-domain +RDEPEND=sys-libs/zlib:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] icu? ( dev-libs/icu:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) readline? ( sys-libs/readline:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tcl? ( dev-lang/tcl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tools? ( dev-lang/tcl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) +SLOT=3 +SRC_URI=doc? ( https://sqlite.org/2018/sqlite-doc-3220000.zip ) tcl? ( https://sqlite.org/2018/sqlite-src-3220000.zip ) test? ( https://sqlite.org/2018/sqlite-src-3220000.zip ) tools? ( https://sqlite.org/2018/sqlite-src-3220000.zip ) !tcl? ( !test? ( !tools? ( https://sqlite.org/2018/sqlite-autoconf-3220000.tar.gz ) ) ) +_eclasses_=autotools dc412f38566b91012efd58b9c203e6c3 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 flag-o-matic 2274fcc1e7ef6affaff5bcd636275417 libtool 0081a71a261724730ec4c248494f044d ltprune 2770eed66a9b8ef944714cd0e968182e multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build eed53a6313267c9fbcd35fc384bd0087 multilib-minimal 9139c3a57e077cb8e0d0f73ceb080b89 toolchain-funcs 185a06792159ca143528e7010368e8af versionator c80ccf29e90adea7c5cae94b42eb76d0 +_md5_=0c0b861cf0fba074078445eb8914bb92 diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-db/sqlite-3.23.1 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-db/sqlite-3.23.1 new file mode 100644 index 0000000000..586cb6c031 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-db/sqlite-3.23.1 @@ -0,0 +1,13 @@ +DEFINED_PHASES=compile configure install prepare setup test +DEPEND=sys-libs/zlib:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] icu? ( dev-libs/icu:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) readline? ( sys-libs/readline:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tcl? ( dev-lang/tcl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tools? ( dev-lang/tcl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) doc? ( app-arch/unzip ) tcl? ( app-arch/unzip ) test? ( app-arch/unzip dev-lang/tcl:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tools? ( app-arch/unzip ) >=app-portage/elt-patches-20170422 !=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 +DESCRIPTION=A SQL Database Engine in a C Library +EAPI=6 +HOMEPAGE=https://sqlite.org/ +IUSE=debug doc icu +readline secure-delete static-libs tcl test tools abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 +KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris +LICENSE=public-domain +RDEPEND=sys-libs/zlib:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] icu? ( dev-libs/icu:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) readline? ( sys-libs/readline:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tcl? ( dev-lang/tcl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tools? ( dev-lang/tcl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) +SLOT=3 +SRC_URI=doc? ( https://sqlite.org/2018/sqlite-doc-3230100.zip ) tcl? ( https://sqlite.org/2018/sqlite-src-3230100.zip ) test? ( https://sqlite.org/2018/sqlite-src-3230100.zip ) tools? ( https://sqlite.org/2018/sqlite-src-3230100.zip ) !tcl? ( !test? ( !tools? ( https://sqlite.org/2018/sqlite-autoconf-3230100.tar.gz ) ) ) +_eclasses_=autotools dc412f38566b91012efd58b9c203e6c3 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 flag-o-matic 2274fcc1e7ef6affaff5bcd636275417 libtool 0081a71a261724730ec4c248494f044d ltprune 2770eed66a9b8ef944714cd0e968182e multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build eed53a6313267c9fbcd35fc384bd0087 multilib-minimal 9139c3a57e077cb8e0d0f73ceb080b89 toolchain-funcs 185a06792159ca143528e7010368e8af versionator c80ccf29e90adea7c5cae94b42eb76d0 +_md5_=de96170e771ff922af87fd5840b61eff From 28d48ddbf047b9fc9175c308cb52da840afb8195 Mon Sep 17 00:00:00 2001 From: David Michael Date: Mon, 14 May 2018 15:13:54 -0400 Subject: [PATCH 16/21] bump(net-dns/bind-tools): sync with upstream --- .../md5-cache/net-dns/bind-tools-9.10.1_p1 | 15 - .../md5-cache/net-dns/bind-tools-9.10.2_p2 | 15 - .../md5-cache/net-dns/bind-tools-9.10.2_p4 | 15 - .../md5-cache/net-dns/bind-tools-9.10.2_p4-r1 | 15 - .../md5-cache/net-dns/bind-tools-9.11.2_p1 | 15 + .../md5-cache/net-dns/bind-tools-9.12.1 | 15 + .../net-dns/bind-tools/ChangeLog | 1227 ----------------- .../net-dns/bind-tools/Manifest | 13 +- .../bind-tools/bind-tools-9.10.1_p1.ebuild | 119 -- .../bind-tools/bind-tools-9.10.2_p4.ebuild | 125 -- ...-r1.ebuild => bind-tools-9.11.2_p1.ebuild} | 30 +- ...0.2_p2.ebuild => bind-tools-9.12.1.ebuild} | 54 +- .../files/bind-tools-9.10.2-openssl.patch | 145 -- .../net-dns/bind-tools/metadata.xml | 2 +- 14 files changed, 86 insertions(+), 1719 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/metadata/md5-cache/net-dns/bind-tools-9.10.1_p1 delete mode 100644 sdk_container/src/third_party/portage-stable/metadata/md5-cache/net-dns/bind-tools-9.10.2_p2 delete mode 100644 sdk_container/src/third_party/portage-stable/metadata/md5-cache/net-dns/bind-tools-9.10.2_p4 delete mode 100644 sdk_container/src/third_party/portage-stable/metadata/md5-cache/net-dns/bind-tools-9.10.2_p4-r1 create mode 100644 sdk_container/src/third_party/portage-stable/metadata/md5-cache/net-dns/bind-tools-9.11.2_p1 create mode 100644 sdk_container/src/third_party/portage-stable/metadata/md5-cache/net-dns/bind-tools-9.12.1 delete mode 100644 sdk_container/src/third_party/portage-stable/net-dns/bind-tools/ChangeLog delete mode 100644 sdk_container/src/third_party/portage-stable/net-dns/bind-tools/bind-tools-9.10.1_p1.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/net-dns/bind-tools/bind-tools-9.10.2_p4.ebuild rename sdk_container/src/third_party/portage-stable/net-dns/bind-tools/{bind-tools-9.10.2_p4-r1.ebuild => bind-tools-9.11.2_p1.ebuild} (75%) rename sdk_container/src/third_party/portage-stable/net-dns/bind-tools/{bind-tools-9.10.2_p2.ebuild => bind-tools-9.12.1.ebuild} (63%) delete mode 100644 sdk_container/src/third_party/portage-stable/net-dns/bind-tools/files/bind-tools-9.10.2-openssl.patch diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/net-dns/bind-tools-9.10.1_p1 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/net-dns/bind-tools-9.10.1_p1 deleted file mode 100644 index 020971cbc8..0000000000 --- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/net-dns/bind-tools-9.10.1_p1 +++ /dev/null @@ -1,15 +0,0 @@ -DEFINED_PHASES=compile configure install prepare -DEPEND=ssl? ( dev-libs/openssl:0 ) gost? ( >=dev-libs/openssl-1.0.0:0[-bindist] ) xml? ( dev-libs/libxml2 ) idn? ( net-dns/idnkit ) gssapi? ( virtual/krb5 ) readline? ( sys-libs/readline ) >=app-portage/elt-patches-20170422 !=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 -DESCRIPTION=bind tools: dig, nslookup, host, nsupdate, dnssec-keygen -EAPI=5 -HOMEPAGE=http://www.isc.org/software/bind -IUSE=doc gost gssapi idn ipv6 readline ssl urandom xml -KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris -LICENSE=ISC BSD BSD-2 HPND JNIC RSA openssl -RDEPEND=ssl? ( dev-libs/openssl:0 ) gost? ( >=dev-libs/openssl-1.0.0:0[-bindist] ) xml? ( dev-libs/libxml2 ) idn? ( net-dns/idnkit ) gssapi? ( virtual/krb5 ) readline? ( sys-libs/readline ) -REQUIRED_USE=gost? ( ssl ) -RESTRICT=test -SLOT=0 -SRC_URI=ftp://ftp.isc.org/isc/bind9/9.10.1-P1/bind-9.10.1-P1.tar.gz -_eclasses_=autotools dc412f38566b91012efd58b9c203e6c3 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 flag-o-matic 2274fcc1e7ef6affaff5bcd636275417 libtool 0081a71a261724730ec4c248494f044d ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 185a06792159ca143528e7010368e8af -_md5_=6fd7ec1dd12a3150b92c276987dbce74 diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/net-dns/bind-tools-9.10.2_p2 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/net-dns/bind-tools-9.10.2_p2 deleted file mode 100644 index 6de3b03141..0000000000 --- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/net-dns/bind-tools-9.10.2_p2 +++ /dev/null @@ -1,15 +0,0 @@ -DEFINED_PHASES=compile configure install prepare -DEPEND=ssl? ( dev-libs/openssl:0 ) gost? ( >=dev-libs/openssl-1.0.0:0[-bindist] ) xml? ( dev-libs/libxml2 ) idn? ( net-dns/idnkit ) gssapi? ( virtual/krb5 ) readline? ( sys-libs/readline:0= ) seccomp? ( sys-libs/libseccomp ) >=app-portage/elt-patches-20170422 !=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 -DESCRIPTION=bind tools: dig, nslookup, host, nsupdate, dnssec-keygen -EAPI=5 -HOMEPAGE=http://www.isc.org/software/bind -IUSE=doc gost gssapi idn ipv6 readline seccomp ssl urandom xml -KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris -LICENSE=ISC BSD BSD-2 HPND JNIC RSA openssl -RDEPEND=ssl? ( dev-libs/openssl:0 ) gost? ( >=dev-libs/openssl-1.0.0:0[-bindist] ) xml? ( dev-libs/libxml2 ) idn? ( net-dns/idnkit ) gssapi? ( virtual/krb5 ) readline? ( sys-libs/readline:0= ) seccomp? ( sys-libs/libseccomp ) !=dev-libs/openssl-1.0.0:0[-bindist] ) xml? ( dev-libs/libxml2 ) idn? ( net-dns/idnkit ) gssapi? ( virtual/krb5 ) readline? ( sys-libs/readline:0= ) seccomp? ( sys-libs/libseccomp ) >=app-portage/elt-patches-20170422 !=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 -DESCRIPTION=bind tools: dig, nslookup, host, nsupdate, dnssec-keygen -EAPI=5 -HOMEPAGE=http://www.isc.org/software/bind -IUSE=doc gost gssapi idn ipv6 readline seccomp ssl urandom xml -KEYWORDS=alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris -LICENSE=ISC BSD BSD-2 HPND JNIC RSA openssl -RDEPEND=ssl? ( dev-libs/openssl:0 ) gost? ( >=dev-libs/openssl-1.0.0:0[-bindist] ) xml? ( dev-libs/libxml2 ) idn? ( net-dns/idnkit ) gssapi? ( virtual/krb5 ) readline? ( sys-libs/readline:0= ) seccomp? ( sys-libs/libseccomp ) !=dev-libs/openssl-1.0.0:0[-bindist] ) xml? ( dev-libs/libxml2 ) idn? ( net-dns/idnkit ) gssapi? ( virtual/krb5 ) readline? ( sys-libs/readline:0= ) seccomp? ( sys-libs/libseccomp ) >=app-portage/elt-patches-20170422 !=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 -DESCRIPTION=bind tools: dig, nslookup, host, nsupdate, dnssec-keygen -EAPI=5 -HOMEPAGE=http://www.isc.org/software/bind -IUSE=doc gost gssapi idn ipv6 libressl readline seccomp ssl urandom xml -KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris -LICENSE=ISC BSD BSD-2 HPND JNIC RSA openssl -RDEPEND=ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) gost? ( >=dev-libs/openssl-1.0.0:0[-bindist] ) xml? ( dev-libs/libxml2 ) idn? ( net-dns/idnkit ) gssapi? ( virtual/krb5 ) readline? ( sys-libs/readline:0= ) seccomp? ( sys-libs/libseccomp ) !=dev-libs/openssl-1.0.0:0=[-bindist] ) xml? ( dev-libs/libxml2 ) idn? ( =app-portage/elt-patches-20170422 !=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 +DESCRIPTION=bind tools: dig, nslookup, host, nsupdate, dnssec-keygen +EAPI=5 +HOMEPAGE=http://www.isc.org/software/bind +IUSE=doc gost gssapi idn ipv6 libressl readline seccomp ssl urandom xml +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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris +LICENSE=Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0 +RDEPEND=ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl ) ) gost? ( >=dev-libs/openssl-1.0.0:0=[-bindist] ) xml? ( dev-libs/libxml2 ) idn? ( bind-9.11.2_p1.tar.gz +_eclasses_=autotools dc412f38566b91012efd58b9c203e6c3 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 flag-o-matic 2274fcc1e7ef6affaff5bcd636275417 libtool 0081a71a261724730ec4c248494f044d ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 185a06792159ca143528e7010368e8af +_md5_=1734d8bab8b78c18c9bf28c519844dc0 diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/net-dns/bind-tools-9.12.1 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/net-dns/bind-tools-9.12.1 new file mode 100644 index 0000000000..6964ee937c --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/net-dns/bind-tools-9.12.1 @@ -0,0 +1,15 @@ +DEFINED_PHASES=compile configure install prepare +DEPEND=ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) gost? ( >=dev-libs/openssl-1.0.0:0=[-bindist] ) xml? ( dev-libs/libxml2 ) idn? ( =app-portage/elt-patches-20170422 !=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 +DESCRIPTION=bind tools: dig, nslookup, host, nsupdate, dnssec-keygen +EAPI=5 +HOMEPAGE=http://www.isc.org/software/bind +IUSE=doc gost gssapi idn ipv6 libedit libressl readline seccomp ssl urandom xml +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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris +LICENSE=Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0 +RDEPEND=ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) gost? ( >=dev-libs/openssl-1.0.0:0=[-bindist] ) xml? ( dev-libs/libxml2 ) idn? ( bind-9.12.1.tar.gz +_eclasses_=autotools dc412f38566b91012efd58b9c203e6c3 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 flag-o-matic 2274fcc1e7ef6affaff5bcd636275417 libtool 0081a71a261724730ec4c248494f044d ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 185a06792159ca143528e7010368e8af +_md5_=72f4e56a789f5d95d87b7a09f72c2b6c diff --git a/sdk_container/src/third_party/portage-stable/net-dns/bind-tools/ChangeLog b/sdk_container/src/third_party/portage-stable/net-dns/bind-tools/ChangeLog deleted file mode 100644 index 649efffbcb..0000000000 --- a/sdk_container/src/third_party/portage-stable/net-dns/bind-tools/ChangeLog +++ /dev/null @@ -1,1227 +0,0 @@ -# ChangeLog for net-dns/bind-tools -# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-dns/bind-tools/ChangeLog,v 1.294 2015/07/23 09:35:31 ago Exp $ - - 23 Jul 2015; Agostino Sarubbo bind-tools-9.10.2_p2.ebuild: - Stable for sparc, wrt bug #553584 - - 23 Jul 2015; Agostino Sarubbo bind-tools-9.10.2_p2.ebuild: - Stable for ppc, wrt bug #553584 - - 17 Jul 2015; Mikle Kolyada bind-tools-9.10.2_p2.ebuild: - ia64 stable wrt bug #553584 - - 15 Jul 2015; Mikle Kolyada bind-tools-9.10.2_p2.ebuild: - arm stable wrt bug #553584 - - 14 Jul 2015; Tobias Klausmann - bind-tools-9.10.2_p2.ebuild: - Stable on alpha, bug 553584 - - 11 Jul 2015; Mikle Kolyada bind-tools-9.10.2_p2.ebuild: - x86 stable wrt bug #553584 - - 11 Jul 2015; Jeroen Roovers bind-tools-9.10.2_p2.ebuild: - Stable for HPPA PPC64 (bug #553584). - - 09 Jul 2015; Mikle Kolyada bind-tools-9.10.2_p2.ebuild: - amd64 stable wrt bug #553584 - -*bind-tools-9.10.2_p2 (08 Jul 2015) - - 08 Jul 2015; Christian Ruppert -bind-tools-9.9.5.ebuild, - -bind-tools-9.10.2.ebuild, -bind-tools-9.10.2-r1.ebuild, - +bind-tools-9.10.2_p2.ebuild: - Version bump, bug 553584 - -*bind-tools-9.10.2-r1 (26 May 2015) - - 26 May 2015; Mike Frysinger +bind-tools-9.10.2-r1.ebuild, - +files/bind-tools-9.10.2-openssl.patch: - Clean up openssl logic to fix cross-compiling #417129 by Bertrand Jacquin. - - 26 May 2015; Mike Frysinger bind-tools-9.10.1_p1.ebuild: - Mark s390/sh stable. - - 26 May 2015; Mike Frysinger bind-tools-9.10.1_p1.ebuild, - bind-tools-9.10.2.ebuild: - Add arm64/m68k love. - - 21 Apr 2015; Mike Gilbert bind-tools-9.10.2.ebuild: - Add blocker on +bind-tools-9.10.2.ebuild: - Non-maintainer bump. Add dnssec tools - bug #473400 - - 18 Mar 2015; Mike Gilbert bind-tools-9.10.1_p1.ebuild: - Pass --with-idnlib=-lidnkit to work around bug 543664. - - 16 Feb 2015; Mikle Kolyada bind-tools-9.10.1_p1.ebuild: - alpha/ia64/sparc stable wrt bug #539220 - - 10 Feb 2015; Jeroen Roovers bind-tools-9.10.1_p1.ebuild: - Stable for HPPA (bug #539220). - - 10 Feb 2015; Sergey Popov bind-tools-9.10.1_p1.ebuild: - Stable on arm, wrt bug #539220 - - 09 Feb 2015; Sergey Popov bind-tools-9.10.1_p1.ebuild: - Stable on ppc/ppc64/x86, wrt bug #539220 - - 08 Feb 2015; Agostino Sarubbo bind-tools-9.10.1_p1.ebuild: - Stable for amd64, wrt bug #539220 - - 07 Feb 2015; Christian Ruppert - bind-tools-9.10.1_p1.ebuild: - Fix json-c automagic, bug 525362 - -*bind-tools-9.10.1_p1 (11 Dec 2014) - - 11 Dec 2014; Christian Ruppert - -bind-tools-9.10.0_p2.ebuild, -bind-tools-9.10.1.ebuild, - +bind-tools-9.10.1_p1.ebuild: - Version bump, cleanup - -*bind-tools-9.10.1 (30 Sep 2014) - - 30 Sep 2014; Christian Ruppert - -bind-tools-9.9.5_p1.ebuild, +bind-tools-9.10.1.ebuild: - Version bump - -*bind-tools-9.10.0_p2 (15 Aug 2014) -*bind-tools-9.9.5_p1 (15 Aug 2014) - - 15 Aug 2014; Christian Ruppert - -bind-tools-9.9.3_p2.ebuild, -bind-tools-9.9.4.ebuild, - +bind-tools-9.9.5_p1.ebuild, +bind-tools-9.10.0_p2.ebuild, - -files/bind-libxml2-2.8.x.patch: - Cleanup and version bumps - - 02 Aug 2014; Agostino Sarubbo bind-tools-9.9.5.ebuild: - Stable for ppc64, wrt bug #506796 - - 01 Aug 2014; Raúl Porcel bind-tools-9.9.5.ebuild: - sparc stable wrt #506796 - - 19 Jul 2014; Tobias Klausmann bind-tools-9.9.5.ebuild: - Stable on alpha, bug #506796 - - 13 Jul 2014; Agostino Sarubbo bind-tools-9.9.5.ebuild: - Stable for ppc, wrt bug #506796 - - 07 Jul 2014; Homer Parker bind-tools-9.9.5.ebuild: - Stable on amd64. - - 22 Jun 2014; Akinori Hattori bind-tools-9.9.5.ebuild: - ia64 stable wrt bug #506796 - - 14 Jun 2014; Pawel Hajdan jr bind-tools-9.9.5.ebuild: - x86 stable wrt bug #506796 - - 27 Apr 2014; Markus Meier bind-tools-9.9.5.ebuild: - arm stable, bug #506796 - - 14 Apr 2014; Jeroen Roovers bind-tools-9.9.5.ebuild: - Stable for HPPA (bug #506796). - - 19 Mar 2014; Agostino Sarubbo bind-tools-9.9.4.ebuild: - Stable for alpha, wrt bug #492254 - - 14 Mar 2014; Agostino Sarubbo bind-tools-9.9.4.ebuild: - Stable for ppc64, wrt bug #492254 - - 12 Mar 2014; Agostino Sarubbo bind-tools-9.9.4.ebuild: - Stable for sparc, wrt bug #492254 - - 07 Mar 2014; Pacho Ramos bind-tools-9.9.4.ebuild: - amd64 stable, bug #492254 - - 24 Feb 2014; Pawel Hajdan jr bind-tools-9.9.4.ebuild: - x86 stable wrt bug #492254 - - 02 Feb 2014; Agostino Sarubbo bind-tools-9.9.4.ebuild: - Stable for ppc, wrt bug #492254 - - 31 Jan 2014; Christian Ruppert bind-tools-9.9.5.ebuild, - metadata.xml: - Fix libgost, bug 456136 - -*bind-tools-9.9.5 (31 Jan 2014) - - 31 Jan 2014; Christian Ruppert +bind-tools-9.9.5.ebuild: - Version bump. Also disable tests for now, bug 479092 - - 30 Jan 2014; Markus Meier bind-tools-9.9.4.ebuild: - arm stable, bug #492254 - - 27 Jan 2014; Akinori Hattori bind-tools-9.9.4.ebuild: - ia64 stable wrt bug #492254 - - 27 Jan 2014; Jeroen Roovers bind-tools-9.9.4.ebuild: - Stable for HPPA (bug #492254). - - 18 Jan 2014; Christian Ruppert bind-tools-9.9.3_p2.ebuild, - bind-tools-9.9.4.ebuild: - Fix openssl dependencies as request per bug 498470 - -*bind-tools-9.9.4 (13 Oct 2013) - - 13 Oct 2013; Christian Ruppert +bind-tools-9.9.4.ebuild: - Bump - - 03 Sep 2013; Agostino Sarubbo -bind-tools-9.9.2.ebuild: - Remove old - - 09 Aug 2013; Agostino Sarubbo bind-tools-9.9.3_p2.ebuild: - Stable for arm, wrt bug #478316 - - 08 Aug 2013; Agostino Sarubbo bind-tools-9.9.3_p2.ebuild: - Stable for sh, wrt bug #478316 - - 06 Aug 2013; Agostino Sarubbo bind-tools-9.9.3_p2.ebuild: - Stable for s390, wrt bug #478316 - - 01 Aug 2013; Agostino Sarubbo bind-tools-9.9.3_p2.ebuild: - Stable for x86, wrt bug #478316 - - 01 Aug 2013; Agostino Sarubbo bind-tools-9.9.3_p2.ebuild: - Stable for sparc, wrt bug #478316 - - 01 Aug 2013; Agostino Sarubbo bind-tools-9.9.3_p2.ebuild: - Stable for ppc, wrt bug #478316 - - 01 Aug 2013; Agostino Sarubbo bind-tools-9.9.3_p2.ebuild: - Stable for ppc64, wrt bug #478316 - - 01 Aug 2013; Agostino Sarubbo bind-tools-9.9.3_p2.ebuild: - Stable for ia64, wrt bug #478316 - - 01 Aug 2013; Agostino Sarubbo bind-tools-9.9.3_p2.ebuild: - Stable for amd64, wrt bug #478316 - - 01 Aug 2013; Agostino Sarubbo bind-tools-9.9.3_p2.ebuild: - Stable for alpha, wrt bug #478316 - - 30 Jul 2013; Jeroen Roovers bind-tools-9.9.3_p2.ebuild: - Stable for HPPA (bug #478316). - -*bind-tools-9.9.3_p2 (30 Jul 2013) - - 30 Jul 2013; Christian Ruppert - -bind-tools-9.9.1_p2.ebuild, -bind-tools-9.9.1_p4.ebuild, - -bind-tools-9.9.2_p2.ebuild, +bind-tools-9.9.3_p2.ebuild: - Version bump. Cleanup. - -*bind-tools-9.9.2_p2 (29 Mar 2013) - - 29 Mar 2013; Christian Ruppert - +bind-tools-9.9.2_p2.ebuild: - Version bump - - 16 Dec 2012; Raúl Porcel bind-tools-9.9.2.ebuild: - alpha/ia64/s390/sh/sparc stable wrt #440318 - - 21 Nov 2012; Agostino Sarubbo bind-tools-9.9.2.ebuild: - Stable for x86, wrt bug #440318 - - 04 Nov 2012; Ulrich Müller bind-tools-9.9.1_p2.ebuild, - bind-tools-9.9.1_p4.ebuild, bind-tools-9.9.2.ebuild: - Update LICENSE, RSA-PKCS11 is replaced by RSA, bug 440752. - - 03 Nov 2012; Agostino Sarubbo bind-tools-9.9.2.ebuild: - Stable for amd64, wrt bug #440318 - - 01 Nov 2012; Christian Ruppert bind-tools-9.9.2.ebuild, - metadata.xml: - Fix AR calls, bug 440338. Fix LICENSE, bug 440752. - - 01 Nov 2012; Jeroen Roovers bind-tools-9.9.2.ebuild: - Stable for HPPA (bug #440318). - - 31 Oct 2012; Anthony G. Basile bind-tools-9.9.2.ebuild: - stable arm, bug #440318 - - 31 Oct 2012; Anthony G. Basile bind-tools-9.9.2.ebuild: - stable ppc ppc64, bug #440318 - -*bind-tools-9.9.2 (10 Oct 2012) -*bind-tools-9.9.1_p4 (10 Oct 2012) - - 10 Oct 2012; Christian Ruppert - -bind-tools-9.9.1_p3.ebuild, +bind-tools-9.9.1_p4.ebuild, - +bind-tools-9.9.2.ebuild: - Version bumps. - -*bind-tools-9.9.1_p3 (12 Sep 2012) - - 12 Sep 2012; Christian Ruppert +bind-tools-9.9.1_p3.ebuild, - -bind-tools-9.9.1_p2-r1.ebuild: - Version bump. - - 11 Sep 2012; Christian Ruppert -bind-tools-9.8.1.ebuild, - -bind-tools-9.8.3_p2.ebuild: - Remove old versions. - - 11 Sep 2012; Christoph Junghans - bind-tools-9.9.1_p2-r1.ebuild: - added prefix keywords - - 27 Aug 2012; Raúl Porcel bind-tools-9.9.1_p2.ebuild: - alpha/ia64/s390/sh/sparc stable wrt #428086 - - 04 Aug 2012; Agostino Sarubbo bind-tools-9.9.1_p2.ebuild: - Stable for amd64, wrt bug #428086 - -*bind-tools-9.9.1_p2-r1 (28 Jul 2012) - - 28 Jul 2012; Christian Ruppert - +bind-tools-9.9.1_p2-r1.ebuild, +files/bind-libxml2-2.8.x.patch: - Fix libxml2 detection, bug 425170, thanks to Bruno . - - 27 Jul 2012; Jeff Horelick bind-tools-9.9.1_p2.ebuild: - marked x86 per bug 428086 - - 26 Jul 2012; Jeroen Roovers bind-tools-9.9.1_p2.ebuild: - Stable for HPPA (bug #427966). - - 26 Jul 2012; Anthony G. Basile - bind-tools-9.9.1_p2.ebuild: - Stable arm, bug #428086 - - 26 Jul 2012; Anthony G. Basile - bind-tools-9.9.1_p2.ebuild: - Stable ppc/ppc64, bug #428086 - -*bind-tools-9.9.1_p2 (25 Jul 2012) -*bind-tools-9.8.3_p2 (25 Jul 2012) - - 25 Jul 2012; Christian Ruppert - -bind-tools-9.8.3_p1.ebuild, +bind-tools-9.8.3_p2.ebuild, - -bind-tools-9.9.1_p1.ebuild, +bind-tools-9.9.1_p2.ebuild: - Version bumps - - 05 Jun 2012; Christian Ruppert bind-tools-9.8.3_p1.ebuild, - bind-tools-9.9.1_p1.ebuild: - Disable tests for now, bug 406399 - - 04 Jun 2012; Christian Ruppert - -files/bind-tools-configure.patch: - Remove unused patch - -*bind-tools-9.9.1_p1 (04 Jun 2012) -*bind-tools-9.8.3_p1 (04 Jun 2012) - - 04 Jun 2012; Christian Ruppert -bind-tools-9.7.3.ebuild, - -bind-tools-9.7.6.ebuild, -bind-tools-9.8.3.ebuild, - +bind-tools-9.8.3_p1.ebuild, -bind-tools-9.9.1.ebuild, - +bind-tools-9.9.1_p1.ebuild: - Version bumps, CVE-2012-1667. Remove old versions - -*bind-tools-9.8.3 (22 May 2012) -*bind-tools-9.7.6 (22 May 2012) - - 22 May 2012; Christian Ruppert -bind-tools-9.7.5.ebuild, - +bind-tools-9.7.6.ebuild, -bind-tools-9.8.2.ebuild, +bind-tools-9.8.3.ebuild: - Version bump - - 22 May 2012; Christian Ruppert metadata.xml: - Remove bind herd.. It's "empty" for years anyway, bug 417001. - -*bind-tools-9.9.1 (21 May 2012) - - 21 May 2012; Christian Ruppert -bind-tools-9.9.0.ebuild, - +bind-tools-9.9.1.ebuild: - Version bump - - 17 May 2012; Christian Ruppert bind-tools-9.7.5.ebuild, - bind-tools-9.8.1.ebuild, bind-tools-9.8.2.ebuild, bind-tools-9.9.0.ebuild: - Disable PKCS11 temporary as it requires OpenSSL to be patched, also see bug - 409687. - -*bind-tools-9.8.2 (07 Apr 2012) -*bind-tools-9.7.5 (07 Apr 2012) - - 07 Apr 2012; Christian Ruppert +bind-tools-9.7.5.ebuild, - +bind-tools-9.8.2.ebuild, bind-tools-9.9.0.ebuild: - Version bumps. - -*bind-tools-9.9.0 (29 Feb 2012) - - 29 Feb 2012; Christian Ruppert +bind-tools-9.9.0.ebuild: - Version bump to 9.9.0 - - 05 Jan 2012; Michael Weber bind-tools-9.8.1.ebuild: - ppc/ppc64 stable (bug 391411) - - 24 Dec 2011; Christian Ruppert bind-tools-9.8.1.ebuild: - Define localstatedir for e.g. default sessions.key used by nsupdate, bug - 395785. - - 11 Dec 2011; Raúl Porcel bind-tools-9.8.1.ebuild: - alpha/ia64/s390/sh/sparc stable wrt #391411 - - 03 Dec 2011; Markus Meier bind-tools-9.8.1.ebuild: - arm stable, bug #391411 - - 28 Nov 2011; Pawel Hajdan jr bind-tools-9.8.1.ebuild: - x86 stable wrt bug #391411 - - 26 Nov 2011; Markos Chandras bind-tools-9.8.1.ebuild: - Stable on amd64 wrt bug #391411 - - 22 Nov 2011; Jeroen Roovers bind-tools-9.8.1.ebuild: - Stable for HPPA (bug #391411). - - 22 Oct 2011; Diego E. Pettenò - bind-tools-9.8.1.ebuild, metadata.xml: - QA: make sure not to automagic depend on gssapi (copy code and description - from bind itself). - -*bind-tools-9.8.1 (02 Sep 2011) - - 02 Sep 2011; Christian Ruppert -bind-tools-9.8.0.ebuild, - +bind-tools-9.8.1.ebuild, metadata.xml: - Version bump to 9.8.1. Some cleanup. - - 02 Jun 2011; Diego E. Pettenò - bind-tools-9.8.0.ebuild: - Fix cross-compilation (bug #266570) by exporting BUILD_CC and forcing-enabled - epoll on Linux builds. Also change the libiconv dependency on idn. Note that - USE=ssl fails because there is another AC_TRY_RUN call that is not - short-circuitable. - - 27 May 2011; Christian Ruppert - -bind-tools-9.6.2_p2-r2.ebuild, -bind-tools-9.6.3.ebuild, - -files/bind-tools-9.6.1-parallel.patch: - Remove 9.6.x. - - 28 Apr 2011; Christian Ruppert - -bind-tools-9.7.2_p2-r2.ebuild: - Remove 9.7.2. - - 28 Mar 2011; Christian Ruppert - -bind-tools-9.4.3_p5.ebuild, -bind-tools-9.4.3_p5-r2.ebuild: - Remove 9.4.x. - - 22 Mar 2011; Brent Baude bind-tools-9.7.3.ebuild: - Marking bind-tools-9.7.3 ppc64 for bug 358265 - - 22 Mar 2011; Brent Baude bind-tools-9.7.3.ebuild: - Marking bind-tools-9.7.3 ppc for bug 358265 - - 19 Mar 2011; Raúl Porcel bind-tools-9.7.3.ebuild: - alpha/arm/ia64/s390/sh/sparc/x86 stable wrt #358265 - - 11 Mar 2011; Jeroen Roovers bind-tools-9.7.3.ebuild: - Stable for HPPA (bug #358265). - - 10 Mar 2011; Markos Chandras bind-tools-9.7.3.ebuild: - Stable on amd64 wrt bug #358265 - - 10 Mar 2011; Christian Ruppert - -bind-tools-9.6.2_p2.ebuild, -bind-tools-9.7.1.ebuild: - Remove 9.6.2_p2 and 9.7.1 as well. - - 10 Mar 2011; Brent Baude - bind-tools-9.6.2_p2-r2.ebuild, bind-tools-9.7.2_p2-r2.ebuild: - net-dns/bind-tools-9.6.2_p2-r2 and 9.7.2_p2-r2 ppc64 for bug 337638 - - 10 Mar 2011; Christian Ruppert - -bind-tools-9.7.1-r2.ebuild: - Remove 9.7.1-r2. - -*bind-tools-9.8.0 (01 Mar 2011) - - 01 Mar 2011; Christian Ruppert - -bind-tools-9.8.0_rc1.ebuild, +bind-tools-9.8.0.ebuild: - Version bump to 9.8.0 - -*bind-tools-9.8.0_rc1 (25 Feb 2011) - - 25 Feb 2011; Christian Ruppert - +bind-tools-9.8.0_rc1.ebuild: - Version bump to 9.8.0_rc1. - -*bind-tools-9.7.3 (15 Feb 2011) - - 15 Feb 2011; Christian Ruppert +bind-tools-9.7.3.ebuild: - Version bump to 9.7.3 - -*bind-tools-9.6.3 (05 Feb 2011) - - 05 Feb 2011; Christian Ruppert +bind-tools-9.6.3.ebuild: - Version bump to 9.6.3. - - 13 Jan 2011; Brent Baude - bind-tools-9.6.2_p2-r2.ebuild, bind-tools-9.7.2_p2-r2.ebuild: - Mark -9.6.2_p2-r2 -9.7.2_p2-r2 ppc for bug 337638 - - 29 Dec 2010; Markos Chandras - bind-tools-9.6.2_p2-r2.ebuild, bind-tools-9.7.2_p2-r2.ebuild: - Stable on amd64 wrt bug #337638 - - 27 Dec 2010; Jeroen Roovers bind-tools-9.6.2_p2-r2.ebuild, - bind-tools-9.7.2_p2-r2.ebuild: - Stable for HPPA (bug #337638). - - 19 Dec 2010; Raúl Porcel bind-tools-9.6.2_p2-r2.ebuild, - bind-tools-9.7.2_p2-r2.ebuild: - alpha/ia64/s390/sh/sparc stable wrt #347621 - - 17 Dec 2010; Tobias Klausmann - bind-tools-9.7.2_p2-r2.ebuild: - Stable on alpha, bug #337638 - - 17 Dec 2010; Tobias Klausmann - bind-tools-9.6.2_p2-r2.ebuild: - Stable on alpha, bug #337638 - - 15 Dec 2010; Markus Meier bind-tools-9.7.2_p2-r2.ebuild: - arm stable, bug #337638 - - 15 Dec 2010; Markus Meier bind-tools-9.6.2_p2-r2.ebuild: - arm stable, bug #337638 - - 14 Dec 2010; Christian Faulhammer - bind-tools-9.6.2_p2-r2.ebuild, bind-tools-9.7.2_p2-r2.ebuild: - stable x86, bug 337638 - -*bind-tools-9.7.2_p2-r2 (14 Nov 2010) -*bind-tools-9.7.1-r2 (14 Nov 2010) -*bind-tools-9.6.2_p2-r2 (14 Nov 2010) -*bind-tools-9.4.3_p5-r2 (14 Nov 2010) - - 14 Nov 2010; Christian Ruppert - -bind-tools-9.4.3_p5-r1.ebuild, +bind-tools-9.4.3_p5-r2.ebuild, - -bind-tools-9.6.2_p2-r1.ebuild, +bind-tools-9.6.2_p2-r2.ebuild, - -bind-tools-9.7.1-r1.ebuild, +bind-tools-9.7.1-r2.ebuild, - -bind-tools-9.7.2_p2-r1.ebuild, +bind-tools-9.7.2_p2-r2.ebuild: - Revbump. Re bug 344029, use append-cflags instead of append-cppflags. - -*bind-tools-9.7.2_p2-r1 (11 Nov 2010) -*bind-tools-9.7.1-r1 (11 Nov 2010) -*bind-tools-9.6.2_p2-r1 (11 Nov 2010) -*bind-tools-9.4.3_p5-r1 (11 Nov 2010) - - 11 Nov 2010; Christian Ruppert bind-tools-9.4.3_p5.ebuild, - +bind-tools-9.4.3_p5-r1.ebuild, +bind-tools-9.6.2_p2-r1.ebuild, - +bind-tools-9.7.1-r1.ebuild, -bind-tools-9.7.2_p2.ebuild, - +bind-tools-9.7.2_p2-r1.ebuild: - Fix HOMEPAGE. QA fixes. Revision bump, added a definition to enable the - sigchase feature, bug 344029. Merged my latest changes into - bind-tools-9.4.3_p5-r1. - - 06 Nov 2010; Markus Meier bind-tools-9.7.1.ebuild: - arm stable, bug #337638 - - 06 Nov 2010; Markus Meier bind-tools-9.6.2_p2.ebuild: - arm stable, bug #337638 - - 06 Oct 2010; Markus Meier bind-tools-9.6.2_p2.ebuild, - bind-tools-9.7.1.ebuild: - x86 stable, bug #337638 - -*bind-tools-9.7.2_p2 (05 Oct 2010) - - 05 Oct 2010; Christian Ruppert - -bind-tools-9.4.3_p4.ebuild, +bind-tools-9.7.2_p2.ebuild: - Version bump to 9.7.2-P2. Remove old 9.4.3-P4. - - 01 Oct 2010; Brent Baude bind-tools-9.6.2_p2.ebuild, - bind-tools-9.7.1.ebuild: - Marking -9.6.2_p2 and -9.7.1 for bug 337638 - - 28 Sep 2010; Jeroen Roovers bind-tools-9.6.2_p2.ebuild, - bind-tools-9.7.1.ebuild: - Stable for PPC (bug #337638). - - 28 Sep 2010; Jeroen Roovers bind-tools-9.7.1.ebuild: - Stable for HPPA (bug #326999). - - 28 Sep 2010; Jeroen Roovers bind-tools-9.6.2_p2.ebuild: - Stable for HPPA (bug #326999). - - 28 Sep 2010; Brent Baude bind-tools-9.4.3_p5.ebuild: - Marking bind-tools-9.4.3_p5 ppc for bug 335840 - - 22 Sep 2010; Markos Chandras - bind-tools-9.6.2_p2.ebuild, bind-tools-9.7.1.ebuild: - Stable on amd64 wrt bug #337638 - - 06 Sep 2010; Brent Baude bind-tools-9.4.3_p5.ebuild: - Marking bind-tools-9.4.3_p5 ppc64 for bug 335840 - - 03 Sep 2010; Christian Ruppert - -bind-tools-9.7.0_p1.ebuild: - Remove bind-tools-9.7.0_p1.ebuild. - -*bind-tools-9.7.1 (19 Jun 2010) - - 19 Jun 2010; Christian Ruppert - +bind-tools-9.7.1.ebuild: - Version bump to 9.7.1. Remove parallel build patch since it has been - applied by upstream. Add urandom flag and configure switch. - -*bind-tools-9.6.2_p2 (23 May 2010) - - 23 May 2010; Christian Ruppert - -bind-tools-9.6.1_p3.ebuild, +bind-tools-9.6.2_p2.ebuild: - Version bump. - -*bind-tools-9.7.0_p1 (12 May 2010) - - 12 May 2010; Christian Ruppert - -bind-tools-9.6.1_p2.ebuild, +bind-tools-9.7.0_p1.ebuild: - Version bump to 9.7.0_p1. Remove bind-tools-9.6.1_p2. Use EAPI 3 and - src_prepare/src_configure. Fix the sed for bug 151839. - - 07 Mar 2010; Markus Meier bind-tools-9.4.3_p5.ebuild: - amd64 stable, bug #301548 - - 03 Mar 2010; Jeroen Roovers bind-tools-9.4.3_p5.ebuild: - Stable for HPPA (bug #301548). - - 03 Mar 2010; Raúl Porcel bind-tools-9.4.3_p5.ebuild: - alpha/arm/ia64/s390/sh/sparc/x86 stable wrt #301548 - - 27 Jan 2010; Jeroen Roovers -bind-tools-9.4.3_p3.ebuild: - Remove old. - - 27 Jan 2010; Brent Baude bind-tools-9.4.3_p4.ebuild: - Marking bind-tools-9.4.3_p4 ppc64 for bug 294497 - -*bind-tools-9.6.1_p3 (27 Jan 2010) -*bind-tools-9.4.3_p5 (27 Jan 2010) - - 27 Jan 2010; Jeroen Roovers bind-tools-9.4.3_p3.ebuild, - bind-tools-9.4.3_p4.ebuild, +bind-tools-9.4.3_p5.ebuild, - +bind-tools-9.6.1_p3.ebuild: - Version bump (bug #301548). Do not hardcode patchlevel in MY_PV. - - 09 Dec 2009; Raúl Porcel bind-tools-9.4.3_p4.ebuild: - alpha/ia64/s390/sh/sparc stable wrt #294497 - - 09 Dec 2009; Jeroen Roovers bind-tools-9.4.3_p4.ebuild: - Stable for PPC (bug #294497). - - 03 Dec 2009; Markus Meier bind-tools-9.4.3_p4.ebuild: - amd64/arm/x86 stable, bug #294497 - - 03 Dec 2009; Jeroen Roovers bind-tools-9.4.3_p4.ebuild: - Stable for HPPA (bug #294497). - -*bind-tools-9.4.3_p4 (26 Nov 2009) - - 26 Nov 2009; Jeroen Roovers +bind-tools-9.4.3_p4.ebuild: - Version bump (bug #294497). - -*bind-tools-9.6.1_p2 (25 Nov 2009) - - 25 Nov 2009; Christian Ruppert - -bind-tools-9.4.3_p2.ebuild, -bind-tools-9.5.1_p3.ebuild, - -bind-tools-9.6.1.ebuild, +bind-tools-9.6.1_p2.ebuild: - Version bump. Clean up. - - 01 Aug 2009; Raúl Porcel bind-tools-9.4.3_p3.ebuild: - alpha/arm/ia64/s390/sh stable wrt #279508 - - 31 Jul 2009; Tiago Cunha bind-tools-9.4.3_p3.ebuild: - stable sparc, security bug 279508 - - 31 Jul 2009; Joseph Jezak bind-tools-9.4.3_p3.ebuild: - Marked ppc64 stable for bug #279508. - - 30 Jul 2009; Markus Meier bind-tools-9.4.3_p3.ebuild: - amd64 stable, bug #279508 - - 30 Jul 2009; Joseph Jezak bind-tools-9.4.3_p3.ebuild: - Marked ppc stable for bug #279508. - -*bind-tools-9.5.1_p3 (30 Jul 2009) - - 30 Jul 2009; Tobias Scherbaum - -bind-tools-9.5.1_p2.ebuild, +bind-tools-9.5.1_p3.ebuild: - Version bump - - 29 Jul 2009; Markus Meier bind-tools-9.4.3_p3.ebuild: - x86 stable, bug #279508 - - 28 Jul 2009; Jeroen Roovers bind-tools-9.4.3_p3.ebuild: - Stable for HPPA (bug #279508). - -*bind-tools-9.4.3_p3 (28 Jul 2009) - - 28 Jul 2009; Tobias Scherbaum - +bind-tools-9.4.3_p3.ebuild: - Version bump, #279508 - - 28 Jul 2009; Tobias Scherbaum - -bind-tools-9.4.2_p2.ebuild, -bind-tools-9.4.3_p1.ebuild, - -bind-tools-9.6.0_p1.ebuild: - Cleanup - - 26 Jul 2009; Christian Ruppert bind-tools-9.6.1.ebuild: - Added missing eautoreconf. - - 26 Jul 2009; Christian Ruppert bind-tools-9.6.1.ebuild, - +files/bind-tools-9.6.1-parallel.patch: - Add parallel-build patch, bug 278364 (only a workaround). - -*bind-tools-9.6.1 (19 Jul 2009) - - 19 Jul 2009; Christian Ruppert - +bind-tools-9.6.1.ebuild: - Version bump to 9.6.1, bug 274494. Added ssl, xml and doc useflag. Fix - HOMEPAGE. append-flags -D_GNU_SOURCE is not needed anymore since it has - been fixed by upstream. Cleanup. - - 15 Apr 2009; Markus Meier bind-tools-9.4.3_p2.ebuild: - amd64 stable, bug #264301 - - 15 Apr 2009; Raúl Porcel bind-tools-9.4.3_p2.ebuild: - alpha/arm/ia64/s390/sh/sparc/x86 stable wrt #264301 - - 14 Apr 2009; Jeroen Roovers bind-tools-9.4.3_p2.ebuild: - Stable for HPPA (bug #264301). - - 13 Apr 2009; Brent Baude bind-tools-9.4.3_p2.ebuild: - Marking bind-tools-9.4.3_p2 ppc64 and ppc for bug 264301 - -*bind-tools-9.5.1_p2 (11 Apr 2009) -*bind-tools-9.4.3_p2 (11 Apr 2009) - - 11 Apr 2009; Tobias Scherbaum - -bind-tools-9.4.1_p1.ebuild, +bind-tools-9.4.3_p2.ebuild, - -bind-tools-9.5.1_p1.ebuild, +bind-tools-9.5.1_p2.ebuild: - Version bump(s), #265095, #264301 - - 11 Feb 2009; Tobias Scherbaum - bind-tools-9.5.1_p1.ebuild, bind-tools-9.6.0_p1.ebuild: - Fix SRC_URI, #257993 - - 10 Jan 2009; Raúl Porcel bind-tools-9.4.3_p1.ebuild: - ia64/sparc stable wrt #254134 - - 10 Jan 2009; Markus Meier bind-tools-9.4.3_p1.ebuild: - amd64/x86 stable, bug #254134 - - 09 Jan 2009; Tobias Klausmann - bind-tools-9.4.3_p1.ebuild: - Stable on alpha, bug #254134 - - 09 Jan 2009; Tobias Scherbaum - bind-tools-9.4.3_p1.ebuild: - ppc stable, bug #254134 - - 08 Jan 2009; Brent Baude bind-tools-9.4.3_p1.ebuild: - Marking bind-tools-9.4.3_p1 ppc64 for bug 254134 - - 08 Jan 2009; Guy Martin bind-tools-9.4.3_p1.ebuild: - hppa stable, #254134 - -*bind-tools-9.6.0_p1 (07 Jan 2009) -*bind-tools-9.5.1_p1 (07 Jan 2009) - - 07 Jan 2009; Tobias Scherbaum - -bind-tools-9.5.1.ebuild, +bind-tools-9.5.1_p1.ebuild, - -bind-tools-9.6.0.ebuild, +bind-tools-9.6.0_p1.ebuild: - Version bump, #254134 - -*bind-tools-9.4.3_p1 (07 Jan 2009) - - 07 Jan 2009; Tobias Scherbaum - +bind-tools-9.4.3_p1.ebuild: - Version bump, #254134 - -*bind-tools-9.6.0 (26 Dec 2008) - - 26 Dec 2008; Tobias Scherbaum - +bind-tools-9.6.0.ebuild: - Version bump - -*bind-tools-9.5.1 (26 Dec 2008) - - 26 Dec 2008; Tobias Scherbaum - -bind-tools-9.4.3.ebuild, -bind-tools-9.5.0_p2.ebuild, - +bind-tools-9.5.1.ebuild: - Version bump - -*bind-tools-9.4.3 (19 Nov 2008) - - 19 Nov 2008; Tobias Scherbaum - +bind-tools-9.4.3.ebuild: - Version bump - - 03 Aug 2008; Tobias Scherbaum - -bind-tools-9.4.2_p1.ebuild, bind-tools-9.4.2_p2.ebuild: - ppc stable, bug #233675 - - 02 Aug 2008; Raúl Porcel bind-tools-9.4.2_p2.ebuild: - alpha/ia64/sparc/x86 stable wrt #233675 - - 02 Aug 2008; Markus Rothe bind-tools-9.4.2_p2.ebuild: - Stable on ppc64; bug #233675 - - 02 Aug 2008; Jeroen Roovers bind-tools-9.4.2_p2.ebuild: - Stable for HPPA (bug #233675). - - 02 Aug 2008; bind-tools-9.4.2_p2.ebuild: - Stable AMD64 keyword for security bug #233675, tested on Opteron 2218 - (hardened/amd64, gcc-3.4.6, glibc-2.6.1-r0, 2.6.24-hardened-r3 x86_64) and - Opteron 2354 (default/linux/amd64/2008.0/developer, gcc-4.3.1, - glibc-2.8_p20080602-r0, 2.6.27-rc1-00154-g660fc1f-dirty x86_64). - -*bind-tools-9.5.0_p2 (02 Aug 2008) -*bind-tools-9.4.2_p2 (02 Aug 2008) - - 02 Aug 2008; Tobias Scherbaum - +bind-tools-9.4.2_p2.ebuild, -bind-tools-9.5.0_p1-r2.ebuild, - +bind-tools-9.5.0_p2.ebuild: - Version bump - -*bind-tools-9.5.0_p1-r2 (27 Jul 2008) - - 27 Jul 2008; Tobias Scherbaum - -bind-tools-9.5.0_p1-r1.ebuild, +bind-tools-9.5.0_p1-r2.ebuild: - Revbump, fix IPv6 support for glibc-2.8 - -*bind-tools-9.5.0_p1-r1 (23 Jul 2008) - - 23 Jul 2008; Tobias Scherbaum - +files/bind-tools-9.5.0_p1-lwconfig.patch, -bind-tools-9.5.0_p1.ebuild, - +bind-tools-9.5.0_p1-r1.ebuild: - Add patch to fix parsing of resolv.conf by host/dig, #231247 - - 20 Jul 2008; Tobias Scherbaum - -bind-tools-9.2.5.ebuild, -bind-tools-9.2.6.ebuild, - -bind-tools-9.2.6-r3.ebuild, -bind-tools-9.2.8.ebuild, - -bind-tools-9.2.8-r1.ebuild, -bind-tools-9.3.2.ebuild, - -bind-tools-9.3.2-r3.ebuild, -bind-tools-9.3.4.ebuild, - -bind-tools-9.3.4-r1.ebuild, -bind-tools-9.4.1-r1.ebuild: - Cleanup - - 10 Jul 2008; Guy Martin bind-tools-9.4.2_p1.ebuild: - Stable on hppa, bug #231201 - - 09 Jul 2008; Tobias Scherbaum - bind-tools-9.4.2_p1.ebuild: - ppc stable, bug #231201 - - 09 Jul 2008; Richard Freeman - bind-tools-9.4.2_p1.ebuild: - amd64 stable - 231201 - - 09 Jul 2008; Raúl Porcel bind-tools-9.4.2_p1.ebuild: - alpha/ia64/sparc stable wrt #231201 - - 09 Jul 2008; Christian Faulhammer - bind-tools-9.4.2_p1.ebuild: - stable x86, security bug 231201 - - 09 Jul 2008; Markus Rothe bind-tools-9.4.2_p1.ebuild: - Stable on ppc64; bug #231201 - -*bind-tools-9.5.0_p1 (08 Jul 2008) -*bind-tools-9.4.2_p1 (08 Jul 2008) - - 08 Jul 2008; Tobias Scherbaum - -bind-tools-9.4.2.ebuild, +bind-tools-9.4.2_p1.ebuild, - -bind-tools-9.5.0.ebuild, +bind-tools-9.5.0_p1.ebuild: - Version bump(s), security bug #231201 - -*bind-tools-9.5.0 (04 Jun 2008) - - 04 Jun 2008; Tobias Scherbaum - +bind-tools-9.5.0.ebuild: - Version bump, #224239 - - 04 May 2008; Tobias Scherbaum - bind-tools-9.4.2.ebuild: - Do actually link libidnkit when USE=idn, #218686 - - 03 May 2008; Tobias Scherbaum -files/nslookup.8, - -bind-tools-9.2.7.ebuild, -bind-tools-9.3.3.ebuild: - Nuke 9.2.7 and 9.3.3 (# 208676) - -*bind-tools-9.4.2 (03 May 2008) - - 03 May 2008; Tobias Scherbaum - +bind-tools-9.4.2.ebuild: - Bump to 9.4.2, include dnssec-keygen (# 198721). - - 29 Feb 2008; Raúl Porcel bind-tools-9.2.6-r3.ebuild, - bind-tools-9.2.8-r1.ebuild, bind-tools-9.3.2-r3.ebuild, - bind-tools-9.3.4-r1.ebuild: - alpha/ia64/sparc/x86 stable - - 01 Aug 2007; Joshua Kinard bind-tools-9.4.1_p1.ebuild: - Stable on mips, per #186556. - - 31 Jul 2007; Christoph Mende - bind-tools-9.4.1_p1.ebuild: - Stable on amd64 wrt security bug #186556 - - 30 Jul 2007; Markus Rothe bind-tools-9.4.1_p1.ebuild: - Stable on ppc64; bug #186556 - - 28 Jul 2007; Tobias Scherbaum - bind-tools-9.4.1_p1.ebuild: - ppc stable, bug #186556 - - 28 Jul 2007; Raúl Porcel bind-tools-9.4.1_p1.ebuild: - alpha/ia64/x86 stable wrt security #186556 - - 27 Jul 2007; Gustavo Zacarias - bind-tools-9.4.1_p1.ebuild: - Stable on sparc wrt security #186556 - - 27 Jul 2007; Jeroen Roovers bind-tools-9.4.1_p1.ebuild: - Stable for HPPA (bug #186556). - - 27 Jul 2007; Seemant Kulleen - bind-tools-9.4.1_p1.ebuild: - fix the version info in the SRC_URI mangling so that the fetch succeeds - -*bind-tools-9.4.1_p1 (27 Jul 2007) - - 27 Jul 2007; Tobias Scherbaum - +bind-tools-9.4.1_p1.ebuild: - Version bump, bug #186556 - - 21 Jun 2007; Joshua Kinard bind-tools-9.4.1-r1.ebuild: - Stable on mips, per #131337. - - 18 Jun 2007; Jeroen Roovers bind-tools-9.4.1-r1.ebuild: - Stable for HPPA (bug #181554). - - 17 Jun 2007; Tobias Scherbaum - bind-tools-9.4.1-r1.ebuild: - ppc stable, bug #181554 - - 12 Jun 2007; bind-tools-9.4.1-r1.ebuild: - marking stable on amd64 - - 11 Jun 2007; Raúl Porcel bind-tools-9.4.1-r1.ebuild: - alpha/ia64/x86 stable wrt #181554 - - 11 Jun 2007; Gustavo Zacarias - bind-tools-9.4.1-r1.ebuild: - Stable on sparc wrt #181554 - - 11 Jun 2007; Markus Rothe bind-tools-9.4.1-r1.ebuild: - Stable on ppc64; bug #181554 - - 10 Jun 2007; Joshua Kinard ChangeLog: - Marked unstable on mips, per #181554. - -*bind-tools-9.4.1-r1 (02 Jun 2007) -*bind-tools-9.3.4-r1 (02 Jun 2007) -*bind-tools-9.2.8-r1 (02 Jun 2007) - - 02 Jun 2007; Konstantin V. Arkhipov - +bind-tools-9.2.8-r1.ebuild, +bind-tools-9.3.4-r1.ebuild, - -bind-tools-9.4.1.ebuild, +bind-tools-9.4.1-r1.ebuild: - Closing bug #151839 again. - - 12 May 2007; Joshua Kinard bind-tools-9.3.3.ebuild: - Stable on mips. - -*bind-tools-9.4.1 (01 May 2007) - - 01 May 2007; Konstantin V. Arkhipov - -bind-tools-9.4.0.ebuild, +bind-tools-9.4.1.ebuild: - Version bump wrt bug #176677. - - 22 Apr 2007; Raúl Porcel bind-tools-9.3.4.ebuild: - ia64 stable - - 16 Apr 2007; Markus Rothe bind-tools-9.3.4.ebuild: - Stable on ppc64 - - 16 Mar 2007; Roy Marples bind-tools-9.4.0.ebuild: - idn requires iconv, which is in a separate library for non glibc systems. - Fixes #171043. - -*bind-tools-9.4.0 (28 Feb 2007) - - 28 Feb 2007; Konstantin V. Arkhipov - -bind-tools-9.4.0_rc2.ebuild, +bind-tools-9.4.0.ebuild: - Version bump, closing bug #168356. - - 13 Feb 2007; Marcus D. Hanwell bind-tools-9.2.8.ebuild, - bind-tools-9.3.4.ebuild: - Stable on amd64, bug 163692. - - 08 Feb 2007; Tobias Scherbaum - bind-tools-9.3.4.ebuild: - Stable on ppc wrt bug #163692. - - 07 Feb 2007; Jeroen Roovers bind-tools-9.3.4.ebuild: - Stable for HPPA (bug #163692). - - 07 Feb 2007; Raúl Porcel bind-tools-9.2.8.ebuild, - bind-tools-9.3.4.ebuild: - x86 stable wrt security bug 163692 - - 07 Feb 2007; Gustavo Zacarias - bind-tools-9.2.8.ebuild, bind-tools-9.3.4.ebuild: - Stable on sparc wrt security #163692 - -*bind-tools-9.4.0_rc2 (06 Feb 2007) -*bind-tools-9.3.4 (06 Feb 2007) -*bind-tools-9.2.8 (06 Feb 2007) - - 06 Feb 2007; Martin Jackson +bind-tools-9.2.8.ebuild, - +bind-tools-9.3.4.ebuild, +bind-tools-9.4.0_rc2.ebuild: - Updates for bugs #163691 #163692 and #164293 - - 19 Dec 2006; Tobias Scherbaum - bind-tools-9.3.3.ebuild: - Stable on ppc wrt bug #158217. - - 18 Dec 2006; Gustavo Zacarias - bind-tools-9.3.3.ebuild: - Stable on sparc wrt security #158217 - - 18 Dec 2006; Christian Faulhammer - bind-tools-9.2.7.ebuild, bind-tools-9.3.3.ebuild: - stable x86, security bug #158217 - - 18 Dec 2006; Konstantin V. Arkhipov - bind-tools-9.2.7.ebuild, bind-tools-9.3.3.ebuild: - Goes stable on amd64 wrt security bug #158217. - -*bind-tools-9.3.3 (17 Dec 2006) -*bind-tools-9.2.7 (17 Dec 2006) - - 17 Dec 2006; Konstantin V. Arkhipov - +bind-tools-9.2.7.ebuild, +bind-tools-9.3.3.ebuild: - Version bumps. - - 20 Jul 2006; Diego Pettenò - bind-tools-9.3.2-r3.ebuild: - Add ~x86-fbsd keyword as per bug #141142. - - 04 Jul 2006; Konstantin Arkhipov - +bind-tools-9.3.2-r3.ebuild, +bind-tools-9.2.6-r3.ebuild, - -bind-tools-9.3.2-r2.ebuild, -bind-tools-9.2.6-r2.ebuild: - Closing bug #134698. - - 25 Apr 2006; Thomas Cort bind-tools-9.2.6.ebuild, - bind-tools-9.3.2.ebuild: - Stable on alpha wrt Bug #122561. - -*bind-tools-9.2.6-r2 (23 Feb 2006) -*bind-tools-9.3.2-r2 (23 Feb 2006) - - 23 Feb 2006; Konstantin Arkhipov - +bind-tools-9.2.6-r2.ebuild, +bind-tools-9.3.2-r2.ebuild, - -bind-tools-9.2.6-r1.ebuild, -bind-tools-9.3.2-r1.ebuild, - +files/bind-tools-configure.patch: - Closing bug #122597, patch taken from sys-devel/flex. - - 20 Feb 2006; Joshua Kinard bind-tools-9.2.6.ebuild, - bind-tools-9.3.2.ebuild: - Marked stable on mips. - - 17 Feb 2006; Joseph Jezak bind-tools-9.2.6.ebuild: - Marked ppc stable for bug #122561. - - 17 Feb 2006; Michael Hanselmann - bind-tools-9.3.2.ebuild: - Stable on ppc. - - 15 Feb 2006; Mark Loeser bind-tools-9.2.6.ebuild, - bind-tools-9.3.2.ebuild: - Stable on x86; bug #122561 - - 16 Feb 2006; Konstantin Arkhipov bind-tools-9.2.6.ebuild, - bind-tools-9.3.2.ebuild: - Stable on ppc64; bug #122561 - - 14 Feb 2006; Gustavo Zacarias - bind-tools-9.2.6.ebuild, bind-tools-9.3.2.ebuild: - Stable on sparc wrt #122561 - -*bind-tools-9.3.2-r1 (12 Feb 2006) -*bind-tools-9.2.6-r1 (12 Feb 2006) - - 12 Feb 2006; Konstantin Arkhipov - +bind-tools-9.2.6-r1.ebuild, +bind-tools-9.3.2-r1.ebuild: - IDN support added, fixes bug #122225. - -*bind-tools-9.3.2 (02 Jan 2006) -*bind-tools-9.2.6 (02 Jan 2006) - - 02 Jan 2006; Konstantin Arkhipov +bind-tools-9.3.2.ebuild, - +bind-tools-9.2.6.ebuild, -bind-tools-9.2.3.ebuild, -bind-tools-9.3.1.ebuild, - -bind-tools-9.2.2.ebuild, -bind-tools-9.2.2_rc1.ebuild, - -bind-tools-9.2.3-r1.ebuild: - Bump. - - 06 Jul 2005; Konstantin Arkhipov bind-tools-9.3.1.ebuild: - Closing bug #97871. - - 07 May 2005; Daniel Ostrow bind-tools-9.2.5.ebuild: - Stable on ppc64. - - 10 Apr 2005; Joshua Kinard bind-tools-9.2.5.ebuild: - Marked stable on mips. - - 06 Apr 2005; Bryan Østergaard - bind-tools-9.2.5.ebuild: - Stable on alpha, bug 87902. - - 04 Apr 2005; Guy Martin bind-tools-9.2.5.ebuild: - Stable on hppa. - - 04 Apr 2005; Michael Hanselmann - bind-tools-9.2.5.ebuild: - Stable on ppc. - - 04 Apr 2005; Gustavo Zacarias - bind-tools-9.2.5.ebuild: - Stable on sparc wrt #87902 - - 04 Apr 2005; Konstantin Arkhipov bind-tools-9.2.5.ebuild: - Stable on x86 and amd64 due to bug #87902. - - 01 Apr 2005; Aron Griffis bind-tools-9.2.3-r1.ebuild: - stable on ia64 - -*bind-tools-9.3.1 (26 Mar 2005) - - 26 Mar 2005; Konstantin Arkhipov +bind-tools-9.3.1.ebuild: - Version bump. Masked for heavy testing. - -*bind-tools-9.2.5 (26 Mar 2005) - - 26 Mar 2005; Konstantin Arkhipov +bind-tools-9.2.5.ebuild: - Version bump. Closes bugs #79718 and #83736. - - 29 Dec 2004; Ciaran McCreesh : - Change encoding to UTF-8 for GLEP 31 compliance - - 23 Nov 2004; Sven Wegener : - Fixed digest. - - 19 Oct 2004; Dylan Carlson - bind-tools-9.2.3-r1.ebuild: - Stable on amd64. - - 02 Jul 2004; Jeffrey Forman bind-tools-9.2.3-r1.ebuild: - Added ipv6 IUSE flag per bug 55184 - - 01 Jul 2004; Jeremy Huddleston - bind-tools-9.2.2.ebuild, bind-tools-9.2.2_rc1.ebuild, - bind-tools-9.2.3-r1.ebuild, bind-tools-9.2.3.ebuild: - virtual/glibc -> virtual/libc - - 08 Jun 2004; Stephen P. Becker - bind-tools-9.2.3-r1.ebuild: - Added gnuconfig tweak for mips. - - 05 Jun 2004; Bryan Østergaard - bind-tools-9.2.3-r1.ebuild: - Stable on alpha. - - 01 Jun 2004; Tom Gall bind-tools-9.2.3-r1.ebuild: - stable on ppc64, bug #52706 - - 15 May 2004; Joshua Kinard bind-tools-9.2.3-r1.ebuild: - Marked stable on mips. - - 27 Apr 2004; Aron Griffis bind-tools-9.2.3.ebuild: - Add flag-o-matic for bug 49179 - - 26 Apr 2004; Michael McCabe bind-tools-9.2.3-r1.ebuild: - added s390 keywords - - 11 Apr 2004; Jason Wever bind-tools-9.2.3-r1.ebuild: - Stable on sparc. - - 11 Mar 2004; Lars Weiler bind-tools-9.2.3-r1.ebuild: - stable on ppc - -*bind-tools-9.2.3-r1 (02 Feb 2004) - - 02 Feb 2004; Stewart Honsberger - bind-tools-9.2.3-r1.ebuild: - Revert to old build method until dynamic linked libs co-exists with BIND - - 30 Jan 2004; bind-tools-9.2.2.ebuild: - Added mips to KEYWORDS. - - 26 Nov 2003; Stewart Honsberger - bind-tools-9.2.2.ebuild, bind-tools-9.2.3.ebuild: - Marked 9.2.2 stable on PPC - Marked 9.2.3 unstable on all arches; critical library conflicts. - - 24 Nov 2003; Aron Griffis bind-tools-9.2.3.ebuild: - Disable on alpha until bug 34265 is resolved - - 18 Nov 2003; Stewart bind-tools-9.2.3.ebuild: - -fPIC flag for 64-bit architectures (Bug #33336) - -*bind-tools-9.2.3 (17 Nov 2003) - - 17 Nov 2003; Stewart Honsberger - bind-tools-9.2.3.ebuild: - Version bump. - Dynamic linking of utilities (Bug #14261) - -*bind-tools-9.2.2 (04 Mar 2002) - - 16 Apr 2003; Guy Martin bind-tools-9.2.2.ebuild : - Marked stable for hppa. - - 06 Apr 2003; Zach Welch bind-tools-9.2.2.ebuild: - add arm keyword - - 30 Mar 2003; Christian Birchinger - bind-tools-9.2.2.ebuild: - Added sparc stable keyword - - 09 Mar 2003; Aron Griffis bind-tools-9.2.2.ebuild: - Marked stable on alpha and x86 during package upgrade phase. - - 04 Mar 2003; Brandon Low bind-tools-9.2.2.ebuild: - make->emake -j1 - - 04 Mar 2003; Brandon Low bind-tools-9.2.2.ebuild: - Version bump, marked unstable. Cleaned up unneeded ebuilds. - -*bind-tools-9.2.2_rc1 (16 Aug 2002) - - 27 Feb 2003; Guy Martin bind-tools-9.2.2_rc1.ebuild : - Added hppa to keywords. - - 16 Aug 2002; Seemant Kulleen - bind-tools-9.2.2_rc1.ebuild : - - Security fix version bump: http://www.kb.cert.org/vuls/id/803539 - Thanks to: kevin@aptbasilicata.it (Maurizio Disimino) in bug #6578 - -*bind-tools-9.2.1 (27 Jun 2002) - - 27 Jun 2002; Seemant Kulleen bind-tools-9.2.1.ebuild - files/digest-bind-tools-9.2.1 : - - Version bump by: markus-krainer@chello.at (Markus Krainer) in bug #3249 - -*bind-tools-9.1.3-r1 (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/sdk_container/src/third_party/portage-stable/net-dns/bind-tools/Manifest b/sdk_container/src/third_party/portage-stable/net-dns/bind-tools/Manifest index 5b5ef08072..3198b211c7 100644 --- a/sdk_container/src/third_party/portage-stable/net-dns/bind-tools/Manifest +++ b/sdk_container/src/third_party/portage-stable/net-dns/bind-tools/Manifest @@ -1,11 +1,2 @@ -AUX bind-tools-9.10.2-openssl.patch 3480 SHA256 67e45c17a88efd3b0daafc1dec0d13cb5cd1628534e3312b3ddf2324087f0068 SHA512 6acd1bd906429abe27ecb28d64f6837d4f11c2906cc4b750c454357056083a1afb078b4e76477b777e9b6eece173442a729ca73cc345bb6a964e6bb6acdbbc67 WHIRLPOOL 4f4d5f197804f89490305e389cf3afae3b40e330fcb04d355355f5da7a45121c9cd7af7d53b3ebeb99c11c7c12bfb446255e868f5cc24d2cf79e8f60413544d9 -AUX bind-tools-9.5.0_p1-lwconfig.patch 1856 SHA256 5e39cd20da4f2b3bf5ee352d73249c105de1e182c595afb20a15e950f2f88f02 SHA512 f46290cddfb39b077269cd2198d04eef6a7e680b5f0f8dcf471e551a61b4b7a56871a56cdd20afdeaa86edb790513d8c522032fb725a266c18e0e59eee803dcc WHIRLPOOL 01365d359cd7a6e1e2e8015a041df3747c58b3942a0c586c9db6f2cde36351e95ee8650483ba0439b9a748a354e134145945217a44e38e11722fad5f21278972 -DIST bind-9.10.1-P1.tar.gz 8356463 SHA256 974343108d32f253a130383d0ba51290fb7bf372092f1451f264a9e3ac09898d SHA512 5fedff46d9cb0ff2544624c6d998f4f4bcd82152730e8e936c2611847fe443018b5c5c1dfb1dc49888dde5e3e30c3814f08369525612f0770575d54a3133ed48 WHIRLPOOL 6f39ff0e15676ed68f6d48d2ec5894b00de5192edbbbff94444f62dcf83e62a1e72019d575da97b6e6cde91b8918da78721c48510dbaad88095d4f2b3af375eb -DIST bind-9.10.2-P2.tar.gz 8469608 SHA256 b1e6f0af88634aaf48fb9d06bbf82968264f49b8e2685f061dd3fd4c1ab76c5f SHA512 f59a4e7ef268cd95be9c31b8f908a77b261c76bfad0572608f503175e4e06e69c22ee88f4b6ae9578cd096aa069d9401f76084c7e07b3e98e9dbbb40d535695c WHIRLPOOL 10b035f790a43552b22eed13a98b8dcfdc0cc0614342ae221ce23ba655fb40a46e336cca8575460bf26a792303c6eba61e184ca5deb219372fdd09609b4c9798 -DIST bind-9.10.2-P4.tar.gz 8471531 SHA256 c00b21ec1def212957f28efe9d10aac52d6ec515e84fbf2c42143f5d71429cb8 SHA512 71dd211167c46ada768389f818b114c9e101132544510df0fde7b83ccbe6ef4d7313a3a254f11efe1ccea43a35f74785de4757c9f6044320174f5a69d39cdd5c WHIRLPOOL 0e179fb597c906c05d820969b8a005511aac177c968ffb10d34c1eda132c6caf9aa6fe8348a16e6ce55317784e44645a5295ccdb2aa740ac5960d6bd85dca7db -EBUILD bind-tools-9.10.1_p1.ebuild 2817 SHA256 3830c1858e1f8319b83b00fcd2486e95b08047749b370dc80690d0698f1751b1 SHA512 459b2afabf4ea0cdee802f0d310ddca287c9e3ba7b92f8bbe9ce62089a2b88e565595293cc269d7f1235c9bee321b26004514944999e46eb06784cfcbc6b0362 WHIRLPOOL a9a43787c6cb1c0bd4f3a68f2a5c39ac18693ab1b65509c30d53b88a191dfa43fa2bb9cb8a8f7017a97c3e02a24a1c51c22a5421f70df4896b9ed9c58a3d0ac2 -EBUILD bind-tools-9.10.2_p2.ebuild 2941 SHA256 f071a668882ec5e4d30487959382db7dd4b4b55562d2b5f1a5509bfb8e913df9 SHA512 31cc78712b0d4845e2e06ec7e7aec9108148c8ce26a3a1d3a250edf77f0191aa5d490b1d815be82ba11fff4b840ee771242bf38195a45d830dad4cd324561949 WHIRLPOOL f878b2c718e8d495704e7494a673e03e612056526658f924ed8bd8383883f73750ed0f7a3313879faebefb98a1acb28d2dc4839b03547031db4f48e3c3395eb6 -EBUILD bind-tools-9.10.2_p4-r1.ebuild 3013 SHA256 cca62ec599a6b9545eec28da96213becbff76bdbe79628e866ae53108f980ba0 SHA512 23b21597fb739db1493b391d98056057db685094955f934595c513745fd39ae094643d7d16d16ec9389e8393f940bc51679bc778954503134c473d6b562e4db5 WHIRLPOOL bb846832ff42810802e70733aa538eb825e53311c3bb492172f72274d7aa156d6299007e01b5082e140ced70b736e82bd750c43afee66198a0b01aa3f35a1dc3 -EBUILD bind-tools-9.10.2_p4.ebuild 2943 SHA256 81b4e101184fe08731d8f8cda2250b2b52e1157181c4d686d86b12e8f6e107ab SHA512 20b7fe7fd0ad02a4328680a8df11fa71feb9ab648335808c1d6267de8da73091a74503b635eafdab715b829637b406d8cd8c397102400b983b2157826cb9ffc0 WHIRLPOOL 46cf139d562a66a4da27c50067f6c5e44050b1d6d11d0e3fac33bda19afb9ac657331e92b270922f3bf5d9df8eab18155dd8bfceb60260dc76fac7c845cd011d -MISC ChangeLog 42396 SHA256 1f35ddc61ee04e1eb7cb0d99f4c49ff665477d456ba1ea08e039eea4b76bdc77 SHA512 c1b8720a91aa51ad540ac28a86579e3f1d7d40d37d08c9046dce84347baed49e5113c2773d2b438d59331aa0d4cbe7e3fd5bf6cb606bd4f7135f9c6b86a949a0 WHIRLPOOL 7c1c9d016271064542b7a7826453f8d25316bcd3a14de15a3a041d34587ac3063e2f1dcff2149e50f5ac60e7554ef0a76bbd889bf9eb2ade67fc163967086b1e -MISC metadata.xml 499 SHA256 8d5d4d0257735d89c3435d0c595aa743e08e79cc8345996a00f1cd0744d92c3e SHA512 d6c960b12a25d46a767131b94712d643c6fcd9508cf9dc02eaff1681749819a0a11615d8fb2b76ba6b78252fa14d21755f05b4f9a7157e16a97a52bdbb688301 WHIRLPOOL d7d8ddf46cfcc638c539d7eea0212086923fdd866b4f9b4c6d1808ead5ccd9bfce63736ede94163998fc50a99664ce36ee923cbdd133dcc033448edb4f7ec0bc +DIST bind-9.11.2_p1.tar.gz 9783329 BLAKE2B 5a3bbd87112064231bd5e6b09ebb4014f9d5cf65cb601c03555ff540a22d87aec3990cd8e37ce5ff09e9a149bdf122d20ecb01f87731e6c79d80379a6926014f SHA512 168f27f580e3be2f7ada27afa2f72e715e750eec76831cf01bd32fabc1fa65dc29dab0eb7ed1682b076d3be99269897ddbc2c10551631a3911d9e5ae1aa40597 +DIST bind-9.12.1.tar.gz 9302783 BLAKE2B 731ce67acb22f72e54de1122c5d5c3c1f0663c400bdff9545578a45e5fe3094c6d754351e57dd5c52cdfe1528305dfde25eba7382a723a60b8bfdfeebb9536cd SHA512 701e34a0a3313568c8e5cf76668fefc2a1fceb2ade0de201b8f678401569f1c622c3d1657a71772fa3298efc8b3cdefe974d98432c0087e8b45af3d50a4262fb diff --git a/sdk_container/src/third_party/portage-stable/net-dns/bind-tools/bind-tools-9.10.1_p1.ebuild b/sdk_container/src/third_party/portage-stable/net-dns/bind-tools/bind-tools-9.10.1_p1.ebuild deleted file mode 100644 index 1c50debf7b..0000000000 --- a/sdk_container/src/third_party/portage-stable/net-dns/bind-tools/bind-tools-9.10.1_p1.ebuild +++ /dev/null @@ -1,119 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" - -inherit eutils autotools flag-o-matic toolchain-funcs - -MY_PN=${PN//-tools} -MY_PV=${PV/_p/-P} -MY_PV=${MY_PV/_rc/rc} -MY_P="${MY_PN}-${MY_PV}" - -DESCRIPTION="bind tools: dig, nslookup, host, nsupdate, dnssec-keygen" -HOMEPAGE="http://www.isc.org/software/bind" -SRC_URI="ftp://ftp.isc.org/isc/bind9/${MY_PV}/${MY_P}.tar.gz" - -LICENSE="ISC BSD BSD-2 HPND JNIC RSA openssl" -SLOT="0" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="doc gost gssapi idn ipv6 readline ssl urandom xml" -# no PKCS11 currently as it requires OpenSSL to be patched, also see bug 409687 - -REQUIRED_USE="gost? ( ssl )" - -DEPEND="ssl? ( dev-libs/openssl:0 ) - gost? ( >=dev-libs/openssl-1.0.0:0[-bindist] ) - xml? ( dev-libs/libxml2 ) - idn? ( net-dns/idnkit ) - gssapi? ( virtual/krb5 ) - readline? ( sys-libs/readline )" -RDEPEND="${DEPEND}" - -S="${WORKDIR}/${MY_P}" - -# bug 479092, requires networking -RESTRICT="test" - -src_prepare() { - # bug 231247 - epatch "${FILESDIR}"/${PN}-9.5.0_p1-lwconfig.patch - - # Disable tests for now, bug 406399 - sed -i '/^SUBDIRS/s:tests::' bin/Makefile.in lib/Makefile.in || die - - # bug #220361 - rm aclocal.m4 - rm -rf libtool.m4/ - eautoreconf -} - -src_configure() { - local myconf= - - if use urandom; then - myconf="${myconf} --with-randomdev=/dev/urandom" - else - myconf="${myconf} --with-randomdev=/dev/random" - fi - - # bug 344029 - append-cflags "-DDIG_SIGCHASE" - - # localstatedir for nsupdate -l, bug 395785 - tc-export BUILD_CC - econf \ - --localstatedir=/var \ - --without-python \ - --disable-seccomp \ - --without-libjson \ - $(use_enable ipv6) \ - $(use_with idn) \ - $(usex idn --with-idnlib=-lidnkit '') \ - $(use_with ssl openssl "${EPREFIX}"/usr) \ - $(use_with xml libxml2) \ - $(use_with gssapi) \ - $(use_with readline) \ - $(use_with gost) \ - ${myconf} - - # bug #151839 - echo '#undef SO_BSDCOMPAT' >> config.h -} - -src_compile() { - local AR=$(tc-getAR) - - emake AR=$AR -C lib/ || die "emake lib failed" - emake AR=$AR -C bin/delv/ || die "emake bin/delv failed" - emake AR=$AR -C bin/dig/ || die "emake bin/dig failed" - emake AR=$AR -C bin/nsupdate/ || die "emake bin/nsupdate failed" - emake AR=$AR -C bin/dnssec/ || die "emake bin/dnssec failed" -} - -src_install() { - dodoc README CHANGES FAQ - - cd "${S}"/bin/delv - dobin delv - doman delv.1 - - cd "${S}"/bin/dig - dobin dig host nslookup - doman {dig,host,nslookup}.1 - - cd "${S}"/bin/nsupdate - dobin nsupdate - doman nsupdate.1 - if use doc; then - dohtml nsupdate.html - fi - - cd "${S}"/bin/dnssec - dobin dnssec-keygen - doman dnssec-keygen.8 - if use doc; then - dohtml dnssec-keygen.html - fi -} diff --git a/sdk_container/src/third_party/portage-stable/net-dns/bind-tools/bind-tools-9.10.2_p4.ebuild b/sdk_container/src/third_party/portage-stable/net-dns/bind-tools/bind-tools-9.10.2_p4.ebuild deleted file mode 100644 index 34af0cf06e..0000000000 --- a/sdk_container/src/third_party/portage-stable/net-dns/bind-tools/bind-tools-9.10.2_p4.ebuild +++ /dev/null @@ -1,125 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" - -inherit eutils autotools flag-o-matic toolchain-funcs - -MY_PN=${PN//-tools} -MY_PV=${PV/_p/-P} -MY_PV=${MY_PV/_rc/rc} -MY_P="${MY_PN}-${MY_PV}" - -DESCRIPTION="bind tools: dig, nslookup, host, nsupdate, dnssec-keygen" -HOMEPAGE="http://www.isc.org/software/bind" -SRC_URI="ftp://ftp.isc.org/isc/bind9/${MY_PV}/${MY_P}.tar.gz" - -LICENSE="ISC BSD BSD-2 HPND JNIC RSA openssl" -SLOT="0" -KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="doc gost gssapi idn ipv6 readline seccomp ssl urandom xml" -# no PKCS11 currently as it requires OpenSSL to be patched, also see bug 409687 - -REQUIRED_USE="gost? ( ssl )" - -DEPEND="ssl? ( dev-libs/openssl:0 ) - gost? ( >=dev-libs/openssl-1.0.0:0[-bindist] ) - xml? ( dev-libs/libxml2 ) - idn? ( net-dns/idnkit ) - gssapi? ( virtual/krb5 ) - readline? ( sys-libs/readline:0= ) - seccomp? ( sys-libs/libseccomp )" -RDEPEND="${DEPEND} - !> config.h -} - -src_compile() { - local AR=$(tc-getAR) - - emake AR="${AR}" -C lib/ - emake AR="${AR}" -C bin/delv/ - emake AR="${AR}" -C bin/dig/ - emake AR="${AR}" -C bin/nsupdate/ - emake AR="${AR}" -C bin/dnssec/ -} - -src_install() { - dodoc README CHANGES FAQ - - cd "${S}"/bin/delv - dobin delv - doman delv.1 - - cd "${S}"/bin/dig - dobin dig host nslookup - doman {dig,host,nslookup}.1 - - cd "${S}"/bin/nsupdate - dobin nsupdate - doman nsupdate.1 - if use doc; then - dohtml nsupdate.html - fi - - cd "${S}"/bin/dnssec - for tool in dsfromkey importkey keyfromlabel keygen \ - revoke settime signzone verify; do - dobin dnssec-"${tool}" - doman dnssec-"${tool}".8 - if use doc; then - dohtml dnssec-"${tool}".html - fi - done -} diff --git a/sdk_container/src/third_party/portage-stable/net-dns/bind-tools/bind-tools-9.10.2_p4-r1.ebuild b/sdk_container/src/third_party/portage-stable/net-dns/bind-tools/bind-tools-9.11.2_p1.ebuild similarity index 75% rename from sdk_container/src/third_party/portage-stable/net-dns/bind-tools/bind-tools-9.10.2_p4-r1.ebuild rename to sdk_container/src/third_party/portage-stable/net-dns/bind-tools/bind-tools-9.11.2_p1.ebuild index 38b6062090..7393c068c6 100644 --- a/sdk_container/src/third_party/portage-stable/net-dns/bind-tools/bind-tools-9.10.2_p4-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/net-dns/bind-tools/bind-tools-9.11.2_p1.ebuild @@ -1,6 +1,5 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Id$ EAPI="5" @@ -13,28 +12,30 @@ MY_P="${MY_PN}-${MY_PV}" DESCRIPTION="bind tools: dig, nslookup, host, nsupdate, dnssec-keygen" HOMEPAGE="http://www.isc.org/software/bind" -SRC_URI="ftp://ftp.isc.org/isc/bind9/${MY_PV}/${MY_P}.tar.gz" +SRC_URI="https://www.isc.org/downloads/file/${MY_P}/?version=tar-gz -> ${MY_PN}-${PV}.tar.gz" -LICENSE="ISC BSD BSD-2 HPND JNIC RSA openssl" +LICENSE="Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="doc gost gssapi idn ipv6 libressl readline seccomp ssl urandom xml" # no PKCS11 currently as it requires OpenSSL to be patched, also see bug 409687 -REQUIRED_USE="gost? ( ssl )" +REQUIRED_USE="gost? ( !libressl ssl )" -DEPEND=" +CDEPEND=" ssl? ( - !libressl? ( dev-libs/openssl:0 ) + !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl ) ) - gost? ( >=dev-libs/openssl-1.0.0:0[-bindist] ) + gost? ( >=dev-libs/openssl-1.0.0:0=[-bindist] ) xml? ( dev-libs/libxml2 ) - idn? ( net-dns/idnkit ) + idn? ( =dev-libs/openssl-1.0.0:0=[-bindist] ) xml? ( dev-libs/libxml2 ) - idn? ( net-dns/idnkit ) + idn? ( - ---- a/configure.in -+++ b/configure.in -@@ -1442,16 +1442,21 @@ case "$use_openssl" in - OPENSSLLINKOBJS="" - OPENSSLLINKSRCS="" - ;; -- auto) -- DST_OPENSSL_INC="" -- CRYPTO="" -+ yes|auto) -+ CRYPTO="" -+ PKG_CHECK_MODULES([OPENSSL], [libcrypto], [CRYPTO='-DOPENSSL'], [ -+ if test "$use_openssl" = "yes"; then -+ AC_MSG_ERROR(openssl not found) -+ fi -+ use_openssl="no" -+ ]) -+ -+ DST_OPENSSL_INC=$OPENSSL_CFLAGS -+ DST_OPENSSL_LIBS=$OPENSSL_LIBS - OPENSSLGOSTLINKOBJS="" - OPENSSLGOSTLINKSRS="" - OPENSSLLINKOBJS="" - OPENSSLLINKSRCS="" -- AC_MSG_ERROR( --[OpenSSL was not found in any of $openssldirs; use --with-openssl=/path --If you don't want OpenSSL, use --without-openssl]) - ;; - *) - if test "$want_native_pkcs11" = "yes" -@@ -1588,27 +1593,39 @@ no) - ;; - esac - -+ CC="$saved_cc" -+ CFLAGS="$saved_cflags" -+ LIBS="$saved_libs" -+ OPENSSLLINKOBJS='${OPENSSLLINKOBJS}' -+ OPENSSLLINKSRCS='${OPENSSLLINKSRCS}' -+ ;; -+esac -+ -+if test "$use_openssl" = "yes"; then -+ saved_cc="$CC" -+ saved_cflags="$CFLAGS" -+ saved_libs="$LIBS" -+ CFLAGS="$CFLAGS $DST_OPENSSL_INC" -+ LIBS="$LIBS $DST_OPENSSL_LIBS" -+ -- AC_MSG_CHECKING(for OpenSSL DSA support) -- if test -f $use_openssl/include/openssl/dsa.h -- then -+ AC_CHECK_HEADERS([openssl/dsa.h]) -+ if test "$ac_cv_header_openssl_dsa_h" = yes; then - AC_DEFINE(HAVE_OPENSSL_DSA) -- AC_MSG_RESULT(yes) -- else -- AC_MSG_RESULT(no) - fi - - AC_CHECK_FUNCS(EVP_sha256 EVP_sha384 EVP_sha512) - - AC_MSG_CHECKING(for OpenSSL ECDSA support) - have_ecdsa="" -- AC_TRY_RUN([ -+ AC_TRY_LINK([ - #include - #include -+],[ - int main() { - EC_KEY *ec256, *ec384; - - #if !defined(HAVE_EVP_SHA256) || !defined(HAVE_EVP_SHA384) -- return (1); -+#error choke - #endif - ec256 = EC_KEY_new_by_curve_name(NID_X9_62_prime256v1); - ec384 = EC_KEY_new_by_curve_name(NID_secp384r1); -@@ -1637,24 +1654,7 @@ int main() { - [AC_MSG_RESULT(yes) - have_ecdsa="yes"], - [AC_MSG_RESULT(no) -- have_ecdsa="no"], -+ have_ecdsa="no"]) -- [AC_MSG_RESULT(using --with-ecdsa)]) -- case "$with_ecdsa" in -- yes) -- case "$have_ecdsa" in -- no) AC_MSG_ERROR([ecdsa not supported]) ;; -- *) have_ecdsa=yes ;; -- esac -- ;; -- no) -- have_ecdsa=no ;; -- *) -- case "$have_ecdsa" in -- yes|no) ;; -- *) AC_MSG_ERROR([need --with-ecdsa=[[yes or no]]]) ;; -- esac -- ;; -- esac - case $have_ecdsa in - yes) - OPENSSL_ECDSA="yes" -@@ -1702,7 +1702,8 @@ int main() { - have_gost="yes"], - [AC_MSG_RESULT(no) - have_gost="no"], -- [AC_MSG_RESULT(using --with-gost)]) -+ [AC_MSG_RESULT(using --with-gost) -+ have_gost=$with_gost]) - case "$with_gost" in - yes) - case "$have_gost" in -@@ -1752,7 +1753,8 @@ int main() { - [AC_MSG_RESULT(yes) - have_aes="yes"], - [AC_MSG_RESULT(no)])], -- [AC_MSG_RESULT(using --with-aes)]) -+ [AC_MSG_RESULT(using --with-aes) -+ have_aes=$with_aes]) - - ISC_OPENSSL_INC="" - ISC_OPENSSL_LIBS="" -@@ -1765,8 +1767,7 @@ int main() { - OPENSSLLINKOBJS='${OPENSSLLINKOBJS}' - OPENSSLLINKSRCS='${OPENSSLLINKSRCS}' - -- ;; --esac -+fi - - # - # This would include the system openssl path (and linker options to use diff --git a/sdk_container/src/third_party/portage-stable/net-dns/bind-tools/metadata.xml b/sdk_container/src/third_party/portage-stable/net-dns/bind-tools/metadata.xml index fb31564a3f..0db3429195 100644 --- a/sdk_container/src/third_party/portage-stable/net-dns/bind-tools/metadata.xml +++ b/sdk_container/src/third_party/portage-stable/net-dns/bind-tools/metadata.xml @@ -1,7 +1,7 @@ - + idl0r@gentoo.org Christian Ruppert From f1d720d69ec78aa65eb6dc228746aea0272c4bb6 Mon Sep 17 00:00:00 2001 From: David Michael Date: Mon, 14 May 2018 17:51:52 -0400 Subject: [PATCH 17/21] bump(virtual/krb5): sync with upstream --- .../metadata/md5-cache/virtual/krb5-0 | 4 +-- .../metadata/md5-cache/virtual/krb5-0-r1 | 4 +-- .../portage-stable/virtual/krb5/ChangeLog | 25 ------------------- .../portage-stable/virtual/krb5/Manifest | 24 ------------------ .../virtual/krb5/krb5-0-r1.ebuild | 11 ++------ .../portage-stable/virtual/krb5/krb5-0.ebuild | 11 ++------ .../portage-stable/virtual/krb5/metadata.xml | 6 +++-- 7 files changed, 12 insertions(+), 73 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/virtual/krb5/ChangeLog delete mode 100644 sdk_container/src/third_party/portage-stable/virtual/krb5/Manifest diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/virtual/krb5-0 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/virtual/krb5-0 index 0066ba6c04..7430f345ef 100644 --- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/virtual/krb5-0 +++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/virtual/krb5-0 @@ -1,7 +1,7 @@ DEFINED_PHASES=- DESCRIPTION=Virtual for Kerberos V implementation -EAPI=3 +EAPI=5 KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos RDEPEND=|| ( app-crypt/mit-krb5 app-crypt/heimdal ) SLOT=0 -_md5_=dd0d3c863b121cef186537545c084df3 +_md5_=097cb7a02a45f7d20beb447f9d206157 diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/virtual/krb5-0-r1 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/virtual/krb5-0-r1 index cda4c12f80..c5d60ccf40 100644 --- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/virtual/krb5-0-r1 +++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/virtual/krb5-0-r1 @@ -2,8 +2,8 @@ DEFINED_PHASES=- DESCRIPTION=Virtual for Kerberos V implementation EAPI=5 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 -KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos +KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos RDEPEND=|| ( >=app-crypt/mit-krb5-1.12.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=app-crypt/heimdal-1.5.3-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) SLOT=0 _eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 ltprune 2770eed66a9b8ef944714cd0e968182e multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build eed53a6313267c9fbcd35fc384bd0087 toolchain-funcs 185a06792159ca143528e7010368e8af -_md5_=afd7bd0def714e1877caae0d7416d524 +_md5_=83ca15e0f1cc12d1243aca2c365625de diff --git a/sdk_container/src/third_party/portage-stable/virtual/krb5/ChangeLog b/sdk_container/src/third_party/portage-stable/virtual/krb5/ChangeLog deleted file mode 100644 index 3c7ac1609d..0000000000 --- a/sdk_container/src/third_party/portage-stable/virtual/krb5/ChangeLog +++ /dev/null @@ -1,25 +0,0 @@ -# ChangeLog for virtual/krb5 -# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/virtual/krb5/ChangeLog,v 1.6 2014/07/28 13:49:48 ago Exp $ - - 28 Jul 2014; Agostino Sarubbo krb5-0-r1.ebuild: - Stable for ppc, wrt bug #512012 - - 23 Jul 2014; Agostino Sarubbo krb5-0-r1.ebuild: - Stable for x86, wrt bug #512012 - - 22 Jul 2014; Agostino Sarubbo krb5-0-r1.ebuild: - Stable for amd64, wrt bug #512912 - -*krb5-0-r1 (15 May 2014) - - 15 May 2014; Michał Górny +krb5-0-r1.ebuild: - Enable multilib support, bug #510354. - - 27 Jun 2013; Alexis Ballier krb5-0.ebuild: - keyword ~amd64-fbsd - -*krb5-0 (13 Mar 2011) - - 13 Mar 2011; Eray Aslan +krb5-0.ebuild, +metadata.xml: - Initial commit diff --git a/sdk_container/src/third_party/portage-stable/virtual/krb5/Manifest b/sdk_container/src/third_party/portage-stable/virtual/krb5/Manifest deleted file mode 100644 index 14648baa5b..0000000000 --- a/sdk_container/src/third_party/portage-stable/virtual/krb5/Manifest +++ /dev/null @@ -1,24 +0,0 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 - -EBUILD krb5-0-r1.ebuild 623 SHA256 f902b3df4c34d93aa041ed9b6dde49f9c434cb0d6908b0cdd0f065b87c99eef0 SHA512 929a6cab3968ce0b96f6a571ef9667155e82bddc4c609c18ae6dfbed518e721b9b51e2bf6af9aba981424e38d514d5dfba30f4c0d7b2277d975881e93321df1a WHIRLPOOL 89e0c1354afb7a18ba29da992f063d585d91a36e4df8bcf482d7cb55b8e5e33b9a5bd166d32a78652ff28a7cc1b101db9fdf36079fc39e02b855a7a82ab2e0e3 -EBUILD krb5-0.ebuild 522 SHA256 3081c2fa2b142585abb231383c40e7b1e568c0463045dabd5eb190b88010d93a SHA512 f3a314df48da0bdf0c5603ae712365212e309337b79daaea94a61235d5544306da74e6ab7187a2f1d22a0405fad94ee1492b06852beade4188baa417ee5250d4 WHIRLPOOL 9e4ea86adc70f2a5841b9852fb484bbe1fc788c653734bb0270c47a00ebb2d2f8db9ed4324b9f0a379e9036f4f945bd1dd1fdba974d978ebc32bb636410bbc48 -MISC ChangeLog 843 SHA256 b33559a2654388785a2525ff7aab0f642dd0d09acafb47fd92779f15a412a0a7 SHA512 4b65cd4f27307f5742dddf61facc106cc96d0d088c45a1a16dd1c22c9315020cea5c7ae02fa5231cbd2cfdfd453f8b55469b6e7947cdbee79cccd61dbe1ddddc WHIRLPOOL 37e0f9866cadefb4fae78d61916497c5b4c3df9be5220aab2596f6a5afa1f3f12205a1b30f1e166e5a94fdc69a6e53ad020862e16d48f59f0e9cb7cb3d1be01f -MISC metadata.xml 162 SHA256 1fe742cb3e026ef71551bf567491db50008748c528c2adc2a7db3e278bfba1d9 SHA512 b333ea0c5689e101f94a81a21582243c2a77d546693f86975a6b5943300617d333093bf306d0169ca91bb25ef61f77870f91de0ee1070c8c744e3a57fa0e376c WHIRLPOOL 317f87315f56484a46bd8ddcf26bc2977026a75dd93899cac18a64a912fbd86642c413a0fd9301b686ec5aa2ca4d86f6215b6e7362aa0b6d88eedd4b66420f57 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2 - -iQIcBAEBCAAGBQJT1lT9AAoJELp701BxlEWfMQYP/2id7NiRq/v+J+KQwoS/qCo7 -cVOfwNwId7EZ9dAcDfCrayJXhZufxGmhpUVCI/eUqHcgys1Uf7pNin0cxmob/JFl -zphYj571M6hfhbkbgMQJbQ8vchYrdQq0pH1701Zf0gCQSp4aGS+D3CWATOQURYAp -nOl0lIHo1rKjJaEsg6/LiFN9SMczV4CrBP4Kpdy9HXcAOysuchQ0TZKiFsj3asXj -cPH2el8Ggk8nGXfHmWOjRdkvbQvRtHI6gEE72H5/E+TVCiu1qcAYkOY0aHFQWMBc -SIBmoY6dHahHFxbuCrFw31i+B5bQC8fmfkp4/JgsCaMghL3tzBYYCV6U/W5vhYTB -E+HGHFJTxbpDC4GNp4yq1Si40HRe9aICR6L0YHI6+R1Bwgp9/cB9fZ7RIpikaohN -cuW2KGo6mF+ZOYeuXUqiLU24dIcDeaqvqQZ/6DOIt5UyEAwHv2Vu5W5KpIA3H9B4 -bGFzMYPj5fkxURYF/howRS6kyombjnxCEkVblV/lD0cEyVKD1xVOU9GV6rOOJJxu -OA4JHwl7EcSDEcHP5xD2uEu+FHBwwN8QXy0jzr+2m374m1+mnJCLO12LvIUZEb93 -MeOmfPh51gTGFJyn+iXWHBl2pp6ylvgGbg3B7Sl3GbWXNP2cDCP4+AgjRSFellR8 -R1NJoX1V0I/0njbJ0pMe -=fG9T ------END PGP SIGNATURE----- diff --git a/sdk_container/src/third_party/portage-stable/virtual/krb5/krb5-0-r1.ebuild b/sdk_container/src/third_party/portage-stable/virtual/krb5/krb5-0-r1.ebuild index 13aa481d69..5949611bf8 100644 --- a/sdk_container/src/third_party/portage-stable/virtual/krb5/krb5-0-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/virtual/krb5/krb5-0-r1.ebuild @@ -1,21 +1,14 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/virtual/krb5/krb5-0-r1.ebuild,v 1.4 2014/07/28 13:49:48 ago Exp $ EAPI=5 inherit multilib-build DESCRIPTION="Virtual for Kerberos V implementation" -HOMEPAGE="" -SRC_URI="" - -LICENSE="" SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" -IUSE="" +KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" -DEPEND="" RDEPEND=" || ( >=app-crypt/mit-krb5-1.12.1-r1[${MULTILIB_USEDEP}] diff --git a/sdk_container/src/third_party/portage-stable/virtual/krb5/krb5-0.ebuild b/sdk_container/src/third_party/portage-stable/virtual/krb5/krb5-0.ebuild index 139d57317e..1823c18c03 100644 --- a/sdk_container/src/third_party/portage-stable/virtual/krb5/krb5-0.ebuild +++ b/sdk_container/src/third_party/portage-stable/virtual/krb5/krb5-0.ebuild @@ -1,17 +1,10 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/virtual/krb5/krb5-0.ebuild,v 1.2 2013/06/27 20:42:55 aballier Exp $ -EAPI=3 +EAPI=5 DESCRIPTION="Virtual for Kerberos V implementation" -HOMEPAGE="" -SRC_URI="" - -LICENSE="" SLOT="0" KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" -IUSE="" -DEPEND="" RDEPEND="|| ( app-crypt/mit-krb5 app-crypt/heimdal )" diff --git a/sdk_container/src/third_party/portage-stable/virtual/krb5/metadata.xml b/sdk_container/src/third_party/portage-stable/virtual/krb5/metadata.xml index 9cc2325ed1..b02e0cad45 100644 --- a/sdk_container/src/third_party/portage-stable/virtual/krb5/metadata.xml +++ b/sdk_container/src/third_party/portage-stable/virtual/krb5/metadata.xml @@ -1,6 +1,8 @@ -kerberos + + kerberos@gentoo.org + Kerberos + - From 6231c73ab0695264411be7a3beeb390913c806a5 Mon Sep 17 00:00:00 2001 From: David Michael Date: Mon, 14 May 2018 18:08:58 -0400 Subject: [PATCH 18/21] bump(dev-libs/libxml2): sync with upstream --- .../portage-stable/dev-libs/libxml2/Manifest | 12 +- .../files/libxml2-2.9.2-disable-tests.patch | 68 ---- .../files/libxml2-2.9.4-CVE-2016-4658.patch | 249 -------------- .../files/libxml2-2.9.4-CVE-2016-5131.patch | 174 ---------- .../files/libxml2-2.9.4-CVE-2016-9318.patch | 202 ----------- .../files/libxml2-2.9.4-CVE-2017-0663.patch | 43 --- .../files/libxml2-2.9.4-CVE-2017-5969.patch | 63 ---- .../files/libxml2-2.9.4-CVE-2017-7375.patch | 35 -- .../files/libxml2-2.9.4-CVE-2017-7376.patch | 31 -- .../libxml2-2.9.4-CVE-2017-9047-9048.patch | 116 ------- .../libxml2-2.9.4-CVE-2017-9049-9050.patch | 316 ------------------ .../libxml2-2.9.4-fix-root-node-cmp.patch | 34 -- .../libxml2-2.9.4-heap-buffer-overflow.patch | 32 -- .../files/libxml2-2.9.4-nullptrderef.patch | 50 --- .../files/libxml2-2.9.4-nullptrderef2.patch | 57 ---- .../files/libxml2-2.9.4-osd-validation.patch | 66 ---- .../dev-libs/libxml2/libxml2-2.9.4-r2.ebuild | 231 ------------- .../dev-libs/libxml2/libxml2-2.9.4-r3.ebuild | 239 ------------- .../dev-libs/libxml2/libxml2-2.9.6.ebuild | 4 +- ...xml2-2.9.5.ebuild => libxml2-2.9.7.ebuild} | 6 +- ...2-2.9.4-r1.ebuild => libxml2-2.9.8.ebuild} | 22 +- .../md5-cache/dev-libs/libxml2-2.9.4-r2 | 14 - .../metadata/md5-cache/dev-libs/libxml2-2.9.5 | 14 - .../metadata/md5-cache/dev-libs/libxml2-2.9.6 | 4 +- .../{libxml2-2.9.4-r1 => libxml2-2.9.7} | 6 +- .../{libxml2-2.9.4-r3 => libxml2-2.9.8} | 8 +- 26 files changed, 25 insertions(+), 2071 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/dev-libs/libxml2/files/libxml2-2.9.2-disable-tests.patch delete mode 100644 sdk_container/src/third_party/portage-stable/dev-libs/libxml2/files/libxml2-2.9.4-CVE-2016-4658.patch delete mode 100644 sdk_container/src/third_party/portage-stable/dev-libs/libxml2/files/libxml2-2.9.4-CVE-2016-5131.patch delete mode 100644 sdk_container/src/third_party/portage-stable/dev-libs/libxml2/files/libxml2-2.9.4-CVE-2016-9318.patch delete mode 100644 sdk_container/src/third_party/portage-stable/dev-libs/libxml2/files/libxml2-2.9.4-CVE-2017-0663.patch delete mode 100644 sdk_container/src/third_party/portage-stable/dev-libs/libxml2/files/libxml2-2.9.4-CVE-2017-5969.patch delete mode 100644 sdk_container/src/third_party/portage-stable/dev-libs/libxml2/files/libxml2-2.9.4-CVE-2017-7375.patch delete mode 100644 sdk_container/src/third_party/portage-stable/dev-libs/libxml2/files/libxml2-2.9.4-CVE-2017-7376.patch delete mode 100644 sdk_container/src/third_party/portage-stable/dev-libs/libxml2/files/libxml2-2.9.4-CVE-2017-9047-9048.patch delete mode 100644 sdk_container/src/third_party/portage-stable/dev-libs/libxml2/files/libxml2-2.9.4-CVE-2017-9049-9050.patch delete mode 100644 sdk_container/src/third_party/portage-stable/dev-libs/libxml2/files/libxml2-2.9.4-fix-root-node-cmp.patch delete mode 100644 sdk_container/src/third_party/portage-stable/dev-libs/libxml2/files/libxml2-2.9.4-heap-buffer-overflow.patch delete mode 100644 sdk_container/src/third_party/portage-stable/dev-libs/libxml2/files/libxml2-2.9.4-nullptrderef.patch delete mode 100644 sdk_container/src/third_party/portage-stable/dev-libs/libxml2/files/libxml2-2.9.4-nullptrderef2.patch delete mode 100644 sdk_container/src/third_party/portage-stable/dev-libs/libxml2/files/libxml2-2.9.4-osd-validation.patch delete mode 100644 sdk_container/src/third_party/portage-stable/dev-libs/libxml2/libxml2-2.9.4-r2.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/dev-libs/libxml2/libxml2-2.9.4-r3.ebuild rename sdk_container/src/third_party/portage-stable/dev-libs/libxml2/{libxml2-2.9.5.ebuild => libxml2-2.9.7.ebuild} (93%) rename sdk_container/src/third_party/portage-stable/dev-libs/libxml2/{libxml2-2.9.4-r1.ebuild => libxml2-2.9.8.ebuild} (85%) delete mode 100644 sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-libs/libxml2-2.9.4-r2 delete mode 100644 sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-libs/libxml2-2.9.5 rename sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-libs/{libxml2-2.9.4-r1 => libxml2-2.9.7} (91%) rename sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-libs/{libxml2-2.9.4-r3 => libxml2-2.9.8} (89%) diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libxml2/Manifest b/sdk_container/src/third_party/portage-stable/dev-libs/libxml2/Manifest index e95b736e00..b8be3f373f 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/libxml2/Manifest +++ b/sdk_container/src/third_party/portage-stable/dev-libs/libxml2/Manifest @@ -1,6 +1,6 @@ -DIST libxml2-2.9.4.tar.gz 5374830 SHA256 ffb911191e509b966deb55de705387f14156e1a56b21824357cdf0053233633c SHA512 f5174ab1a3a0ec0037a47f47aa47def36674e02bfb42b57f609563f84c6247c585dbbb133c056953a5adb968d328f18cbc102eb0d00d48eb7c95478389e5daf9 WHIRLPOOL 268d3364a3d293810dff060b3ab92042c5550e50dbe9038c4d5b54ea6a22ed77f9572575517ae3bacfe518d634047eb9d5345e903b125e56a3d32ad1ba96dabf -DIST libxml2-2.9.5.tar.gz 5466888 SHA256 4031c1ecee9ce7ba4f313e91ef6284164885cdb69937a123f6a83bb6a72dcd38 SHA512 197dbd1722e5f90eea43837323352f48d215e198aa6b95685645ef7511e2beba8aadc0dd67e099c945120c5dbe7f8c9da5f376b22f447059e9ffa941c1bfd175 WHIRLPOOL 14cfeaa1c18af4e64131505010484b2e64d83d617984c6321b77c4263901b16b24c945eb9af17763fe63048c3910111fdc498fe9183c04ecea9182ea8f9214fa -DIST libxml2-2.9.6.tar.gz 5469624 SHA256 8b9038cca7240e881d462ea391882092dfdc6d4f483f72683e817be08df5ebbc SHA512 5ef80f895374bd5dd3bcd5f00c715795f026bf45d998f8f762c0cdb739b8755e01de40cf853d98a3826eacef95c4adebe4777db11020e8d98d0bda921f55a0ed WHIRLPOOL 1fa2b10f8715f3718863957e6a5173400b42c6587c4602f52c0ae9103fafd7a515c28158c9bc928c532139cd73274f070015c64677434a0a6fa83f0a9e8425ff -DIST xmlts20080827.tar.gz 638940 SHA256 96151685cec997e1f9f3387e3626d61e6284d4d6e66e0e440c209286c03e9cc7 SHA512 7325d0977c4427fc4944b291ccf896a665f654cc24399e5565c12a849c2bc3aef4fa3ee42a09ac115abcb6570c51a8fbd052c38d64d164279ecdecad5a4e884d WHIRLPOOL 50835380c3ea208df0bf9ce032ed2df69c4c6cb5a53ffdd39a08fb4f1d166f311b2ef2fe0d9911ae1ebff92aeb42f6ea55e727dfe0b7a3b95e6c7240315b3eda -DIST xsts-2002-01-16.tar.gz 6894439 SHA256 55e5c08db29946a91ea8e70e8f2418d3fd30d8b6777941dfba7f54726ffd9914 SHA512 43300af6d39c1e2221b0ed7318fe14c7464eeb6eb030ed1e22eb29b4ab17f014e2a4c8887c3a46ae5d243e3072da27f00f4e285498ae6f1288177d38d1108288 WHIRLPOOL 84dd51959460a4f8aa582d57ad39229c546ca7fe155012c57c368b59f5d31400d8b940a343a7320058330ca611303139cacdffed514783f96406ac5366026b11 -DIST xsts-2004-01-14.tar.gz 2761085 SHA256 09bdf9f81f381ebf9bc158a9472e498e896f7a02eb7461146e9abe1b9493ca17 SHA512 32854388d7e720ad67156baf50bf2bae7bd878ca3e35fd7e44e57cad3f434f69d56bbbedd61509f8a1faf01c9eae74a078df8fe130780b182c05c05cb1c39ebe WHIRLPOOL c46a3bf7d6dd771757f4304995cc177cf51c6cdd0e9778851fc13d3809c7b984690b4f273b3e075abe018110968eb7fc78f5b83170d3e18bacf00a4ed64b213d +DIST libxml2-2.9.6.tar.gz 5469624 BLAKE2B cb8fc74044876b2ddf9742a4a84d685ce6cd1e41a991ee79fd70a9175c54d2a9a3d3a2c3229a4ce177fcd4e30b0cee08c7cf3a36fef68b179db0ce521fbbf3b0 SHA512 5ef80f895374bd5dd3bcd5f00c715795f026bf45d998f8f762c0cdb739b8755e01de40cf853d98a3826eacef95c4adebe4777db11020e8d98d0bda921f55a0ed +DIST libxml2-2.9.7.tar.gz 5467389 BLAKE2B e15082fb87fb41a7aab6f39120b1d1bbd0325af8009bb3b74c69a98bf7347a39f59055762df157dcf223a79ac84f17535cb40af0a9a461ee3d2c1d55f4832e1b SHA512 da06cb7c5032ef4b7c8e902fabb9d2c74634c42c161be07a7c66a00d53a68029f89b0d4de32a6b9d4ff338c2d1d9c4e53aefb9cf50cb1c2d6c6b06b442ef42d5 +DIST libxml2-2.9.8.tar.gz 5469097 BLAKE2B 0b7836db46edebf6e7108c28da4bb7e3fb5ddc695aaa3e456ba51a66c0294a741d7b60eb4c31c7040443bbd54712c019424078bd533856a9650b39a703a926d5 SHA512 28903282c7672206effa1362fd564cbe4cf5be44264b083a7d14e383f73bccd1b81bcafb5f4f2f56f5e7e05914c660e27668c9ce91b1b9f256ef5358d55ba917 +DIST xmlts20080827.tar.gz 638940 BLAKE2B c5aab959c6e0698acd5b9be82b48a8ac26f4d01cc03f9acfff20d344f97f4711fc6d4a524ae70457147e8e30c72e27b6726829e1dd21896286aa974ed60774e7 SHA512 7325d0977c4427fc4944b291ccf896a665f654cc24399e5565c12a849c2bc3aef4fa3ee42a09ac115abcb6570c51a8fbd052c38d64d164279ecdecad5a4e884d +DIST xsts-2002-01-16.tar.gz 6894439 BLAKE2B 1e9ec63d2c104655e64249e07440a04d862fcbcd4d4e19745d81b34994319b510a531c9d6df1491fae1e90b5d0764f0f1a827251ca8df5d613178b0eab01ef25 SHA512 43300af6d39c1e2221b0ed7318fe14c7464eeb6eb030ed1e22eb29b4ab17f014e2a4c8887c3a46ae5d243e3072da27f00f4e285498ae6f1288177d38d1108288 +DIST xsts-2004-01-14.tar.gz 2761085 BLAKE2B 41545995fb3a65d053257c376c07d45ffd1041a433bfbdb46d4dd87a5afb60c18c8629a3d988323f9e7a1d709775b5a7e5930276a7121c0725a22705c0976e36 SHA512 32854388d7e720ad67156baf50bf2bae7bd878ca3e35fd7e44e57cad3f434f69d56bbbedd61509f8a1faf01c9eae74a078df8fe130780b182c05c05cb1c39ebe diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libxml2/files/libxml2-2.9.2-disable-tests.patch b/sdk_container/src/third_party/portage-stable/dev-libs/libxml2/files/libxml2-2.9.2-disable-tests.patch deleted file mode 100644 index a231269b4b..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-libs/libxml2/files/libxml2-2.9.2-disable-tests.patch +++ /dev/null @@ -1,68 +0,0 @@ -do not build test programs as we don't install them - ---- a/Makefile.am -+++ b/Makefile.am -@@ -10,7 +10,7 @@ - - AM_CFLAGS = $(THREAD_CFLAGS) $(Z_CFLAGS) $(LZMA_CFLAGS) - --noinst_PROGRAMS=testSchemas testRelax testSAX testHTML testXPath testURI \ -+check_PROGRAMS=testSchemas testRelax testSAX testHTML testXPath testURI \ - testThreads testC14N testAutomata testRegexp \ - testReader testapi testModule runtest runsuite testchar \ - testdict runxmlconf testrecurse testlimits -@@ -170,7 +170,7 @@ - testModule_DEPENDENCIES = $(DEPS) - testModule_LDADD= $(LDADDS) - --noinst_LTLIBRARIES = testdso.la -+check_LTLIBRARIES = testdso.la - testdso_la_SOURCES = testdso.c - testdso_la_LDFLAGS = -module -no-undefined -avoid-version -rpath $(libdir) - -@@ -202,7 +202,7 @@ runxmlconf_LDADD= $(LDADDS) - #testOOM_DEPENDENCIES = $(DEPS) - #testOOM_LDADD= $(LDADDS) - --runtests: -+runtests: $(check_PROGRAMS) - [ -d test ] || $(LN_S) $(srcdir)/test . - [ -d result ] || $(LN_S) $(srcdir)/result . - $(CHECKER) ./runtest$(EXEEXT) && $(CHECKER) ./testrecurse$(EXEEXT) &&$(CHECKER) ./testapi$(EXEEXT) && $(CHECKER) ./testchar$(EXEEXT)&& $(CHECKER) ./testdict$(EXEEXT) && $(CHECKER) ./runxmlconf$(EXEEXT) ---- a/doc/examples/Makefile.am -+++ b/doc/examples/Makefile.am -@@ -13,7 +13,7 @@ - rebuild: examples.xml index.html - .PHONY: rebuild - --examples.xml: index.py $(noinst_PROGRAMS:=.c) -+examples.xml: index.py $(check_PROGRAMS:=.c) - cd $(srcdir) && $(PYTHON) index.py - $(MAKE) Makefile - -@@ -49,7 +49,7 @@ - xpath1.res \ - xpath2.res - --noinst_PROGRAMS = \ -+check_PROGRAMS = \ - io1 \ - io2 \ - parse1 \ -@@ -99,7 +99,7 @@ - valgrind: - $(MAKE) CHECKER='valgrind' tests - --tests: $(noinst_PROGRAMS) -+tests: $(check_PROGRAMS) - test -f Makefile.am || test -f test1.xml || $(LN_S) $(srcdir)/test?.xml . - @(echo '## examples regression tests') - @(echo > .memdump) ---- a/example/Makefile.am -+++ b/example/Makefile.am -@@ -1,4 +1,4 @@ --noinst_PROGRAMS = gjobread -+check_PROGRAMS = gjobread - - AM_CPPFLAGS = -I$(top_builddir)/include -I$(top_srcdir)/include -I$(srcdir)/include - AM_CFLAGS = $(THREAD_CFLAGS) $(Z_CFLAGS) diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libxml2/files/libxml2-2.9.4-CVE-2016-4658.patch b/sdk_container/src/third_party/portage-stable/dev-libs/libxml2/files/libxml2-2.9.4-CVE-2016-4658.patch deleted file mode 100644 index 2ef22ce7a0..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-libs/libxml2/files/libxml2-2.9.4-CVE-2016-4658.patch +++ /dev/null @@ -1,249 +0,0 @@ -From c1d1f7121194036608bf555f08d3062a36fd344b Mon Sep 17 00:00:00 2001 -From: Nick Wellnhofer -Date: Tue, 28 Jun 2016 18:34:52 +0200 -Subject: Disallow namespace nodes in XPointer ranges - -Namespace nodes must be copied to avoid use-after-free errors. -But they don't necessarily have a physical representation in a -document, so simply disallow them in XPointer ranges. - -Found with afl-fuzz. - -Fixes CVE-2016-4658. ---- - xpointer.c | 149 +++++++++++++++++++++++-------------------------------------- - 1 file changed, 56 insertions(+), 93 deletions(-) - -diff --git a/xpointer.c b/xpointer.c -index a7b03fb..694d120 100644 ---- a/xpointer.c -+++ b/xpointer.c -@@ -320,6 +320,45 @@ xmlXPtrRangesEqual(xmlXPathObjectPtr range1, xmlXPathObjectPtr range2) { - } - - /** -+ * xmlXPtrNewRangeInternal: -+ * @start: the starting node -+ * @startindex: the start index -+ * @end: the ending point -+ * @endindex: the ending index -+ * -+ * Internal function to create a new xmlXPathObjectPtr of type range -+ * -+ * Returns the newly created object. -+ */ -+static xmlXPathObjectPtr -+xmlXPtrNewRangeInternal(xmlNodePtr start, int startindex, -+ xmlNodePtr end, int endindex) { -+ xmlXPathObjectPtr ret; -+ -+ /* -+ * Namespace nodes must be copied (see xmlXPathNodeSetDupNs). -+ * Disallow them for now. -+ */ -+ if ((start != NULL) && (start->type == XML_NAMESPACE_DECL)) -+ return(NULL); -+ if ((end != NULL) && (end->type == XML_NAMESPACE_DECL)) -+ return(NULL); -+ -+ ret = (xmlXPathObjectPtr) xmlMalloc(sizeof(xmlXPathObject)); -+ if (ret == NULL) { -+ xmlXPtrErrMemory("allocating range"); -+ return(NULL); -+ } -+ memset(ret, 0, sizeof(xmlXPathObject)); -+ ret->type = XPATH_RANGE; -+ ret->user = start; -+ ret->index = startindex; -+ ret->user2 = end; -+ ret->index2 = endindex; -+ return(ret); -+} -+ -+/** - * xmlXPtrNewRange: - * @start: the starting node - * @startindex: the start index -@@ -344,17 +383,7 @@ xmlXPtrNewRange(xmlNodePtr start, int startindex, - if (endindex < 0) - return(NULL); - -- ret = (xmlXPathObjectPtr) xmlMalloc(sizeof(xmlXPathObject)); -- if (ret == NULL) { -- xmlXPtrErrMemory("allocating range"); -- return(NULL); -- } -- memset(ret, 0 , (size_t) sizeof(xmlXPathObject)); -- ret->type = XPATH_RANGE; -- ret->user = start; -- ret->index = startindex; -- ret->user2 = end; -- ret->index2 = endindex; -+ ret = xmlXPtrNewRangeInternal(start, startindex, end, endindex); - xmlXPtrRangeCheckOrder(ret); - return(ret); - } -@@ -381,17 +410,8 @@ xmlXPtrNewRangePoints(xmlXPathObjectPtr start, xmlXPathObjectPtr end) { - if (end->type != XPATH_POINT) - return(NULL); - -- ret = (xmlXPathObjectPtr) xmlMalloc(sizeof(xmlXPathObject)); -- if (ret == NULL) { -- xmlXPtrErrMemory("allocating range"); -- return(NULL); -- } -- memset(ret, 0 , (size_t) sizeof(xmlXPathObject)); -- ret->type = XPATH_RANGE; -- ret->user = start->user; -- ret->index = start->index; -- ret->user2 = end->user; -- ret->index2 = end->index; -+ ret = xmlXPtrNewRangeInternal(start->user, start->index, end->user, -+ end->index); - xmlXPtrRangeCheckOrder(ret); - return(ret); - } -@@ -416,17 +436,7 @@ xmlXPtrNewRangePointNode(xmlXPathObjectPtr start, xmlNodePtr end) { - if (start->type != XPATH_POINT) - return(NULL); - -- ret = (xmlXPathObjectPtr) xmlMalloc(sizeof(xmlXPathObject)); -- if (ret == NULL) { -- xmlXPtrErrMemory("allocating range"); -- return(NULL); -- } -- memset(ret, 0 , (size_t) sizeof(xmlXPathObject)); -- ret->type = XPATH_RANGE; -- ret->user = start->user; -- ret->index = start->index; -- ret->user2 = end; -- ret->index2 = -1; -+ ret = xmlXPtrNewRangeInternal(start->user, start->index, end, -1); - xmlXPtrRangeCheckOrder(ret); - return(ret); - } -@@ -453,17 +463,7 @@ xmlXPtrNewRangeNodePoint(xmlNodePtr start, xmlXPathObjectPtr end) { - if (end->type != XPATH_POINT) - return(NULL); - -- ret = (xmlXPathObjectPtr) xmlMalloc(sizeof(xmlXPathObject)); -- if (ret == NULL) { -- xmlXPtrErrMemory("allocating range"); -- return(NULL); -- } -- memset(ret, 0 , (size_t) sizeof(xmlXPathObject)); -- ret->type = XPATH_RANGE; -- ret->user = start; -- ret->index = -1; -- ret->user2 = end->user; -- ret->index2 = end->index; -+ ret = xmlXPtrNewRangeInternal(start, -1, end->user, end->index); - xmlXPtrRangeCheckOrder(ret); - return(ret); - } -@@ -486,17 +486,7 @@ xmlXPtrNewRangeNodes(xmlNodePtr start, xmlNodePtr end) { - if (end == NULL) - return(NULL); - -- ret = (xmlXPathObjectPtr) xmlMalloc(sizeof(xmlXPathObject)); -- if (ret == NULL) { -- xmlXPtrErrMemory("allocating range"); -- return(NULL); -- } -- memset(ret, 0 , (size_t) sizeof(xmlXPathObject)); -- ret->type = XPATH_RANGE; -- ret->user = start; -- ret->index = -1; -- ret->user2 = end; -- ret->index2 = -1; -+ ret = xmlXPtrNewRangeInternal(start, -1, end, -1); - xmlXPtrRangeCheckOrder(ret); - return(ret); - } -@@ -516,17 +506,7 @@ xmlXPtrNewCollapsedRange(xmlNodePtr start) { - if (start == NULL) - return(NULL); - -- ret = (xmlXPathObjectPtr) xmlMalloc(sizeof(xmlXPathObject)); -- if (ret == NULL) { -- xmlXPtrErrMemory("allocating range"); -- return(NULL); -- } -- memset(ret, 0 , (size_t) sizeof(xmlXPathObject)); -- ret->type = XPATH_RANGE; -- ret->user = start; -- ret->index = -1; -- ret->user2 = NULL; -- ret->index2 = -1; -+ ret = xmlXPtrNewRangeInternal(start, -1, NULL, -1); - return(ret); - } - -@@ -541,6 +521,8 @@ xmlXPtrNewCollapsedRange(xmlNodePtr start) { - */ - xmlXPathObjectPtr - xmlXPtrNewRangeNodeObject(xmlNodePtr start, xmlXPathObjectPtr end) { -+ xmlNodePtr endNode; -+ int endIndex; - xmlXPathObjectPtr ret; - - if (start == NULL) -@@ -549,7 +531,12 @@ xmlXPtrNewRangeNodeObject(xmlNodePtr start, xmlXPathObjectPtr end) { - return(NULL); - switch (end->type) { - case XPATH_POINT: -+ endNode = end->user; -+ endIndex = end->index; -+ break; - case XPATH_RANGE: -+ endNode = end->user2; -+ endIndex = end->index2; - break; - case XPATH_NODESET: - /* -@@ -557,39 +544,15 @@ xmlXPtrNewRangeNodeObject(xmlNodePtr start, xmlXPathObjectPtr end) { - */ - if (end->nodesetval->nodeNr <= 0) - return(NULL); -+ endNode = end->nodesetval->nodeTab[end->nodesetval->nodeNr - 1]; -+ endIndex = -1; - break; - default: - /* TODO */ - return(NULL); - } - -- ret = (xmlXPathObjectPtr) xmlMalloc(sizeof(xmlXPathObject)); -- if (ret == NULL) { -- xmlXPtrErrMemory("allocating range"); -- return(NULL); -- } -- memset(ret, 0 , (size_t) sizeof(xmlXPathObject)); -- ret->type = XPATH_RANGE; -- ret->user = start; -- ret->index = -1; -- switch (end->type) { -- case XPATH_POINT: -- ret->user2 = end->user; -- ret->index2 = end->index; -- break; -- case XPATH_RANGE: -- ret->user2 = end->user2; -- ret->index2 = end->index2; -- break; -- case XPATH_NODESET: { -- ret->user2 = end->nodesetval->nodeTab[end->nodesetval->nodeNr - 1]; -- ret->index2 = -1; -- break; -- } -- default: -- STRANGE -- return(NULL); -- } -+ ret = xmlXPtrNewRangeInternal(start, -1, endNode, endIndex); - xmlXPtrRangeCheckOrder(ret); - return(ret); - } --- -cgit v0.12 - diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libxml2/files/libxml2-2.9.4-CVE-2016-5131.patch b/sdk_container/src/third_party/portage-stable/dev-libs/libxml2/files/libxml2-2.9.4-CVE-2016-5131.patch deleted file mode 100644 index 9ce3fb9d87..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-libs/libxml2/files/libxml2-2.9.4-CVE-2016-5131.patch +++ /dev/null @@ -1,174 +0,0 @@ -From 9ab01a277d71f54d3143c2cf333c5c2e9aaedd9e Mon Sep 17 00:00:00 2001 -From: Nick Wellnhofer -Date: Tue, 28 Jun 2016 14:22:23 +0200 -Subject: Fix XPointer paths beginning with range-to - -The old code would invoke the broken xmlXPtrRangeToFunction. range-to -isn't really a function but a special kind of location step. Remove -this function and always handle range-to in the XPath code. - -The old xmlXPtrRangeToFunction could also be abused to trigger a -use-after-free error with the potential for remote code execution. - -Found with afl-fuzz. - -Fixes CVE-2016-5131. ---- - result/XPath/xptr/vidbase | 13 ++++++++ - test/XPath/xptr/vidbase | 1 + - xpath.c | 7 ++++- - xpointer.c | 76 ++++------------------------------------------- - 4 files changed, 26 insertions(+), 71 deletions(-) - -diff --git a/result/XPath/xptr/vidbase b/result/XPath/xptr/vidbase -index 8b9e92d..f19193e 100644 ---- a/result/XPath/xptr/vidbase -+++ b/result/XPath/xptr/vidbase -@@ -17,3 +17,16 @@ Object is a Location Set: - To node - ELEMENT p - -+ -+======================== -+Expression: xpointer(range-to(id('chapter2'))) -+Object is a Location Set: -+1 : Object is a range : -+ From node -+ / -+ To node -+ ELEMENT chapter -+ ATTRIBUTE id -+ TEXT -+ content=chapter2 -+ -diff --git a/test/XPath/xptr/vidbase b/test/XPath/xptr/vidbase -index b146383..884b106 100644 ---- a/test/XPath/xptr/vidbase -+++ b/test/XPath/xptr/vidbase -@@ -1,2 +1,3 @@ - xpointer(id('chapter1')/p) - xpointer(id('chapter1')/p[1]/range-to(following-sibling::p[2])) -+xpointer(range-to(id('chapter2'))) -diff --git a/xpath.c b/xpath.c -index d992841..5a01b1b 100644 ---- a/xpath.c -+++ b/xpath.c -@@ -10691,13 +10691,18 @@ xmlXPathCompPathExpr(xmlXPathParserContextPtr ctxt) { - lc = 1; - break; - } else if ((NXT(len) == '(')) { -- /* Note Type or Function */ -+ /* Node Type or Function */ - if (xmlXPathIsNodeType(name)) { - #ifdef DEBUG_STEP - xmlGenericError(xmlGenericErrorContext, - "PathExpr: Type search\n"); - #endif - lc = 1; -+#ifdef LIBXML_XPTR_ENABLED -+ } else if (ctxt->xptr && -+ xmlStrEqual(name, BAD_CAST "range-to")) { -+ lc = 1; -+#endif - } else { - #ifdef DEBUG_STEP - xmlGenericError(xmlGenericErrorContext, -diff --git a/xpointer.c b/xpointer.c -index 676c510..d74174a 100644 ---- a/xpointer.c -+++ b/xpointer.c -@@ -1332,8 +1332,6 @@ xmlXPtrNewContext(xmlDocPtr doc, xmlNodePtr here, xmlNodePtr origin) { - ret->here = here; - ret->origin = origin; - -- xmlXPathRegisterFunc(ret, (xmlChar *)"range-to", -- xmlXPtrRangeToFunction); - xmlXPathRegisterFunc(ret, (xmlChar *)"range", - xmlXPtrRangeFunction); - xmlXPathRegisterFunc(ret, (xmlChar *)"range-inside", -@@ -2243,76 +2241,14 @@ xmlXPtrRangeInsideFunction(xmlXPathParserContextPtr ctxt, int nargs) { - * @nargs: the number of args - * - * Implement the range-to() XPointer function -+ * -+ * Obsolete. range-to is not a real function but a special type of location -+ * step which is handled in xpath.c. - */ - void --xmlXPtrRangeToFunction(xmlXPathParserContextPtr ctxt, int nargs) { -- xmlXPathObjectPtr range; -- const xmlChar *cur; -- xmlXPathObjectPtr res, obj; -- xmlXPathObjectPtr tmp; -- xmlLocationSetPtr newset = NULL; -- xmlNodeSetPtr oldset; -- int i; -- -- if (ctxt == NULL) return; -- CHECK_ARITY(1); -- /* -- * Save the expression pointer since we will have to evaluate -- * it multiple times. Initialize the new set. -- */ -- CHECK_TYPE(XPATH_NODESET); -- obj = valuePop(ctxt); -- oldset = obj->nodesetval; -- ctxt->context->node = NULL; -- -- cur = ctxt->cur; -- newset = xmlXPtrLocationSetCreate(NULL); -- -- for (i = 0; i < oldset->nodeNr; i++) { -- ctxt->cur = cur; -- -- /* -- * Run the evaluation with a node list made of a single item -- * in the nodeset. -- */ -- ctxt->context->node = oldset->nodeTab[i]; -- tmp = xmlXPathNewNodeSet(ctxt->context->node); -- valuePush(ctxt, tmp); -- -- xmlXPathEvalExpr(ctxt); -- CHECK_ERROR; -- -- /* -- * The result of the evaluation need to be tested to -- * decided whether the filter succeeded or not -- */ -- res = valuePop(ctxt); -- range = xmlXPtrNewRangeNodeObject(oldset->nodeTab[i], res); -- if (range != NULL) { -- xmlXPtrLocationSetAdd(newset, range); -- } -- -- /* -- * Cleanup -- */ -- if (res != NULL) -- xmlXPathFreeObject(res); -- if (ctxt->value == tmp) { -- res = valuePop(ctxt); -- xmlXPathFreeObject(res); -- } -- -- ctxt->context->node = NULL; -- } -- -- /* -- * The result is used as the new evaluation set. -- */ -- xmlXPathFreeObject(obj); -- ctxt->context->node = NULL; -- ctxt->context->contextSize = -1; -- ctxt->context->proximityPosition = -1; -- valuePush(ctxt, xmlXPtrWrapLocationSet(newset)); -+xmlXPtrRangeToFunction(xmlXPathParserContextPtr ctxt, -+ int nargs ATTRIBUTE_UNUSED) { -+ XP_ERROR(XPATH_EXPR_ERROR); - } - - /** --- -cgit v0.12 - diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libxml2/files/libxml2-2.9.4-CVE-2016-9318.patch b/sdk_container/src/third_party/portage-stable/dev-libs/libxml2/files/libxml2-2.9.4-CVE-2016-9318.patch deleted file mode 100644 index 5d1adb014a..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-libs/libxml2/files/libxml2-2.9.4-CVE-2016-9318.patch +++ /dev/null @@ -1,202 +0,0 @@ -From 292be65a52ab9e0eb3a53b4e0be5a57bc6de59d3 Mon Sep 17 00:00:00 2001 -From: Doran Moppert -Date: Fri, 7 Apr 2017 16:45:56 +0200 -Subject: [PATCH 6/7] Add an XML_PARSE_NOXXE flag to block all entities loading - even local - -For https://bugzilla.gnome.org/show_bug.cgi?id=772726 - -* include/libxml/parser.h: Add a new parser flag XML_PARSE_NOXXE -* elfgcchack.h, xmlIO.h, xmlIO.c: associated loading routine -* include/libxml/xmlerror.h: new error raised -* xmllint.c: adds --noxxe flag to activate the option ---- - elfgcchack.h | 10 ++++++++++ - include/libxml/parser.h | 3 ++- - include/libxml/xmlIO.h | 8 ++++++++ - include/libxml/xmlerror.h | 1 + - parser.c | 4 ++++ - xmlIO.c | 40 +++++++++++++++++++++++++++++++++++----- - xmllint.c | 5 +++++ - 7 files changed, 65 insertions(+), 6 deletions(-) - -diff --git a/elfgcchack.h b/elfgcchack.h -index 8c52884a..1b81dcde 100644 ---- a/elfgcchack.h -+++ b/elfgcchack.h -@@ -6547,6 +6547,16 @@ extern __typeof (xmlNoNetExternalEntityLoader) xmlNoNetExternalEntityLoader__int - #endif - #endif - -+#ifdef bottom_xmlIO -+#undef xmlNoXxeExternalEntityLoader -+extern __typeof (xmlNoXxeExternalEntityLoader) xmlNoXxeExternalEntityLoader __attribute((alias("xmlNoXxeExternalEntityLoader__internal_alias"))); -+#else -+#ifndef xmlNoXxeExternalEntityLoader -+extern __typeof (xmlNoXxeExternalEntityLoader) xmlNoXxeExternalEntityLoader__internal_alias __attribute((visibility("hidden"))); -+#define xmlNoXxeExternalEntityLoader xmlNoXxeExternalEntityLoader__internal_alias -+#endif -+#endif -+ - #ifdef bottom_tree - #undef xmlNodeAddContent - extern __typeof (xmlNodeAddContent) xmlNodeAddContent __attribute((alias("xmlNodeAddContent__internal_alias"))); -diff --git a/include/libxml/parser.h b/include/libxml/parser.h -index 47fbec03..63ca1b97 100644 ---- a/include/libxml/parser.h -+++ b/include/libxml/parser.h -@@ -1111,7 +1111,8 @@ typedef enum { - XML_PARSE_HUGE = 1<<19,/* relax any hardcoded limit from the parser */ - XML_PARSE_OLDSAX = 1<<20,/* parse using SAX2 interface before 2.7.0 */ - XML_PARSE_IGNORE_ENC= 1<<21,/* ignore internal document encoding hint */ -- XML_PARSE_BIG_LINES = 1<<22 /* Store big lines numbers in text PSVI field */ -+ XML_PARSE_BIG_LINES = 1<<22,/* Store big lines numbers in text PSVI field */ -+ XML_PARSE_NOXXE = 1<<23 /* Forbid any external entity loading */ - } xmlParserOption; - - XMLPUBFUN void XMLCALL -diff --git a/include/libxml/xmlIO.h b/include/libxml/xmlIO.h -index 3e41744d..8d3fdef5 100644 ---- a/include/libxml/xmlIO.h -+++ b/include/libxml/xmlIO.h -@@ -299,6 +299,14 @@ XMLPUBFUN xmlParserInputPtr XMLCALL - const char *ID, - xmlParserCtxtPtr ctxt); - -+/* -+ * A predefined entity loader external entity expansion -+ */ -+XMLPUBFUN xmlParserInputPtr XMLCALL -+ xmlNoXxeExternalEntityLoader (const char *URL, -+ const char *ID, -+ xmlParserCtxtPtr ctxt); -+ - /* - * xmlNormalizeWindowsPath is obsolete, don't use it. - * Check xmlCanonicPath in uri.h for a better alternative. -diff --git a/include/libxml/xmlerror.h b/include/libxml/xmlerror.h -index 037c16d5..3036062d 100644 ---- a/include/libxml/xmlerror.h -+++ b/include/libxml/xmlerror.h -@@ -470,6 +470,7 @@ typedef enum { - XML_IO_EADDRINUSE, /* 1554 */ - XML_IO_EALREADY, /* 1555 */ - XML_IO_EAFNOSUPPORT, /* 1556 */ -+ XML_IO_ILLEGAL_XXE, /* 1557 */ - XML_XINCLUDE_RECURSION=1600, - XML_XINCLUDE_PARSE_VALUE, /* 1601 */ - XML_XINCLUDE_ENTITY_DEF_MISMATCH, /* 1602 */ -diff --git a/parser.c b/parser.c -index b832406a..8e11c127 100644 ---- a/parser.c -+++ b/parser.c -@@ -15352,6 +15352,10 @@ xmlCtxtUseOptionsInternal(xmlParserCtxtPtr ctxt, int options, const char *encodi - ctxt->options |= XML_PARSE_NONET; - options -= XML_PARSE_NONET; - } -+ if (options & XML_PARSE_NOXXE) { -+ ctxt->options |= XML_PARSE_NOXXE; -+ options -= XML_PARSE_NOXXE; -+ } - if (options & XML_PARSE_COMPACT) { - ctxt->options |= XML_PARSE_COMPACT; - options -= XML_PARSE_COMPACT; -diff --git a/xmlIO.c b/xmlIO.c -index 6e61f45a..34881461 100644 ---- a/xmlIO.c -+++ b/xmlIO.c -@@ -212,6 +212,7 @@ static const char *IOerr[] = { - "adddress in use", /* EADDRINUSE */ - "already in use", /* EALREADY */ - "unknown address familly", /* EAFNOSUPPORT */ -+ "Attempt to load external entity %s", /* XML_IO_ILLEGAL_XXE */ - }; - - #if defined(_WIN32) || defined (__DJGPP__) && !defined (__CYGWIN__) -@@ -4057,13 +4058,22 @@ xmlDefaultExternalEntityLoader(const char *URL, const char *ID, - xmlGenericError(xmlGenericErrorContext, - "xmlDefaultExternalEntityLoader(%s, xxx)\n", URL); - #endif -- if ((ctxt != NULL) && (ctxt->options & XML_PARSE_NONET)) { -+ if (ctxt != NULL) { - int options = ctxt->options; - -- ctxt->options -= XML_PARSE_NONET; -- ret = xmlNoNetExternalEntityLoader(URL, ID, ctxt); -- ctxt->options = options; -- return(ret); -+ if (options & XML_PARSE_NOXXE) { -+ ctxt->options -= XML_PARSE_NOXXE; -+ ret = xmlNoXxeExternalEntityLoader(URL, ID, ctxt); -+ ctxt->options = options; -+ return(ret); -+ } -+ -+ if (options & XML_PARSE_NONET) { -+ ctxt->options -= XML_PARSE_NONET; -+ ret = xmlNoNetExternalEntityLoader(URL, ID, ctxt); -+ ctxt->options = options; -+ return(ret); -+ } - } - #ifdef LIBXML_CATALOG_ENABLED - resource = xmlResolveResourceFromCatalog(URL, ID, ctxt); -@@ -4164,6 +4174,13 @@ xmlNoNetExternalEntityLoader(const char *URL, const char *ID, - xmlParserInputPtr input = NULL; - xmlChar *resource = NULL; - -+ if (ctxt == NULL) { -+ return(NULL); -+ } -+ if (ctxt->input_id == 1) { -+ return xmlDefaultExternalEntityLoader((const char *) URL, ID, ctxt); -+ } -+ - #ifdef LIBXML_CATALOG_ENABLED - resource = xmlResolveResourceFromCatalog(URL, ID, ctxt); - #endif -@@ -4186,5 +4203,18 @@ xmlNoNetExternalEntityLoader(const char *URL, const char *ID, - return(input); - } - -+xmlParserInputPtr -+xmlNoXxeExternalEntityLoader(const char *URL, const char *ID, -+ xmlParserCtxtPtr ctxt) { -+ if (ctxt == NULL) { -+ return(NULL); -+ } -+ if (ctxt->input_id == 1) { -+ return xmlDefaultExternalEntityLoader((const char *) URL, ID, ctxt); -+ } -+ xmlIOErr(XML_IO_ILLEGAL_XXE, (const char *) URL); -+ return(NULL); -+} -+ - #define bottom_xmlIO - #include "elfgcchack.h" -diff --git a/xmllint.c b/xmllint.c -index f8eb7ec4..8f304cda 100644 ---- a/xmllint.c -+++ b/xmllint.c -@@ -3019,6 +3019,7 @@ static void usage(const char *name) { - printf("\t--path 'paths': provide a set of paths for resources\n"); - printf("\t--load-trace : print trace of all external entities loaded\n"); - printf("\t--nonet : refuse to fetch DTDs or entities over network\n"); -+ printf("\t--noxxe : forbid any external entity loading\n"); - printf("\t--nocompact : do not generate compact text nodes\n"); - printf("\t--htmlout : output results as HTML\n"); - printf("\t--nowrap : do not put HTML doc wrapper\n"); -@@ -3461,6 +3462,10 @@ main(int argc, char **argv) { - (!strcmp(argv[i], "--nonet"))) { - options |= XML_PARSE_NONET; - xmlSetExternalEntityLoader(xmlNoNetExternalEntityLoader); -+ } else if ((!strcmp(argv[i], "-noxxe")) || -+ (!strcmp(argv[i], "--noxxe"))) { -+ options |= XML_PARSE_NOXXE; -+ xmlSetExternalEntityLoader(xmlNoXxeExternalEntityLoader); - } else if ((!strcmp(argv[i], "-nocompact")) || - (!strcmp(argv[i], "--nocompact"))) { - options &= ~XML_PARSE_COMPACT; --- -2.14.1 - diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libxml2/files/libxml2-2.9.4-CVE-2017-0663.patch b/sdk_container/src/third_party/portage-stable/dev-libs/libxml2/files/libxml2-2.9.4-CVE-2017-0663.patch deleted file mode 100644 index 517e178a53..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-libs/libxml2/files/libxml2-2.9.4-CVE-2017-0663.patch +++ /dev/null @@ -1,43 +0,0 @@ -From d815758b6a8c9dee8155268e49b5ef3b80135a14 Mon Sep 17 00:00:00 2001 -From: Nick Wellnhofer -Date: Tue, 6 Jun 2017 12:56:28 +0200 -Subject: [PATCH 1/3] Fix type confusion in xmlValidateOneNamespace - -Comment out code that casts xmlNsPtr to xmlAttrPtr. ID types on -namespace declarations make no practical sense anyway. - -Fixes bug 780228. - -Found with libFuzzer and ASan. ---- - valid.c | 7 +++++++ - 1 file changed, 7 insertions(+) - -diff --git a/valid.c b/valid.c -index 8075d3a0..c51ea290 100644 ---- a/valid.c -+++ b/valid.c -@@ -4627,6 +4627,12 @@ xmlNodePtr elem, const xmlChar *prefix, xmlNsPtr ns, const xmlChar *value) { - } - } - -+ /* -+ * Casting ns to xmlAttrPtr is wrong. We'd need separate functions -+ * xmlAddID and xmlAddRef for namespace declarations, but it makes -+ * no practical sense to use ID types anyway. -+ */ -+#if 0 - /* Validity Constraint: ID uniqueness */ - if (attrDecl->atype == XML_ATTRIBUTE_ID) { - if (xmlAddID(ctxt, doc, value, (xmlAttrPtr) ns) == NULL) -@@ -4638,6 +4644,7 @@ xmlNodePtr elem, const xmlChar *prefix, xmlNsPtr ns, const xmlChar *value) { - if (xmlAddRef(ctxt, doc, value, (xmlAttrPtr) ns) == NULL) - ret = 0; - } -+#endif - - /* Validity Constraint: Notation Attributes */ - if (attrDecl->atype == XML_ATTRIBUTE_NOTATION) { --- -2.14.1 - diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libxml2/files/libxml2-2.9.4-CVE-2017-5969.patch b/sdk_container/src/third_party/portage-stable/dev-libs/libxml2/files/libxml2-2.9.4-CVE-2017-5969.patch deleted file mode 100644 index 4d1362f2f9..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-libs/libxml2/files/libxml2-2.9.4-CVE-2017-5969.patch +++ /dev/null @@ -1,63 +0,0 @@ -From 8952ce48a5fa1d3de1f087f10e8b6e47bb59f4e3 Mon Sep 17 00:00:00 2001 -From: Daniel Veillard -Date: Wed, 7 Jun 2017 16:47:36 +0200 -Subject: [PATCH 1/7] Fix NULL pointer deref in xmlDumpElementContent - -Can only be triggered in recovery mode. - -Fixes bug 758422 (CVE-2017-5969). ---- - valid.c | 24 ++++++++++++++---------- - 1 file changed, 14 insertions(+), 10 deletions(-) - -diff --git a/valid.c b/valid.c -index 19f84b82..0a8e58ab 100644 ---- a/valid.c -+++ b/valid.c -@@ -1172,29 +1172,33 @@ xmlDumpElementContent(xmlBufferPtr buf, xmlElementContentPtr content, int glob) - xmlBufferWriteCHAR(buf, content->name); - break; - case XML_ELEMENT_CONTENT_SEQ: -- if ((content->c1->type == XML_ELEMENT_CONTENT_OR) || -- (content->c1->type == XML_ELEMENT_CONTENT_SEQ)) -+ if ((content->c1 != NULL) && -+ ((content->c1->type == XML_ELEMENT_CONTENT_OR) || -+ (content->c1->type == XML_ELEMENT_CONTENT_SEQ))) - xmlDumpElementContent(buf, content->c1, 1); - else - xmlDumpElementContent(buf, content->c1, 0); - xmlBufferWriteChar(buf, " , "); -- if ((content->c2->type == XML_ELEMENT_CONTENT_OR) || -- ((content->c2->type == XML_ELEMENT_CONTENT_SEQ) && -- (content->c2->ocur != XML_ELEMENT_CONTENT_ONCE))) -+ if ((content->c2 != NULL) && -+ ((content->c2->type == XML_ELEMENT_CONTENT_OR) || -+ ((content->c2->type == XML_ELEMENT_CONTENT_SEQ) && -+ (content->c2->ocur != XML_ELEMENT_CONTENT_ONCE)))) - xmlDumpElementContent(buf, content->c2, 1); - else - xmlDumpElementContent(buf, content->c2, 0); - break; - case XML_ELEMENT_CONTENT_OR: -- if ((content->c1->type == XML_ELEMENT_CONTENT_OR) || -- (content->c1->type == XML_ELEMENT_CONTENT_SEQ)) -+ if ((content->c1 != NULL) && -+ ((content->c1->type == XML_ELEMENT_CONTENT_OR) || -+ (content->c1->type == XML_ELEMENT_CONTENT_SEQ))) - xmlDumpElementContent(buf, content->c1, 1); - else - xmlDumpElementContent(buf, content->c1, 0); - xmlBufferWriteChar(buf, " | "); -- if ((content->c2->type == XML_ELEMENT_CONTENT_SEQ) || -- ((content->c2->type == XML_ELEMENT_CONTENT_OR) && -- (content->c2->ocur != XML_ELEMENT_CONTENT_ONCE))) -+ if ((content->c2 != NULL) && -+ ((content->c2->type == XML_ELEMENT_CONTENT_SEQ) || -+ ((content->c2->type == XML_ELEMENT_CONTENT_OR) && -+ (content->c2->ocur != XML_ELEMENT_CONTENT_ONCE)))) - xmlDumpElementContent(buf, content->c2, 1); - else - xmlDumpElementContent(buf, content->c2, 0); --- -2.14.1 - diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libxml2/files/libxml2-2.9.4-CVE-2017-7375.patch b/sdk_container/src/third_party/portage-stable/dev-libs/libxml2/files/libxml2-2.9.4-CVE-2017-7375.patch deleted file mode 100644 index db9d597ad7..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-libs/libxml2/files/libxml2-2.9.4-CVE-2017-7375.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 9ea49a06b9421b6a3a9c243fb1ec23b19bd6b049 Mon Sep 17 00:00:00 2001 -From: Neel Mehta -Date: Fri, 7 Apr 2017 17:43:02 +0200 -Subject: [PATCH 7/7] Prevent unwanted external entity reference - -For https://bugzilla.gnome.org/show_bug.cgi?id=780691 - -* parser.c: add a specific check to avoid PE reference ---- - parser.c | 9 +++++++++ - 1 file changed, 9 insertions(+) - -diff --git a/parser.c b/parser.c -index 8e11c127..e8e962bb 100644 ---- a/parser.c -+++ b/parser.c -@@ -8125,6 +8125,15 @@ xmlParsePEReference(xmlParserCtxtPtr ctxt) - if (xmlPushInput(ctxt, input) < 0) - return; - } else { -+ if ((entity->etype == XML_EXTERNAL_PARAMETER_ENTITY) && -+ ((ctxt->options & XML_PARSE_NOENT) == 0) && -+ ((ctxt->options & XML_PARSE_DTDVALID) == 0) && -+ ((ctxt->options & XML_PARSE_DTDLOAD) == 0) && -+ ((ctxt->options & XML_PARSE_DTDATTR) == 0) && -+ (ctxt->replaceEntities == 0) && -+ (ctxt->validate == 0)) -+ return; -+ - /* - * TODO !!! - * handle the extra spaces added before and after --- -2.14.1 - diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libxml2/files/libxml2-2.9.4-CVE-2017-7376.patch b/sdk_container/src/third_party/portage-stable/dev-libs/libxml2/files/libxml2-2.9.4-CVE-2017-7376.patch deleted file mode 100644 index 14ec773608..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-libs/libxml2/files/libxml2-2.9.4-CVE-2017-7376.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 43cd3b6222bda2332e963eb1c9ead78f29912b0a Mon Sep 17 00:00:00 2001 -From: Daniel Veillard -Date: Fri, 7 Apr 2017 17:13:28 +0200 -Subject: [PATCH 2/3] Increase buffer space for port in HTTP redirect support - -For https://bugzilla.gnome.org/show_bug.cgi?id=780690 - -nanohttp.c: the code wrongly assumed a short int port value. ---- - nanohttp.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/nanohttp.c b/nanohttp.c -index 26e4290e..9c17530e 100644 ---- a/nanohttp.c -+++ b/nanohttp.c -@@ -1423,9 +1423,9 @@ retry: - if (ctxt->port != 80) { - /* reserve space for ':xxxxx', incl. potential proxy */ - if (proxy) -- blen += 12; -+ blen += 17; - else -- blen += 6; -+ blen += 11; - } - bp = (char*)xmlMallocAtomic(blen); - if ( bp == NULL ) { --- -2.14.1 - diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libxml2/files/libxml2-2.9.4-CVE-2017-9047-9048.patch b/sdk_container/src/third_party/portage-stable/dev-libs/libxml2/files/libxml2-2.9.4-CVE-2017-9047-9048.patch deleted file mode 100644 index f7c48cd877..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-libs/libxml2/files/libxml2-2.9.4-CVE-2017-9047-9048.patch +++ /dev/null @@ -1,116 +0,0 @@ -From 839b89e678b5265a0e6b0477410e64fac669d578 Mon Sep 17 00:00:00 2001 -From: Nick Wellnhofer -Date: Sat, 3 Jun 2017 02:01:29 +0200 -Subject: [PATCH 4/7] Fix buffer size checks in xmlSnprintfElementContent -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -xmlSnprintfElementContent failed to correctly check the available -buffer space in two locations. - -Fixes bug 781333 (CVE-2017-9047) and bug 781701 (CVE-2017-9048). - -Thanks to Marcel Böhme and Thuan Pham for the report. ---- - result/valid/781333.xml | 5 +++++ - result/valid/781333.xml.err | 3 +++ - result/valid/781333.xml.err.rdr | 6 ++++++ - test/valid/781333.xml | 4 ++++ - valid.c | 20 +++++++++++--------- - 5 files changed, 29 insertions(+), 9 deletions(-) - create mode 100644 result/valid/781333.xml - create mode 100644 result/valid/781333.xml.err - create mode 100644 result/valid/781333.xml.err.rdr - create mode 100644 test/valid/781333.xml - -diff --git a/result/valid/781333.xml b/result/valid/781333.xml -new file mode 100644 -index 00000000..45dc451d ---- /dev/null -+++ b/result/valid/781333.xml -@@ -0,0 +1,5 @@ -+ -+ -+]> -+ -diff --git a/result/valid/781333.xml.err b/result/valid/781333.xml.err -new file mode 100644 -index 00000000..b401b49a ---- /dev/null -+++ b/result/valid/781333.xml.err -@@ -0,0 +1,3 @@ -+./test/valid/781333.xml:4: element a: validity error : Element a content does not follow the DTD, expecting ( ..., got -+ -+ ^ -diff --git a/result/valid/781333.xml.err.rdr b/result/valid/781333.xml.err.rdr -new file mode 100644 -index 00000000..5ff56992 ---- /dev/null -+++ b/result/valid/781333.xml.err.rdr -@@ -0,0 +1,6 @@ -+./test/valid/781333.xml:4: element a: validity error : Element a content does not follow the DTD, expecting ( ..., got -+ -+ ^ -+./test/valid/781333.xml:5: element a: validity error : Element a content does not follow the DTD, Expecting more child -+ -+^ -diff --git a/test/valid/781333.xml b/test/valid/781333.xml -new file mode 100644 -index 00000000..b29e5a68 ---- /dev/null -+++ b/test/valid/781333.xml -@@ -0,0 +1,4 @@ -+ -+]> -+ -diff --git a/valid.c b/valid.c -index 0a8e58ab..8075d3a0 100644 ---- a/valid.c -+++ b/valid.c -@@ -1266,22 +1266,23 @@ xmlSnprintfElementContent(char *buf, int size, xmlElementContentPtr content, int - case XML_ELEMENT_CONTENT_PCDATA: - strcat(buf, "#PCDATA"); - break; -- case XML_ELEMENT_CONTENT_ELEMENT: -+ case XML_ELEMENT_CONTENT_ELEMENT: { -+ int qnameLen = xmlStrlen(content->name); -+ -+ if (content->prefix != NULL) -+ qnameLen += xmlStrlen(content->prefix) + 1; -+ if (size - len < qnameLen + 10) { -+ strcat(buf, " ..."); -+ return; -+ } - if (content->prefix != NULL) { -- if (size - len < xmlStrlen(content->prefix) + 10) { -- strcat(buf, " ..."); -- return; -- } - strcat(buf, (char *) content->prefix); - strcat(buf, ":"); - } -- if (size - len < xmlStrlen(content->name) + 10) { -- strcat(buf, " ..."); -- return; -- } - if (content->name != NULL) - strcat(buf, (char *) content->name); - break; -+ } - case XML_ELEMENT_CONTENT_SEQ: - if ((content->c1->type == XML_ELEMENT_CONTENT_OR) || - (content->c1->type == XML_ELEMENT_CONTENT_SEQ)) -@@ -1323,6 +1324,7 @@ xmlSnprintfElementContent(char *buf, int size, xmlElementContentPtr content, int - xmlSnprintfElementContent(buf, size, content->c2, 0); - break; - } -+ if (size - strlen(buf) <= 2) return; - if (englob) - strcat(buf, ")"); - switch (content->ocur) { --- -2.14.1 - diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libxml2/files/libxml2-2.9.4-CVE-2017-9049-9050.patch b/sdk_container/src/third_party/portage-stable/dev-libs/libxml2/files/libxml2-2.9.4-CVE-2017-9049-9050.patch deleted file mode 100644 index abf43ef981..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-libs/libxml2/files/libxml2-2.9.4-CVE-2017-9049-9050.patch +++ /dev/null @@ -1,316 +0,0 @@ -From 9c95d1b7f3951efe09df66ec41d7b19d6283084d Mon Sep 17 00:00:00 2001 -From: Nick Wellnhofer -Date: Mon, 5 Jun 2017 15:37:17 +0200 -Subject: [PATCH 3/7] Fix handling of parameter-entity references -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -There were two bugs where parameter-entity references could lead to an -unexpected change of the input buffer in xmlParseNameComplex and -xmlDictLookup being called with an invalid pointer. - -Percent sign in DTD Names -========================= - -The NEXTL macro used to call xmlParserHandlePEReference. When parsing -"complex" names inside the DTD, this could result in entity expansion -which created a new input buffer. The fix is to simply remove the call -to xmlParserHandlePEReference from the NEXTL macro. This is safe because -no users of the macro require expansion of parameter entities. - -- xmlParseNameComplex -- xmlParseNCNameComplex -- xmlParseNmtoken - -The percent sign is not allowed in names, which are grammatical tokens. - -- xmlParseEntityValue - -Parameter-entity references in entity values are expanded but this -happens in a separate step in this function. - -- xmlParseSystemLiteral - -Parameter-entity references are ignored in the system literal. - -- xmlParseAttValueComplex -- xmlParseCharDataComplex -- xmlParseCommentComplex -- xmlParsePI -- xmlParseCDSect - -Parameter-entity references are ignored outside the DTD. - -- xmlLoadEntityContent - -This function is only called from xmlStringLenDecodeEntities and -entities are replaced in a separate step immediately after the function -call. - -This bug could also be triggered with an internal subset and double -entity expansion. - -This fixes bug 766956 initially reported by Wei Lei and independently by -Chromium's ClusterFuzz, Hanno Böck, and Marco Grassi. Thanks to everyone -involved. - -xmlParseNameComplex with XML_PARSE_OLD10 -======================================== - -When parsing Names inside an expanded parameter entity with the -XML_PARSE_OLD10 option, xmlParseNameComplex would call xmlGROW via the -GROW macro if the input buffer was exhausted. At the end of the -parameter entity's replacement text, this function would then call -xmlPopInput which invalidated the input buffer. - -There should be no need to invoke GROW in this situation because the -buffer is grown periodically every XML_PARSER_CHUNK_SIZE characters and, -at least for UTF-8, in xmlCurrentChar. This also matches the code path -executed when XML_PARSE_OLD10 is not set. - -This fixes bugs 781205 (CVE-2017-9049) and 781361 (CVE-2017-9050). -Thanks to Marcel Böhme and Thuan Pham for the report. - -Additional hardening -==================== - -A separate check was added in xmlParseNameComplex to validate the -buffer size. ---- - Makefile.am | 18 ++++++++++++++++++ - parser.c | 18 ++++++++++-------- - result/errors10/781205.xml | 0 - result/errors10/781205.xml.err | 21 +++++++++++++++++++++ - result/errors10/781361.xml | 0 - result/errors10/781361.xml.err | 13 +++++++++++++ - result/valid/766956.xml | 0 - result/valid/766956.xml.err | 9 +++++++++ - result/valid/766956.xml.err.rdr | 10 ++++++++++ - runtest.c | 3 +++ - test/errors10/781205.xml | 3 +++ - test/errors10/781361.xml | 3 +++ - test/valid/766956.xml | 2 ++ - test/valid/dtds/766956.dtd | 2 ++ - 14 files changed, 94 insertions(+), 8 deletions(-) - create mode 100644 result/errors10/781205.xml - create mode 100644 result/errors10/781205.xml.err - create mode 100644 result/errors10/781361.xml - create mode 100644 result/errors10/781361.xml.err - create mode 100644 result/valid/766956.xml - create mode 100644 result/valid/766956.xml.err - create mode 100644 result/valid/766956.xml.err.rdr - create mode 100644 test/errors10/781205.xml - create mode 100644 test/errors10/781361.xml - create mode 100644 test/valid/766956.xml - create mode 100644 test/valid/dtds/766956.dtd - -diff --git a/Makefile.am b/Makefile.am -index 3b52bae7..bf20124e 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -422,6 +422,24 @@ Errtests : xmllint$(EXEEXT) - if [ -n "$$log" ] ; then echo $$name result ; echo $$log ; fi ; \ - rm result.$$name error.$$name ; \ - fi ; fi ; done) -+ @echo "## Error cases regression tests (old 1.0)" -+ -@(for i in $(srcdir)/test/errors10/*.xml ; do \ -+ name=`basename $$i`; \ -+ if [ ! -d $$i ] ; then \ -+ if [ ! -f $(srcdir)/result/errors10/$$name ] ; then \ -+ echo New test file $$name ; \ -+ $(CHECKER) $(top_builddir)/xmllint --oldxml10 $$i \ -+ 2> $(srcdir)/result/errors10/$$name.err \ -+ > $(srcdir)/result/errors10/$$name ; \ -+ grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0"; \ -+ else \ -+ log=`$(CHECKER) $(top_builddir)/xmllint --oldxml10 $$i 2> error.$$name > result.$$name ; \ -+ grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0"; \ -+ diff $(srcdir)/result/errors10/$$name result.$$name ; \ -+ diff $(srcdir)/result/errors10/$$name.err error.$$name` ; \ -+ if [ -n "$$log" ] ; then echo $$name result ; echo "$$log" ; fi ; \ -+ rm result.$$name error.$$name ; \ -+ fi ; fi ; done) - @echo "## Error cases stream regression tests" - -@(for i in $(srcdir)/test/errors/*.xml ; do \ - name=`basename $$i`; \ -diff --git a/parser.c b/parser.c -index 53a6b7f0..b832406a 100644 ---- a/parser.c -+++ b/parser.c -@@ -2115,7 +2115,6 @@ static void xmlGROW (xmlParserCtxtPtr ctxt) { - ctxt->input->line++; ctxt->input->col = 1; \ - } else ctxt->input->col++; \ - ctxt->input->cur += l; \ -- if (*ctxt->input->cur == '%') xmlParserHandlePEReference(ctxt); \ - } while (0) - - #define CUR_CHAR(l) xmlCurrentChar(ctxt, &l) -@@ -3406,13 +3405,6 @@ xmlParseNameComplex(xmlParserCtxtPtr ctxt) { - len += l; - NEXTL(l); - c = CUR_CHAR(l); -- if (c == 0) { -- count = 0; -- GROW; -- if (ctxt->instate == XML_PARSER_EOF) -- return(NULL); -- c = CUR_CHAR(l); -- } - } - } - if ((len > XML_MAX_NAME_LENGTH) && -@@ -3420,6 +3412,16 @@ xmlParseNameComplex(xmlParserCtxtPtr ctxt) { - xmlFatalErr(ctxt, XML_ERR_NAME_TOO_LONG, "Name"); - return(NULL); - } -+ if (ctxt->input->cur - ctxt->input->base < len) { -+ /* -+ * There were a couple of bugs where PERefs lead to to a change -+ * of the buffer. Check the buffer size to avoid passing an invalid -+ * pointer to xmlDictLookup. -+ */ -+ xmlFatalErr(ctxt, XML_ERR_INTERNAL_ERROR, -+ "unexpected change of input buffer"); -+ return (NULL); -+ } - if ((*ctxt->input->cur == '\n') && (ctxt->input->cur[-1] == '\r')) - return(xmlDictLookup(ctxt->dict, ctxt->input->cur - (len + 1), len)); - return(xmlDictLookup(ctxt->dict, ctxt->input->cur - len, len)); -diff --git a/result/errors10/781205.xml b/result/errors10/781205.xml -new file mode 100644 -index 00000000..e69de29b -diff --git a/result/errors10/781205.xml.err b/result/errors10/781205.xml.err -new file mode 100644 -index 00000000..da15c3f7 ---- /dev/null -+++ b/result/errors10/781205.xml.err -@@ -0,0 +1,21 @@ -+Entity: line 1: parser error : internal error: xmlParseInternalSubset: error detected in Markup declaration -+ -+ %a; -+ ^ -+Entity: line 1: -+<:0000 -+^ -+Entity: line 1: parser error : DOCTYPE improperly terminated -+ %a; -+ ^ -+Entity: line 1: -+<:0000 -+^ -+namespace error : Failed to parse QName ':0000' -+ %a; -+ ^ -+<:0000 -+ ^ -+./test/errors10/781205.xml:4: parser error : Couldn't find end of Start Tag :0000 line 1 -+ -+^ -diff --git a/result/errors10/781361.xml b/result/errors10/781361.xml -new file mode 100644 -index 00000000..e69de29b -diff --git a/result/errors10/781361.xml.err b/result/errors10/781361.xml.err -new file mode 100644 -index 00000000..655f41a2 ---- /dev/null -+++ b/result/errors10/781361.xml.err -@@ -0,0 +1,13 @@ -+./test/errors10/781361.xml:4: parser error : xmlParseElementDecl: 'EMPTY', 'ANY' or '(' expected -+ -+^ -+./test/errors10/781361.xml:4: parser error : internal error: xmlParseInternalSubset: error detected in Markup declaration -+ -+ -+^ -+./test/errors10/781361.xml:4: parser error : DOCTYPE improperly terminated -+ -+^ -+./test/errors10/781361.xml:4: parser error : Start tag expected, '<' not found -+ -+^ -diff --git a/result/valid/766956.xml b/result/valid/766956.xml -new file mode 100644 -index 00000000..e69de29b -diff --git a/result/valid/766956.xml.err b/result/valid/766956.xml.err -new file mode 100644 -index 00000000..34b1dae6 ---- /dev/null -+++ b/result/valid/766956.xml.err -@@ -0,0 +1,9 @@ -+test/valid/dtds/766956.dtd:2: parser error : PEReference: expecting ';' -+%ä%ent; -+ ^ -+Entity: line 1: parser error : Content error in the external subset -+ %ent; -+ ^ -+Entity: line 1: -+value -+^ -diff --git a/result/valid/766956.xml.err.rdr b/result/valid/766956.xml.err.rdr -new file mode 100644 -index 00000000..77603462 ---- /dev/null -+++ b/result/valid/766956.xml.err.rdr -@@ -0,0 +1,10 @@ -+test/valid/dtds/766956.dtd:2: parser error : PEReference: expecting ';' -+%ä%ent; -+ ^ -+Entity: line 1: parser error : Content error in the external subset -+ %ent; -+ ^ -+Entity: line 1: -+value -+^ -+./test/valid/766956.xml : failed to parse -diff --git a/runtest.c b/runtest.c -index 7d030bdc..cd233da9 100644 ---- a/runtest.c -+++ b/runtest.c -@@ -4202,6 +4202,9 @@ testDesc testDescriptions[] = { - { "Error cases regression tests", - errParseTest, "./test/errors/*.xml", "result/errors/", "", ".err", - 0 }, -+ { "Error cases regression tests (old 1.0)", -+ errParseTest, "./test/errors10/*.xml", "result/errors10/", "", ".err", -+ XML_PARSE_OLD10 }, - #ifdef LIBXML_READER_ENABLED - { "Error cases stream regression tests", - streamParseTest, "./test/errors/*.xml", "result/errors/", NULL, ".str", -diff --git a/test/errors10/781205.xml b/test/errors10/781205.xml -new file mode 100644 -index 00000000..d9e9e839 ---- /dev/null -+++ b/test/errors10/781205.xml -@@ -0,0 +1,3 @@ -+ -+ %a; -diff --git a/test/errors10/781361.xml b/test/errors10/781361.xml -new file mode 100644 -index 00000000..67476bcb ---- /dev/null -+++ b/test/errors10/781361.xml -@@ -0,0 +1,3 @@ -+ -+ %elem; -diff --git a/test/valid/766956.xml b/test/valid/766956.xml -new file mode 100644 -index 00000000..19a95a0e ---- /dev/null -+++ b/test/valid/766956.xml -@@ -0,0 +1,2 @@ -+ -+ -diff --git a/test/valid/dtds/766956.dtd b/test/valid/dtds/766956.dtd -new file mode 100644 -index 00000000..dddde68b ---- /dev/null -+++ b/test/valid/dtds/766956.dtd -@@ -0,0 +1,2 @@ -+ -+%ä%ent; --- -2.14.1 - diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libxml2/files/libxml2-2.9.4-fix-root-node-cmp.patch b/sdk_container/src/third_party/portage-stable/dev-libs/libxml2/files/libxml2-2.9.4-fix-root-node-cmp.patch deleted file mode 100644 index 224d60ff05..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-libs/libxml2/files/libxml2-2.9.4-fix-root-node-cmp.patch +++ /dev/null @@ -1,34 +0,0 @@ -From a1fb9a4f511d89f0738b62cabd6d92bfd9eb94a9 Mon Sep 17 00:00:00 2001 -From: Nick Wellnhofer -Date: Tue, 28 Jun 2016 14:19:58 +0200 -Subject: [PATCH 3/3] Fix comparison with root node in xmlXPathCmpNodes - -This change has already been made in xmlXPathCmpNodesExt but not in -xmlXPathCmpNodes. ---- - xpath.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/xpath.c b/xpath.c -index 67afbca5..5a01b1b3 100644 ---- a/xpath.c -+++ b/xpath.c -@@ -3342,13 +3342,13 @@ xmlXPathCmpNodes(xmlNodePtr node1, xmlNodePtr node2) { - * compute depth to root - */ - for (depth2 = 0, cur = node2;cur->parent != NULL;cur = cur->parent) { -- if (cur == node1) -+ if (cur->parent == node1) - return(1); - depth2++; - } - root = cur; - for (depth1 = 0, cur = node1;cur->parent != NULL;cur = cur->parent) { -- if (cur == node2) -+ if (cur->parent == node2) - return(-1); - depth1++; - } --- -2.14.1 - diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libxml2/files/libxml2-2.9.4-heap-buffer-overflow.patch b/sdk_container/src/third_party/portage-stable/dev-libs/libxml2/files/libxml2-2.9.4-heap-buffer-overflow.patch deleted file mode 100644 index 770a1832b1..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-libs/libxml2/files/libxml2-2.9.4-heap-buffer-overflow.patch +++ /dev/null @@ -1,32 +0,0 @@ -From df4f9bdc7a37908ded8bd1fec4f75509eaa156de Mon Sep 17 00:00:00 2001 -From: David Kilzer -Date: Tue, 4 Jul 2017 18:38:03 +0200 -Subject: [PATCH 5/7] Heap-buffer-overflow read of size 1 in - xmlFAParsePosCharGroup - -Credit to OSS-Fuzz. - -Add a check to xmlFAParseCharRange() for the end of the buffer -to prevent reading past the end of it. - -This fixes Bug 784017. ---- - xmlregexp.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/xmlregexp.c b/xmlregexp.c -index ca3b4f46..6676c2a8 100644 ---- a/xmlregexp.c -+++ b/xmlregexp.c -@@ -5051,7 +5051,7 @@ xmlFAParseCharRange(xmlRegParserCtxtPtr ctxt) { - return; - } - len = 1; -- } else if ((cur != 0x5B) && (cur != 0x5D)) { -+ } else if ((cur != '\0') && (cur != 0x5B) && (cur != 0x5D)) { - end = CUR_SCHAR(ctxt->cur, len); - } else { - ERROR("Expecting the end of a char range"); --- -2.14.1 - diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libxml2/files/libxml2-2.9.4-nullptrderef.patch b/sdk_container/src/third_party/portage-stable/dev-libs/libxml2/files/libxml2-2.9.4-nullptrderef.patch deleted file mode 100644 index d2a9c3e2ad..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-libs/libxml2/files/libxml2-2.9.4-nullptrderef.patch +++ /dev/null @@ -1,50 +0,0 @@ -From e905f08123e4a6e7731549e6f09dadff4cab65bd Mon Sep 17 00:00:00 2001 -From: Nick Wellnhofer -Date: Sun, 26 Jun 2016 12:38:28 +0200 -Subject: Fix more NULL pointer derefs in xpointer.c - -Found with afl-fuzz. ---- - xpointer.c | 12 +++++++----- - 1 file changed, 7 insertions(+), 5 deletions(-) - -diff --git a/xpointer.c b/xpointer.c -index 694d120..e643ee9 100644 ---- a/xpointer.c -+++ b/xpointer.c -@@ -542,7 +542,7 @@ xmlXPtrNewRangeNodeObject(xmlNodePtr start, xmlXPathObjectPtr end) { - /* - * Empty set ... - */ -- if (end->nodesetval->nodeNr <= 0) -+ if ((end->nodesetval == NULL) || (end->nodesetval->nodeNr <= 0)) - return(NULL); - endNode = end->nodesetval->nodeTab[end->nodesetval->nodeNr - 1]; - endIndex = -1; -@@ -1361,7 +1361,7 @@ xmlXPtrEval(const xmlChar *str, xmlXPathContextPtr ctx) { - */ - xmlNodeSetPtr set; - set = tmp->nodesetval; -- if ((set->nodeNr != 1) || -+ if ((set == NULL) || (set->nodeNr != 1) || - (set->nodeTab[0] != (xmlNodePtr) ctx->doc)) - stack++; - } else -@@ -2034,9 +2034,11 @@ xmlXPtrRangeFunction(xmlXPathParserContextPtr ctxt, int nargs) { - xmlXPathFreeObject(set); - XP_ERROR(XPATH_MEMORY_ERROR); - } -- for (i = 0;i < oldset->locNr;i++) { -- xmlXPtrLocationSetAdd(newset, -- xmlXPtrCoveringRange(ctxt, oldset->locTab[i])); -+ if (oldset != NULL) { -+ for (i = 0;i < oldset->locNr;i++) { -+ xmlXPtrLocationSetAdd(newset, -+ xmlXPtrCoveringRange(ctxt, oldset->locTab[i])); -+ } - } - - /* --- -cgit v0.12 - diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libxml2/files/libxml2-2.9.4-nullptrderef2.patch b/sdk_container/src/third_party/portage-stable/dev-libs/libxml2/files/libxml2-2.9.4-nullptrderef2.patch deleted file mode 100644 index 2484f76e7b..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-libs/libxml2/files/libxml2-2.9.4-nullptrderef2.patch +++ /dev/null @@ -1,57 +0,0 @@ -From d8083bf77955b7879c1290f0c0a24ab8cc70f7fb Mon Sep 17 00:00:00 2001 -From: Nick Wellnhofer -Date: Sat, 25 Jun 2016 12:35:50 +0200 -Subject: Fix NULL pointer deref in XPointer range-to - -- Check for errors after evaluating first operand. -- Add sanity check for empty stack. - -Found with afl-fuzz. ---- - result/XPath/xptr/viderror | 4 ++++ - test/XPath/xptr/viderror | 1 + - xpath.c | 7 ++++++- - 3 files changed, 11 insertions(+), 1 deletion(-) - create mode 100644 result/XPath/xptr/viderror - create mode 100644 test/XPath/xptr/viderror - -diff --git a/result/XPath/xptr/viderror b/result/XPath/xptr/viderror -new file mode 100644 -index 0000000..d589882 ---- /dev/null -+++ b/result/XPath/xptr/viderror -@@ -0,0 +1,4 @@ -+ -+======================== -+Expression: xpointer(non-existing-fn()/range-to(id('chapter2'))) -+Object is empty (NULL) -diff --git a/test/XPath/xptr/viderror b/test/XPath/xptr/viderror -new file mode 100644 -index 0000000..da8c53b ---- /dev/null -+++ b/test/XPath/xptr/viderror -@@ -0,0 +1 @@ -+xpointer(non-existing-fn()/range-to(id('chapter2'))) -diff --git a/xpath.c b/xpath.c -index 113bce6..751665b 100644 ---- a/xpath.c -+++ b/xpath.c -@@ -14005,9 +14005,14 @@ xmlXPathCompOpEval(xmlXPathParserContextPtr ctxt, xmlXPathStepOpPtr op) - xmlNodeSetPtr oldset; - int i, j; - -- if (op->ch1 != -1) -+ if (op->ch1 != -1) { - total += - xmlXPathCompOpEval(ctxt, &comp->steps[op->ch1]); -+ CHECK_ERROR0; -+ } -+ if (ctxt->value == NULL) { -+ XP_ERROR0(XPATH_INVALID_OPERAND); -+ } - if (op->ch2 == -1) - return (total); - --- -cgit v0.12 - diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libxml2/files/libxml2-2.9.4-osd-validation.patch b/sdk_container/src/third_party/portage-stable/dev-libs/libxml2/files/libxml2-2.9.4-osd-validation.patch deleted file mode 100644 index 9d1a03346f..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-libs/libxml2/files/libxml2-2.9.4-osd-validation.patch +++ /dev/null @@ -1,66 +0,0 @@ -From 8bc6baccc7da291c2338b8d95953ea487b0b3ca1 Mon Sep 17 00:00:00 2001 -From: Alex Henrie -Date: Thu, 26 May 2016 17:38:35 -0600 -Subject: [PATCH 2/7] Fix attribute decoding during XML schema validation - -For https://bugzilla.gnome.org/show_bug.cgi?id=766834 - -vctxt->parserCtxt is always NULL in xmlSchemaSAXHandleStartElementNs, -so this function can't call xmlStringLenDecodeEntities to decode the -entities. ---- - xmlschemas.c | 30 +++++++++++++++++++++++++----- - 1 file changed, 25 insertions(+), 5 deletions(-) - -diff --git a/xmlschemas.c b/xmlschemas.c -index e1b3a4f0..59535e5c 100644 ---- a/xmlschemas.c -+++ b/xmlschemas.c -@@ -27391,6 +27391,7 @@ xmlSchemaSAXHandleStartElementNs(void *ctx, - * attributes yet. - */ - if (nb_attributes != 0) { -+ int valueLen, k, l; - xmlChar *value; - - for (j = 0, i = 0; i < nb_attributes; i++, j += 5) { -@@ -27400,12 +27401,31 @@ xmlSchemaSAXHandleStartElementNs(void *ctx, - * libxml2 differs from normal SAX here in that it escapes all ampersands - * as & instead of delivering the raw converted string. Changing the - * behavior at this point would break applications that use this API, so -- * we are forced to work around it. There is no danger of accidentally -- * decoding some entity other than & in this step because without -- * unescaped ampersands there can be no other entities in the string. -+ * we are forced to work around it. - */ -- value = xmlStringLenDecodeEntities(vctxt->parserCtxt, attributes[j+3], -- attributes[j+4] - attributes[j+3], XML_SUBSTITUTE_REF, 0, 0, 0); -+ valueLen = attributes[j+4] - attributes[j+3]; -+ value = xmlMallocAtomic(valueLen + 1); -+ if (value == NULL) { -+ xmlSchemaVErrMemory(vctxt, -+ "allocating string for decoded attribute", -+ NULL); -+ goto internal_error; -+ } -+ for (k = 0, l = 0; k < valueLen; l++) { -+ if (k < valueLen - 4 && -+ attributes[j+3][k+0] == '&' && -+ attributes[j+3][k+1] == '#' && -+ attributes[j+3][k+2] == '3' && -+ attributes[j+3][k+3] == '8' && -+ attributes[j+3][k+4] == ';') { -+ value[l] = '&'; -+ k += 5; -+ } else { -+ value[l] = attributes[j+3][k]; -+ k++; -+ } -+ } -+ value[l] = '\0'; - /* - * TODO: Set the node line. - */ --- -2.14.1 - diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libxml2/libxml2-2.9.4-r2.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/libxml2/libxml2-2.9.4-r2.ebuild deleted file mode 100644 index 465cae6a0a..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-libs/libxml2/libxml2-2.9.4-r2.ebuild +++ /dev/null @@ -1,231 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=( python2_7 python3_{4,5,6} ) -PYTHON_REQ_USE="xml" - -inherit libtool flag-o-matic ltprune python-r1 autotools prefix multilib-minimal - -DESCRIPTION="Version 2 of the library to manipulate XML files" -HOMEPAGE="http://www.xmlsoft.org/" - -LICENSE="MIT" -SLOT="2" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" -IUSE="debug examples icu ipv6 lzma python readline static-libs test" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -XSTS_HOME="http://www.w3.org/XML/2004/xml-schema-test-suite" -XSTS_NAME_1="xmlschema2002-01-16" -XSTS_NAME_2="xmlschema2004-01-14" -XSTS_TARBALL_1="xsts-2002-01-16.tar.gz" -XSTS_TARBALL_2="xsts-2004-01-14.tar.gz" -XMLCONF_TARBALL="xmlts20080827.tar.gz" - -SRC_URI="ftp://xmlsoft.org/${PN}/${PN}-${PV/_rc/-rc}.tar.gz - test? ( - ${XSTS_HOME}/${XSTS_NAME_1}/${XSTS_TARBALL_1} - ${XSTS_HOME}/${XSTS_NAME_2}/${XSTS_TARBALL_2} - http://www.w3.org/XML/Test/${XMLCONF_TARBALL} )" - -RDEPEND=" - >=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}] - icu? ( >=dev-libs/icu-51.2-r1:=[${MULTILIB_USEDEP}] ) - lzma? ( >=app-arch/xz-utils-5.0.5-r1:=[${MULTILIB_USEDEP}] ) - python? ( ${PYTHON_DEPS} ) - readline? ( sys-libs/readline:= ) -" -DEPEND="${RDEPEND} - dev-util/gtk-doc-am - virtual/pkgconfig - hppa? ( >=sys-devel/binutils-2.15.92.0.2 ) -" - -S="${WORKDIR}/${PN}-${PV%_rc*}" - -MULTILIB_CHOST_TOOLS=( - /usr/bin/xml2-config -) - -src_unpack() { - # ${A} isn't used to avoid unpacking of test tarballs into $WORKDIR, - # as they are needed as tarballs in ${S}/xstc instead and not unpacked - unpack ${P/_rc/-rc}.tar.gz - cd "${S}" || die - - if use test; then - cp "${DISTDIR}/${XSTS_TARBALL_1}" \ - "${DISTDIR}/${XSTS_TARBALL_2}" \ - "${S}"/xstc/ \ - || die "Failed to install test tarballs" - unpack ${XMLCONF_TARBALL} - fi -} - -src_prepare() { - default - - DOCS=( AUTHORS ChangeLog NEWS README* TODO* ) - - # Patches needed for prefix support - eapply "${FILESDIR}"/${PN}-2.7.1-catalog_path.patch - - eprefixify catalog.c xmlcatalog.c runtest.c xmllint.c - - # Fix build for Windows platform - # https://bugzilla.gnome.org/show_bug.cgi?id=760456 - eapply "${FILESDIR}"/${PN}-2.8.0_rc1-winnt.patch - - # Disable programs that we don't actually install. - # https://bugzilla.gnome.org/show_bug.cgi?id=760457 - eapply "${FILESDIR}"/${PN}-2.9.2-disable-tests.patch - - # Fix python detection, bug #567066 - # https://bugzilla.gnome.org/show_bug.cgi?id=760458 - eapply "${FILESDIR}"/${PN}-2.9.2-python-ABIFLAG.patch - - # Apply round of security patches wrt bugs - # 589816, 597112, 597114, 597116. This will be included - # in the next upstream release - eapply "${FILESDIR}"/${PN}-2.9.4-CVE-2016-4658.patch - eapply "${FILESDIR}"/${PN}-2.9.4-CVE-2016-5131.patch - eapply "${FILESDIR}"/${PN}-2.9.4-nullptrderef.patch - eapply "${FILESDIR}"/${PN}-2.9.4-nullptrderef2.patch - - # Apply round of security patches wrt bugs: - # 599192, 586886, 618604, 622914, 605208, 623206 - # This will be included in the next upstream release - eapply "${FILESDIR}"/${P}-CVE-2017-5969.patch - eapply "${FILESDIR}"/${P}-osd-validation.patch - eapply "${FILESDIR}"/${P}-CVE-2017-9049-9050.patch - eapply "${FILESDIR}"/${P}-CVE-2017-9047-9048.patch - eapply "${FILESDIR}"/${P}-heap-buffer-overflow.patch - eapply "${FILESDIR}"/${P}-CVE-2016-9318.patch - eapply "${FILESDIR}"/${P}-CVE-2017-7375.patch - - # Avoid final linking arguments for python modules - if [[ ${CHOST} == *-darwin* ]] ; then - sed -i -e '/PYTHON_LIBS/s/ldflags/libs/' configure.ac || die - fi - - # Please do not remove, as else we get references to PORTAGE_TMPDIR - # in /usr/lib/python?.?/site-packages/libxml2mod.la among things. - # We now need to run eautoreconf at the end to prevent maintainer mode. -# elibtoolize -# epunt_cxx # if we don't eautoreconf - - eautoreconf -} - -multilib_src_configure() { - # filter seemingly problematic CFLAGS (#26320) - filter-flags -fprefetch-loop-arrays -funroll-loops - - # USE zlib support breaks gnome2 - # (libgnomeprint for instance fails to compile with - # fresh install, and existing) - (22 Dec 2002). - - # The meaning of the 'debug' USE flag does not apply to the --with-debug - # switch (enabling the libxml2 debug module). See bug #100898. - - # --with-mem-debug causes unusual segmentation faults (bug #105120). - - libxml2_configure() { - ECONF_SOURCE="${S}" econf \ - --with-html-subdir=${PF}/html \ - $(use_with debug run-debug) \ - $(use_with icu) \ - $(use_with lzma) \ - $(use_enable ipv6) \ - $(use_enable static-libs static) \ - $(multilib_native_use_with readline) \ - $(multilib_native_use_with readline history) \ - "$@" - } - - libxml2_py_configure() { - mkdir -p "${BUILD_DIR}" || die # ensure python build dirs exist - run_in_build_dir libxml2_configure "--with-python=${ROOT%/}${PYTHON}" # odd build system, also see bug #582130 - } - - libxml2_configure --without-python # build python bindings separately - - if multilib_is_native_abi && use python; then - python_foreach_impl libxml2_py_configure - fi -} - -multilib_src_compile() { - default - if multilib_is_native_abi && use python; then - local native_builddir=${BUILD_DIR} - python_foreach_impl libxml2_py_emake top_builddir="${native_builddir}" all - fi -} - -multilib_src_test() { - default - multilib_is_native_abi && use python && python_foreach_impl libxml2_py_emake test -} - -multilib_src_install() { - emake DESTDIR="${D}" \ - EXAMPLES_DIR="${EPREFIX}"/usr/share/doc/${PF}/examples install - - if multilib_is_native_abi && use python; then - python_foreach_impl libxml2_py_emake \ - DESTDIR="${D}" \ - docsdir="${EPREFIX}"/usr/share/doc/${PF}/python \ - exampledir="${EPREFIX}"/usr/share/doc/${PF}/python/examples \ - install - python_foreach_impl python_optimize - fi -} - -multilib_src_install_all() { - # on windows, xmllint is installed by interix libxml2 in parent prefix. - # this is the version to use. the native winnt version does not support - # symlinks, which makes repoman fail if the portage tree is linked in - # from another location (which is my default). -- mduft - if [[ ${CHOST} == *-winnt* ]]; then - rm -rf "${ED}"/usr/bin/xmllint - rm -rf "${ED}"/usr/bin/xmlcatalog - fi - - rm -rf "${ED}"/usr/share/doc/${P} - einstalldocs - - if ! use examples; then - rm -rf "${ED}"/usr/share/doc/${PF}/examples - rm -rf "${ED}"/usr/share/doc/${PF}/python/examples - fi - - prune_libtool_files --modules -} - -pkg_postinst() { - # We don't want to do the xmlcatalog during stage1, as xmlcatalog will not - # be in / and stage1 builds to ROOT=/tmp/stage1root. This fixes bug #208887. - if [[ "${ROOT}" != "/" ]]; then - elog "Skipping XML catalog creation for stage building (bug #208887)." - else - # need an XML catalog, so no-one writes to a non-existent one - CATALOG="${EROOT}etc/xml/catalog" - - # we dont want to clobber an existing catalog though, - # only ensure that one is there - # - if [[ ! -e ${CATALOG} ]]; then - [[ -d "${EROOT}etc/xml" ]] || mkdir -p "${EROOT}etc/xml" - "${EPREFIX}"/usr/bin/xmlcatalog --create > "${CATALOG}" - einfo "Created XML catalog in ${CATALOG}" - fi - fi -} - -libxml2_py_emake() { - pushd "${BUILD_DIR}/python" > /dev/null || die - emake "$@" - popd > /dev/null -} diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libxml2/libxml2-2.9.4-r3.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/libxml2/libxml2-2.9.4-r3.ebuild deleted file mode 100644 index 16bd262479..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-libs/libxml2/libxml2-2.9.4-r3.ebuild +++ /dev/null @@ -1,239 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=( python2_7 python3_{4,5,6} ) -PYTHON_REQ_USE="xml" - -inherit libtool flag-o-matic ltprune python-r1 autotools prefix multilib-minimal - -DESCRIPTION="Version 2 of the library to manipulate XML files" -HOMEPAGE="http://www.xmlsoft.org/" - -LICENSE="MIT" -SLOT="2" -KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" -IUSE="debug examples icu ipv6 lzma python readline static-libs test" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -XSTS_HOME="http://www.w3.org/XML/2004/xml-schema-test-suite" -XSTS_NAME_1="xmlschema2002-01-16" -XSTS_NAME_2="xmlschema2004-01-14" -XSTS_TARBALL_1="xsts-2002-01-16.tar.gz" -XSTS_TARBALL_2="xsts-2004-01-14.tar.gz" -XMLCONF_TARBALL="xmlts20080827.tar.gz" - -SRC_URI="ftp://xmlsoft.org/${PN}/${PN}-${PV/_rc/-rc}.tar.gz - test? ( - ${XSTS_HOME}/${XSTS_NAME_1}/${XSTS_TARBALL_1} - ${XSTS_HOME}/${XSTS_NAME_2}/${XSTS_TARBALL_2} - http://www.w3.org/XML/Test/${XMLCONF_TARBALL} )" - -RDEPEND=" - >=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}] - icu? ( >=dev-libs/icu-51.2-r1:=[${MULTILIB_USEDEP}] ) - lzma? ( >=app-arch/xz-utils-5.0.5-r1:=[${MULTILIB_USEDEP}] ) - python? ( ${PYTHON_DEPS} ) - readline? ( sys-libs/readline:= ) -" -DEPEND="${RDEPEND} - dev-util/gtk-doc-am - virtual/pkgconfig - hppa? ( >=sys-devel/binutils-2.15.92.0.2 ) -" - -S="${WORKDIR}/${PN}-${PV%_rc*}" - -MULTILIB_CHOST_TOOLS=( - /usr/bin/xml2-config -) - -src_unpack() { - # ${A} isn't used to avoid unpacking of test tarballs into $WORKDIR, - # as they are needed as tarballs in ${S}/xstc instead and not unpacked - unpack ${P/_rc/-rc}.tar.gz - cd "${S}" || die - - if use test; then - cp "${DISTDIR}/${XSTS_TARBALL_1}" \ - "${DISTDIR}/${XSTS_TARBALL_2}" \ - "${S}"/xstc/ \ - || die "Failed to install test tarballs" - unpack ${XMLCONF_TARBALL} - fi -} - -src_prepare() { - default - - DOCS=( AUTHORS ChangeLog NEWS README* TODO* ) - - # Patches needed for prefix support - eapply "${FILESDIR}"/${PN}-2.7.1-catalog_path.patch - - eprefixify catalog.c xmlcatalog.c runtest.c xmllint.c - - # Fix build for Windows platform - # https://bugzilla.gnome.org/show_bug.cgi?id=760456 - eapply "${FILESDIR}"/${PN}-2.8.0_rc1-winnt.patch - - # Disable programs that we don't actually install. - # https://bugzilla.gnome.org/show_bug.cgi?id=760457 - eapply "${FILESDIR}"/${PN}-2.9.2-disable-tests.patch - - # Fix python detection, bug #567066 - # https://bugzilla.gnome.org/show_bug.cgi?id=760458 - eapply "${FILESDIR}"/${PN}-2.9.2-python-ABIFLAG.patch - - # Apply round of security patches wrt bugs - # 589816, 597112, 597114, 597116. This will be included - # in the next upstream release - eapply "${FILESDIR}"/${PN}-2.9.4-CVE-2016-4658.patch - eapply "${FILESDIR}"/${PN}-2.9.4-CVE-2016-5131.patch - eapply "${FILESDIR}"/${PN}-2.9.4-nullptrderef.patch - eapply "${FILESDIR}"/${PN}-2.9.4-nullptrderef2.patch - - # Apply round of security patches wrt bugs: - # 599192, 586886, 618604, 622914, 605208, 623206 - # This will be included in the next upstream release - eapply "${FILESDIR}"/${P}-CVE-2017-5969.patch - eapply "${FILESDIR}"/${P}-osd-validation.patch - eapply "${FILESDIR}"/${P}-CVE-2017-9049-9050.patch - eapply "${FILESDIR}"/${P}-CVE-2017-9047-9048.patch - eapply "${FILESDIR}"/${P}-heap-buffer-overflow.patch - eapply "${FILESDIR}"/${P}-CVE-2016-9318.patch - eapply "${FILESDIR}"/${P}-CVE-2017-7375.patch - eapply "${FILESDIR}"/${P}-CVE-2017-0663.patch - - # More patche stolen from Debian patch stack - eapply "${FILESDIR}"/${P}-CVE-2017-7376.patch - eapply "${FILESDIR}"/${P}-fix-root-node-cmp.patch - - # After all the patching this test still fails: - rm "${S}"/test/errors10/781205.xml || die - - # Avoid final linking arguments for python modules - if [[ ${CHOST} == *-darwin* ]] ; then - sed -i -e '/PYTHON_LIBS/s/ldflags/libs/' configure.ac || die - fi - - # Please do not remove, as else we get references to PORTAGE_TMPDIR - # in /usr/lib/python?.?/site-packages/libxml2mod.la among things. - # We now need to run eautoreconf at the end to prevent maintainer mode. -# elibtoolize -# epunt_cxx # if we don't eautoreconf - - eautoreconf -} - -multilib_src_configure() { - # filter seemingly problematic CFLAGS (#26320) - filter-flags -fprefetch-loop-arrays -funroll-loops - - # USE zlib support breaks gnome2 - # (libgnomeprint for instance fails to compile with - # fresh install, and existing) - (22 Dec 2002). - - # The meaning of the 'debug' USE flag does not apply to the --with-debug - # switch (enabling the libxml2 debug module). See bug #100898. - - # --with-mem-debug causes unusual segmentation faults (bug #105120). - - libxml2_configure() { - ECONF_SOURCE="${S}" econf \ - --with-html-subdir=${PF}/html \ - $(use_with debug run-debug) \ - $(use_with icu) \ - $(use_with lzma) \ - $(use_enable ipv6) \ - $(use_enable static-libs static) \ - $(multilib_native_use_with readline) \ - $(multilib_native_use_with readline history) \ - "$@" - } - - libxml2_py_configure() { - mkdir -p "${BUILD_DIR}" || die # ensure python build dirs exist - run_in_build_dir libxml2_configure "--with-python=${ROOT%/}${PYTHON}" # odd build system, also see bug #582130 - } - - libxml2_configure --without-python # build python bindings separately - - if multilib_is_native_abi && use python; then - python_foreach_impl libxml2_py_configure - fi -} - -multilib_src_compile() { - default - if multilib_is_native_abi && use python; then - local native_builddir=${BUILD_DIR} - python_foreach_impl libxml2_py_emake top_builddir="${native_builddir}" all - fi -} - -multilib_src_test() { - emake check - multilib_is_native_abi && use python && python_foreach_impl libxml2_py_emake test -} - -multilib_src_install() { - emake DESTDIR="${D}" \ - EXAMPLES_DIR="${EPREFIX}"/usr/share/doc/${PF}/examples install - - if multilib_is_native_abi && use python; then - python_foreach_impl libxml2_py_emake \ - DESTDIR="${D}" \ - docsdir="${EPREFIX}"/usr/share/doc/${PF}/python \ - exampledir="${EPREFIX}"/usr/share/doc/${PF}/python/examples \ - install - python_foreach_impl python_optimize - fi -} - -multilib_src_install_all() { - # on windows, xmllint is installed by interix libxml2 in parent prefix. - # this is the version to use. the native winnt version does not support - # symlinks, which makes repoman fail if the portage tree is linked in - # from another location (which is my default). -- mduft - if [[ ${CHOST} == *-winnt* ]]; then - rm -rf "${ED}"/usr/bin/xmllint - rm -rf "${ED}"/usr/bin/xmlcatalog - fi - - rm -rf "${ED}"/usr/share/doc/${P} - einstalldocs - - if ! use examples; then - rm -rf "${ED}"/usr/share/doc/${PF}/examples - rm -rf "${ED}"/usr/share/doc/${PF}/python/examples - fi - - prune_libtool_files --modules -} - -pkg_postinst() { - # We don't want to do the xmlcatalog during stage1, as xmlcatalog will not - # be in / and stage1 builds to ROOT=/tmp/stage1root. This fixes bug #208887. - if [[ "${ROOT}" != "/" ]]; then - elog "Skipping XML catalog creation for stage building (bug #208887)." - else - # need an XML catalog, so no-one writes to a non-existent one - CATALOG="${EROOT}etc/xml/catalog" - - # we dont want to clobber an existing catalog though, - # only ensure that one is there - # - if [[ ! -e ${CATALOG} ]]; then - [[ -d "${EROOT}etc/xml" ]] || mkdir -p "${EROOT}etc/xml" - "${EPREFIX}"/usr/bin/xmlcatalog --create > "${CATALOG}" - einfo "Created XML catalog in ${CATALOG}" - fi - fi -} - -libxml2_py_emake() { - pushd "${BUILD_DIR}/python" > /dev/null || die - emake "$@" - popd > /dev/null -} diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libxml2/libxml2-2.9.6.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/libxml2/libxml2-2.9.6.ebuild index a2ffa16582..e1b36acddb 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/libxml2/libxml2-2.9.6.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-libs/libxml2/libxml2-2.9.6.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -12,7 +12,7 @@ HOMEPAGE="http://www.xmlsoft.org/" LICENSE="MIT" SLOT="2" -KEYWORDS="alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" +KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" IUSE="debug examples icu ipv6 lzma python readline static-libs test" REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libxml2/libxml2-2.9.5.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/libxml2/libxml2-2.9.7.ebuild similarity index 93% rename from sdk_container/src/third_party/portage-stable/dev-libs/libxml2/libxml2-2.9.5.ebuild rename to sdk_container/src/third_party/portage-stable/dev-libs/libxml2/libxml2-2.9.7.ebuild index dc7fa4d365..0660af14c4 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/libxml2/libxml2-2.9.5.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-libs/libxml2/libxml2-2.9.7.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -12,7 +12,7 @@ HOMEPAGE="http://www.xmlsoft.org/" LICENSE="MIT" SLOT="2" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" +KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="debug examples icu ipv6 lzma python readline static-libs test" REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" @@ -75,7 +75,7 @@ src_prepare() { # Fix build for Windows platform # https://bugzilla.gnome.org/show_bug.cgi?id=760456 - eapply "${FILESDIR}"/${PN}-2.8.0_rc1-winnt.patch + # eapply "${FILESDIR}"/${PN}-2.8.0_rc1-winnt.patch # Fix python detection, bug #567066 # https://bugzilla.gnome.org/show_bug.cgi?id=760458 diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libxml2/libxml2-2.9.4-r1.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/libxml2/libxml2-2.9.8.ebuild similarity index 85% rename from sdk_container/src/third_party/portage-stable/dev-libs/libxml2/libxml2-2.9.4-r1.ebuild rename to sdk_container/src/third_party/portage-stable/dev-libs/libxml2/libxml2-2.9.8.ebuild index 4a0945630c..0d83dca0a9 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/libxml2/libxml2-2.9.4-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-libs/libxml2/libxml2-2.9.8.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -7,12 +7,12 @@ PYTHON_REQ_USE="xml" inherit libtool flag-o-matic ltprune python-r1 autotools prefix multilib-minimal -DESCRIPTION="Version 2 of the library to manipulate XML files" +DESCRIPTION="XML C parser and toolkit" HOMEPAGE="http://www.xmlsoft.org/" LICENSE="MIT" SLOT="2" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" +KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="debug examples icu ipv6 lzma python readline static-libs test" REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" @@ -75,24 +75,12 @@ src_prepare() { # Fix build for Windows platform # https://bugzilla.gnome.org/show_bug.cgi?id=760456 - eapply "${FILESDIR}"/${PN}-2.8.0_rc1-winnt.patch - - # Disable programs that we don't actually install. - # https://bugzilla.gnome.org/show_bug.cgi?id=760457 - eapply "${FILESDIR}"/${PN}-2.9.2-disable-tests.patch + # eapply "${FILESDIR}"/${PN}-2.8.0_rc1-winnt.patch # Fix python detection, bug #567066 # https://bugzilla.gnome.org/show_bug.cgi?id=760458 eapply "${FILESDIR}"/${PN}-2.9.2-python-ABIFLAG.patch - # Apply latest round of security patches wrt bugs - # 589816, 597112, 597114, 597116. This will be included - # in the next upstream release - eapply "${FILESDIR}"/${PN}-2.9.4-CVE-2016-4658.patch - eapply "${FILESDIR}"/${PN}-2.9.4-CVE-2016-5131.patch - eapply "${FILESDIR}"/${PN}-2.9.4-nullptrderef.patch - eapply "${FILESDIR}"/${PN}-2.9.4-nullptrderef2.patch - # Avoid final linking arguments for python modules if [[ ${CHOST} == *-darwin* ]] ; then sed -i -e '/PYTHON_LIBS/s/ldflags/libs/' configure.ac || die @@ -154,7 +142,7 @@ multilib_src_compile() { } multilib_src_test() { - default + emake check multilib_is_native_abi && use python && python_foreach_impl libxml2_py_emake test } diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-libs/libxml2-2.9.4-r2 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-libs/libxml2-2.9.4-r2 deleted file mode 100644 index a5406b5035..0000000000 --- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-libs/libxml2-2.9.4-r2 +++ /dev/null @@ -1,14 +0,0 @@ -DEFINED_PHASES=compile configure install postinst prepare test unpack -DEPEND=>=sys-libs/zlib-1.2.8-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] icu? ( >=dev-libs/icu-51.2-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) python_targets_python3_4? ( dev-lang/python:3.4[xml] ) python_targets_python3_5? ( dev-lang/python:3.5[xml] ) python_targets_python3_6? ( dev-lang/python:3.6[xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) readline? ( sys-libs/readline:= ) dev-util/gtk-doc-am virtual/pkgconfig hppa? ( >=sys-devel/binutils-2.15.92.0.2 ) >=app-portage/elt-patches-20170422 !=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 -DESCRIPTION=Version 2 of the library to manipulate XML files -EAPI=6 -HOMEPAGE=http://www.xmlsoft.org/ -IUSE=debug examples icu ipv6 lzma python readline static-libs test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 -KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt -LICENSE=MIT -RDEPEND=>=sys-libs/zlib-1.2.8-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] icu? ( >=dev-libs/icu-51.2-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) python_targets_python3_4? ( dev-lang/python:3.4[xml] ) python_targets_python3_5? ( dev-lang/python:3.5[xml] ) python_targets_python3_6? ( dev-lang/python:3.6[xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) readline? ( sys-libs/readline:= ) -REQUIRED_USE=python? ( || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) ) -SLOT=2 -SRC_URI=ftp://xmlsoft.org/libxml2/libxml2-2.9.4.tar.gz test? ( http://www.w3.org/XML/2004/xml-schema-test-suite/xmlschema2002-01-16/xsts-2002-01-16.tar.gz http://www.w3.org/XML/2004/xml-schema-test-suite/xmlschema2004-01-14/xsts-2004-01-14.tar.gz http://www.w3.org/XML/Test/xmlts20080827.tar.gz ) -_eclasses_=autotools dc412f38566b91012efd58b9c203e6c3 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 flag-o-matic 2274fcc1e7ef6affaff5bcd636275417 libtool 0081a71a261724730ec4c248494f044d ltprune 2770eed66a9b8ef944714cd0e968182e multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build eed53a6313267c9fbcd35fc384bd0087 multilib-minimal 9139c3a57e077cb8e0d0f73ceb080b89 prefix 7b6fb2fc216b101b5d97d171925a847c python-r1 e9350ec46bb5c9f3504b4fbe8b8d8987 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 185a06792159ca143528e7010368e8af -_md5_=7e332363ad0884f56252a97f3ecb1dbd diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-libs/libxml2-2.9.5 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-libs/libxml2-2.9.5 deleted file mode 100644 index ecd8eab911..0000000000 --- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-libs/libxml2-2.9.5 +++ /dev/null @@ -1,14 +0,0 @@ -DEFINED_PHASES=compile configure install postinst prepare test unpack -DEPEND=>=sys-libs/zlib-1.2.8-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] icu? ( >=dev-libs/icu-51.2-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) python_targets_python3_4? ( dev-lang/python:3.4[xml] ) python_targets_python3_5? ( dev-lang/python:3.5[xml] ) python_targets_python3_6? ( dev-lang/python:3.6[xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) readline? ( sys-libs/readline:= ) dev-util/gtk-doc-am virtual/pkgconfig hppa? ( >=sys-devel/binutils-2.15.92.0.2 ) >=app-portage/elt-patches-20170422 !=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 -DESCRIPTION=Version 2 of the library to manipulate XML files -EAPI=6 -HOMEPAGE=http://www.xmlsoft.org/ -IUSE=debug examples icu ipv6 lzma python readline static-libs test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 -KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt -LICENSE=MIT -RDEPEND=>=sys-libs/zlib-1.2.8-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] icu? ( >=dev-libs/icu-51.2-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) python_targets_python3_4? ( dev-lang/python:3.4[xml] ) python_targets_python3_5? ( dev-lang/python:3.5[xml] ) python_targets_python3_6? ( dev-lang/python:3.6[xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) readline? ( sys-libs/readline:= ) -REQUIRED_USE=python? ( || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) ) -SLOT=2 -SRC_URI=ftp://xmlsoft.org/libxml2/libxml2-2.9.5.tar.gz test? ( http://www.w3.org/XML/2004/xml-schema-test-suite/xmlschema2002-01-16/xsts-2002-01-16.tar.gz http://www.w3.org/XML/2004/xml-schema-test-suite/xmlschema2004-01-14/xsts-2004-01-14.tar.gz http://www.w3.org/XML/Test/xmlts20080827.tar.gz ) -_eclasses_=autotools dc412f38566b91012efd58b9c203e6c3 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 flag-o-matic 2274fcc1e7ef6affaff5bcd636275417 libtool 0081a71a261724730ec4c248494f044d ltprune 2770eed66a9b8ef944714cd0e968182e multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build eed53a6313267c9fbcd35fc384bd0087 multilib-minimal 9139c3a57e077cb8e0d0f73ceb080b89 prefix 7b6fb2fc216b101b5d97d171925a847c python-r1 e9350ec46bb5c9f3504b4fbe8b8d8987 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 185a06792159ca143528e7010368e8af -_md5_=e6b60ac57b7cb77be70a02f10a0c162f diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-libs/libxml2-2.9.6 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-libs/libxml2-2.9.6 index 54f980d48f..05ec898e7c 100644 --- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-libs/libxml2-2.9.6 +++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-libs/libxml2-2.9.6 @@ -4,11 +4,11 @@ DESCRIPTION=Version 2 of the library to manipulate XML files EAPI=6 HOMEPAGE=http://www.xmlsoft.org/ IUSE=debug examples icu ipv6 lzma python readline static-libs test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 -KEYWORDS=alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt +KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt LICENSE=MIT RDEPEND=>=sys-libs/zlib-1.2.8-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] icu? ( >=dev-libs/icu-51.2-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) python_targets_python3_4? ( dev-lang/python:3.4[xml] ) python_targets_python3_5? ( dev-lang/python:3.5[xml] ) python_targets_python3_6? ( dev-lang/python:3.6[xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) readline? ( sys-libs/readline:= ) REQUIRED_USE=python? ( || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) ) SLOT=2 SRC_URI=ftp://xmlsoft.org/libxml2/libxml2-2.9.6.tar.gz test? ( http://www.w3.org/XML/2004/xml-schema-test-suite/xmlschema2002-01-16/xsts-2002-01-16.tar.gz http://www.w3.org/XML/2004/xml-schema-test-suite/xmlschema2004-01-14/xsts-2004-01-14.tar.gz http://www.w3.org/XML/Test/xmlts20080827.tar.gz ) _eclasses_=autotools dc412f38566b91012efd58b9c203e6c3 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 flag-o-matic 2274fcc1e7ef6affaff5bcd636275417 libtool 0081a71a261724730ec4c248494f044d ltprune 2770eed66a9b8ef944714cd0e968182e multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build eed53a6313267c9fbcd35fc384bd0087 multilib-minimal 9139c3a57e077cb8e0d0f73ceb080b89 prefix 7b6fb2fc216b101b5d97d171925a847c python-r1 e9350ec46bb5c9f3504b4fbe8b8d8987 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 185a06792159ca143528e7010368e8af -_md5_=b23a32eb7b3c7e9025a9a7c72d048e33 +_md5_=5b8a175deffe6bf2888738eebeea2d8e diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-libs/libxml2-2.9.4-r1 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-libs/libxml2-2.9.7 similarity index 91% rename from sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-libs/libxml2-2.9.4-r1 rename to sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-libs/libxml2-2.9.7 index c8e74ab2c1..4d99503b7b 100644 --- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-libs/libxml2-2.9.4-r1 +++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-libs/libxml2-2.9.7 @@ -4,11 +4,11 @@ DESCRIPTION=Version 2 of the library to manipulate XML files EAPI=6 HOMEPAGE=http://www.xmlsoft.org/ IUSE=debug examples icu ipv6 lzma python readline static-libs test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 -KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt +KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris LICENSE=MIT RDEPEND=>=sys-libs/zlib-1.2.8-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] icu? ( >=dev-libs/icu-51.2-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) python_targets_python3_4? ( dev-lang/python:3.4[xml] ) python_targets_python3_5? ( dev-lang/python:3.5[xml] ) python_targets_python3_6? ( dev-lang/python:3.6[xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) readline? ( sys-libs/readline:= ) REQUIRED_USE=python? ( || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) ) SLOT=2 -SRC_URI=ftp://xmlsoft.org/libxml2/libxml2-2.9.4.tar.gz test? ( http://www.w3.org/XML/2004/xml-schema-test-suite/xmlschema2002-01-16/xsts-2002-01-16.tar.gz http://www.w3.org/XML/2004/xml-schema-test-suite/xmlschema2004-01-14/xsts-2004-01-14.tar.gz http://www.w3.org/XML/Test/xmlts20080827.tar.gz ) +SRC_URI=ftp://xmlsoft.org/libxml2/libxml2-2.9.7.tar.gz test? ( http://www.w3.org/XML/2004/xml-schema-test-suite/xmlschema2002-01-16/xsts-2002-01-16.tar.gz http://www.w3.org/XML/2004/xml-schema-test-suite/xmlschema2004-01-14/xsts-2004-01-14.tar.gz http://www.w3.org/XML/Test/xmlts20080827.tar.gz ) _eclasses_=autotools dc412f38566b91012efd58b9c203e6c3 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 flag-o-matic 2274fcc1e7ef6affaff5bcd636275417 libtool 0081a71a261724730ec4c248494f044d ltprune 2770eed66a9b8ef944714cd0e968182e multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build eed53a6313267c9fbcd35fc384bd0087 multilib-minimal 9139c3a57e077cb8e0d0f73ceb080b89 prefix 7b6fb2fc216b101b5d97d171925a847c python-r1 e9350ec46bb5c9f3504b4fbe8b8d8987 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 185a06792159ca143528e7010368e8af -_md5_=2a5a1a0cd641a38ef62a2249076fb157 +_md5_=3d784bbfdc0077127e4b53bffda9463b diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-libs/libxml2-2.9.4-r3 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-libs/libxml2-2.9.8 similarity index 89% rename from sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-libs/libxml2-2.9.4-r3 rename to sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-libs/libxml2-2.9.8 index cf713af02c..426c0c2155 100644 --- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-libs/libxml2-2.9.4-r3 +++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-libs/libxml2-2.9.8 @@ -1,14 +1,14 @@ DEFINED_PHASES=compile configure install postinst prepare test unpack DEPEND=>=sys-libs/zlib-1.2.8-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] icu? ( >=dev-libs/icu-51.2-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) python_targets_python3_4? ( dev-lang/python:3.4[xml] ) python_targets_python3_5? ( dev-lang/python:3.5[xml] ) python_targets_python3_6? ( dev-lang/python:3.6[xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) readline? ( sys-libs/readline:= ) dev-util/gtk-doc-am virtual/pkgconfig hppa? ( >=sys-devel/binutils-2.15.92.0.2 ) >=app-portage/elt-patches-20170422 !=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 -DESCRIPTION=Version 2 of the library to manipulate XML files +DESCRIPTION=XML C parser and toolkit EAPI=6 HOMEPAGE=http://www.xmlsoft.org/ IUSE=debug examples icu ipv6 lzma python readline static-libs test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 -KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt +KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris LICENSE=MIT RDEPEND=>=sys-libs/zlib-1.2.8-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] icu? ( >=dev-libs/icu-51.2-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) python_targets_python3_4? ( dev-lang/python:3.4[xml] ) python_targets_python3_5? ( dev-lang/python:3.5[xml] ) python_targets_python3_6? ( dev-lang/python:3.6[xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) readline? ( sys-libs/readline:= ) REQUIRED_USE=python? ( || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) ) SLOT=2 -SRC_URI=ftp://xmlsoft.org/libxml2/libxml2-2.9.4.tar.gz test? ( http://www.w3.org/XML/2004/xml-schema-test-suite/xmlschema2002-01-16/xsts-2002-01-16.tar.gz http://www.w3.org/XML/2004/xml-schema-test-suite/xmlschema2004-01-14/xsts-2004-01-14.tar.gz http://www.w3.org/XML/Test/xmlts20080827.tar.gz ) +SRC_URI=ftp://xmlsoft.org/libxml2/libxml2-2.9.8.tar.gz test? ( http://www.w3.org/XML/2004/xml-schema-test-suite/xmlschema2002-01-16/xsts-2002-01-16.tar.gz http://www.w3.org/XML/2004/xml-schema-test-suite/xmlschema2004-01-14/xsts-2004-01-14.tar.gz http://www.w3.org/XML/Test/xmlts20080827.tar.gz ) _eclasses_=autotools dc412f38566b91012efd58b9c203e6c3 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 flag-o-matic 2274fcc1e7ef6affaff5bcd636275417 libtool 0081a71a261724730ec4c248494f044d ltprune 2770eed66a9b8ef944714cd0e968182e multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build eed53a6313267c9fbcd35fc384bd0087 multilib-minimal 9139c3a57e077cb8e0d0f73ceb080b89 prefix 7b6fb2fc216b101b5d97d171925a847c python-r1 e9350ec46bb5c9f3504b4fbe8b8d8987 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 185a06792159ca143528e7010368e8af -_md5_=34dff334b06fc41d041d809bcc50b03a +_md5_=3f846f94312bc3d969801508d3d24c37 From dccb03203200e68708e63bfe71a52e01336380df Mon Sep 17 00:00:00 2001 From: David Michael Date: Wed, 16 May 2018 16:45:59 -0400 Subject: [PATCH 19/21] bump(net-misc/rsync): sync with upstream --- .../net-misc/{rsync-3.1.2-r2 => rsync-3.1.3} | 6 +- .../md5-cache/net-misc/rsync-3.1.3_pre1 | 12 --- .../portage-stable/net-misc/rsync/Manifest | 3 +- .../files/rsync-3.1.2-CVE-2017-16548.patch | 17 ---- .../rsync-3.1.2-CVE-2017-17433-fixup.patch | 33 ------- .../files/rsync-3.1.2-CVE-2017-17433.patch | 39 -------- .../rsync-3.1.2-CVE-2017-17434-part1.patch | 22 ----- .../rsync-3.1.2-CVE-2017-17434-part2.patch | 33 ------- .../net-misc/rsync/rsync-3.1.2-r2.ebuild | 95 ------------------- ...c-3.1.3_pre1.ebuild => rsync-3.1.3.ebuild} | 2 +- 10 files changed, 5 insertions(+), 257 deletions(-) rename sdk_container/src/third_party/portage-stable/metadata/md5-cache/net-misc/{rsync-3.1.2-r2 => rsync-3.1.3} (77%) delete mode 100644 sdk_container/src/third_party/portage-stable/metadata/md5-cache/net-misc/rsync-3.1.3_pre1 delete mode 100644 sdk_container/src/third_party/portage-stable/net-misc/rsync/files/rsync-3.1.2-CVE-2017-16548.patch delete mode 100644 sdk_container/src/third_party/portage-stable/net-misc/rsync/files/rsync-3.1.2-CVE-2017-17433-fixup.patch delete mode 100644 sdk_container/src/third_party/portage-stable/net-misc/rsync/files/rsync-3.1.2-CVE-2017-17433.patch delete mode 100644 sdk_container/src/third_party/portage-stable/net-misc/rsync/files/rsync-3.1.2-CVE-2017-17434-part1.patch delete mode 100644 sdk_container/src/third_party/portage-stable/net-misc/rsync/files/rsync-3.1.2-CVE-2017-17434-part2.patch delete mode 100644 sdk_container/src/third_party/portage-stable/net-misc/rsync/rsync-3.1.2-r2.ebuild rename sdk_container/src/third_party/portage-stable/net-misc/rsync/{rsync-3.1.3_pre1.ebuild => rsync-3.1.3.ebuild} (89%) diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/net-misc/rsync-3.1.2-r2 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/net-misc/rsync-3.1.3 similarity index 77% rename from sdk_container/src/third_party/portage-stable/metadata/md5-cache/net-misc/rsync-3.1.2-r2 rename to sdk_container/src/third_party/portage-stable/metadata/md5-cache/net-misc/rsync-3.1.3 index 76c9d5112e..18ded3d784 100644 --- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/net-misc/rsync-3.1.2-r2 +++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/net-misc/rsync-3.1.3 @@ -4,10 +4,10 @@ DESCRIPTION=File transfer program to keep remote files into sync EAPI=6 HOMEPAGE=https://rsync.samba.org/ IUSE=acl examples iconv ipv6 static stunnel xattr -KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris +KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris LICENSE=GPL-3 RDEPEND=!static? ( acl? ( virtual/acl ) xattr? ( kernel_linux? ( sys-apps/attr ) ) >=dev-libs/popt-1.5 ) iconv? ( virtual/libiconv ) SLOT=0 -SRC_URI=https://rsync.samba.org/ftp/rsync/src/rsync-3.1.2.tar.gz +SRC_URI=https://rsync.samba.org/ftp/rsync/src/rsync-3.1.3.tar.gz _eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 flag-o-matic 2274fcc1e7ef6affaff5bcd636275417 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e prefix 7b6fb2fc216b101b5d97d171925a847c systemd 34815d3b76e745c5ca33eec9f95074c2 toolchain-funcs 185a06792159ca143528e7010368e8af -_md5_=91bbe1ff4912a278d06fecd6988c9acb +_md5_=4871e7359f567de89c0d011e262a8244 diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/net-misc/rsync-3.1.3_pre1 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/net-misc/rsync-3.1.3_pre1 deleted file mode 100644 index 2254a4cf5d..0000000000 --- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/net-misc/rsync-3.1.3_pre1 +++ /dev/null @@ -1,12 +0,0 @@ -DEFINED_PHASES=configure install postinst -DEPEND=!static? ( acl? ( virtual/acl ) xattr? ( kernel_linux? ( sys-apps/attr ) ) >=dev-libs/popt-1.5 ) iconv? ( virtual/libiconv ) static? ( acl? ( virtual/acl[static-libs(+)] ) xattr? ( kernel_linux? ( sys-apps/attr[static-libs(+)] ) ) >=dev-libs/popt-1.5[static-libs(+)] ) virtual/pkgconfig -DESCRIPTION=File transfer program to keep remote files into sync -EAPI=6 -HOMEPAGE=https://rsync.samba.org/ -IUSE=acl examples iconv ipv6 static stunnel xattr -LICENSE=GPL-3 -RDEPEND=!static? ( acl? ( virtual/acl ) xattr? ( kernel_linux? ( sys-apps/attr ) ) >=dev-libs/popt-1.5 ) iconv? ( virtual/libiconv ) -SLOT=0 -SRC_URI=https://rsync.samba.org/ftp/rsync/src-previews/rsync-3.1.3pre1.tar.gz -_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 flag-o-matic 2274fcc1e7ef6affaff5bcd636275417 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e prefix 7b6fb2fc216b101b5d97d171925a847c systemd 34815d3b76e745c5ca33eec9f95074c2 toolchain-funcs 185a06792159ca143528e7010368e8af -_md5_=9ade8802b00cf8adad13271bb93c138d diff --git a/sdk_container/src/third_party/portage-stable/net-misc/rsync/Manifest b/sdk_container/src/third_party/portage-stable/net-misc/rsync/Manifest index 677260a226..829c80d46f 100644 --- a/sdk_container/src/third_party/portage-stable/net-misc/rsync/Manifest +++ b/sdk_container/src/third_party/portage-stable/net-misc/rsync/Manifest @@ -1,2 +1 @@ -DIST rsync-3.1.2.tar.gz 892724 BLAKE2B e366514ae9835ba7c201a9e09fb9342c5e52fa36d45d46300d080403de25a64ba3ed7a703e56b4f47a743a597694a2d0a50bb4bab6cfa0aa7b59a4f7b93b9f21 SHA512 4c55fd69f436ead0cb5a0b7c6fdfef9bb28ddb9c63534eb619e756b118d5b08cfc5e696498650932c86e865b37e06633da947e6720ca0c27ed5c034313ae208b -DIST rsync-3.1.3pre1.tar.gz 905910 BLAKE2B 1823494a325181773cd14f2b8a9aae4ad6a891d70713e111f43c516a69cb9852103c7bb8ced864aec24b8d2a7a4e791c53f6e868276c6c6cc25f0aaba36ddbf2 SHA512 8e2e4623650985169d4ec2e84549f8b5f060b5544380c5b332998161eb1adcfece48216c343730eb726904079836c2d47dc85fa9707fccc02f09841eb547b597 +DIST rsync-3.1.3.tar.gz 905908 BLAKE2B 616a1f3239327a28b881310f5f249c90b8bcdb05091279cd62f9cb4e35a8428c7cdd9b89e711ba124601a738f0deb9bfbebafba7fd88b72866476138a9f8c75a SHA512 8385f4c0ea37e7a1da3cf45794154f5bc4d1c49bc625ba3b5f85adaf3eafe6d71c15bdcb1410bde731e5d4c19aff3331606637462fa27a68dc3e13192dd78f99 diff --git a/sdk_container/src/third_party/portage-stable/net-misc/rsync/files/rsync-3.1.2-CVE-2017-16548.patch b/sdk_container/src/third_party/portage-stable/net-misc/rsync/files/rsync-3.1.2-CVE-2017-16548.patch deleted file mode 100644 index d06607cf77..0000000000 --- a/sdk_container/src/third_party/portage-stable/net-misc/rsync/files/rsync-3.1.2-CVE-2017-16548.patch +++ /dev/null @@ -1,17 +0,0 @@ -X-Git-Url: https://git.samba.org/rsync.git/?p=rsync.git;a=blobdiff_plain;f=xattrs.c;h=4867e6f5b8ad2934d43b06f3b99b7b3690a6dc7a;hp=68305d7559b34f5cc2f196b74429b82fa6ff49dd;hb=47a63d90e71d3e19e0e96052bb8c6b9cb140ecc1;hpb=bc112b0e7feece62ce98708092306639a8a53cce - -diff --git a/xattrs.c b/xattrs.c -index 68305d7..4867e6f 100644 ---- a/xattrs.c -+++ b/xattrs.c -@@ -824,6 +824,10 @@ void receive_xattr(int f, struct file_struct *file) - out_of_memory("receive_xattr"); - name = ptr + dget_len + extra_len; - read_buf(f, name, name_len); -+ if (name_len < 1 || name[name_len-1] != '\0') { -+ rprintf(FERROR, "Invalid xattr name received (missing trailing \\0).\n"); -+ exit_cleanup(RERR_FILEIO); -+ } - if (dget_len == datum_len) - read_buf(f, ptr, dget_len); - else { diff --git a/sdk_container/src/third_party/portage-stable/net-misc/rsync/files/rsync-3.1.2-CVE-2017-17433-fixup.patch b/sdk_container/src/third_party/portage-stable/net-misc/rsync/files/rsync-3.1.2-CVE-2017-17433-fixup.patch deleted file mode 100644 index 0cc9b8256d..0000000000 --- a/sdk_container/src/third_party/portage-stable/net-misc/rsync/files/rsync-3.1.2-CVE-2017-17433-fixup.patch +++ /dev/null @@ -1,33 +0,0 @@ -From: Wayne Davison -Date: Sun, 3 Dec 2017 23:49:56 +0000 (-0800) -Subject: Fix issue with earlier path-check (fixes "make check") -X-Git-Url: https://git.samba.org/?p=rsync.git;a=commitdiff_plain;h=f5e8a17e093065fb20fea00a29540fe2c7896441;hp=5509597decdbd7b91994210f700329d8a35e70a1 - -Fix issue with earlier path-check (fixes "make check") ---- - -diff --git a/receiver.c b/receiver.c -index 9c46242..75cb00d 100644 ---- a/receiver.c -+++ b/receiver.c -@@ -574,15 +574,15 @@ int recv_files(int f_in, int f_out, char *local_name) - file = dir_flist->files[cur_flist->parent_ndx]; - fname = local_name ? local_name : f_name(file, fbuf); - -- if (daemon_filter_list.head -- && check_filter(&daemon_filter_list, FLOG, fname, 0) < 0) { -+ if (DEBUG_GTE(RECV, 1)) -+ rprintf(FINFO, "recv_files(%s)\n", fname); -+ -+ if (daemon_filter_list.head && (*fname != '.' || fname[1] != '\0') -+ && check_filter(&daemon_filter_list, FLOG, fname, 0) < 0) { - rprintf(FERROR, "attempt to hack rsync failed.\n"); - exit_cleanup(RERR_PROTOCOL); - } - -- if (DEBUG_GTE(RECV, 1)) -- rprintf(FINFO, "recv_files(%s)\n", fname); -- - #ifdef SUPPORT_XATTRS - if (preserve_xattrs && iflags & ITEM_REPORT_XATTR && do_xfers - && !(want_xattr_optim && BITS_SET(iflags, ITEM_XNAME_FOLLOWS|ITEM_LOCAL_CHANGE))) diff --git a/sdk_container/src/third_party/portage-stable/net-misc/rsync/files/rsync-3.1.2-CVE-2017-17433.patch b/sdk_container/src/third_party/portage-stable/net-misc/rsync/files/rsync-3.1.2-CVE-2017-17433.patch deleted file mode 100644 index 0ab8de1fce..0000000000 --- a/sdk_container/src/third_party/portage-stable/net-misc/rsync/files/rsync-3.1.2-CVE-2017-17433.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 3e06d40029cfdce9d0f73d87cfd4edaf54be9c51 Mon Sep 17 00:00:00 2001 -From: Jeriko One -Date: Thu, 2 Nov 2017 23:44:19 -0700 -Subject: [PATCH] Check fname in recv_files sooner. - ---- - receiver.c | 12 ++++++------ - 1 file changed, 6 insertions(+), 6 deletions(-) - -Index: rsync-3.1.2/receiver.c -=================================================================== ---- rsync-3.1.2.orig/receiver.c -+++ rsync-3.1.2/receiver.c -@@ -580,6 +580,12 @@ int recv_files(int f_in, int f_out, char - file = dir_flist->files[cur_flist->parent_ndx]; - fname = local_name ? local_name : f_name(file, fbuf); - -+ if (daemon_filter_list.head -+ && check_filter(&daemon_filter_list, FLOG, fname, 0) < 0) { -+ rprintf(FERROR, "attempt to hack rsync failed.\n"); -+ exit_cleanup(RERR_PROTOCOL); -+ } -+ - if (DEBUG_GTE(RECV, 1)) - rprintf(FINFO, "recv_files(%s)\n", fname); - -@@ -651,12 +657,6 @@ int recv_files(int f_in, int f_out, char - - cleanup_got_literal = 0; - -- if (daemon_filter_list.head -- && check_filter(&daemon_filter_list, FLOG, fname, 0) < 0) { -- rprintf(FERROR, "attempt to hack rsync failed.\n"); -- exit_cleanup(RERR_PROTOCOL); -- } -- - if (read_batch) { - int wanted = redoing - ? we_want_redo(ndx) diff --git a/sdk_container/src/third_party/portage-stable/net-misc/rsync/files/rsync-3.1.2-CVE-2017-17434-part1.patch b/sdk_container/src/third_party/portage-stable/net-misc/rsync/files/rsync-3.1.2-CVE-2017-17434-part1.patch deleted file mode 100644 index aeb8c2ee33..0000000000 --- a/sdk_container/src/third_party/portage-stable/net-misc/rsync/files/rsync-3.1.2-CVE-2017-17434-part1.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 5509597decdbd7b91994210f700329d8a35e70a1 Mon Sep 17 00:00:00 2001 -From: Jeriko One -Date: Thu, 16 Nov 2017 17:26:03 -0800 -Subject: [PATCH] Check daemon filter against fnamecmp in recv_files(). - ---- - receiver.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -Index: rsync-3.1.2/receiver.c -=================================================================== ---- rsync-3.1.2.orig/receiver.c -+++ rsync-3.1.2/receiver.c -@@ -728,7 +728,7 @@ int recv_files(int f_in, int f_out, char - break; - } - if (!fnamecmp || (daemon_filter_list.head -- && check_filter(&daemon_filter_list, FLOG, fname, 0) < 0)) { -+ && check_filter(&daemon_filter_list, FLOG, fnamecmp, 0) < 0)) { - fnamecmp = fname; - fnamecmp_type = FNAMECMP_FNAME; - } diff --git a/sdk_container/src/third_party/portage-stable/net-misc/rsync/files/rsync-3.1.2-CVE-2017-17434-part2.patch b/sdk_container/src/third_party/portage-stable/net-misc/rsync/files/rsync-3.1.2-CVE-2017-17434-part2.patch deleted file mode 100644 index 5b94efa0c1..0000000000 --- a/sdk_container/src/third_party/portage-stable/net-misc/rsync/files/rsync-3.1.2-CVE-2017-17434-part2.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 70aeb5fddd1b2f8e143276f8d5a085db16c593b9 Mon Sep 17 00:00:00 2001 -From: Jeriko One -Date: Thu, 16 Nov 2017 17:05:42 -0800 -Subject: [PATCH] Sanitize xname in read_ndx_and_attrs. - ---- - rsync.c | 6 ++++++ - 1 file changed, 6 insertions(+) - -Index: rsync-3.1.2/rsync.c -=================================================================== ---- rsync-3.1.2.orig/rsync.c -+++ rsync-3.1.2/rsync.c -@@ -50,6 +50,7 @@ extern int flist_eof; - extern int file_old_total; - extern int keep_dirlinks; - extern int make_backups; -+extern int sanitize_paths; - extern struct file_list *cur_flist, *first_flist, *dir_flist; - extern struct chmod_mode_struct *daemon_chmod_modes; - #ifdef ICONV_OPTION -@@ -397,6 +398,11 @@ int read_ndx_and_attrs(int f_in, int f_o - if (iflags & ITEM_XNAME_FOLLOWS) { - if ((len = read_vstring(f_in, buf, MAXPATHLEN)) < 0) - exit_cleanup(RERR_PROTOCOL); -+ -+ if (sanitize_paths) { -+ sanitize_path(buf, buf, "", 0, SP_DEFAULT); -+ len = strlen(buf); -+ } - } else { - *buf = '\0'; - len = -1; diff --git a/sdk_container/src/third_party/portage-stable/net-misc/rsync/rsync-3.1.2-r2.ebuild b/sdk_container/src/third_party/portage-stable/net-misc/rsync/rsync-3.1.2-r2.ebuild deleted file mode 100644 index 224e0afbcc..0000000000 --- a/sdk_container/src/third_party/portage-stable/net-misc/rsync/rsync-3.1.2-r2.ebuild +++ /dev/null @@ -1,95 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -inherit eutils flag-o-matic prefix systemd - -DESCRIPTION="File transfer program to keep remote files into sync" -HOMEPAGE="https://rsync.samba.org/" -SRC_URI="https://rsync.samba.org/ftp/rsync/src/${P}.tar.gz" -[[ "${PV}" = *_pre* ]] && SRC_URI="https://rsync.samba.org/ftp/rsync/src-previews/${P/_/}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -if [[ ${PV} != *_pre ]] ; then -KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -fi -IUSE="acl examples iconv ipv6 static stunnel xattr" - -LIB_DEPEND="acl? ( virtual/acl[static-libs(+)] ) - xattr? ( kernel_linux? ( sys-apps/attr[static-libs(+)] ) ) - >=dev-libs/popt-1.5[static-libs(+)]" -RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} ) - iconv? ( virtual/libiconv )" -DEPEND="${RDEPEND} - static? ( ${LIB_DEPEND} )" - -PATCHES=( - "${FILESDIR}"/${PN}-3.1.2-CVE-2017-16548.patch - "${FILESDIR}"/${PN}-3.1.2-CVE-2017-17433.patch - "${FILESDIR}"/${PN}-3.1.2-CVE-2017-17434-part1.patch - "${FILESDIR}"/${PN}-3.1.2-CVE-2017-17434-part2.patch - "${FILESDIR}"/${PN}-3.1.2-CVE-2017-17433-fixup.patch -) - -S=${WORKDIR}/${P/_/} - -src_configure() { - use static && append-ldflags -static - econf \ - --without-included-popt \ - $(use_enable acl acl-support) \ - $(use_enable xattr xattr-support) \ - $(use_enable ipv6) \ - $(use_enable iconv) \ - --with-rsyncd-conf="${EPREFIX}"/etc/rsyncd.conf - touch proto.h-tstamp #421625 -} - -src_install() { - emake DESTDIR="${D}" install - newconfd "${FILESDIR}"/rsyncd.conf.d rsyncd - newinitd "${FILESDIR}"/rsyncd.init.d-r1 rsyncd - dodoc NEWS OLDNEWS README TODO tech_report.tex - insinto /etc - newins "${FILESDIR}"/rsyncd.conf-3.0.9-r1 rsyncd.conf - - insinto /etc/logrotate.d - newins "${FILESDIR}"/rsyncd.logrotate rsyncd - - insinto /etc/xinetd.d - newins "${FILESDIR}"/rsyncd.xinetd-3.0.9-r1 rsyncd - - # Install stunnel helpers - if use stunnel ; then - emake DESTDIR="${D}" install-ssl-client - emake DESTDIR="${D}" install-ssl-daemon - fi - - # Install the useful contrib scripts - if use examples ; then - exeinto /usr/share/rsync - doexe support/* - rm -f "${ED}"/usr/share/rsync/{Makefile*,*.c} - fi - - eprefixify "${ED}"/etc/{,xinetd.d}/rsyncd* - - systemd_dounit "${FILESDIR}/rsyncd.service" -} - -pkg_postinst() { - if egrep -qis '^[[:space:]]use chroot[[:space:]]*=[[:space:]]*(no|0|false)' \ - "${EROOT}"/etc/rsyncd.conf "${EROOT}"/etc/rsync/rsyncd.conf ; then - ewarn "You have disabled chroot support in your rsyncd.conf. This" - ewarn "is a security risk which you should fix. Please check your" - ewarn "/etc/rsyncd.conf file and fix the setting 'use chroot'." - fi - if use stunnel ; then - einfo "Please install \">=net-misc/stunnel-4\" in order to use stunnel feature." - einfo - einfo "You maybe have to update the certificates configured in" - einfo "${EROOT}/etc/stunnel/rsync.conf" - fi -} diff --git a/sdk_container/src/third_party/portage-stable/net-misc/rsync/rsync-3.1.3_pre1.ebuild b/sdk_container/src/third_party/portage-stable/net-misc/rsync/rsync-3.1.3.ebuild similarity index 89% rename from sdk_container/src/third_party/portage-stable/net-misc/rsync/rsync-3.1.3_pre1.ebuild rename to sdk_container/src/third_party/portage-stable/net-misc/rsync/rsync-3.1.3.ebuild index 2c1a70bd5e..d61ad5797e 100644 --- a/sdk_container/src/third_party/portage-stable/net-misc/rsync/rsync-3.1.3_pre1.ebuild +++ b/sdk_container/src/third_party/portage-stable/net-misc/rsync/rsync-3.1.3.ebuild @@ -13,7 +13,7 @@ SRC_URI="https://rsync.samba.org/ftp/rsync/src/${P}.tar.gz" LICENSE="GPL-3" SLOT="0" [[ ${PV} = *_pre* ]] || \ -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="acl examples iconv ipv6 static stunnel xattr" LIB_DEPEND="acl? ( virtual/acl[static-libs(+)] ) From 99aa76bc84f142672a88485c70095dd8f9db17e9 Mon Sep 17 00:00:00 2001 From: David Michael Date: Wed, 16 May 2018 16:48:42 -0400 Subject: [PATCH 20/21] bump(metadata/glsa): sync with upstream --- .../portage-stable/metadata/glsa/Manifest | 30 ++--- .../metadata/glsa/Manifest.files.gz | Bin 421384 -> 423767 bytes .../metadata/glsa/glsa-201804-13.xml | 63 +++++++++++ .../metadata/glsa/glsa-201804-14.xml | 51 +++++++++ .../metadata/glsa/glsa-201804-15.xml | 52 +++++++++ .../metadata/glsa/glsa-201804-16.xml | 61 ++++++++++ .../metadata/glsa/glsa-201804-17.xml | 53 +++++++++ .../metadata/glsa/glsa-201804-18.xml | 51 +++++++++ .../metadata/glsa/glsa-201804-19.xml | 54 +++++++++ .../metadata/glsa/glsa-201804-20.xml | 50 +++++++++ .../metadata/glsa/glsa-201804-21.xml | 50 +++++++++ .../metadata/glsa/glsa-201804-22.xml | 104 ++++++++++++++++++ .../metadata/glsa/glsa-201805-01.xml | 50 +++++++++ .../metadata/glsa/glsa-201805-02.xml | 52 +++++++++ .../metadata/glsa/glsa-201805-03.xml | 72 ++++++++++++ .../metadata/glsa/glsa-201805-04.xml | 48 ++++++++ .../metadata/glsa/glsa-201805-05.xml | 50 +++++++++ .../metadata/glsa/timestamp.chk | 2 +- .../metadata/glsa/timestamp.commit | 2 +- 19 files changed, 878 insertions(+), 17 deletions(-) create mode 100644 sdk_container/src/third_party/portage-stable/metadata/glsa/glsa-201804-13.xml create mode 100644 sdk_container/src/third_party/portage-stable/metadata/glsa/glsa-201804-14.xml create mode 100644 sdk_container/src/third_party/portage-stable/metadata/glsa/glsa-201804-15.xml create mode 100644 sdk_container/src/third_party/portage-stable/metadata/glsa/glsa-201804-16.xml create mode 100644 sdk_container/src/third_party/portage-stable/metadata/glsa/glsa-201804-17.xml create mode 100644 sdk_container/src/third_party/portage-stable/metadata/glsa/glsa-201804-18.xml create mode 100644 sdk_container/src/third_party/portage-stable/metadata/glsa/glsa-201804-19.xml create mode 100644 sdk_container/src/third_party/portage-stable/metadata/glsa/glsa-201804-20.xml create mode 100644 sdk_container/src/third_party/portage-stable/metadata/glsa/glsa-201804-21.xml create mode 100644 sdk_container/src/third_party/portage-stable/metadata/glsa/glsa-201804-22.xml create mode 100644 sdk_container/src/third_party/portage-stable/metadata/glsa/glsa-201805-01.xml create mode 100644 sdk_container/src/third_party/portage-stable/metadata/glsa/glsa-201805-02.xml create mode 100644 sdk_container/src/third_party/portage-stable/metadata/glsa/glsa-201805-03.xml create mode 100644 sdk_container/src/third_party/portage-stable/metadata/glsa/glsa-201805-04.xml create mode 100644 sdk_container/src/third_party/portage-stable/metadata/glsa/glsa-201805-05.xml diff --git a/sdk_container/src/third_party/portage-stable/metadata/glsa/Manifest b/sdk_container/src/third_party/portage-stable/metadata/glsa/Manifest index eb5b254c6b..3a2c80d1dd 100644 --- a/sdk_container/src/third_party/portage-stable/metadata/glsa/Manifest +++ b/sdk_container/src/third_party/portage-stable/metadata/glsa/Manifest @@ -1,23 +1,23 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA512 -MANIFEST Manifest.files.gz 421384 BLAKE2B bfbe5e356f9fb5467472e01b9ffa4c7ab788e49c049d40c7633dfa4d2ebb5c4bf4f92a4fa43049b85dad5d10c593ecd0e243ea7c1975e84055fc34386f72a4e8 SHA512 f0c1e1729862aec592153456994003bbdbb8f9bff919d3e8a74ef963808bc6065be99f22297469abc9678fd65da4c09918d0a860c5e2f27c193f04efea6f9560 -TIMESTAMP 2018-04-16T16:38:37Z +MANIFEST Manifest.files.gz 423767 BLAKE2B b4b02eedb610a1c6d9e2d0e9f57f61c0c0ddafb48679b275cd19d127faac6f1d44d72cf4d204e2e99bbdadfb9d1e296ea33c63e12cff5af0207e2e6247914ff9 SHA512 ba2fcf04666f32bf8235a27f099dd883ab13109b872e9d00eac03e3e02b976470b0d5a6f1b3ce76acd9005d909e8b6e04ffdfefb9cce629ec213bbe88eb4d8b4 +TIMESTAMP 2018-05-16T20:08:33Z -----BEGIN PGP SIGNATURE----- -iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAlrU0Y1fFIAAAAAALgAo +iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAlr8j8JfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY -klBfbA/+II6sFbYzfmHBo4ga8eobS/m9HvPovkJSupaE/CJ52UMKsqp18Zr8Ja27 -WRGo6T1onvi916MCzxFgxXNoUQfGMOaXAecOEZUyQ+DlzGtXB7c8u1scUojzgG/0 -FtUEjMr5MUhbvj47OcbGrpnXY6eJEHwMbp/rQuftVORG1+e296B4bihALfpzP9J2 -6nb/Oby8qGY4eXOhENW6s2+U1f5AAYggvxssKxQ+WK24rxPIRKIQn/8jACwdaDyx -YLyL+TXj4JFZ3HTjgDDn44aG1M2fkk/qViWpLw+F1jTaYmNUHUSk57aNtv6z15Yp -7V5cBz+No2gJNPaz2BtIAQw7NhYFV78I1tiQ9FqpB+jPmeBDerhKz/6dcNyekwSk -bGerQHuyO7SRhF+JWrust1OuKcn8z9b8WvV1XpWZo1eQuTSqU6JPFQWaBpVT7+CS -Zb5YBIZuqKyvEwhx8LT7osCDX8cXq4AsRfRJ+PwUL1Eh3dRjPCDURW+0SrYKb+xf -ppzUCJhQjk0iigYsow5d6v03pionjkl4xZWBBetnyGvH3lpb85AylEHCDbhLOx9z -/zM5y3mOl2AddyVQkvEyCDy4z42MjE5gxSAoA4ixjwuFtYsCqrdoa4kotksPhPP5 -52d8oLEf3GvMNMxzILDBdkL6i2amqipA3q0MEyiB/2CblWsBccw= -=AM/3 +klBLhA//RVNgrZDx/5ZGvC+E2NFZhybIh6MHFsCzYZjlm4GH1owjNTBz9Pb4qBmx +I+Nmb9OW6GV+ZBIHG3xaVFeswQD+q4rFObbyF1Yxw/pDaAi3Bmlm6B4vMENcXYTK +9d1QtaE5ronANqnq1tcA/+cHxJSTTqNoTzWPiyfv/mtajuhdI0z+7zTin8+CEELH +SRXJDXjpStwVZbKNP6OrNk7zluuerY86mgAqVMrV2ZIQ0FnEYC3M69Y7U5lccFrc +KxLpqZWNLhBYzrvP+aNdfpPSVrMJhPBnPOYvOm3Q+kP4iiwMuYKWEfgjn0GfepMi +nHY5HUCZAxyB+kl5oHLAe8QL1yU8YfBjcfC9j3ZL25+M2/+WoZwaUNyOpwa5xx0t +8grQY7Sz3/pHE5XIttn7yvRUt2R2kMIukkhY99GNEI0TzDVjZfIoxR9vquV6i7vM +XGL9pGAEW91FSG9ZOeZ8Kb56DePEj7GY/d7lHPnAa10KBWN8YH4j0L+aBCbNiBLM +ugnK9r0C4X5n0/kbPY+5OLP5bdP3RWxjl5aO0BHpx1jFAd0LJgyyAPYMlBC21cva +3eaQjvLmdYab6zpIjJ3eg4Iwk96rgCddwRwWio5nZn50kKF2dnavndMzQIzNp+un +iK7AonyV5Z+E8dgVF1dZd/QX6WecMObMZ50fAa/3zXDuYK+Ce54= +=rOnb -----END PGP SIGNATURE----- diff --git a/sdk_container/src/third_party/portage-stable/metadata/glsa/Manifest.files.gz b/sdk_container/src/third_party/portage-stable/metadata/glsa/Manifest.files.gz index 88a05be6bc960cbbbde0a182aa87a57934858a8e..595bc6ad9a46f7e080bf92836971859c905a924b 100644 GIT binary patch delta 12541 zcmVdMS}IR#GS#Rl|tAa_!H zRA92gm)d{jRX4`z8m_ao2|3`te_(wm>z!4jgmVzjDFm5ahx0c?9Wr*3&#}SfWw}qD zsFWsJKWts7SCj{bt(%}UR3V>a8i05v7?W+rWuKFfPsU_Z*x%@?AFOS;q9GCSS}FUr zyjIsW2_($lLw{2aCs9x%7Xpq&Ez2)SU3aQZt;*Nh;`y>#zqV~3_lZ*@e|CU;vvDoQ z*bWgerFQ4QsbSfON}uiLnbff~e64Dic+|zi9qsR~A`9QSf$nAxyF#nUqSUmi= zbuDP|3|nF?rMq4L*jG+ey+=QipndwWtxwe#KJru!EN4xXy{ri&+a>8hFRr?Rml|LU zcerNr7awT3IEPxb6hNXXe{FTiGMi83Oj6vu;ePM=uHb~yyD6dR-^EDIgmtaZ%f5y zlTclNK%I5l>{s#qiHF*k&cfQT)mT+?Ce`ty3J5XyY?KYW%6rI&{<2zsuzdXJoeuBl z0B-H#Cph}nCDwT9Oz7G&HH}g%W%Be7BNx-w38U z_+0sxsi^DGsa2Une|s?$YM=|ew%&6P>H<#Zd)pH4t0zn0nq_D3aOvVPqSlph7#7$$(SlHF#x4IO|vb7Po%qw?5=E z?CtG3;xQ0*`-n|rN#dXf?j3PAW^Md|6}} zZ(7u8{dsnv7L^Le>~Y{mg+n%s5#ZH>AVYx_uAtT?n^mzzX*@%bwwq}0$SI5Ly|26W zbT3ZzF?xu~XaQ=LoKLNSrQxjURJ;Qmi2!;uZ^^DZ61$|nrsI)U&>Nf49@6vI?Q8t) zZzZ7A$4qmce}Q68p9=s|7eLp;^4x-7*4nLzwlZ>4`>&r%LFx&GA(PZsol~z))GVWS z-ni3Xk`+~%*BoTaUkmQLV&hpbrl&GM@ge=cZZW7r#|5e#+8_>yPyC@o}^7wM@C4eZ6Ey|9H~QDTFyGd$;t6x0KHWV+KVJlgiOvvMBaS!OcE% z?evC^H?iJ!Ie%W=K}rlc#dp+#MA>GEVmIeDYf0`M^9w=fK%Er=lB;T)E@?KaC`D8! zCVAr=e*nGuSrVTF5@9`3B>|ztaa$u%Uc#ij-?a6#w#^O|Qhc69Fkw+2pbQ~}ik9f7 zo=lVlq*?Zt)%ukl{*X*px=Z5{in(Dk1DrIZakHaVxVOiojpWMPcG^|8S##>_AXc)Z z<7Uf;&FiAh7~WiY{de+NBuYA1DGU@A#-X^2fAjgpnHe=1ul!;cfN&`x?3-5g7x%^M zX1J>4vGqGA%fg}2F7M_^S`;6v&ClN z=59edvZQ_94GR9UTKVt!E%o=P74lX&%oGu`IxccFYdhnNvUB%#4?Z;9I{g}*$mA`7 zfA~2kQ-$rCD1@@aJg|%cb!qaE6*pblv{lPD${n`VO(rZ}-e+woUsyh9gB3U<0Ysi1 z6BOHCOa9NM#}EC|oL5bz#!#qWWimLHxXR4lQmbq zwvJY0Tj*Z_G6K-=31ZcmHD@~=Fs6p>GB+-Xi5;}6$e;RKr`);29cbBbzxwiP4K{$? zM#seUP(L_8uK(k9%9I>WniR9#UDAhW(pyn(C%1(9?MQtH`e`=QC zpu~)qM!=qRHlGf~QL4}ZAoy3o)4f`M`tspJ;Q)N8Xf&@cJKxy^qTg2QCvNdEKRV4Op35;1$^=e5WgnqJr`2;z zF9{AuZ&V@@J=`kQczsC@S6IcFP5x;oi5Lsg$=ZUdphXHJ7|Ox8mBkgXf2pEyWKe`~flN+S zua88M4Z)W(w4phRK13G5F-TW8cRSYPekO`O>&t58zd8FQ?qMRGH5*$c8+YUlbwY=} z14Wv7Zp? zw1P?NL)Q9nIyyakl)$F!Qqv+k?NF4h>!cB?jPk~MZL-tU_&hfDAelQ8zO|{UTMDv? zmsyFD72tJ`4W(i&3qfD8RrZ>qDWt-z1vlmJbAMT_7q9vqt2fSsHRtR7h`o zvpREY$@Pv~XX4QEfi%Qfr$=8QL_TT=YU(=cr=WFK$(og(&Xo3tqMnFb)%l3GQuIKN zq^T@>*qM1rmkM<%e3z|6yJrw`L~yG9U4LyxC`! zI7?gE>lXZJsa5QnQyhhmj~vp{;nv~gn-s~xE;g8n57GNqb@OkBVO8azzGd6y6t-BY zO5N&+564`1_SD|DukE(1Cc{TP;rPk2uWxVUlf!XjU=XVpe{~KysTu-mwY%i>4hyZK z;G=;TKOPj=WJ%n|#@HR0RBScq(x4d}>6I0)ypFs&-*nK=_FMS`EqiV zLCzD&p9h$Lf6=V2RC9iHY$R4|#SR)e9Zq36BwD1ByXZ%vCaxBx z!{N-J^=?$LLEJfypDNKAMqeDi5)68dm5_es(gf%_9Y|68?Hc{>RJBLG)JR4*j#(3&;K-{pi{$;hUzr}RdPVa0Z zoA6rcf3)H7{;_GDn${nc9YI7_zn)bEi|MMPUf$#g^0V{-R5*sn<4m<@*cpe7$i%|Oa&Q+ttBz6f9F8DKuh3q-+pEaGlsuc>ute&esD45 zqA7{tsHd{0CmWX38=ozDXjeqN(dJOcO#pTzuZMdqjn5RTR(RJ7e(Df*1Dm~9yM0lF zwjMIV(p|cE*+V|kj##E#(Kh9H&p{9fW<2tiikwO(%Zm(-0+xA*-89W850FsjKjnX& ze^ykVHnEVrIZic4qZYZ>4$e_~Uosj%EUYOK zDiTL1J)H;T2;JN9N&b)SAor;JT~6v2f40Y4OqcYP_=cxSS|LtiT_Cb|osx!GF35n% z#VgN7fbgDMQT+8Bl2J?*o3Q7Mf5I44k6#Ma%#Vz z(_hK-2f>i51UBd6c+aBSoww||bN8eoVzBc}(N>d&utSmz8^F^4e{wP_eqebvCqYrU zz2f~wUQPR9#pa1EV{D`J{3zz_MNkH+Zii-q+N8YEo0Df6JQYROwP%hm5^?ZC`&K^G zS}r-;v+r(IhPlYIUAL$51)cu(<*yI!s|^*6ZCbJA!or^jpP=PnM50DmZH2({qn z;;53>#1Fge(jr)?e~h6_Av;$3DZx27IX~57V56wmbS|pg)uLuRq|)yGikffnRIeU{ z;*~|rZr-?m29SaD*VabT4e(%9mM(=lf0{qW{#I(yI)}~Jj6duzdHz*paj(`dmj4jb<+T&5^QA$ff4Y`@^XV15N2lm=seQ0^ zpnEHYt!`%w%ds?nh8lUm1j zH^O?`IWDqxf8ZRlv$Qqqs^NRnM;ch^OI7_Vna<{Z&)E1U0TI2-J=c9$y-+MR9fnUC zO3KCkj0qx-sPaJKT=3u?wbGpy%9LvX^n=W^Fy^suJr1QMF7z zsKsAZwYme#sd|-V0ytTj!tL#S>^pu(N0mC&xLGxEe?q5yLk~r6F4noVKJ}LX4tclW zcwroXF)MV;&HoaJ~LQ#MZ{ z{>&3SfA6YV-9?b!9fC(xyG_O1Pbb=vgxRg3WFD|}a2(FdhUg?zalZA|b#ThT;V4ru z&SR@?INZxS@?2blbbW?!ZMk`=D^9dKv8T+-->dbKO#hf^zJ?%tf$h4NtiW$6HErAF zZ7!)Dyry$(h8%pekcIu5BUDrj@1M^;KOUT%c7sy~$VKU$4bX z@B*z?-NyB00p&d52xMF;GBEM*x_rfc-dkQX>113yyZ^dc@B2i+$A=PLb6nvvF7xgW ze_n)r>Zpio+bUosXl{B_3sNT7nK{&h?HasvO^l3ZR z+sW2#*c8>RQ}`p+*PYK&dVJq(WfPC8E{p1=sQ0kEEOU5Jbrw_c=P?$HSFRK-QJIx>Wi6oSCOBHDv zUxh|JtUz{E&C3xF6SPo0+F?Ep+X0lc))Ednwt7(qi)%Cjq5>)9-eMqZ`Fp0z+rN0- zQUo0^mdAb(Svb;y*7i2%++_c1HB}cd<=Ej-gA|If=xFT`m1gBN83vupl~Cc}Elp{X z)VA~A(-w!1_oe4aSLKZNRToE1Ti;-xS?woKE6`DCPd!D&PBDL3tsj>=TLzzh2g}PJ zct?5VBl!TqzPNrVOVRGBL5vEXK%cp_b$A5=1ZA3J-(NQIgG#{O54G?}@{+{mr5fS= z0_PT4H>ZPX6ovY8X(wn$dv$<>B5S$La8?Ji$ErlO|A^sXxkcyh#lOPy6>5w(O4 zdR=XoIjjIx4vuJF3%+Ids*pc6~r2I`Nq*i2F=Ym2=N=bECS4@kC@QPA#P&i9wq zs=s!VA9p_IbxKR*7@y?DVoO;nakjb(65q9UJyRx=leKTBT$~ZhWo;gl#+F-z!prka z1e-i9|2=@;lTwAEa}82|t7X%1>fk{!!jf~kpYx*|cr}8uMN2p?IT(uS+S-s?7wUGx z^&YTo%^kjm8s_r8>Y%h*N41ksRQPm!fY6#9E_@vR*G0PPu0Yy+_9wbJRjwk8(qBB( z5^w%>wbF}27C!8c`Z1{auV-73aMp~!)F{dvc6Nr=?L$G)M@pN20e8C}fnRQKj3vXi zz!wT34$h8pQQl$5pL1wfA#6JuRdG=nRD8ayyQu%iA9^$Hyy@XRH>bl@B=d@A+|F{@ zUjvgA*|oecg#l{QoV!v+69ei9{4xDW6rWAH6Z2*qb_r(-+ZZfse0glj(cH%Me4dje zOqvEQtET*AwO+b^fgh?rV9+@oq#WwgbPb3cAR?r)AEvXD14^^0-9deRYAxlXfSzmxckiO@ct;68cb)g_{lEsrh=h9z}Wp}clqe@;n9||+d zZ7Luh^xQU);J>DXcb=3UoboTL^=t1PKD9>lc0ZRYp@sZGl|#iv&Qr1Zb_Tx0Ni=l0 z$O(x9WH!Lc#ZjnRc^#`H)|X9{GD*)E$|qHRK>ntGGpN!qZ8l5uyQZ`~aP;a1 zI*WAc1m4KQ1k<3jBFD}MCx<}!wB|G%>*fIC>K8GLJw{SU4yM{m>z$|6+C1p7;K-*I ze7bDpAG4GJp4Ych9698?@PJ-b=Wl!Kk0s#w!NsUm=L#jtPe5UAmnNFk*>7q#9eUEe zg<%_iD5qCmCGVrGsxg~Ej@?AwBbQ30n5b5xlxsMPem(}{^kbSTVyqj?5 zU87_I&h5prwd<+XHgQBJwxaKrGQq8|JBp)EbE%`D*1A__wLMKKu3;xbaaz!SGKGJ zX<2ob4eh1mYidJi(*(4CZ|$4Zsf(Q9r-Y|+qPBRfP9GH)H9L%(mwPL6+ViC5)_z*O zU&6(g)%t_w%SV(iTAj7HTFCcQa$1?vhX<32q+ha{fE+d{vB0WpDxhSEv2BJQRnn+6 zhFW?HL>bgYB*1tNuNg-4+H=!13GdZA&!jo6g8xpA9&e`yk*lPC-w0e%k7tkP4;9!! zv4;qk5CjrmcHHhs^jV61I+ICA*OYX!YcEMX!FlhoM}-t&xVHqXh>}EjQnPLK79fZI zwR{)eS(#r}>v!(-Bg#i&A~9J$o4wO#m_W|zWgE#Lol8nP%Nw$@8U4P;)^TyB^rCE5 zLz*>ke8s;U&9xza=}j&`cPwwc3HvfwruR}jE+B2G;y0u8)K`DY;qXKHwPe3`*~79O zoAwo}fjBLTtf01%b8S@mz$m#^TPvKmHM$~|yx+BFT_r&tJFD=mC8zvQ5_lWOAmuuG zCKZPd1j7Fk<$vwH&yQ~4QZ@icW6y)V)Y+n4<>{gkL+hJ=KyE2b%3=+kv#Dgamhyxb zziMq7vb-4zwxR#gbvOuDJZWRF@H#Z4?dp^Ch>(AMhQ_(e*7C19(cU7_IRvV@v{e)8 zW*Zh2jy7eh9$wu^++IadszdLVyRc(!O+<;9_0)iiI4SkfNSsNa$?J_E*V^eu1!6im z^VvydJ9G4ZZDs#uwSKTXVCNmTsQi)?Py(O#~rYBUwN@q@_`s1V)>@(xVT5txKj2lxrj}m4m&q1{U!d`H|cC zlI_t-)d_i0mT7B7fcX0)=HDKK?wTLkZh7~YHG9){kQ{azva|-}=pO{oN16&akB5_R zG8Q;ivE{7l2G1W_uk+HUTGJl@qsp79vEKoR^Vympw+!UwI0XnlxmFdjC{fS%ogSm1^cjhw_-vgP1%E~JrYOt-hsT@ga<>O~W!6hQdx z^l&Amp$?7ZyI0QyuN9u5OQbeEofDum3&EL?s(a4!sGFVH-lJ@nleyV|9T2Gf_ZAyg z7MTD*@=@cT%{M4NZeqc--*a&+>$o#D<(Jj^^&$J{%Xj4w);4+|P;e42b$BUPR4&nf zPclj&P`Hx>lC_mc$*Nt$v#pz`4S2kcC<`??2Mutf>bGbW6P0=?c9ay*y^ihw)1Bb6 zE2KI3+q*yoB~|C2JO`y_)=1rOM;hbMas2NfnjoT4m38?A_0V}zt>oly1>W%l`melI zEYhTgO%A6kP<3A_cxXg8Qf9+BI#1<)FH?S)cE7CFFVE*=HqgRq?09V%3}V#z%DxQH zlyo^IrH}%gR^x1vIv;K848B{K>E=Kk_UV=Ex}-j^I^GeeideT;a10#g<Y<^iwpV?O^K7z$3WiYoo&YvRc2~*H5M}uQXMCy@(5?+)`bG zCd^9}@_H(ur6vrJjGU=IwKKi!A0q1T3yWPWXI-AVb~05|c;GxF8B@GO{mSLLvDkWC ztK8;9k(yuXL%sJFyN2^)iwwYjlq%_0f6X4{-DWBdsj?-K0B;#~DXQ@EG^fHk%|{JoWO_5J{E1Q{h31I9??MwoOH2BKt@8&mg6zW?f0+{3beWDm-7u-Ow- zNYYYxz=Ovm5UG7u*L+WaR~{tEFgCNPX-j{Ie{etpQ|dvEFLrQR4@ zQ=j_c5zrQzTyZ%DtW=_Zx0Oz~awfZ~_SF7|_Do%_)^bY0OQ^?@;ph#L>!6*(x|-b8 z$4gJm)-3xDGQ*Of=Wp@mU#q46%pt1>@OG%6KM2r{5IA5>_^JCY_lQFSBX7)`!u8j3ze~`3)Z#L5%y^L~lt$I0qR7u+u%$jBJQ@7sSw1J^^qB>W4=74QxANIU7 zS4te5sm%EHJ<{9I19sNqf(#EWcpfA}s-C M zH85;%hnpn+1k$R!C+!?mWJrd|SI0&LV8z20ftq@%@T$gtbWWgBAIH%w!iK^tkKF+)qPM7E{TCfBHUD)kDwTJiKPZPG^4A01a)x#Uagmo z&4-q*x`Ul?or2^WdqGPnIbu9vN17d>cBb_JcX$c+)|?W?N0}i?<8c78nn^cRq-}=2 zoJD9L?xlr)h}|TKRZ8?zPu)aZcBCX3a*aawzpK@1)()sYiddIvS9JR$6Cl+$Ch-O# zusRjh%Utkgy-1*7#Gu~ksly9})(q1jL+_?R*A-v|Tu^U*5)=3+TF7iy4Q+f+CI7WL z?q62xPY;5a^VWlys=gem!D{rYrTtknwp3xCS3{zInR+e<-^=kMiL6LKRZ*?Wdk*rz z1wl`LbGn?i1_BMAG?qy_B472VdT^TNTG5Z|SjwjAv34U=SjgAbT|upr@1sCTa)4 z@`L$~jYRl%5RcCKs#^c>9py#d;!Z4 zcHmsA2mPu~4%YNWFSA5e{*PB*D(vdi!D}UdSWrSY?e(I+YqNrY3T}P6eA}lS&d??~ z-yBD>2oKu6?X5ppzI~`?$iX(rYTR=x^P$tpshfAcc0H%{q|}}22rpP8ll_3LQOp#* z$CMTi6cki7YTT$;*pnBpZ-x?-U#inj#vZAljIxNgfKwKRwD;m-$i?m!hs}pzn-Ud& zg+%INOIido%spixBYh9Hbq(;mFuyi@Pt+rkba44xqT zTAD;$iurwwTff}b59Q&hJb?uAQ}v6;USY4Y0@}{r61AKh1{+e*Q?QY(X5QNP-i10q zySAl$T?BqvO6pLpLn$^f0K4zely7%`Bq|%ho26ZgWI0cYSHIW=V70u_>`?SymDs9# zW;?qsF!nt=3u3=-5&yI&b6(7rWwgbvPKSekx(riVQ*>=RH|GP2!^BxZGZn)4R!i%m zxCvhOvG3~6FFlCk#eIFB#F4G?<)1uhi{Ft2XWK4;_0fs*7+Of?q{+4n(?}qHAa)S2 zo%fP-qzwI8+9B&;3umw+dBTgQcGir)O}OB&K0uC>L!2L7hljHWZ=L2VQyxAi0FtE- z(nNs;ƭ{SDq?;w@?vw7dEt9FFkVm}_lq+Yq8$zYpmP{A6c(ZuPDY{W}}Qu&%qC zw(f8-@A$6OwUkDj&o8U>J7e>IA8yEQ6S{`0W4C>la`DQiL}|4gZn=WIwr3vcv9adh zC|{{kQPF05p5PUtN>uYUcMZsHC&CXPfy!Lt2$~8cEr4_p1c_H|5Snt#@3~U|fdg+3 z<-DE(OL1$d1TsM%USj}4^M77lkb{>w$u5?+j55?M2~~&Xy>F%`dl*E2LaD{cb3%#o zo@X43#OO@@@@81a&rL9_e|H1(YhFHt|1iJR52vqnOlwq{T|y?Q@UdCPHzZt~kD4bA z7ikJX)dEyk;JuUU9;pb&omkQ5QkLbS6zk0z>7EY2P!KE5V#MYwu*y+!qY<_!Tzqu{ zZz=m^_39-)b-9x@ULfgzX~zrVy9Jf4728%G%xfN!OlCI{S+{E_dHGg8rbfU}PtIF5%dt(pVNM{X^F3iJ z+1a=OG67VtT=eGPxL2v=1Tmh~yA$hJHQgPtZj>HDu+HNQKmaIzLSyDm(&E4Es$BV6 zY7)v1e9xU4&Se}v8H8sO_8PeZz5`iW;YCu(&@O(PPqHpV9S3HVP9kufMx$Fbeh}$H z?NOAY(|~yui;AUdj^*^d`!?D-b?u%AD^u(ozpU2FyWj&soY85Ii|S4PF#RXg-Mf34 zQHgCko$9Fv{mD;%=iM5sNexr^`DFd5)@a>!x%ZEoFC~$;TaNE34NG*La&?1T-EnEw zQXRQC1KA8Eo5nbz)BrkA4tnA5FcrP$dUmJVA!Jr9u@#HIPs=Fg__=9(CM!aS^b>fT2isD zOO@lLF(}7B>(Sx#scNh;L;=K{Czgj23v5S-Wi@m>PY%F2s2X)x*-|4#T?*no(RTSN zLU7F9)$Ln@TAx))kfyv@jxPiuX~wHp>R&Y)fdkEdg62|4VQK;2y?ij%R1mb6cWiE3 zwasyOqt+l3k_3xfmZVZ{6VuzimfOPPXf&E4PpT!%R45`;i@qp__seSiVEK|hZZU!- zv^@v{hn%MsZU>d4IuM-*6jiV4mj<4EWCB{%UDc0Ts^;ZR73XJ*H2{6i^rN-24 zP{m&ge=0|!10aaa~wMZMVKOvvF?$cPLgtm*5AMQ3Ga>zU`o(?CD>7tGw=f z+6RL0$_sY_uEawJOVlg#H4e6iPLck$q1?vHpycS2HO;;GKshT z0YL8avFR180XWeF8>zAPHVh`e=|^AkMQQg!5MUyuI{+iMSPcA)?zqcEs1lWsEGQ8Y#bmrXZ9_qa-Ji$vC@43?~1HqELlv6wec=FP6HD!|& z0~*yCtYNLuy`?AfQDi%yWTTnGstT!pSJO&OM*ii@=c7PYw1Uo@1U|(wh#dYX-mH8K zP9(+cm(}`HC)N*5N`KI^v@g*XgVJRdUZjmvIgR3lx&XT*XEK0kpht4h41nLH>|W5$(EGW}8*FyKrNGGa zxZ-Yz?+)#`zO2@tI+39JMyH8mv1DR%;P29?Mfqq!vyh_L*Cx|(W-dKY^cg$62C`Zv zhJu7{Rn^8VM>B^O0aHLlg!&LyY2!3z4?jVX)T$SL}Mo@ z%dKgj{ENcZISKNdmlg_MM0lO9l5ABIz`|G}D)F8-C<0SjfP&}>D$N5Locb!=jl`zt zs)E}8Q})`?Ro-Ek-%jFho%rEbtvyil&hB6z&2l+YHI$t@h{Hn9d~3mf0h~F6*g8Jx z@5g5J{!u&kr4Z!3ing?%PV#v0Qh6RjfealAy|pgtKb@C%sSboHp#%bp@3`g9PV5a! zZqkdk1aTbNP?hbKy~&Hoaw1wZQ$y@|LGnL!7SMRe<~|;8vdQsOTy?iq;O8GwWVgaU*Egam{Iv<5gve{6Fk$&n-aU#HLs1O`7N4j>5nBLTVr z$p}J%u#f=l{h{~RU73mL#0&1H;7Iyxq+*24+&<-Cd2q_fO#aAZ{( z%w})1pOrmC(omLCrgv^$`kop;%e-J$Ym|9t%%;I4P*^GRu`G6pw4BBPG*xA)X`A!3 ze{wpnop|DwkFI~ku}3%0FFEn|{FXjSZ}|+(29NF8d_T{r_z_VLM5IR=pirY%5Eqc) zQd{u>Qu3eF!57bvBSMj)B)WGK1Rb`PBq>d4s5T z%ag4Lg8I!+c^NW^nVGE1-%#F&Q|6^ee^Fp$+J<{>2U+XwWf~i$9c^W=gy%f?iWisL zszqCIcR{Ai(&n9wONn2%|1S}wf-DPHbz#5ycM05s2C`=DQ(#_N)QTS*ffd`@OFWA zmHa#IejJ*hds37nae`FVXg$?9-`?^|-x7+#^(80%%x?kwJ}d#NducZn8_?T<+)43K zfyoMAYX6m2-5959xX#ul|-8 zT3y#9kTCxa{Y^QXL_v*Q2sjqCEWadm-KjdYD&K31=gVsS*tUJ#Cr*vne*yB%#g+MNTZhGiovg*MNvvk|7!kqX>ONLK`MPva?$B0r4h1JRNrw->6y{7)8R@$lo; zwV=f_Y>Bm$?s@@WUpZ0r9{osy_UXsAK2=}%$WuA6oHbSUvL=vhm!t!|xataCYJf4^ z;hN1~e4ypx9BS240Ew!!f7K<+Y(AAUNpbUr`@QG8f)jpUa^lbY7Vz|a5=YsCxDGmqQ1ILK@VxW>t;GMZzv z&VlQ71F*|Zt(VPoA^5#lYmE@vQZ8r}Aw(Yh#EZmWB}*h{FXR+if8fk%25q#wEft$h zLUjQGb=GaOU&Z$)9%^4Y3v0txV^z(WRL74hAjIIaQ8w@@?;#`l%WD0`^6{g0I=rI; zxV4Ml;OJYISmUKLp=-<3G)l3Q$^WZR`b3)}S^$AKFa4%sk9fL9NK3c;j@eD=UZlb*-r!2DfzV6!7 zy*Sm!=pibj1*lnaKD7##hO?$q@eXh#0_f4aCA;oO?2`JLjz?ZWZ)`?;NY5X)ukok9 zm4H$oGtGGhe~LYQE&xbf09_Bua|?c1YquiW%E(RazkXc`QcoxhnWVnzoO*SlW*NQn z#+?R}tfP{z{-An;G^u&Dtt0&a(Im`V zB2K~-aRV6ZrTlE!DwO!TbW_o#1qAGf68mpBIyVDxf7WhkG5fOv$r_0R!LC=@R>nu7 zfcdgozomzdkDGn3Wym@t-mnZFEAnsT}Pki(;=7-0U;g zPH*^l6YFi4^Y_&qq{NU@d`B%vlx>zMc5`mCmgL?szYv5D)L9`QxvIA5l4i4tQbcuP zk~hu)f6%L+CGklh5!NGB5)eupw>1*wB}~fuOV`Tz)3?IH#=&DdwWdUNUpqXr(I>6HK)!FVkJvD zZnk{bye{gD;mwuTen9WNykw13Howl+|UiiCTSX z?iREoOWNn%px`g7mH(XIQh$$HA#at#Oc61w<0411wlmHsJ9lsQ;6uZ$)9=xVOx_ZR zf1h(QRoJeHLMThj1Is8-mnI)sanq$uTeW~frm$o-BG>B5lV{1=mor`=Z|jy4 zG@+E*>0K5zQks87r@)+-1#|fjvMGBwe?tYma7su9kLqM0uTZB34tjX_E$L*Pthw^F zb+jVeLjMYo5rBSA5Ub9tIos)gF*R(Lxp7HM?4VUe{?y+(<<1@MK+A^v)t6suumS8g zIwr1%`oRHm{U5g*{~L_*koJ|DaFBV)5o>yuNKRgdQms=9YR)pC>|`fV)E2_0e`W~| zO3Zj^1ngO7^XX6=r3xJYg1-u$?$!F;mk%Eb2jELZqj`PV`R@LxFsu`{3c_rvN7Z)1 zLU+oB(*=a6*9gBt49DL@AGFhCF`dU8N>GMii4e6}&a6HN`&rvJ6c8V8Zyjzw-dJy~ z5yBZI?sXBpNH4=%<{QA=%hmLke;&y@*WlfL;EhVvk2YweG_$V&iF{#FUQ8{doK|VN z$dZB`4bu3NLz=fJiv+{*O%mQg;ku{3h_N7@tSzVtTBI<7p&X1`SzG~|e<})R=7U_e zWGNpysp)M*7Au*UuaoDe>_Nrr6~)kX%)PH^SnnX`CO2LMM=j%~O%I1r*Kl45WOAx{ zeI$}>2)>k|4b55fA+iXLLAtuR+p#A1Gg0(eUsfys$=NS)4-@IE+1M)CxFc_<6FT%A zDALR$|6kIWpk_t=m{=n+fA98#)YYdtVZe)`nux4+S_=4p%!%~if#!9h=9`XL@DpT0 zE10xCWUU{kqtnAj32e$PH7&B!4n^6zP8y-gC~vISCOb`y&tqc`lDRYCTbru7r68Ml znUyG60bcjmP%7545cCyWWv?lkLMqH!a8nLH_m|ar@v7fZ9zcHWf7vik5p|xH1o8C# zD(%T_3%!|Ay}AsLY^la+DYx|ayjOY6pjHWR2josW1cMGy2y zn#!_=otc+(sZggPe*!w+krci6S9)lf8q;%Wsl3vc)%wBmALa#eYi4pU^AXR-n|)S^ zv$U1HZo!|HTE(t8#Zd_P$RRBqZXHg(Ns%1vVuP9Z5WRm@H~)4RR#gt_TefXZVT+Zj z)UA&AaLk2gPwjpC+HT8gGJMn%j^8Z%`u0XXIUGj@2C;fkf9H^ssv)3OyGu^*u+Sp_7{mc)H*jNO4r#a4qZ4VuA`URm+V>&UC~V@V-jR_pit7S;H>@=^DpkaoS? zk|47!bs|}#%Hug70yInY$X3^K)nH22J!&>8t8Ovup*vtNH9O1xw`0?sPEzHNZzoq7 zG#RU#Y@HtAqfvqiV6VseK>n65hN-ocH%+g30{@jtiLQg&^)n%n9(Y7avC|D)d$zoS&n{w6scCdPWlJ7YEM%K7oNq zPF7sI1ZOMDejwKc16@1Z4PzZ1Yk$ z>meg7-KC3{J>(010*eQ~uX! ze?|3a6AQ_k<5Y7rYLR>G;2gF0C8Ghv!kThK^>QR#Y>!*2%%K#M3dE-Lbr*g6-foa~;|oUl8~vo7t4I87AScKd)6fNtWd zB5{P$(|J&i(7hd>ATBhVZ_;j$TY9#0KLYuAM8%%d9!`3Vr*iKpTyY>- z?U!_XK@dNEdFr%x+*)n$Xl(i`a3*RzBX|?1eMZ$Y=6()c(}oio zd3K& z(aLK&>QvbY{Y#Yp-Ived!~W>hXDx2oNSjZQs=80%Bqf@!lcLDp6u*tvgT9k^Xkjzo(pk?1eWLA zu+%LIY60Axnqg4|Dq82=e~)~4jmn6p*&0g&%q*o+H_>`pNIZIU@uEfgUiSiLi0kWW z!}}90lNF4jaElZU~-JQ>pwpke{Pn?owV|T1O)IusSh$moU1!?k+{IxL;14AYp%(mH z998m~_+htQS_CVVe=(FPWXDQBB{&Bs=cjrMY!nrn&PA2GTGWh(RNCENQS&XH>eYi# zyt0Vd%^UZx0c0TkwY8CS13XxjrAwjCpXQITf0SCZj-e+#M)&M12hJW;P=eyoqnd0W z@{);}82=p1-Or?$!Fi@*iTlymn%BzBFi5f7g;9KD~nX=oDQpwGY+~ zbZ@1QoTvlvDPYCsHjF3H^D(tAAwynUK&2i^ORDw6&boz|g%?iQB1JtYyb*2s)N;Q? zz#k5+3NFg_Ud|*>3XDv))h)!DQho7}oW)wK=xk2d*k+KVe(O$oKZ;>QH5ycXQtSBc zMp$n<$3@l-f1E>hmbPYHHGFUSNCPW}A}zSzFJ!s>J$0R4vmF zYVlW9t?s~bs$ON808Un>aC>_n`;OnyQKe2bZdOg4f6!^)&_j`%i*;_TPyHo;L*6Yo zo;nXj#JsZ*tzGK60wGBtQNyH8ieDfm`=DP|>j%q!D6DvF3_r+-sG$Auh(KG zc!5@{ZsYp0fO4L21Troa8JKu@UA|&J?=7#HbTTfU-M_BZ`#ury@u7s*99OuE%e?!8 ze-~k&Ix6DYwhCAYnw#F#f|Ln%W)AgWy9O^^6XWRQ3rK9r{jEx1xu(Cy8f<^3Q&ZHu z?PTjVY>MjEDf|)Z>&|B>J-%ZnA&1nyL$!a_sP^K?=oKbhP$}O0)8s41><)N~mz~Ev7U{ zYTNnmX^X?h`_l8It8&Kss*9tht#7c;to9SA73iq6r=Fr>r+lK$2+B0czQ1hZ2bF-mA8O%|VWRUsnRvx;3KU~vAO6BCcpB3-gW{uww<1h!}exS#)+5EmeQ=2EmVjqkJLXV!1rqX zVEGS~MPiLp(b4&!M@QbH+FibSOhrwJ>0MV8@Z^YpmpZG&B5Da8 z^t#$Eb65eY%BA|TT;X-iwezOrK_`~L4b&fJv6-Y$))spk&NW3tACPP*qoCcpobNBI zRe$UzKkj_a>y(zrF+RzQ#g?*E;%s#nB))6ydZtV!Cu`qMxi}-1%i269jV-qbg_q}< z2sU|I{`UZWPf8Vv&NWDXt(Hy4se=c_2usfCe$J0>;MEAq7A@hpzR*`Mg@RJn>UN`LWC zOT78(YNZ#4EPU7>^9ke7)yq2 zfo~K-9Go5HqP)Y9Kj+Y}LfCdRs^X$DsQ7$YcTxWzf9cJ*^QMRQ+?)XW-;&Cz6XLv zDk0Dx=+qyqSM(-Lp4wQFTpZ>E<&?@v1JAR9YRafZB1m_C0N*PL?Z$a8GnS{5tbsuU z>7c>)a(IBZtRmi*)k;66!XL^k)WVm?h%><30F*e}cIW4yHh*NEYkXdc!fT{VO)wnM zj%z8%b5AOIewofr4k*p0b_ezOskM}k0(!C)+`Wso)0)$8teXRjt6#)0_83VaIhblMt#_VMYxAJTf+L?= z@aeLVf0?BW@Vvg2;>aQAg$MMiI)B?+zbygJ4=zTnI#(!BegX<}yEM_P&VEy~>Cltz zEezX#KsmkgDtRAeRgKvUa_lDZCQ-j{JvGX6&K#RVUa2ZzceghI?m3j%*951tSv=Ts zB#sYWHT7v%(O}fNq84O8SR(>oR&k6z%bw4Bv#Cv^fZSW=)F#j_I4N_vnv3rFK@F?r2GfSwKqZ8f%~Yex^1 zA7Gn7{ZutdILccc_5!mW>C$*fx{IL{G|Hi3)A^GrM+KZN%u!{&kgKT$7l_bN#if^j zp?Yys-srNd7-IJXze)~=^k+r$x_*owYe$^^H8i4;pC9D&x_!N}?G25!s_F*4*%DJ=6RaDhS=&+FMo-lLnqG#! z^_M~9k0xNfY9Yq6<|V&!vIW2=y3Y&qw!P;j#b&Yy%_dD2s-Bar$0G-r~D_S&vP{nSWsBB&L z=W4y|y~}%Vb(L1w-WrlNW$U^(_)VYErhmYQrwqm1`J|Jy2kaqUh!osEs=4!%eU73K z5!=H{z;yyaXW5FQLDGvO?1!S*>EuP5KONnbT=I(Yk)pWR7mJQXDtR#;=^a#18qRC> zr)AY$Hnf+Luc-~8O%u?6zO`>sr!I1apAw$RiQ3|^I(<}J)a)>BUhb{PY0s0ITl;DC zehC*}R_iyGFCS69Xm!@&Y9ZfK$!TRuA0A99l77i*0&>`-!~(0XseqCt#Srk(Pt_4=}aaeT~pG@uDvAn1n0fS9u-oA;ocIkB1#hBNzJy^TYwz; z*YZ<%XJvj_t)IEmk0>9BiNs|2Z1zr{VFEd;mu)12bS^3FEN{rpX7u|WTgSzj(u=ZL z4QbZE@fH7ZG}nfIq&K+$-Lbs&ChW^#nchqBxPY{!ir}C zY}!|>2I90VvVz)5&b3kL1Eb_xZLM(L*64~<@_yHzb(I8p?5x6%mYnj7lEB+I1}WFk zGpRUyAQ1kSDF0*ceSUNUm$Css8hak>rOp=ZDo+=U7+T+d1aeDhQWk6QoJ}RWwUj5k z_^P#O$ns_=*oOW`*Wn;s@uZEx!t2nGwyRIlBSQZ585-v8v6;-u6^BXK5yCa*VwTx+Kr6^QBN z%x5Q+?aa}Cx0U^u)%u0y0Xy%wMdg>IfD!-=pi~o_=2U`HZB(PnnZT+qI@|f0!MmPY zWfJECOVcsSVH$7nyOS+h$4ro!b9%|{&E_9OY1WTjL|}MP{2ADvl*4?jmZCnCnZ>f| zkzJrHCclbkKCC1NUYCXJ9LWOOAuWy4Brw|Kl^%V6Xk9XGpj;z)sT}N;HL!@!$gkYa zmu!z#s!qt0vP@eu0>qyuG5_=+bl3dQcFViJtl68sgXFN&kfk*!NBr+9LgaN4NwE5* z)~=_2YT5SAyohxLjc9ixYlkGMGg@P4HTeVyLyJ(W&uY;a_Li=)^I}zkUdBfWERlkq zH&y8+sn^k%TXhI36Ls+QOv!DBAIz0Yx-*}d_#Vh4R90U3P=jr~P34$Ub(DyA zs+%{Dekm3fcCgSRWF(-r2xWj zr-v&k4RvTN-@SS!c&+dZT_UyV>6`$iSqRRARNZr)N8Rkq_8w)soXpJz?0`V+zqi=1 zvd9Dgl8+kyY`#JHaT5!s{ho_sS;w8JDZi}Nj}O^LU%o4ku(r_yfr68Gsl!XTqH>9U zev(lNfx?|6kgTmlN>=R}o^9PkZNTGoL|LfGIcR_*Rlh~6n5fiCv7@Ab?saVcpY8;o zT_MfM-`)i(D5*OCbwEJbXet13~vw;>?W5;XDU=X9uSN3Iq zrliX$DTNf^v>IoV)cI&zXYk#^Og9JWuurdK*Cq9V)$xu%Rm8f*f@9z?FNeM~f|8x# zP?(aEo`JP+Hn-;mqlEUDUy0uP5HnRu2tDwY}`^Hwajf5SQNn)s@!y7IPyEDoYAUKqT5B<(BFi zG+|zQ^q`jm6gE zTIDt;iq!m4AL_lg*fpFVTVw!#rc_D4`fK(m?>19$NR=&-1bEA^OHqZNr#Tg_YUCvQ z@&?uFjZP(USdXBoq^8Hu0;vSZNC3{ewgUz0x zLXwuk10Fmkfk^GMy5@TVyz(GPCZD+VK1aWJCnIkw5-O(Vz3=J-A{M->pC~(O5e&S> zqpoRk!{aflV$+1t?e6O^ffk120q*tP@k~;p*_Pd_Gl5|wbL20p_2WYp-+N0}FZIUQ zn)=iikASw&h{Xu|sgunr7!cX0Ixknrt7y-@5hYrVR|W6V^Mw zxl-cbOl?jN(krlg9NrhoF6r-?W~rPPF^*HiXI4F8Rqb%&LDq9)T#a+8oI^{%FUR+t zPkp9p0xHq-r3`9+Bq1-*ffH4d;Pt{w*^*pS8R9&Zza*)uRzHCQ{Mw|*ep#*SPZyCT zZkyo3nH>J<+gOdQCWM^9_(N<+C*hY`Ob!shDhnec@pC!ZqJ}$F5HGUX{o$u9ogAA2 z*1)j69d45N6G*G_p0smNks%o-UmY72fE5p01ZwK3!mAp8(>Z}keH=%#2pbBoJdRr} zjlf77O}J8W;vlv#^dRPm)NMXNR`)?UxFiM^iEvYGK7wM@C6*fG(2TC~5!Au`bG2SN zHXmBL>JE0obqbPi>;)~Qa>J#`at*^!cD$TbSx|EyN4Sv#QqC}LfvUD552On_A1n8X`| z!0J>~FLS}0^&)|S5rcZCrw%U^S~Eu)d-;lL z;a)s{%9qvpeV!svuJNWXR-Ksbic}tHaWIU6a0D};@1lg;R06nE7Fi|@Q zmS4C9%gDqhx30QgQGS#B0or*hPp3_{J?K|`a + + + ncurses: Multiple vulnerabilities + Multiple vulnerabilities have been found in ncurses, the worst of + which allows remote attackers to execute arbitrary code. + + ncurses + 2018-04-17 + 2018-04-17 + 624644 + 625830 + 629276 + 639706 + remote + + + 6.1 + 6.1 + + + +

Free software emulation of curses in System V.

+ + +

Multiple vulnerabilities have been discovered in ncurses. Please review + the CVE identifiers referenced below for details. +

+ + +

A remote attacker, by enticing the user to process untrusted terminfo or + other data, could execute arbitrary code or cause a Denial of Service + condition. +

+ + +

There is no known workaround at this time.

+ + +

All ncurses users should upgrade to the latest version:

+ + + # emerge --sync + # emerge --ask --oneshot --verbose ">=sys-libs/ncurses-6.1:0" + + + + CVE-2017-10684 + CVE-2017-10685 + CVE-2017-11112 + CVE-2017-11113 + CVE-2017-13728 + CVE-2017-13729 + CVE-2017-13730 + CVE-2017-13731 + CVE-2017-13732 + CVE-2017-13733 + CVE-2017-13734 + CVE-2017-16879 + + b-man + b-man + diff --git a/sdk_container/src/third_party/portage-stable/metadata/glsa/glsa-201804-14.xml b/sdk_container/src/third_party/portage-stable/metadata/glsa/glsa-201804-14.xml new file mode 100644 index 0000000000..474c1588cb --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/metadata/glsa/glsa-201804-14.xml @@ -0,0 +1,51 @@ + + + + GDK-PixBuf: Remote code execution + A vulnerability has been found in GDK-PixBuf that may allow a + remote attacker to execute arbitrary code. + + gdkpixbuf + 2018-04-17 + 2018-04-17 + 644770 + remote + + + 2.36.11 + 2.36.11 + + + +

GDK-PixBuf is an image loading library for GTK+.

+ + +

Several integer overflows were discovered in GDK-PixBuf’s gif_get_lzw + function. +

+ + +

A remote attacker, by enticing a user to process a specially crafted + image file, could execute arbitrary code or cause a Denial of Service + condition. +

+ + +

There is no known workaround at this time.

+ + +

All GDK-PixBuf users should upgrade to the latest version:

+ + + # emerge --sync + # emerge --ask --oneshot --verbose ">=x11-libs/gdk-pixbuf-2.36.11" + + + + + CVE-2017-1000422 + + + b-man + b-man + diff --git a/sdk_container/src/third_party/portage-stable/metadata/glsa/glsa-201804-15.xml b/sdk_container/src/third_party/portage-stable/metadata/glsa/glsa-201804-15.xml new file mode 100644 index 0000000000..fe0526b63a --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/metadata/glsa/glsa-201804-15.xml @@ -0,0 +1,52 @@ + + + + Evince: Command injection + A vulnerability has been found in Evince which may allow for + arbitrary command execution. + + evince + 2018-04-17 + 2018-04-17 + 650272 + remote + + + 3.24.2-r1 + 3.24.2-r1 + + + +

Evince is a document viewer for multiple document formats, including + PostScript. +

+ + +

A vulnerability was discovered in Evince’s handling of filenames while + printing PDF files. +

+ + +

A remote attacker, by enticing the user to process a specially crafted + file, could execute arbitrary commands. +

+ + +

There is no known workaround at this time.

+ + +

All Evince users should upgrade to the latest version:

+ + + # emerge --sync + # emerge --ask --oneshot --verbose ">=app-text/evince-3.24.2-r1" + + + + + CVE-2017-1000159 + + + b-man + b-man + diff --git a/sdk_container/src/third_party/portage-stable/metadata/glsa/glsa-201804-16.xml b/sdk_container/src/third_party/portage-stable/metadata/glsa/glsa-201804-16.xml new file mode 100644 index 0000000000..14bc438d2f --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/metadata/glsa/glsa-201804-16.xml @@ -0,0 +1,61 @@ + + + + ClamAV: Multiple vulnerabilities + Multiple vulnerabilities have been found in ClamAV, the worst of + which may allow remote attackers to execute arbitrary code. + + clamav + 2018-04-22 + 2018-04-22 + 623534 + 625632 + 628686 + 628690 + 649314 + remote + + + 0.99.4 + 0.99.4 + + + +

ClamAV is a GPL virus scanner.

+ + +

Multiple vulnerabilities have been discovered in ClamAV. Please review + the CVE identifiers referenced below for details. +

+ + +

A remote attacker, through multiple vectors, could execute arbitrary + code, cause a Denial of Service condition, or have other unspecified + impacts. +

+ + +

There is no known workaround at this time.

+ + +

All ClamAV users should upgrade to the latest version:

+ + + # emerge --sync + # emerge --ask --oneshot --verbose ">=app-antivirus/clamav-0.99.4" + + + + CVE-2012-6706 + CVE-2017-11423 + CVE-2017-6418 + CVE-2017-6419 + CVE-2017-6420 + CVE-2018-0202 + + CVE-2018-1000085 + + + b-man + b-man + diff --git a/sdk_container/src/third_party/portage-stable/metadata/glsa/glsa-201804-17.xml b/sdk_container/src/third_party/portage-stable/metadata/glsa/glsa-201804-17.xml new file mode 100644 index 0000000000..7390b995ad --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/metadata/glsa/glsa-201804-17.xml @@ -0,0 +1,53 @@ + + + + Quagga: Multiple vulnerabilities + Multiple vulnerabilities have been found in Quagga, the worst of + which could allow remote attackers to execute arbitrary code. + + quagga + 2018-04-22 + 2018-04-22 + 647788 + remote + + + 1.2.4 + 1.2.4 + + + +

Quagga is a free routing daemon replacing Zebra supporting RIP, OSPF and + BGP. +

+ + +

Multiple vulnerabilities have been discovered in Quagga. Please review + the CVE identifiers referenced below for details. +

+ + +

A remote attacker, by sending specially crafted packets, could execute + arbitrary code or cause a Denial of Service condition. +

+ + +

There is no known workaround at this time.

+ + +

All Quagga users should upgrade to the latest version:

+ + + # emerge --sync + # emerge --ask --oneshot --verbose ">=net-misc/quagga-1.2.4" + + + + CVE-2018-5378 + CVE-2018-5379 + CVE-2018-5380 + CVE-2018-5381 + + b-man + b-man + diff --git a/sdk_container/src/third_party/portage-stable/metadata/glsa/glsa-201804-18.xml b/sdk_container/src/third_party/portage-stable/metadata/glsa/glsa-201804-18.xml new file mode 100644 index 0000000000..11d18817a8 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/metadata/glsa/glsa-201804-18.xml @@ -0,0 +1,51 @@ + + + + tenshi: Privilege escalation + Gentoo's tenshi ebuild is vulnerable to privilege escalation due to + the way pid files are handled. + + tenshi + 2018-04-22 + 2018-04-22 + 626654 + local + + + 0.17 + 0.17 + + + +

A log monitoring program, designed to watch one or more log files for + lines matching user defined regular expressions and report on the + matches. +

+ + +

It was discovered that the tenshi ebuild creates a tenshi.pid file after + dropping privileges to a non-root account. +

+ + +

A local attacker could escalate privileges to root or kill arbitrary + processes. +

+ + +

There is no known workaround at this time.

+ + +

All tenshi users should upgrade to the latest version:

+ + + # emerge --sync + # emerge --ask --oneshot --verbose ">=app-admin/tenshi-0.17" + + + + CVE-2017-11746 + + b-man + b-man + diff --git a/sdk_container/src/third_party/portage-stable/metadata/glsa/glsa-201804-19.xml b/sdk_container/src/third_party/portage-stable/metadata/glsa/glsa-201804-19.xml new file mode 100644 index 0000000000..0bdefb18b2 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/metadata/glsa/glsa-201804-19.xml @@ -0,0 +1,54 @@ + + + + mbed TLS: Multiple vulnerabilites + Multiple vulnerabilities have been found in mbed TLS, the worst of + which could allow remote attackers to execute arbitrary code. + + mbedtls + 2018-04-22 + 2018-04-22 + 647800 + remote + + + 2.7.2 + 2.7.2 + + + +

mbed TLS (previously PolarSSL) is an “easy to understand, use, + integrate and expand” implementation of the TLS and SSL protocols and + the respective cryptographic algorithms and support code required. +

+ + +

Multiple vulnerabilities have been discovered in mbed TLS. Please review + the CVE identifiers referenced below for details. +

+ + +

A remote attacker, through multiple vectors, could possibly execute + arbitrary code with the privileges of the process or cause a Denial of + Service condition. +

+ + +

There is no known workaround at this time.

+ + +

All mbed TLS users should upgrade to the latest version:

+ + + # emerge --sync + # emerge --ask --oneshot --verbose ">=net-libs/mbedtls-2.7.2" + + + + CVE-2017-18187 + CVE-2018-0487 + CVE-2018-0488 + + b-man + b-man + diff --git a/sdk_container/src/third_party/portage-stable/metadata/glsa/glsa-201804-20.xml b/sdk_container/src/third_party/portage-stable/metadata/glsa/glsa-201804-20.xml new file mode 100644 index 0000000000..e097d700a0 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/metadata/glsa/glsa-201804-20.xml @@ -0,0 +1,50 @@ + + + + unADF: Remote code execution + Multiple vulnerabilities have been found in unADF that may allow a + remote attacker to execute arbitrary code. + + unadf + 2018-04-22 + 2018-04-22 + 636388 + remote + + + 0.7.12-r1 + 0.7.12-r1 + + + +

An unzip like for .ADF files.

+ + +

Multiple vulnerabilities were discovered in unADF that can lead to + remote code execution. Please review the CVE identifiers referenced below + for details. +

+ + +

A remote attacker, by enticing a user to process a specially crafted + file, could execute arbitrary code. +

+ + +

There is no known workaround at this time.

+ + +

All unADF users should upgrade to the latest version:

+ + + # emerge --sync + # emerge --ask --oneshot --verbose ">=app-arch/unadf-0.7.12-r1" + + + + CVE-2016-1243 + CVE-2016-1244 + + b-man + b-man + diff --git a/sdk_container/src/third_party/portage-stable/metadata/glsa/glsa-201804-21.xml b/sdk_container/src/third_party/portage-stable/metadata/glsa/glsa-201804-21.xml new file mode 100644 index 0000000000..f73a5903ab --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/metadata/glsa/glsa-201804-21.xml @@ -0,0 +1,50 @@ + + + + librelp: Remote code execution + A vulnerability has been found in librelp that may allow a remote + attacker to execute arbitrary code. + + librelp + 2018-04-22 + 2018-04-22 + 651192 + remote + + + 1.2.15 + 1.2.15 + + + +

A reliable logging program.

+ + +

A buffer overflow was discovered in librelp with the handling of x509 + certificates. +

+ + +

A remote attacker, by sending a specially crafted x509 certificate, + could execute arbitrary code. +

+ + +

There is no known workaround at this time.

+ + +

All librelp users should upgrade to the latest version:

+ + + # emerge --sync + # emerge --ask --oneshot --verbose ">=dev-libs/librelp-1.2.15" + + + + + CVE-2018-1000140 + + + b-man + b-man + diff --git a/sdk_container/src/third_party/portage-stable/metadata/glsa/glsa-201804-22.xml b/sdk_container/src/third_party/portage-stable/metadata/glsa/glsa-201804-22.xml new file mode 100644 index 0000000000..ae516bd2d3 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/metadata/glsa/glsa-201804-22.xml @@ -0,0 +1,104 @@ + + + + Chromium, Google Chrome: Multiple vulnerabilities + Multiple vulnerabilities have been found in Chromium and Google + Chrome, the worst of which could result in the execution of arbitrary code. + + chromium,chrome + 2018-04-24 + 2018-04-24 + 653696 + remote + + + 66.0.3359.117 + 66.0.3359.117 + + + 66.0.3359.117 + 66.0.3359.117 + + + +

Chromium is an open-source browser project that aims to build a safer, + faster, and more stable way for all users to experience the web. +

+ +

Google Chrome is one fast, simple, and secure browser for all your + devices. +

+ + +

Multiple vulnerabilities have been discovered in Chromium and Google + Chrome. Please review the referenced CVE identifiers and Google Chrome + Releases for details. +

+ + +

A remote attacker could possibly execute arbitrary code with the + privileges of the process, cause a Denial of Service condition, bypass + content security controls, or conduct URL spoofing. +

+ + +

There is no known workaround at this time.

+ + +

All Chromium users should upgrade to the latest version:

+ + + # emerge --sync + # emerge --ask --oneshot --verbose + ">=www-client/chromium-66.0.3359.117" + + +

All Google Chrome users should upgrade to the latest version:

+ + + # emerge --sync + # emerge --ask --oneshot --verbose + ">=www-client/google-chrome-66.0.3359.117" + + + + CVE-2018-6085 + CVE-2018-6086 + CVE-2018-6087 + CVE-2018-6088 + CVE-2018-6089 + CVE-2018-6090 + CVE-2018-6091 + CVE-2018-6092 + CVE-2018-6093 + CVE-2018-6094 + CVE-2018-6095 + CVE-2018-6096 + CVE-2018-6097 + CVE-2018-6098 + CVE-2018-6099 + CVE-2018-6100 + CVE-2018-6101 + CVE-2018-6102 + CVE-2018-6103 + CVE-2018-6104 + CVE-2018-6105 + CVE-2018-6106 + CVE-2018-6107 + CVE-2018-6108 + CVE-2018-6109 + CVE-2018-6110 + CVE-2018-6111 + CVE-2018-6112 + CVE-2018-6113 + CVE-2018-6114 + CVE-2018-6115 + CVE-2018-6116 + CVE-2018-6117 + + Google Chrome Release 20180417 + + + b-man + b-man + diff --git a/sdk_container/src/third_party/portage-stable/metadata/glsa/glsa-201805-01.xml b/sdk_container/src/third_party/portage-stable/metadata/glsa/glsa-201805-01.xml new file mode 100644 index 0000000000..36f4038742 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/metadata/glsa/glsa-201805-01.xml @@ -0,0 +1,50 @@ + + + + hesiod: Root privilege escalation + A vulnerability was discovered in hesiod which may allow remote + attackers to gain root privileges. + + hesiod + 2018-05-02 + 2018-05-02 + 606652 + local, remote + + + 3.1.0 + + + +

DNS functionality to access to DB of information that changes + infrequently. +

+ + +

Multiple vulnerabilities have been discovered in hesiod that have + remained unaddressed. Please review the referenced CVE identifiers for + details. +

+ + +

A remote or local attacker may be able to escalate privileges to root.

+ + +

There is no known workaround at this time.

+ + +

Gentoo has discontinued support for hesiod and recommends that users + unmerge the package: +

+ + + # emerge --unmerge "net-dns/hesiod" + + + + CVE-2016-10151 + CVE-2016-10152 + + b-man + b-man + diff --git a/sdk_container/src/third_party/portage-stable/metadata/glsa/glsa-201805-02.xml b/sdk_container/src/third_party/portage-stable/metadata/glsa/glsa-201805-02.xml new file mode 100644 index 0000000000..d23f963400 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/metadata/glsa/glsa-201805-02.xml @@ -0,0 +1,52 @@ + + + + Python: Buffer overflow + A buffer overflow in Python might allow remote attackers to execute + arbitrary code. + + python + 2018-05-02 + 2018-05-02 + 637938 + remote + + + 2.7.14 + 2.7.14 + + + +

Python is an interpreted, interactive, object-oriented programming + language. +

+ + +

A buffer overflow was discovered in Python’s PyString_DecodeEscape + function in stringobject.c. +

+ + +

Remote attackers, by enticing a user to process a specially crafted + file, could execute arbitrary code. +

+ + +

There is no known workaround at this time.

+ + +

All Python 2 users should upgrade to the latest version:

+ + + # emerge --sync + # emerge --ask --oneshot --verbose ">=dev-lang/python-2.7.14:2.7" + + + + + CVE-2017-1000158 + + + b-man + b-man + diff --git a/sdk_container/src/third_party/portage-stable/metadata/glsa/glsa-201805-03.xml b/sdk_container/src/third_party/portage-stable/metadata/glsa/glsa-201805-03.xml new file mode 100644 index 0000000000..4b3387ed8c --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/metadata/glsa/glsa-201805-03.xml @@ -0,0 +1,72 @@ + + + + Chromium, Google Chrome: Multiple vulnerabilities + Multiple vulnerabilities have been found in Chromium and Google + Chrome, the worst of which could result in the execution of arbitrary code. + + chromium, google-chrome + 2018-05-02 + 2018-05-02 + 654384 + remote + + + 66.0.3359.139 + 66.0.3359.139 + + + 66.0.3359.139 + 66.0.3359.139 + + + +

Chromium is an open-source browser project that aims to build a safer, + faster, and more stable way for all users to experience the web. +

+ +

Google Chrome is one fast, simple, and secure browser for all your + devices. +

+ + +

Multiple vulnerabilities have been discovered in Chromium and Google + Chrome. Please review the referenced CVE identifiers and Google Chrome + Releases for details. +

+ + +

A remote attacker could possibly execute arbitrary code with the + privileges of the process. +

+ + +

There is no known workaround at this time.

+ + +

All Chromium users should upgrade to the latest version:

+ + + # emerge --sync + # emerge --ask --oneshot --verbose + ">=www-client/chromium-66.0.3359.139" + + +

All Google Chrome users should upgrade to the latest version:

+ + + # emerge --sync + # emerge --ask --oneshot --verbose + ">=www-client/google-chrome-66.0.3359.139" + + + + + CVE-2018-6118 + + Google Chrome Release 20180426 + + + chrisadr + chrisadr + diff --git a/sdk_container/src/third_party/portage-stable/metadata/glsa/glsa-201805-04.xml b/sdk_container/src/third_party/portage-stable/metadata/glsa/glsa-201805-04.xml new file mode 100644 index 0000000000..f63ce11ab6 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/metadata/glsa/glsa-201805-04.xml @@ -0,0 +1,48 @@ + + + + rsync: Arbitrary command execution + A vulnerability in rsync might allow remote attackers to execute + arbitrary commands. + + rsync + 2018-05-08 + 2018-05-08 + 646818 + remote + + + 3.1.3 + 3.1.3 + + + +

File transfer program to keep remote files into sync.

+ + +

A vulnerability was discovered in rsync’s parse_arguments function in + options.c. +

+ + +

Remote attackers could possibly execute arbitrary commands with the + privilege of the process. +

+ + +

There is no known workaround at this time.

+ + +

All rsync users should upgrade to the latest version:

+ + + # emerge --sync + # emerge --ask --oneshot --verbose ">=net-misc/rsync-3.1.3" + + + + CVE-2018-5764 + + Zlogene + b-man + diff --git a/sdk_container/src/third_party/portage-stable/metadata/glsa/glsa-201805-05.xml b/sdk_container/src/third_party/portage-stable/metadata/glsa/glsa-201805-05.xml new file mode 100644 index 0000000000..ef4b236a7e --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/metadata/glsa/glsa-201805-05.xml @@ -0,0 +1,50 @@ + + + + mpv: Remote code execution + A vulnerability has been found in mpv that may allow a remote + attacker to execute arbitrary code. + + mpv + 2018-05-14 + 2018-05-14 + 646886 + local, remote + + + 0.27.2 + 0.27.2 + + + +

Video player based on MPlayer/mplayer2

+ + +

A vulnerability was discovered in mpv with the handling of HTML + documents containing VIDEO elements. Additionally, mpv accepts arbitrary + URLs in a src attribute without a protocol whitelist in + player/lua/ytdl_hook.lua. +

+ + +

A remote attacker, by enticing the user to visit a specially crafted web + site, could execute arbitrary code. +

+ + +

There is no known workaround at this time.

+ + +

All mpv users should upgrade to the latest version:

+ + + # emerge --sync + # emerge --ask --oneshot --verbose ">=media-video/mpv-0.27.2" + + + + CVE-2018-6360 + + jmbailey + jmbailey + diff --git a/sdk_container/src/third_party/portage-stable/metadata/glsa/timestamp.chk b/sdk_container/src/third_party/portage-stable/metadata/glsa/timestamp.chk index 14d5754e1d..b9507068ed 100644 --- a/sdk_container/src/third_party/portage-stable/metadata/glsa/timestamp.chk +++ b/sdk_container/src/third_party/portage-stable/metadata/glsa/timestamp.chk @@ -1 +1 @@ -Mon, 16 Apr 2018 16:38:33 +0000 +Wed, 16 May 2018 20:08:29 +0000 diff --git a/sdk_container/src/third_party/portage-stable/metadata/glsa/timestamp.commit b/sdk_container/src/third_party/portage-stable/metadata/glsa/timestamp.commit index 3c4f54fe8d..2680641b2a 100644 --- a/sdk_container/src/third_party/portage-stable/metadata/glsa/timestamp.commit +++ b/sdk_container/src/third_party/portage-stable/metadata/glsa/timestamp.commit @@ -1 +1 @@ -aa26a212e36fbca3a9091a00250a459fd6576eae 1523834733 2018-04-15T23:25:33+00:00 +40f254b177f3628d865f1e77c8fd7c94584de14e 1526340152 2018-05-14T23:22:32+00:00 From 6e88f21b33c6621a9729c24db492ea7c8d0b53c9 Mon Sep 17 00:00:00 2001 From: David Michael Date: Wed, 16 May 2018 16:56:26 -0400 Subject: [PATCH 21/21] dev-util/catalyst: Move to coreos-overlay --- .../portage-stable/dev-util/catalyst/Manifest | 14 -- .../catalyst/catalyst-2.0.18-r1.ebuild | 115 ----------------- .../catalyst/catalyst-2.0.18-r4.ebuild | 120 ------------------ .../catalyst/catalyst-2.0.9999.ebuild | 108 ---------------- .../dev-util/catalyst/catalyst-3.0.0.ebuild | 63 --------- .../dev-util/catalyst/catalyst-3.0.1.ebuild | 65 ---------- .../dev-util/catalyst/catalyst-9999.ebuild | 65 ---------- ...atalyst-2.0.18-Do-notuntarwith--acls.patch | 95 -------------- .../files/catalyst-2.0.18-fix-quotes.patch | 38 ------ .../catalyst-2.0.18-remove-machine-id.patch | 25 ---- .../catalyst-2.0.18-stage1-export-ROOT.patch | 42 ------ .../dev-util/catalyst/metadata.xml | 14 -- .../md5-cache/dev-util/catalyst-2.0.18-r1 | 14 -- .../md5-cache/dev-util/catalyst-2.0.18-r4 | 14 -- .../md5-cache/dev-util/catalyst-2.0.9999 | 12 -- .../md5-cache/dev-util/catalyst-3.0.0 | 14 -- .../md5-cache/dev-util/catalyst-3.0.1 | 14 -- .../metadata/md5-cache/dev-util/catalyst-9999 | 12 -- 18 files changed, 844 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/dev-util/catalyst/Manifest delete mode 100644 sdk_container/src/third_party/portage-stable/dev-util/catalyst/catalyst-2.0.18-r1.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/dev-util/catalyst/catalyst-2.0.18-r4.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/dev-util/catalyst/catalyst-2.0.9999.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/dev-util/catalyst/catalyst-3.0.0.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/dev-util/catalyst/catalyst-3.0.1.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/dev-util/catalyst/catalyst-9999.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/dev-util/catalyst/files/catalyst-2.0.18-Do-notuntarwith--acls.patch delete mode 100644 sdk_container/src/third_party/portage-stable/dev-util/catalyst/files/catalyst-2.0.18-fix-quotes.patch delete mode 100644 sdk_container/src/third_party/portage-stable/dev-util/catalyst/files/catalyst-2.0.18-remove-machine-id.patch delete mode 100644 sdk_container/src/third_party/portage-stable/dev-util/catalyst/files/catalyst-2.0.18-stage1-export-ROOT.patch delete mode 100644 sdk_container/src/third_party/portage-stable/dev-util/catalyst/metadata.xml delete mode 100644 sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-util/catalyst-2.0.18-r1 delete mode 100644 sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-util/catalyst-2.0.18-r4 delete mode 100644 sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-util/catalyst-2.0.9999 delete mode 100644 sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-util/catalyst-3.0.0 delete mode 100644 sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-util/catalyst-3.0.1 delete mode 100644 sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-util/catalyst-9999 diff --git a/sdk_container/src/third_party/portage-stable/dev-util/catalyst/Manifest b/sdk_container/src/third_party/portage-stable/dev-util/catalyst/Manifest deleted file mode 100644 index bedf00b016..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-util/catalyst/Manifest +++ /dev/null @@ -1,14 +0,0 @@ -AUX catalyst-2.0.18-Do-notuntarwith--acls.patch 6156 BLAKE2B 921e36d63c3a51f212c3a8a3afd054737e9d21f9870d82249a701a2fb00c27f9f97d7411df46357509477c3cafdd9341752fee77321f94910fd18b9a1d5ffef1 SHA512 500d72f7e11f99eb53275aac3e1b94394826cfa271312ee268092d12a70128b46455c5da1122fb70e21459f56ded3e3ad2752c33516cd3dc4ea4ac70cd0ec32f -AUX catalyst-2.0.18-fix-quotes.patch 1663 BLAKE2B 3fcd863f94eb9d8e659520d29b8ec9c576b27c25f00adf5d47c60aa6cfa0e6da10b9745e4c6752fc7682f13423180e6f58777c584a7283eee4fc9db02ef34a1f SHA512 185705eba562dfeb52740ad3a0c3ea611648d508079ad54c9e5680d318888cc5123c5ff365b1c575a5348ddfd8210763277daed226b564ed3a59e15f18bff205 -AUX catalyst-2.0.18-remove-machine-id.patch 778 BLAKE2B 1174a6d9c777144d204fed28e912a981b5df93c2c7de983555c53863b5f1baa2a5d1f184fff7f6bb84534f884302ebc97d525d4db2250e0602b841faa7994a41 SHA512 7e5230eacc6ca7b535d416cd2dd846fa9fbc58951ef4cbdb14108afcbcd63f2d8a7b082920d04dc51b9eb47a6d44eeb5a07d704b14e71b6a972d96ca79f807d6 -AUX catalyst-2.0.18-stage1-export-ROOT.patch 1274 BLAKE2B 336c159e54f0a629c73b61814c1d2d9be5996af4367383164c446e9d5067eedff8094724a3830f3e50c922af72e9eacb90168e603d2506c4be4769d1fc549793 SHA512 6372917d395d8129c49c4dd8de7e6a8e7797f6c535e39713fa68059d82f398aa1fb0ffb1b6a65c91f9b5a4861f29cffd4717b7a612276e78d22ac1985ee32113 -DIST catalyst-2.0.18.tar.bz2 861398 BLAKE2B 70986d312410fb7abb5c8d7eacefa0f0150a3642e92e4f7b7e9944cf3653e7e2ba987ffb34a614b261a22ce3bb964488181c019f92bbc9c73567f89be04c0989 SHA512 5a1408ffe06ce5c06a6bca8f0e3ecd91c17cdc36e2dfa37881d843432bdfe987fd2cfd988cd5719bdf378c18c2e79ee59e281c3b4dba4ae9edfc2dd654b8ee4a -DIST catalyst-3.0.0.tar.bz2 879203 BLAKE2B 15c410a38aa5db4b558f18fe84f7ed4c12db26c8af39062728d4217f7d034c694531e4693dd0925848a983345dcd519955226bb9825041556bd0b62bcaba181b SHA512 0f5d5f0898dc070271aab5347d4fb1ad4d44e777a2242f8b80a2f1a5a11e3ba6005754e6af2a6848246ad05f10124e4ce172637c7e2d23eb4f055610456d903f -DIST catalyst-3.0.1.tar.bz2 877731 BLAKE2B 0c0b67b4be26737fa6d81011a8a63cfd7f2f41e49a81ecd45f3c901ef70d04e0a72295b12609df036dd9be09241c33dda8fa7a204ad074683b18685d027efe2a SHA512 be7c4d6fcf1f41087995a1a3621fb0250dce6d0a96101255c70832d5cf727a94e924d86092b33464fc5e284173704d33d5aa0d0d49dfcce7369befa5fc8de4e8 -EBUILD catalyst-2.0.18-r1.ebuild 3100 BLAKE2B 18f15c937c4f3fe3790ad0dd4f665b4c2a5c100ccc8e9669ded1e45bc24bbe8391fcc3a3b0d2f17b3a9494d2fdef529b387037ec7518796e045d59faf516fa18 SHA512 111606cceb268f3f4b8c51ed8d980ef440215d622a7994c773da7b3fe7ead0ad3fb32bd4eac1835bda1fad5389aa4c995dc597fe7ccc6f8b4d7871997df3541d -EBUILD catalyst-2.0.18-r4.ebuild 3261 BLAKE2B 07fba7e944a03f7bd99c4504aac4014e515c667a6c4b05791ec059e7fa805cc648a228389045b13d71c39b1910fe8016bdde218cdc7b070a9bd7ac8beb8341a9 SHA512 19be49f4b0508aa4f091e5769463d52280693e5540b8ebda4d9745f24d16ba5a8e938081f1b345dfb25d3d7675f90d721c8fff928d3a4f7f40886e2b4cb14ade -EBUILD catalyst-2.0.9999.ebuild 2901 BLAKE2B 6ad35b1e2bce193bdc50de8547c0918036b7b1db8339462b2a1e6bd3f4de680918ca514a5d9243c476af0a9358b8ab2c18409b2585ca0565bfee8b27dd11ae83 SHA512 ede4a30e85f2b9b55fa627ef6b7de8a2f0f83a15bd67cea54596bcbd73b4f89ae991087e55bc34187d3572f25c1c3d9d0f818626f3880e758832a58a3af95f23 -EBUILD catalyst-3.0.0.ebuild 1680 BLAKE2B ac456283dc3d7f16811b7edeb9a4e674da723ab3183dfdc6f79e7231598c3b326f737c8f5ef61064e13bd3586e9fcf33fca586207e8bed273f57c7c0930512ce SHA512 e71fb731b7d007bc26cf65eb85a23902378da0d7c931dabdeb4f5201f399a1555151cfbcfe19c4620467b0f3ad910e79456dd7f3bbf875e1b2705cb3ec1e246b -EBUILD catalyst-3.0.1.ebuild 1756 BLAKE2B c603a8fe69ae249700eb62e3ff45e338cf61758692cd6746d51833a24eaba10cc0b9d32deedbbf336efc1cbfc5571a7c40cde33be63191697f0cce9d3d4f74df SHA512 5f3c60d668c6aeb27987f32c71cfeee29d4a56bf3d48e2ea906527ef221638010512ac3bd00065591ae7aba71359cf2730078a33db883895d116fa95321519ef -EBUILD catalyst-9999.ebuild 1752 BLAKE2B b4dce3d64505cf72d7d546be2107050e4840477a4ceb883cd3aa93ea2c6f5a3fc63470e6dfea172f15c5f37fcff30dc29d2e972314aba46c2890b6a73639904e SHA512 c6548d3b6cfa924e4ca5dab4fe9680d5a4562dcbe8cb1debeaf1088c1c9fd8bbc66c2cf7272a1fea1997fdc0d8f8ae833e3ed6c3b7b6b16a10eae17b61993271 -MISC metadata.xml 417 BLAKE2B 161ad5d6df19baf10cd3110f677c85aa0d4c08051fc3be98c28d3f02312a50460a1e71619c314921e23fa680506ab88375ea033ea945db78a82a5fed35c953dc SHA512 ba623747ea22b2e886740d771dcd80ac54df9b29762d1d1f3eb46701e9463d245a2e310eb03695dc9342a57da486a9a8d56892da709727476a2d6afed5e63cb8 diff --git a/sdk_container/src/third_party/portage-stable/dev-util/catalyst/catalyst-2.0.18-r1.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/catalyst/catalyst-2.0.18-r1.ebuild deleted file mode 100644 index 9562f69636..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-util/catalyst/catalyst-2.0.18-r1.ebuild +++ /dev/null @@ -1,115 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -if [[ ${PV} == *9999* ]]; then - SRC_ECLASS="git-2" - EGIT_REPO_URI="anongit.gentoo.org/proj/catalyst.git" - EGIT_MASTER="master" - S="${WORKDIR}/${PN}" -else - SRC_URI="mirror://gentoo/${P}.tar.bz2 - https://dev.gentoo.org/~jmbsvicetto/distfiles/${P}.tar.bz2 - https://dev.gentoo.org/~mattst88/distfiles/${P}.tar.bz2 - https://dev.gentoo.org/~zerochaos/distfiles/${P}.tar.bz2 - https://dev.gentoo.org/~dolsen/releases/catalyst/${P}.tar.bz2" - KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd" -fi - -PYTHON_COMPAT=( python2_7 ) - -inherit eutils multilib python-single-r1 ${SRC_ECLASS} - -DESCRIPTION="Release metatool used for creating releases based on Gentoo Linux" -HOMEPAGE="https://wiki.gentoo.org/wiki/Catalyst" - -LICENSE="GPL-2" -SLOT="0" -IUSE="ccache kernel_linux" - -DEPEND=" - app-text/asciidoc - ${PYTHON_DEPS} -" -RDEPEND=" - app-arch/lbzip2 - app-crypt/shash - app-arch/tar[xattr] - sys-fs/dosfstools - virtual/cdrtools - amd64? ( >=sys-boot/syslinux-3.72 ) - x86? ( >=sys-boot/syslinux-3.72 ) - ccache? ( dev-util/ccache ) - kernel_linux? ( app-misc/zisofs-tools >=sys-fs/squashfs-tools-2.1 ) - ${PYTHON_DEPS} -" - -REQUIRED_USE=${PYTHON_REQUIRED_USE} - -PATCHES=( "${FILESDIR}/catalyst-2.0.18-Do-notuntarwith--acls.patch" ) - -pkg_setup() { - if use ccache ; then - einfo "Enabling ccache support for catalyst." - else - ewarn "By default, ccache support for catalyst is disabled." - ewarn "If this is not what you intended," - ewarn "then you should add ccache to your USE." - fi - - echo - einfo "The template spec files are now installed by default. You can find" - einfo "them under /usr/share/doc/${PF}/examples" - einfo "and they are considered to be the authorative source of information" - einfo "on catalyst." - echo - - python-single-r1_pkg_setup -} - -src_prepare() { - epatch "${PATCHES[@]}" -} - -src_install() { - insinto /usr/$(get_libdir)/${PN} - exeinto /usr/$(get_libdir)/${PN} - doexe catalyst || die "copying catalyst" - - if [[ ${PV} == 3.9999* ]]; then - doins -r modules files || die "copying files" - else - doins -r arch modules livecd || die "copying files" - fi - - for x in targets/*; do - exeinto /usr/$(get_libdir)/${PN}/$x - doexe $x/* || die "copying ${x}" - done - - # Here is where we actually enable ccache - use ccache && \ - sed -i -e 's:options="autoresume kern:options="autoresume ccache kern:' \ - files/catalyst.conf - - sed -i -e "s:/usr/lib/catalyst:/usr/$(get_libdir)/catalyst:" \ - files/catalyst.conf - - make_wrapper catalyst /usr/$(get_libdir)/${PN}/catalyst - insinto /etc/catalyst - doins files/catalyst.conf files/catalystrc || die "copying configuration" - insinto /usr/share/doc/${PF}/examples - doins examples/* || die - dodoc README AUTHORS - doman files/catalyst.1 files/catalyst-spec.5 - - python_fix_shebang "${ED}usr/$(get_libdir)/catalyst/catalyst" - python_optimize "${ED}" -} - -pkg_postinst() { - einfo "You can find more information about catalyst by checking out the" - einfo "catalyst project page at:" - einfo "https://wiki.gentoo.org/wiki/Catalyst" -} diff --git a/sdk_container/src/third_party/portage-stable/dev-util/catalyst/catalyst-2.0.18-r4.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/catalyst/catalyst-2.0.18-r4.ebuild deleted file mode 100644 index 98e502b926..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-util/catalyst/catalyst-2.0.18-r4.ebuild +++ /dev/null @@ -1,120 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -if [[ ${PV} == *9999* ]]; then - SRC_ECLASS="git-2" - EGIT_REPO_URI="anongit.gentoo.org/proj/catalyst.git" - EGIT_MASTER="master" - S="${WORKDIR}/${PN}" -else - SRC_URI="mirror://gentoo/${P}.tar.bz2 - https://dev.gentoo.org/~jmbsvicetto/distfiles/${P}.tar.bz2 - https://dev.gentoo.org/~mattst88/distfiles/${P}.tar.bz2 - https://dev.gentoo.org/~zerochaos/distfiles/${P}.tar.bz2 - https://dev.gentoo.org/~dolsen/releases/catalyst/${P}.tar.bz2" - KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd" -fi - -PYTHON_COMPAT=( python2_7 ) - -inherit eutils multilib python-single-r1 ${SRC_ECLASS} - -DESCRIPTION="Release metatool used for creating releases based on Gentoo Linux" -HOMEPAGE="https://wiki.gentoo.org/wiki/Catalyst" - -LICENSE="GPL-2" -SLOT="0" -IUSE="ccache kernel_linux" - -DEPEND=" - app-text/asciidoc - ${PYTHON_DEPS} -" -RDEPEND=" - app-arch/lbzip2 - app-crypt/shash - app-arch/tar[xattr] - sys-fs/dosfstools - virtual/cdrtools - amd64? ( >=sys-boot/syslinux-3.72 ) - x86? ( >=sys-boot/syslinux-3.72 ) - ccache? ( dev-util/ccache ) - kernel_linux? ( app-misc/zisofs-tools >=sys-fs/squashfs-tools-2.1 ) - ${PYTHON_DEPS} -" - -REQUIRED_USE=${PYTHON_REQUIRED_USE} - -PATCHES=( - "${FILESDIR}/catalyst-2.0.18-Do-notuntarwith--acls.patch" - "${FILESDIR}/catalyst-2.0.18-fix-quotes.patch" - "${FILESDIR}/catalyst-2.0.18-remove-machine-id.patch" - "${FILESDIR}/catalyst-2.0.18-stage1-export-ROOT.patch" -) - -pkg_setup() { - if use ccache ; then - einfo "Enabling ccache support for catalyst." - else - ewarn "By default, ccache support for catalyst is disabled." - ewarn "If this is not what you intended," - ewarn "then you should add ccache to your USE." - fi - - echo - einfo "The template spec files are now installed by default. You can find" - einfo "them under /usr/share/doc/${PF}/examples" - einfo "and they are considered to be the authorative source of information" - einfo "on catalyst." - echo - - python-single-r1_pkg_setup -} - -src_prepare() { - epatch "${PATCHES[@]}" -} - -src_install() { - insinto /usr/$(get_libdir)/${PN} - exeinto /usr/$(get_libdir)/${PN} - doexe catalyst || die "copying catalyst" - - if [[ ${PV} == 3.9999* ]]; then - doins -r modules files || die "copying files" - else - doins -r arch modules livecd || die "copying files" - fi - - for x in targets/*; do - exeinto /usr/$(get_libdir)/${PN}/$x - doexe $x/* || die "copying ${x}" - done - - # Here is where we actually enable ccache - use ccache && \ - sed -i -e 's:options="autoresume kern:options="autoresume ccache kern:' \ - files/catalyst.conf - - sed -i -e "s:/usr/lib/catalyst:/usr/$(get_libdir)/catalyst:" \ - files/catalyst.conf - - make_wrapper catalyst /usr/$(get_libdir)/${PN}/catalyst - insinto /etc/catalyst - doins files/catalyst.conf files/catalystrc || die "copying configuration" - insinto /usr/share/doc/${PF}/examples - doins examples/* || die - dodoc README AUTHORS - doman files/catalyst.1 files/catalyst-spec.5 - - python_fix_shebang "${ED}usr/$(get_libdir)/catalyst/catalyst" - python_optimize "${ED}" -} - -pkg_postinst() { - einfo "You can find more information about catalyst by checking out the" - einfo "catalyst project page at:" - einfo "https://wiki.gentoo.org/wiki/Catalyst" -} diff --git a/sdk_container/src/third_party/portage-stable/dev-util/catalyst/catalyst-2.0.9999.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/catalyst/catalyst-2.0.9999.ebuild deleted file mode 100644 index 3d4ac9380d..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-util/catalyst/catalyst-2.0.9999.ebuild +++ /dev/null @@ -1,108 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -if [[ ${PV} == *9999* ]]; then - SRC_ECLASS="git-2" - EGIT_REPO_URI="git://anongit.gentoo.org/proj/catalyst.git" - EGIT_MASTER="master" - EGIT_BRANCH="2.X" - S="${WORKDIR}/${PN}" -else - SRC_URI="mirror://gentoo/${P}.tar.bz2 - https://dev.gentoo.org/~jmbsvicetto/distfiles/${P}.tar.bz2 - https://dev.gentoo.org/~zerochaos/distfiles/${P}.tar.bz2" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" -fi - -PYTHON_COMPAT=( python2_7 ) - -inherit eutils multilib python-single-r1 ${SRC_ECLASS} - -DESCRIPTION="Release metatool used for creating releases based on Gentoo Linux" -HOMEPAGE="https://wiki.gentoo.org/wiki/Catalyst" - -LICENSE="GPL-2" -SLOT="0" -IUSE="ccache kernel_linux" - -DEPEND=" - app-text/asciidoc - ${PYTHON_DEPS} -" -RDEPEND=" - app-arch/lbzip2 - app-crypt/shash - app-arch/tar[xattr] - sys-fs/dosfstools - virtual/cdrtools - amd64? ( >=sys-boot/syslinux-3.72 ) - x86? ( >=sys-boot/syslinux-3.72 ) - ccache? ( dev-util/ccache ) - kernel_linux? ( app-misc/zisofs-tools >=sys-fs/squashfs-tools-2.1 ) - ${PYTHON_DEPS} -" - -REQUIRED_USE=${PYTHON_REQUIRED_USE} - -pkg_setup() { - if use ccache ; then - einfo "Enabling ccache support for catalyst." - else - ewarn "By default, ccache support for catalyst is disabled." - ewarn "If this is not what you intended," - ewarn "then you should add ccache to your USE." - fi - - echo - einfo "The template spec files are now installed by default. You can find" - einfo "them under /usr/share/doc/${PF}/examples" - einfo "and they are considered to be the authorative source of information" - einfo "on catalyst." - echo - - python-single-r1_pkg_setup -} - -src_install() { - insinto /usr/$(get_libdir)/${PN} - exeinto /usr/$(get_libdir)/${PN} - doexe catalyst || die "copying catalyst" - - if [[ ${PV} == 3.9999* ]]; then - doins -r modules files || die "copying files" - else - doins -r arch modules livecd || die "copying files" - fi - - for x in targets/*; do - exeinto /usr/$(get_libdir)/${PN}/$x - doexe $x/* || die "copying ${x}" - done - - # Here is where we actually enable ccache - use ccache && \ - sed -i -e 's:options="autoresume kern:options="autoresume ccache kern:' \ - files/catalyst.conf - - sed -i -e "s:/usr/lib/catalyst:/usr/$(get_libdir)/catalyst:" \ - files/catalyst.conf - - make_wrapper catalyst /usr/$(get_libdir)/${PN}/catalyst - insinto /etc/catalyst - doins files/catalyst.conf files/catalystrc || die "copying configuration" - insinto /usr/share/doc/${PF}/examples - doins examples/* || die - dodoc README AUTHORS - doman files/catalyst.1 files/catalyst-spec.5 - - python_fix_shebang "${ED}usr/$(get_libdir)/catalyst/catalyst" - python_optimize "${ED}" -} - -pkg_postinst() { - einfo "You can find more information about catalyst by checking out the" - einfo "catalyst project page at:" - einfo "https://wiki.gentoo.org/wiki/Catalyst" -} diff --git a/sdk_container/src/third_party/portage-stable/dev-util/catalyst/catalyst-3.0.0.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/catalyst/catalyst-3.0.0.ebuild deleted file mode 100644 index 2128e99574..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-util/catalyst/catalyst-3.0.0.ebuild +++ /dev/null @@ -1,63 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -if [[ ${PV} == *9999* ]]; then - SRC_ECLASS="git-2" - EGIT_REPO_URI="git://anongit.gentoo.org/proj/catalyst.git" - EGIT_BRANCH="master" - S="${WORKDIR}/${PN}" -else - SRC_URI="mirror://gentoo/${P}.tar.bz2 - https://dev.gentoo.org/~dolsen/releases/catalyst/${P}.tar.bz2 - https://dev.gentoo.org/~jmbsvicetto/distfiles/${P}.tar.bz2 - https://dev.gentoo.org/~zerochaos/distfiles/${P}.tar.bz2" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" -fi - -PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} ) - -inherit distutils-r1 multilib ${SRC_ECLASS} - -DESCRIPTION="Release metatool used for creating releases based on Gentoo Linux" -HOMEPAGE="https://wiki.gentoo.org/wiki/Catalyst" - -LICENSE="GPL-2" -SLOT="0" -IUSE="ccache doc kernel_linux" - -DEPEND=" - app-text/asciidoc - >=dev-python/snakeoil-0.6.5[${PYTHON_USEDEP}] -" -RDEPEND=" - >=dev-python/pydecomp-0.2[${PYTHON_USEDEP}] - app-arch/lbzip2 - app-crypt/shash - sys-fs/dosfstools - !x86-fbsd? ( || ( app-arch/tar[xattr] app-arch/libarchive[xattr] ) ) - x86-fbsd? ( app-arch/libarchive[xattr] ) - virtual/cdrtools - amd64? ( >=sys-boot/syslinux-3.72 ) - x86? ( >=sys-boot/syslinux-3.72 ) - ccache? ( dev-util/ccache ) - kernel_linux? ( app-misc/zisofs-tools >=sys-fs/squashfs-tools-2.1 ) -" - -python_prepare_all() { - echo VERSION="${PV}" "${PYTHON}" setup.py set_version - VERSION="${PV}" "${PYTHON}" setup.py set_version -} - -python_compile_all() { - # build the man pages and docs - emake -} - -python_install_all() { - distutils-r1_python_install_all - if use doc; then - dodoc files/HOWTO.html files/docbook-xsl.css - fi -} diff --git a/sdk_container/src/third_party/portage-stable/dev-util/catalyst/catalyst-3.0.1.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/catalyst/catalyst-3.0.1.ebuild deleted file mode 100644 index 2e0198f3ec..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-util/catalyst/catalyst-3.0.1.ebuild +++ /dev/null @@ -1,65 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -if [[ ${PV} == *9999* ]]; then - SRC_ECLASS="git-2" - EGIT_REPO_URI="git://anongit.gentoo.org/proj/catalyst.git" - EGIT_BRANCH="master" - S="${WORKDIR}/${PN}" -else - SRC_URI="mirror://gentoo/${P}.tar.bz2 - https://dev.gentoo.org/~dolsen/releases/catalyst/${P}.tar.bz2 - https://dev.gentoo.org/~jmbsvicetto/distfiles/${P}.tar.bz2 - https://dev.gentoo.org/~zerochaos/distfiles/${P}.tar.bz2" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" -fi - -PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} ) - -inherit distutils-r1 multilib ${SRC_ECLASS} - -DESCRIPTION="Release metatool used for creating releases based on Gentoo Linux" -HOMEPAGE="https://wiki.gentoo.org/wiki/Catalyst" - -LICENSE="GPL-2" -SLOT="0" -IUSE="ccache doc kernel_linux" - -DEPEND=" - app-text/asciidoc - >=dev-python/snakeoil-0.6.5[${PYTHON_USEDEP}] -" -RDEPEND=" - >=dev-python/pydecomp-0.2[${PYTHON_USEDEP}] - app-arch/lbzip2 - app-crypt/shash - sys-fs/dosfstools - !kernel_FreeBSD? ( || ( app-arch/tar[xattr] app-arch/libarchive[xattr] ) ) - kernel_FreeBSD? ( app-arch/libarchive[xattr] ) - virtual/cdrtools - amd64? ( >=sys-boot/syslinux-3.72 ) - x86? ( >=sys-boot/syslinux-3.72 ) - ccache? ( dev-util/ccache ) - kernel_linux? ( app-misc/zisofs-tools >=sys-fs/squashfs-tools-2.1 ) -" - -python_prepare_all() { - python_setup - echo VERSION="${PV}" "${PYTHON}" setup.py set_version - VERSION="${PV}" "${PYTHON}" setup.py set_version || die - distutils-r1_python_prepare_all -} - -python_compile_all() { - # build the man pages and docs - emake -} - -python_install_all() { - distutils-r1_python_install_all - if use doc; then - dodoc files/HOWTO.html files/docbook-xsl.css - fi -} diff --git a/sdk_container/src/third_party/portage-stable/dev-util/catalyst/catalyst-9999.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/catalyst/catalyst-9999.ebuild deleted file mode 100644 index c5635f4c74..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-util/catalyst/catalyst-9999.ebuild +++ /dev/null @@ -1,65 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -if [[ ${PV} == *9999* ]]; then - SRC_ECLASS="git-2" - EGIT_REPO_URI="git://anongit.gentoo.org/proj/catalyst.git" - EGIT_BRANCH="master" - S="${WORKDIR}/${PN}" -else - SRC_URI="mirror://gentoo/${P}.tar.bz2 - https://dev.gentoo.org/~dolsen/releases/catalyst/${P}.tar.bz2 - https://dev.gentoo.org/~jmbsvicetto/distfiles/${P}.tar.bz2 - https://dev.gentoo.org/~zerochaos/distfiles/${P}.tar.bz2" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" -fi - -PYTHON_COMPAT=( python{3_4,3_5,3_6} ) - -inherit distutils-r1 multilib ${SRC_ECLASS} - -DESCRIPTION="Release metatool used for creating releases based on Gentoo Linux" -HOMEPAGE="https://wiki.gentoo.org/wiki/Catalyst" - -LICENSE="GPL-2" -SLOT="0" -IUSE="ccache doc kernel_linux" - -DEPEND=" - app-text/asciidoc - >=dev-python/snakeoil-0.6.5[${PYTHON_USEDEP}] -" -RDEPEND=" - =dev-python/pydecomp-9999[${PYTHON_USEDEP}] - app-arch/lbzip2 - app-crypt/shash - sys-fs/dosfstools - !kernel_FreeBSD? ( || ( app-arch/tar[xattr] app-arch/libarchive[xattr] ) ) - kernel_FreeBSD? ( app-arch/libarchive[xattr] ) - virtual/cdrtools - amd64? ( >=sys-boot/syslinux-3.72 ) - x86? ( >=sys-boot/syslinux-3.72 ) - ccache? ( dev-util/ccache ) - kernel_linux? ( app-misc/zisofs-tools >=sys-fs/squashfs-tools-2.1 ) -" - -python_prepare_all() { - python_setup - echo VERSION="${PV}" "${PYTHON}" setup.py set_version - VERSION="${PV}" "${PYTHON}" setup.py set_version || die - distutils-r1_python_prepare_all -} - -python_compile_all() { - # build the man pages and docs - emake -} - -python_install_all() { - distutils-r1_python_install_all - if use doc; then - dodoc files/HOWTO.html files/docbook-xsl.css - fi -} diff --git a/sdk_container/src/third_party/portage-stable/dev-util/catalyst/files/catalyst-2.0.18-Do-notuntarwith--acls.patch b/sdk_container/src/third_party/portage-stable/dev-util/catalyst/files/catalyst-2.0.18-Do-notuntarwith--acls.patch deleted file mode 100644 index f4cbcfbb7d..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-util/catalyst/files/catalyst-2.0.18-Do-notuntarwith--acls.patch +++ /dev/null @@ -1,95 +0,0 @@ -From 45286727a63d16d0688a88bf7cf68289efd26861 Mon Sep 17 00:00:00 2001 -From: "Anthony G. Basile" -Date: Sun, 18 Jan 2015 22:21:16 -0500 -Subject: [PATCH] Do not untar with --acls, fixes bug #536762 -To: gentoo-catalyst@lists.gentoo.org - ---- - modules/catalyst_support.py | 6 +++--- - modules/generic_stage_target.py | 18 +++++++++--------- - 2 files changed, 12 insertions(+), 12 deletions(-) - -diff --git a/modules/catalyst_support.py b/modules/catalyst_support.py -index 0e9faac..702887d 100644 ---- a/modules/catalyst_support.py -+++ b/modules/catalyst_support.py -@@ -108,9 +108,9 @@ contents_map={ - # 'find' is disabled because it requires the source path, which is not - # always available - #"find" :[calc_contents,"find %(path)s"], -- "tar-tv":[calc_contents,"tar --xattrs --acls tvf %(file)s"], -- "tar-tvz":[calc_contents,"tar --xattrs --acls tvzf %(file)s"], -- "tar-tvj":[calc_contents,"tar --xattrs --acls -I lbzip2 -tvf %(file)s"], -+ "tar-tv":[calc_contents,"tar --xattrs tvf %(file)s"], -+ "tar-tvz":[calc_contents,"tar --xattrs tvzf %(file)s"], -+ "tar-tvj":[calc_contents,"tar --xattrs -I lbzip2 -tvf %(file)s"], - "isoinfo-l":[calc_contents,"isoinfo -l -i %(file)s"], - # isoinfo-f should be a last resort only - "isoinfo-f":[calc_contents,"isoinfo -f -i %(file)s"], -diff --git a/modules/generic_stage_target.py b/modules/generic_stage_target.py -index c7db027..cc24c63 100644 ---- a/modules/generic_stage_target.py -+++ b/modules/generic_stage_target.py -@@ -660,10 +660,10 @@ class generic_stage_target(generic_target): - self.settings["chroot_path"]+\ - " (This may take some time) ...\n" - if "bz2" == self.settings["chroot_path"][-3:]: -- unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --acls --selinux -I lbzip2 -xpf "+self.settings["source_path"]+" -C "+\ -+ unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --selinux -I lbzip2 -xpf "+self.settings["source_path"]+" -C "+\ - self.settings["chroot_path"] - else: -- unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --acls --selinux -I lbzip2 -xpf "+self.settings["source_path"]+" -C "+\ -+ unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --selinux -I lbzip2 -xpf "+self.settings["source_path"]+" -C "+\ - self.settings["chroot_path"] - error_msg="Tarball extraction of "+\ - self.settings["source_path"]+" to "+\ -@@ -675,10 +675,10 @@ class generic_stage_target(generic_target): - self.settings["chroot_path"]+\ - " (This may take some time) ...\n" - if "bz2" == self.settings["chroot_path"][-3:]: -- unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --acls --selinux -I lbzip2 -xpf "+self.settings["source_path"]+" -C "+\ -+ unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --selinux -I lbzip2 -xpf "+self.settings["source_path"]+" -C "+\ - self.settings["chroot_path"] - else: -- unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --acls --selinux -I lbzip2 -xpf "+self.settings["source_path"]+" -C "+\ -+ unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --selinux -I lbzip2 -xpf "+self.settings["source_path"]+" -C "+\ - self.settings["chroot_path"] - error_msg="Tarball extraction of "+self.settings["source_path"]+\ - " to "+self.settings["chroot_path"]+" failed." -@@ -777,9 +777,9 @@ class generic_stage_target(generic_target): - "catalyst-hash") - destdir=self.settings["snapshot_cache_path"] - if "bz2" == self.settings["chroot_path"][-3:]: -- unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --acls --selinux -I lbzip2 -xpf "+self.settings["snapshot_path"]+" -C "+destdir -+ unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --selinux -I lbzip2 -xpf "+self.settings["snapshot_path"]+" -C "+destdir - else: -- unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --acls --selinux -xpf "+self.settings["snapshot_path"]+" -C "+destdir -+ unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --selinux -xpf "+self.settings["snapshot_path"]+" -C "+destdir - unpack_errmsg="Error unpacking snapshot" - cleanup_msg="Cleaning up invalid snapshot cache at \n\t"+\ - self.settings["snapshot_cache_path"]+\ -@@ -796,10 +796,10 @@ class generic_stage_target(generic_target): - cleanup_msg=\ - "Cleaning up existing portage tree (This can take a long time)..." - if "bz2" == self.settings["chroot_path"][-3:]: -- unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --acls --selinux -I lbzip2 -xpf "+self.settings["snapshot_path"]+" -C "+\ -+ unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --selinux -I lbzip2 -xpf "+self.settings["snapshot_path"]+" -C "+\ - self.settings["chroot_path"]+"/usr" - else: -- unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --acls --selinux -xpf "+self.settings["snapshot_path"]+" -C "+\ -+ unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --selinux -xpf "+self.settings["snapshot_path"]+" -C "+\ - self.settings["chroot_path"]+"/usr" - unpack_errmsg="Error unpacking snapshot" - -@@ -1224,7 +1224,7 @@ class generic_stage_target(generic_target): - - print "Creating stage tarball..." - -- cmd("tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --acls --selinux -I lbzip2 -cpf "+self.settings["target_path"]+" -C "+\ -+ cmd("tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --selinux -I lbzip2 -cpf "+self.settings["target_path"]+" -C "+\ - self.settings["stage_path"]+" .",\ - "Couldn't create stage tarball",env=self.env) - --- -2.2.2 - diff --git a/sdk_container/src/third_party/portage-stable/dev-util/catalyst/files/catalyst-2.0.18-fix-quotes.patch b/sdk_container/src/third_party/portage-stable/dev-util/catalyst/files/catalyst-2.0.18-fix-quotes.patch deleted file mode 100644 index ccaffbe6b0..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-util/catalyst/files/catalyst-2.0.18-fix-quotes.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 1eabce3a9c15c5caf022e71c1959e8c8f4819fad Mon Sep 17 00:00:00 2001 -From: "Anthony G. Basile" -Date: Thu, 3 Mar 2016 20:48:43 -0500 -Subject: [PATCH] targets/support/chroot-functions.sh: correct quotes to allow - expansion of $1 - -This is a backport of commit b2473eff. The single quotes prevented the proper -expansion of $1 in setup_pkgmgr(). Since this is usually called as -`setup_pkgmgr "build"` during stage1 builds, it is surprising this was -not caught earlier. ---- - targets/support/chroot-functions.sh | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/targets/support/chroot-functions.sh b/targets/support/chroot-functions.sh -index 3b7f77b..6c1a31c 100755 ---- a/targets/support/chroot-functions.sh -+++ b/targets/support/chroot-functions.sh -@@ -172,12 +172,12 @@ setup_pkgmgr(){ - # Use --update or portage might just waste time/cycles and reinstall the same version. - # Use --newuse to make sure it rebuilds with any changed use flags. - if [ -n "$1" ];then -- echo "Adding USE='${USE} $1' to make.conf for portage build" -- [ -e /etc/portage/make.conf ] && echo 'USE="${USE} $1"' >> /etc/portage/make.conf -+ echo "Adding USE=\"${USE} $1\" to make.conf for portage build" -+ [ -e /etc/portage/make.conf ] && echo "USE=\"\${USE} $1\"" >> /etc/portage/make.conf - run_merge --oneshot --update --newuse sys-apps/portage -- sed -i '/USE="${USE} $1"/d' /etc/portage/make.conf -+ sed -i "/USE=\"\${USE} $1\"/d" /etc/portage/make.conf - else -- echo "Updating portage with USE='${USE}'" -+ echo "Updating portage with USE=\"${USE}\"" - run_merge --oneshot --update --newuse sys-apps/portage - fi - } --- -2.4.10 - diff --git a/sdk_container/src/third_party/portage-stable/dev-util/catalyst/files/catalyst-2.0.18-remove-machine-id.patch b/sdk_container/src/third_party/portage-stable/dev-util/catalyst/files/catalyst-2.0.18-remove-machine-id.patch deleted file mode 100644 index 1c641fd2b9..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-util/catalyst/files/catalyst-2.0.18-remove-machine-id.patch +++ /dev/null @@ -1,25 +0,0 @@ -From fbf94254a714c8d72840faee42cf348eb69b1a43 Mon Sep 17 00:00:00 2001 -From: "Anthony G. Basile" -Date: Fri, 8 Apr 2016 17:58:15 -0400 -Subject: [PATCH] targets/support/chroot-functions.sh: remove machine-id for - systemd stages - ---- - targets/support/chroot-functions.sh | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/targets/support/chroot-functions.sh b/targets/support/chroot-functions.sh -index 6c1a31c..67874a0 100755 ---- a/targets/support/chroot-functions.sh -+++ b/targets/support/chroot-functions.sh -@@ -223,6 +223,7 @@ cleanup_stages() { - stage1|stage2|stage3|system) - rm -f /var/lib/portage/world - touch /var/lib/portage/world -+ rm -f /etc/machine-id - ;; - *) - echo "Skipping removal of world file for ${clst_target}" --- -2.7.3 - diff --git a/sdk_container/src/third_party/portage-stable/dev-util/catalyst/files/catalyst-2.0.18-stage1-export-ROOT.patch b/sdk_container/src/third_party/portage-stable/dev-util/catalyst/files/catalyst-2.0.18-stage1-export-ROOT.patch deleted file mode 100644 index 67fc2c631b..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-util/catalyst/files/catalyst-2.0.18-stage1-export-ROOT.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 5fd2d5edd3c4c1e99687beb9acc130bab162866b Mon Sep 17 00:00:00 2001 -From: "Anthony G. Basile" -Date: Sat, 4 Jun 2016 12:43:44 -0400 -Subject: stage1-preclean-chroot.sh: export ROOT=/tmp/stage1root for - setup_gcc() - -setup_gcc() calls gcc-config to select a particular gcc profile. At stage1 this -needs to be done in the /tmp/stage1root chroot. gcc-config looks for ROOT to -choose the root directory in which to make the selection. If we don't export -ROOT, then setup_gcc is ineffective. - -X-Gentoo-Bug: 584234 -X-Gentoo-Bug-Url: https://bugs.gentoo.org/show_bug.cgi?id=584234 - -Signed-off-by: Anthony G. Basile ---- - targets/stage1/stage1-preclean-chroot.sh | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/targets/stage1/stage1-preclean-chroot.sh b/targets/stage1/stage1-preclean-chroot.sh -index a80fc92..dc67521 100755 ---- a/targets/stage1/stage1-preclean-chroot.sh -+++ b/targets/stage1/stage1-preclean-chroot.sh -@@ -1,5 +1,6 @@ - #!/bin/bash - -+export ROOT=/tmp/stage1root - export RUN_DEFAULT_FUNCS="no" - - source /tmp/chroot-functions.sh -@@ -8,8 +9,6 @@ update_env_settings - show_debug - - # Now, some finishing touches to initialize gcc-config.... --unset ROOT -- - setup_gcc - setup_binutils - --- -cgit v0.12 - diff --git a/sdk_container/src/third_party/portage-stable/dev-util/catalyst/metadata.xml b/sdk_container/src/third_party/portage-stable/dev-util/catalyst/metadata.xml deleted file mode 100644 index 6c4b9cdbcc..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-util/catalyst/metadata.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - catalyst@gentoo.org - - - livecd@gentoo.org - Gentoo LiveCD Project - - - Enables ccache support - - diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-util/catalyst-2.0.18-r1 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-util/catalyst-2.0.18-r1 deleted file mode 100644 index 00b3bec0e6..0000000000 --- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-util/catalyst-2.0.18-r1 +++ /dev/null @@ -1,14 +0,0 @@ -DEFINED_PHASES=install postinst prepare setup -DEPEND=app-text/asciidoc python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] -DESCRIPTION=Release metatool used for creating releases based on Gentoo Linux -EAPI=5 -HOMEPAGE=https://wiki.gentoo.org/wiki/Catalyst -IUSE=ccache kernel_linux python_targets_python2_7 -KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd -LICENSE=GPL-2 -RDEPEND=app-arch/lbzip2 app-crypt/shash app-arch/tar[xattr] sys-fs/dosfstools virtual/cdrtools amd64? ( >=sys-boot/syslinux-3.72 ) x86? ( >=sys-boot/syslinux-3.72 ) ccache? ( dev-util/ccache ) kernel_linux? ( app-misc/zisofs-tools >=sys-fs/squashfs-tools-2.1 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] -REQUIRED_USE=python_targets_python2_7 -SLOT=0 -SRC_URI=mirror://gentoo/catalyst-2.0.18.tar.bz2 https://dev.gentoo.org/~jmbsvicetto/distfiles/catalyst-2.0.18.tar.bz2 https://dev.gentoo.org/~mattst88/distfiles/catalyst-2.0.18.tar.bz2 https://dev.gentoo.org/~zerochaos/distfiles/catalyst-2.0.18.tar.bz2 https://dev.gentoo.org/~dolsen/releases/catalyst/catalyst-2.0.18.tar.bz2 -_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e python-single-r1 317a2557b4d7319a7418225f65accf77 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 185a06792159ca143528e7010368e8af -_md5_=3d375d850fe2a9af1cb655f054b3f3c1 diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-util/catalyst-2.0.18-r4 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-util/catalyst-2.0.18-r4 deleted file mode 100644 index 9857f4749f..0000000000 --- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-util/catalyst-2.0.18-r4 +++ /dev/null @@ -1,14 +0,0 @@ -DEFINED_PHASES=install postinst prepare setup -DEPEND=app-text/asciidoc python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] -DESCRIPTION=Release metatool used for creating releases based on Gentoo Linux -EAPI=5 -HOMEPAGE=https://wiki.gentoo.org/wiki/Catalyst -IUSE=ccache kernel_linux python_targets_python2_7 -KEYWORDS=~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd -LICENSE=GPL-2 -RDEPEND=app-arch/lbzip2 app-crypt/shash app-arch/tar[xattr] sys-fs/dosfstools virtual/cdrtools amd64? ( >=sys-boot/syslinux-3.72 ) x86? ( >=sys-boot/syslinux-3.72 ) ccache? ( dev-util/ccache ) kernel_linux? ( app-misc/zisofs-tools >=sys-fs/squashfs-tools-2.1 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] -REQUIRED_USE=python_targets_python2_7 -SLOT=0 -SRC_URI=mirror://gentoo/catalyst-2.0.18.tar.bz2 https://dev.gentoo.org/~jmbsvicetto/distfiles/catalyst-2.0.18.tar.bz2 https://dev.gentoo.org/~mattst88/distfiles/catalyst-2.0.18.tar.bz2 https://dev.gentoo.org/~zerochaos/distfiles/catalyst-2.0.18.tar.bz2 https://dev.gentoo.org/~dolsen/releases/catalyst/catalyst-2.0.18.tar.bz2 -_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e python-single-r1 317a2557b4d7319a7418225f65accf77 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 185a06792159ca143528e7010368e8af -_md5_=c71150e9d8822360aeb45bb306aa7efe diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-util/catalyst-2.0.9999 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-util/catalyst-2.0.9999 deleted file mode 100644 index 75c5464f0b..0000000000 --- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-util/catalyst-2.0.9999 +++ /dev/null @@ -1,12 +0,0 @@ -DEFINED_PHASES=install postinst setup unpack -DEPEND=app-text/asciidoc python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-vcs/git -DESCRIPTION=Release metatool used for creating releases based on Gentoo Linux -EAPI=5 -HOMEPAGE=https://wiki.gentoo.org/wiki/Catalyst -IUSE=ccache kernel_linux python_targets_python2_7 -LICENSE=GPL-2 -RDEPEND=app-arch/lbzip2 app-crypt/shash app-arch/tar[xattr] sys-fs/dosfstools virtual/cdrtools amd64? ( >=sys-boot/syslinux-3.72 ) x86? ( >=sys-boot/syslinux-3.72 ) ccache? ( dev-util/ccache ) kernel_linux? ( app-misc/zisofs-tools >=sys-fs/squashfs-tools-2.1 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] -REQUIRED_USE=python_targets_python2_7 -SLOT=0 -_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 git-2 195a672bfaf52d868442171c9469bbb6 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e python-single-r1 317a2557b4d7319a7418225f65accf77 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 185a06792159ca143528e7010368e8af -_md5_=d9762f953ada351e4d2f4ce1bf9c65d6 diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-util/catalyst-3.0.0 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-util/catalyst-3.0.0 deleted file mode 100644 index 0f387a6ebb..0000000000 --- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-util/catalyst-3.0.0 +++ /dev/null @@ -1,14 +0,0 @@ -DEFINED_PHASES=compile configure install prepare test -DEPEND=app-text/asciidoc >=dev-python/snakeoil-0.6.5[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] -DESCRIPTION=Release metatool used for creating releases based on Gentoo Linux -EAPI=5 -HOMEPAGE=https://wiki.gentoo.org/wiki/Catalyst -IUSE=ccache doc kernel_linux python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 -KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 -LICENSE=GPL-2 -RDEPEND=>=dev-python/pydecomp-0.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] app-arch/lbzip2 app-crypt/shash sys-fs/dosfstools !x86-fbsd? ( || ( app-arch/tar[xattr] app-arch/libarchive[xattr] ) ) x86-fbsd? ( app-arch/libarchive[xattr] ) virtual/cdrtools amd64? ( >=sys-boot/syslinux-3.72 ) x86? ( >=sys-boot/syslinux-3.72 ) ccache? ( dev-util/ccache ) kernel_linux? ( app-misc/zisofs-tools >=sys-fs/squashfs-tools-2.1 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] -REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) -SLOT=0 -SRC_URI=mirror://gentoo/catalyst-3.0.0.tar.bz2 https://dev.gentoo.org/~dolsen/releases/catalyst/catalyst-3.0.0.tar.bz2 https://dev.gentoo.org/~jmbsvicetto/distfiles/catalyst-3.0.0.tar.bz2 https://dev.gentoo.org/~zerochaos/distfiles/catalyst-3.0.0.tar.bz2 -_eclasses_=distutils-r1 372bbe39047c0a2550319a3a82f3e063 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 ltprune 2770eed66a9b8ef944714cd0e968182e multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing 6f5991c7101863d0b29df63990ad852e python-r1 e9350ec46bb5c9f3504b4fbe8b8d8987 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 185a06792159ca143528e7010368e8af xdg-utils f2c8335407f0b935b0a96d4adf23ef25 -_md5_=30f0d30fad98e1014637a2f69c5b82d7 diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-util/catalyst-3.0.1 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-util/catalyst-3.0.1 deleted file mode 100644 index 9990b86ff0..0000000000 --- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-util/catalyst-3.0.1 +++ /dev/null @@ -1,14 +0,0 @@ -DEFINED_PHASES=compile configure install prepare test -DEPEND=app-text/asciidoc >=dev-python/snakeoil-0.6.5[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] -DESCRIPTION=Release metatool used for creating releases based on Gentoo Linux -EAPI=5 -HOMEPAGE=https://wiki.gentoo.org/wiki/Catalyst -IUSE=ccache doc kernel_linux python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 -KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd -LICENSE=GPL-2 -RDEPEND=>=dev-python/pydecomp-0.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] app-arch/lbzip2 app-crypt/shash sys-fs/dosfstools !kernel_FreeBSD? ( || ( app-arch/tar[xattr] app-arch/libarchive[xattr] ) ) kernel_FreeBSD? ( app-arch/libarchive[xattr] ) virtual/cdrtools amd64? ( >=sys-boot/syslinux-3.72 ) x86? ( >=sys-boot/syslinux-3.72 ) ccache? ( dev-util/ccache ) kernel_linux? ( app-misc/zisofs-tools >=sys-fs/squashfs-tools-2.1 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] -REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) -SLOT=0 -SRC_URI=mirror://gentoo/catalyst-3.0.1.tar.bz2 https://dev.gentoo.org/~dolsen/releases/catalyst/catalyst-3.0.1.tar.bz2 https://dev.gentoo.org/~jmbsvicetto/distfiles/catalyst-3.0.1.tar.bz2 https://dev.gentoo.org/~zerochaos/distfiles/catalyst-3.0.1.tar.bz2 -_eclasses_=distutils-r1 372bbe39047c0a2550319a3a82f3e063 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 ltprune 2770eed66a9b8ef944714cd0e968182e multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing 6f5991c7101863d0b29df63990ad852e python-r1 e9350ec46bb5c9f3504b4fbe8b8d8987 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 185a06792159ca143528e7010368e8af xdg-utils f2c8335407f0b935b0a96d4adf23ef25 -_md5_=857106b1b6cf9b332fe9b3f43808203e diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-util/catalyst-9999 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-util/catalyst-9999 deleted file mode 100644 index 21f99cec68..0000000000 --- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-util/catalyst-9999 +++ /dev/null @@ -1,12 +0,0 @@ -DEFINED_PHASES=compile configure install prepare test unpack -DEPEND=app-text/asciidoc >=dev-python/snakeoil-0.6.5[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-vcs/git -DESCRIPTION=Release metatool used for creating releases based on Gentoo Linux -EAPI=5 -HOMEPAGE=https://wiki.gentoo.org/wiki/Catalyst -IUSE=ccache doc kernel_linux python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 -LICENSE=GPL-2 -RDEPEND==dev-python/pydecomp-9999[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] app-arch/lbzip2 app-crypt/shash sys-fs/dosfstools !kernel_FreeBSD? ( || ( app-arch/tar[xattr] app-arch/libarchive[xattr] ) ) kernel_FreeBSD? ( app-arch/libarchive[xattr] ) virtual/cdrtools amd64? ( >=sys-boot/syslinux-3.72 ) x86? ( >=sys-boot/syslinux-3.72 ) ccache? ( dev-util/ccache ) kernel_linux? ( app-misc/zisofs-tools >=sys-fs/squashfs-tools-2.1 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] -REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) -SLOT=0 -_eclasses_=distutils-r1 372bbe39047c0a2550319a3a82f3e063 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 git-2 195a672bfaf52d868442171c9469bbb6 ltprune 2770eed66a9b8ef944714cd0e968182e multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing 6f5991c7101863d0b29df63990ad852e python-r1 e9350ec46bb5c9f3504b4fbe8b8d8987 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 185a06792159ca143528e7010368e8af xdg-utils f2c8335407f0b935b0a96d4adf23ef25 -_md5_=25cbfe1c068db10041a2c5831776589e