diff --git a/Manifest.files.gz b/Manifest.files.gz index eb35e49c26d3..f91aff14a658 100644 Binary files a/Manifest.files.gz and b/Manifest.files.gz differ diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz index a31c60ea27ef..d9118f0f1b07 100644 Binary files a/app-admin/Manifest.gz and b/app-admin/Manifest.gz differ diff --git a/app-admin/hcloud/Manifest b/app-admin/hcloud/Manifest index e88a924acae3..b305c1888a95 100644 --- a/app-admin/hcloud/Manifest +++ b/app-admin/hcloud/Manifest @@ -1 +1,2 @@ DIST hcloud-1.20.0.tar.xz 790040 BLAKE2B ba0d62c8e817daadaa9eb891adb3f655a9ae33b05617449e26b09a3ba6b99a6b6f61df1cf29138a008a7ee58e45efdfe07c408af89efb1c2bd870d7340976bb8 SHA512 5dbb9060595e836ccde99984783954e894f74c098f911ae8c4cc1944d444fd28b6f722bb711d9b1ae245ddf3af8cca1939585ed778c8026fbf8c4201c2d15469 +DIST hcloud-1.21.0.tar.xz 823556 BLAKE2B 8a37c7854d6c74f58a8f9dd021674a19f1cc968901e109dadf2e1b7621c3dd4981b07939334b293419d42fc8d1b1a1ff04b962a40b0ae8bf2518a0f7cccd7c68 SHA512 3186839ed95f355f67bdf7169dfa0b10852c8e2e3dc0f2a30e712072cd06cc69a40b038cfa214a47d33e39707d00a81f781aae7f51773cdaca96bcc0b80b1dec diff --git a/app-admin/hcloud/hcloud-1.21.0.ebuild b/app-admin/hcloud/hcloud-1.21.0.ebuild new file mode 100644 index 000000000000..77d54006fe99 --- /dev/null +++ b/app-admin/hcloud/hcloud-1.21.0.ebuild @@ -0,0 +1,34 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DESCRIPTION="A command-line interface for Hetzner Cloud" +HOMEPAGE="https://github.com/hetznercloud/cli" +SRC_URI="https://dev.gentoo.org/~ago/distfiles/${P}.tar.xz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64" + +IUSE="" +DEPEND="dev-lang/go:=" +RESTRICT="strip" +QA_FLAGS_IGNORED=".*" + +src_compile() { + go build -mod vendor -o ${PN} -ldflags "-w -X github.com/hetznercloud/cli/cli.Version=${PV}-gentoo" ./cmd/${PN} || die "build failed" +} + +src_test() { + # For upstream a simple test is run 'hcloud version' + ./hcloud version + if [[ $? -ne 0 ]] + then + die "Test failed" + fi +} + +src_install() { + dobin ${PN} +} diff --git a/app-admin/sudo/Manifest b/app-admin/sudo/Manifest index 45dff2a03fa6..c37d2480b40a 100644 --- a/app-admin/sudo/Manifest +++ b/app-admin/sudo/Manifest @@ -1,2 +1,2 @@ DIST sudo-1.9.5p2.tar.gz 4012277 BLAKE2B 41913887463e4f775564af8d614fb5ed762200aa777dc789ec333842d4f432323474fc952a531fe929b33607cdfbcd18d7fe7470a15d67139deaf855841ed11f SHA512 f0fe914963c31a6f8ab6c86847ff6cdd125bd5a839b27f46dcae03963f4fc413b3d4cca54c1979feb825c8479b44c7df0642c07345c941eecf6f9f1e03ea0e27 -DIST sudo-1.9.6.tar.gz 4118872 BLAKE2B fa3a3cb47540f6f926a292f81e4a18358e31fe11d0a63cb8560f26fc85a5e82830752f3352466a5dd67787f5e0760f035f8787bd2241034f351cb5905a98100d SHA512 16291bd7290284272efe675f8b94218540224217f03d96bbb7bcbe6c9d5b7453ff6b24fd28dcbce2fdee59cc8adb9798f4f13272bd25592abc17caa77236dfa3 +DIST sudo-1.9.6p1.tar.gz 4119888 BLAKE2B 02bdb551c46cff11ac56e64937c64e6a29ccd8e0af34ea2f6b33c223bee8f7ad958d0fc3d7ef8ef12bf5bc82565769b923ff112a3f3d6bf6999fa4f6ea55e38e SHA512 632dfe72f04ce9a7a5a7236fcd5c09ce4535e695ced49d24dd848e3a7b1bea7380df44188b9e475af4271069539b5a5816948a98fbb0649ebebaba8b4c4b7745 diff --git a/app-admin/sudo/sudo-1.9.6.ebuild b/app-admin/sudo/sudo-1.9.6_p1.ebuild similarity index 100% rename from app-admin/sudo/sudo-1.9.6.ebuild rename to app-admin/sudo/sudo-1.9.6_p1.ebuild diff --git a/app-antivirus/Manifest.gz b/app-antivirus/Manifest.gz index ca85572e2d19..f659a026afef 100644 Binary files a/app-antivirus/Manifest.gz and b/app-antivirus/Manifest.gz differ diff --git a/app-antivirus/clamtk/Manifest b/app-antivirus/clamtk/Manifest index fe4ef942e0fb..dc02ffb0ca13 100644 --- a/app-antivirus/clamtk/Manifest +++ b/app-antivirus/clamtk/Manifest @@ -1,5 +1,5 @@ DIST clamtk-6.06.tar.xz 232024 BLAKE2B a9a7310410f685bb6cae24ae6cee45b31a524b88cf75c9346617614e5dba43f3942d39dd6d484d656906c3fbb2122ab3858ab017c0e79d5ed9271b2968b750d2 SHA512 ee4d09e0f3c703bef5a1b3e1bdc97d3d1d91998c98e82a2fb1e3326fa8fdff32d7bbef7d9e2bf2b6292fa1982b1efb3b5cdb4cdd7afb17f6ffd0e089d8b4539a -DIST clamtk-6.09.tar.xz 228208 BLAKE2B bef7dca1b60c8c7d02efbaf48d75fc95ac6706f553b0d5c7146e3c36220f326b760306f3011d7774510c8f52d577be1d4dd10abe58aefa900fad8ee414f050a0 SHA512 4bb7f4f8fdc346d60ba3dbe6abdf09edcad2fa3fd4aab6f9eebf88705a213dab9974e2b838eeb05f155ca44ed249874e23679002a1d6e8832bfe3c104b2832a8 +DIST clamtk-6.10.tar.xz 286008 BLAKE2B 3f602c9422d57cc24ca47141a237870445c2390f3e4fa07cf32073e058899a603f0882b7df51c40184f84d75632bd2b608035ae71f4d8253a474f9fd30a212da SHA512 32f7856e89fa3d3dfc5b546bbf71c6b2fed62ac3ccc18f30ac9b55ceb9a48a182d667af0b430942a4021c0454491300e312f93ea8d57bce711d00950afebfd71 DIST clamtk-gnome-0.05.tar.xz 15148 BLAKE2B d72ad0c9b3272c1a21d3722994152e23aeb01bd79d006cbcd3545c2689887b4f596daeeef72a13d9cdd9cfc89c4091963b4a1917824bbb06be4678f2c446a114 SHA512 a5d3b0e87889880272aa61a0feebca8e885c7fa964bad767351c826188c236f2152b3c43328b6aa720c5942b2bf1da69916d3664358c274813a6ac032ee4dea0 DIST clamtk-kde-0.18.tar.xz 17732 BLAKE2B ca82934417f2d869fd8c8e36a31ef4a52cf4ee73581c5d1d400c1b28908c5ea2524a8f5d1110b1e949038378613fb4d5607d5123eebe91df695a53d0dd489302 SHA512 145ddd349010e0bb6fe3295e50d6e15a2dd96e604babbd5de4cb49ba75169d2050777cac38e40ac6a64cb89ddf94025d610aca73136c75f81115d0a2d863d24e DIST nemo-sendto-clamtk-0.04.tar.xz 4228 BLAKE2B ce656d4f021bc30cd12fb2ee5f98a78c1f1fdb2460ed2cbba0b572408617f91b39b2ca2fe542b9cec7be79b4b9fdfd685f5553e1a671454ca1e6723241dcb805 SHA512 2b5d3abbc4ae5dbc71b1b7bc836df88ad51e6afa00d5e954b5c1355a70c0420b6fef895e1cb5cccb86a662aee2039cef6c01821c1347fa155b5da3529b25562c diff --git a/app-antivirus/clamtk/clamtk-6.09.ebuild b/app-antivirus/clamtk/clamtk-6.10.ebuild similarity index 97% rename from app-antivirus/clamtk/clamtk-6.09.ebuild rename to app-antivirus/clamtk/clamtk-6.10.ebuild index b6fbc1d64246..a03f211ef68b 100644 --- a/app-antivirus/clamtk/clamtk-6.09.ebuild +++ b/app-antivirus/clamtk/clamtk-6.10.ebuild @@ -15,7 +15,7 @@ MY_PV_THUNAR="0.06" DESCRIPTION="A graphical front-end for ClamAV" HOMEPAGE="https://gitlab.com/dave_m/clamtk/wikis/Home" SRC_URI=" - https://bitbucket.org/davem_/${PN}/downloads/${P}.tar.xz + https://github.com/dave-theunsub/${PN}/releases/download/v${PV}/${P}.tar.xz kde? ( https://bitbucket.org/davem_/${PN}-kde/downloads/${PN}-kde-${MY_PV_KDE}.tar.xz ) nautilus? ( https://bitbucket.org/davem_/${PN}-gnome/downloads/${PN}-gnome-${MY_PV_NAUTILUS}.tar.xz ) nemo? ( https://bitbucket.org/davem_/nemo-sendto-${PN}/downloads/nemo-sendto-${PN}-${MY_PV_NEMO}.tar.xz ) diff --git a/app-cdr/Manifest.gz b/app-cdr/Manifest.gz index 540260b9b5c2..e7bc2f058a29 100644 Binary files a/app-cdr/Manifest.gz and b/app-cdr/Manifest.gz differ diff --git a/app-cdr/dvd+rw-tools/dvd+rw-tools-7.1-r4.ebuild b/app-cdr/dvd+rw-tools/dvd+rw-tools-7.1-r4.ebuild new file mode 100644 index 000000000000..6e8c6a487ec5 --- /dev/null +++ b/app-cdr/dvd+rw-tools/dvd+rw-tools-7.1-r4.ebuild @@ -0,0 +1,58 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +inherit toolchain-funcs + +DESCRIPTION="A set of tools for DVD+RW/-RW drives" +HOMEPAGE="http://fy.chalmers.se/~appro/linux/DVD+RW/" +SRC_URI="http://fy.chalmers.se/~appro/linux/DVD+RW/tools/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux" +IUSE="" + +RDEPEND="app-cdr/cdrtools" +DEPEND="${RDEPEND} + sys-devel/m4" + +PATCHES=( + "${FILESDIR}"/${PN}-7.0-sysmacros.patch + "${FILESDIR}"/${PN}-7.0-wctomb-r1.patch + "${FILESDIR}"/${PN}-7.0-glibc2.6.90.patch + "${FILESDIR}"/${PN}-7.0-dvddl-r1.patch + "${FILESDIR}"/${PN}-7.0-wexit.patch + "${FILESDIR}"/${PN}-7.0-reload.patch + "${FILESDIR}"/${PN}-7.1-noevent.patch + "${FILESDIR}"/${PN}-7.1-lastshort.patch + "${FILESDIR}"/${PN}-7.1-bluray_srm+pow.patch + "${FILESDIR}"/${PN}-7.1-bluray_pow_freespace.patch + "${FILESDIR}"/${PN}-7.1-clang.patch +) + +# this is a text file, not html +DOCS=( index.html ) + +src_prepare() { + # Linux compiler flags only include -O2 and are incremental. + sed -i '/FLAGS/s:-O2::' Makefile.m4 || die "failed to sed out FLAGS" + default +} + +src_compile() { + emake SHELL="${EPREFIX}"/bin/bash CC="$(tc-getCC)" CXX="$(tc-getCXX)" +} + +src_install() { + emake SHELL="${EPREFIX}"/bin/bash prefix="${ED}/usr" install + einstalldocs +} + +pkg_postinst() { + if [[ -z "${REPLACING_VERSIONS}" ]] ; then + elog 'If you receive an error, "unable to anonymously mmap...' + elog 'Resource temporarily unavailable" when running growisofs,' + elog 'then you may need to run "ulimit -l unlimited".' + fi +} diff --git a/app-cdr/dvd+rw-tools/files/dvd+rw-tools-7.1-clang.patch b/app-cdr/dvd+rw-tools/files/dvd+rw-tools-7.1-clang.patch new file mode 100644 index 000000000000..430d535ed622 --- /dev/null +++ b/app-cdr/dvd+rw-tools/files/dvd+rw-tools-7.1-clang.patch @@ -0,0 +1,71 @@ +--- a/dvd+rw-booktype.cpp 2006-06-24 12:21:48.000000000 +0300 ++++ b/dvd+rw-booktype.cpp 2021-03-14 10:16:02.533741829 +0200 +@@ -398,7 +398,7 @@ + break; + case OPT_MEDIA: + if (profile!=0x1A && profile!=0x14 && profile!=13) +- { fprintf (stderr,":-( action is applicable to DVD±RW only\n"); ++ { fprintf (stderr,":-( action is applicable to DVD\xb1RW only\n"); + break; + } + +@@ -759,7 +759,7 @@ + } + } + +- delete list; ++ delete[] list; + } + + profile=buf[6]<<8|buf[7]; +--- a/dvd+rw-mediainfo.cpp 2006-09-23 20:46:57.000000000 +0300 ++++ b/dvd+rw-mediainfo.cpp 2021-03-14 10:16:02.533741829 +0200 +@@ -621,7 +621,7 @@ + if (phys_end>0) phys_end -= phys_start; + if (phys_end>0) phys_end += 1; + +- printf (" %s %u*2KB=%"LLU"\n", ++ printf (" %s %u*2KB=%" LLU "\n", + dvd_dash>=0?"Legacy lead-out at:":"Last border-out at:", + phys_end,phys_end*2048LL); + +@@ -941,14 +941,14 @@ + printf(" %s:\t\t%u*%u=",type[formats[8]&3], + capacity=formats[4]<<24|formats[5]<<16|formats[6]<<8|formats[7], + blocksize); +- printf("%"LLU"\n",(unsigned long long)capacity*blocksize); ++ printf("%" LLU "\n",(unsigned long long)capacity*blocksize); + + for(i=12;i0) str[l]='\0'; +- else str[0]='±',str[1]='\0'; ++ else str[0]='\xb1',str[1]='\0'; + } + ~__plusminus() { } + operator char*(){ return str; } diff --git a/app-cdr/dvd+rw-tools/metadata.xml b/app-cdr/dvd+rw-tools/metadata.xml index 6f49eba8f496..24939706c0c6 100644 --- a/app-cdr/dvd+rw-tools/metadata.xml +++ b/app-cdr/dvd+rw-tools/metadata.xml @@ -1,5 +1,12 @@ - + + ceamac.paragon@gmail.com + Viorel Munteanu + + + proxy-maint@gentoo.org + Proxy Maintainers + diff --git a/app-emacs/Manifest.gz b/app-emacs/Manifest.gz index b3c7a3790ca1..21ad5dae02bf 100644 Binary files a/app-emacs/Manifest.gz and b/app-emacs/Manifest.gz differ diff --git a/app-emacs/auctex/auctex-12.3.ebuild b/app-emacs/auctex/auctex-12.3.ebuild index 809f35351cca..6ce7fec4acc6 100644 --- a/app-emacs/auctex/auctex-12.3.ebuild +++ b/app-emacs/auctex/auctex-12.3.ebuild @@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" LICENSE="GPL-3+ FDL-1.3+" SLOT="0" -KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris" +KEYWORDS="amd64 arm ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris" IUSE="preview-latex" RDEPEND="virtual/latex-base diff --git a/app-emacs/nxml-gentoo-schemas/Manifest b/app-emacs/nxml-gentoo-schemas/Manifest index f10067864e08..3ae11883efd7 100644 --- a/app-emacs/nxml-gentoo-schemas/Manifest +++ b/app-emacs/nxml-gentoo-schemas/Manifest @@ -1,3 +1,2 @@ DIST nxml-gentoo-schemas-20200303.tar.xz 8452 BLAKE2B bee7e3d58b03e3aaefcd09d93a9b6919ae6b4892ac09e218ac68cbbc048e28def8b49cc4c583ddad04da61d61bb76386f0c0f33e12d2c8a938447e3f590854d5 SHA512 42f8ee48e349423db156d585bdd2c1d333f69693ac541bc44f8c1d0bae412b1793e1d86fc527287225040aa9b4b791ad2922196cf750de6029b4c77eebdc62de -DIST nxml-gentoo-schemas-20210203.tar.xz 8440 BLAKE2B 733c7949bd39a94e657c829c478b76229cfbe2edca6f973f45a91423fb573ed6ff5717ef7bca74733266d7ff5b31f5426d06df51d79263422dba1467234ae8ba SHA512 bdd28b40d0748f595b6ac035686605b7d7a08e9802d0e497893329b4cbc1195f4e785befb8afe6362eb8eb45132f3928f394546412ba463c47977587b6f88b3d DIST nxml-gentoo-schemas-20210314.tar.xz 8512 BLAKE2B 9219644c1a0dbc7afc78c0c4f2623d9d71bbd4f62c387eb025e001e756262107d59f739d695c172ae4ef54049b98f4c3e92bc630be39bcf2f6727d8b0ea27247 SHA512 a092f48f3fe69df0bc51b3e5dd11a6ef09f4074589ffe9872f4936548caf14554fef8cd8ab42626f621c0163a23879698ad12a0818b52cc4b4a4f384a98afd6c diff --git a/app-emacs/nxml-gentoo-schemas/nxml-gentoo-schemas-20210203.ebuild b/app-emacs/nxml-gentoo-schemas/nxml-gentoo-schemas-20210203.ebuild deleted file mode 100644 index b8b974d25777..000000000000 --- a/app-emacs/nxml-gentoo-schemas/nxml-gentoo-schemas-20210203.ebuild +++ /dev/null @@ -1,24 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit elisp - -DESCRIPTION="Extension for nxml-mode with Gentoo-specific schemas" -HOMEPAGE="https://gitweb.gentoo.org/proj/nxml-gentoo-schemas.git/" -SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz" - -LICENSE="HPND MIT GPL-2+" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" - -SITEFILE="60${PN}-gentoo.el" - -src_compile() { :; } - -src_install() { - insinto "${SITEETC}/${PN}" - doins schemas.xml *.rnc - elisp-site-file-install "${FILESDIR}/${SITEFILE}" -} diff --git a/app-emacs/nxml-gentoo-schemas/nxml-gentoo-schemas-20210314.ebuild b/app-emacs/nxml-gentoo-schemas/nxml-gentoo-schemas-20210314.ebuild index b8b974d25777..949349df0449 100644 --- a/app-emacs/nxml-gentoo-schemas/nxml-gentoo-schemas-20210314.ebuild +++ b/app-emacs/nxml-gentoo-schemas/nxml-gentoo-schemas-20210314.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz" LICENSE="HPND MIT GPL-2+" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86" SITEFILE="60${PN}-gentoo.el" diff --git a/app-emacs/org-mode/org-mode-9.4.4.ebuild b/app-emacs/org-mode/org-mode-9.4.4.ebuild index 00545f28b213..bffbcb8d7146 100644 --- a/app-emacs/org-mode/org-mode-9.4.4.ebuild +++ b/app-emacs/org-mode/org-mode-9.4.4.ebuild @@ -12,7 +12,7 @@ SRC_URI="https://orgmode.org/org-${PV}.tar.gz" LICENSE="GPL-3+ FDL-1.3+ contrib? ( GPL-2+ MIT ) odt-schema? ( OASIS-Open )" SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" +KEYWORDS="amd64 ppc x86" IUSE="contrib doc odt-schema" RESTRICT="test" diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz index 52afdffa1c6c..0e4d6b701495 100644 Binary files a/app-misc/Manifest.gz and b/app-misc/Manifest.gz differ diff --git a/app-misc/banner/banner-1.3.5.ebuild b/app-misc/banner/banner-1.3.5.ebuild index 7a4c24d8d711..04ec4557b924 100644 --- a/app-misc/banner/banner-1.3.5.ebuild +++ b/app-misc/banner/banner-1.3.5.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -9,7 +9,7 @@ SRC_URI="https://github.com/pronovic/${PN}/archive/BANNER_V${PV}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux" S="${WORKDIR}/${PN}-${PN^^}_V${PV}" diff --git a/app-misc/oneko/Manifest b/app-misc/oneko/Manifest index f469fcaa1538..55ced1b39784 100644 --- a/app-misc/oneko/Manifest +++ b/app-misc/oneko/Manifest @@ -1,6 +1,4 @@ DIST oneko-1.2-cat.png 223 BLAKE2B 35eb9a8aa7e49aa00a7a689187b598ee837b9236715ed62ffc37a94f9afdd54cac9c251eb82a85cbf7ef31af36c010d54310d79f079cf43a6ba3761ee3b18c34 SHA512 f3543be2bac0d14d3db5fe6bc33cf59caae743d547993fe010c79d2bfc6f8720d608026d692733b7519d5b6b99db09f58f34af9bd2d8fcc3556b6994734f24bf DIST oneko-1.2-dog.png 236 BLAKE2B 8aa4bb11d75283784e7bef8eb6d887706d90cf6370cfa41433d32bffbb23db0b775e5a23fe9b19ef0d9426d5e98e583b599e477427c3223f4a225f1904da7ad1 SHA512 11e4a4ecfba26a0ea782846ca288da7ba3f68629dc8f4b0d7987923f06afe57971d53c9161ed13711a9a1f737ea3d8ec76f559311dd10234dca49cfa9d20f533 -DIST oneko-1.2-sakura-nobsd.patch.bz2 2967 BLAKE2B 128fe382d81fdd18f077d015fcad41613baae00171149a2d4fd253bb03595ca4c7be16640531140af90edf176754fad2bf7e4d5ae27471bf7079b3a558788189 SHA512 dbab7471b1c76d8bd7b0c0f9512ce274d98b7e96e8f1cb781a07b031d3a23c0c716222465dee16ad77f658c681116e71e6f8f50ab45ee8f24d132e24fed6849e -DIST oneko-1.2.sakura.5.tar.gz 76825 BLAKE2B e6fbb02823a25e71b6b26d067ca898352d26971bd6595b2f8d33205bf268238e277f8a0a980178704857d50042acd0cb1663d9eb0549764934153864b3602ed1 SHA512 328bc267c027dc2bf9f4d0bf7a3a5cfb0f77e7ffe566dad58ba8728a8d72f905ef0b1b92fea77179d1e79886aea8a6b27cda44dc227d96b69ed34b4fdde3ec15 DIST oneko_1.2.sakura.6-14.debian.tar.xz 10996 BLAKE2B 4507243c28371d99976a3ef4d015b53f6dc1e28a0e841c55da18710bfc3825786dc8ee8ce06b5af1ca41445661d6f5c10225b80c6802ab5d2de06dab09de10e0 SHA512 35656ade57e57ba400b6e2d0f9dcfa1b41a7002f874f1113db080d9e75e390ff0e1f4ec169fbcf1cbea135988500501c65a2f520eaab196b8d92ef4feb993baf DIST oneko_1.2.sakura.6.orig.tar.gz 64623 BLAKE2B 262f9373b1739c0181a52377dd72c5f35bd9d8e4e54364304704bb6794216585a7617525ccf439cef4783556aa732ac84f60a45424021b5963d69485c21a15fe SHA512 3f06b1c23ac6e3d9864530904bccbe0fdbeebb512233e35555ae44d2b45b2e6e50480081f46b048994c9415dca05691a0796357d86b4b7e8dc0bbcf1642ae348 diff --git a/app-misc/oneko/oneko-1.2-r2.ebuild b/app-misc/oneko/oneko-1.2-r2.ebuild deleted file mode 100644 index 8ef1f755b8e6..000000000000 --- a/app-misc/oneko/oneko-1.2-r2.ebuild +++ /dev/null @@ -1,71 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit eutils toolchain-funcs - -DESCRIPTION="A cat, dog and others which chase the mouse or windows around the screen" -HOMEPAGE="http://www.daidouji.com/oneko/" -SRC_URI="http://www.daidouji.com/oneko/distfiles/${P}.sakura.5.tar.gz - mirror://gentoo/${P}-cat.png - mirror://gentoo/${P}-dog.png - mirror://gentoo/${P}-sakura-nobsd.patch.bz2" - -LICENSE="public-domain" -SLOT="0" -KEYWORDS="amd64 ppc ppc64 x86" - -RDEPEND=" - x11-libs/libX11 - x11-libs/libXext -" -DEPEND=" - ${RDEPEND} - app-text/rman - x11-base/xorg-proto - x11-misc/gccmakedep - x11-misc/imake -" - -S=${WORKDIR}/oneko-${PV}.sakura.5 - -src_prepare() { - epatch \ - "${WORKDIR}"/${P}-sakura-nobsd.patch \ - "${FILESDIR}"/${P}-include.patch -} - -src_configure() { - xmkmf -a || die -} - -src_compile() { - emake \ - CC="$(tc-getCC)" \ - CCOPTIONS="${CFLAGS}" \ - EXTRA_LDOPTIONS="${LDFLAGS}" -} - -src_install() { - dobin oneko - newman oneko._man oneko.1x - dodoc README README-NEW README-SUPP - newicon "${DISTDIR}/${P}-cat.png" "cat.png" - newicon "${DISTDIR}/${P}-dog.png" "dog.png" - make_desktop_entry "oneko" "oneko (cat)" "cat" "Game;Amusement" - make_desktop_entry "oneko -dog" "oneko (dog)" "dog" "Game;Amusement" - make_desktop_entry "killall -TERM oneko" "oneko kill" "" "Game;Amusement" -} - -pkg_postinst() { - elog "To kill oneko, type the following in a terminal:" - elog "" - elog "killall oneko" - elog "" - elog "If your mouse cursor changes to the default black cross" - elog "after running ${PN}, you should emerge x11-apps/xsetroot" - elog "and run:" - elog "" - elog "xsetroot -cursor_name left_ptr" - elog "" -} diff --git a/app-misc/oneko/oneko-1.2_p5.ebuild b/app-misc/oneko/oneko-1.2_p5.ebuild deleted file mode 100644 index 6693ade88c71..000000000000 --- a/app-misc/oneko/oneko-1.2_p5.ebuild +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit desktop toolchain-funcs - -DESCRIPTION="A cat, dog and others which chase the mouse or windows around the screen" -HOMEPAGE="http://www.daidouji.com/oneko/" -SRC_URI=" - http://www.daidouji.com/oneko/distfiles/${P/_p*}.sakura.${PV/*_p}.tar.gz - mirror://gentoo/${P/_p*}-cat.png - mirror://gentoo/${P/_p*}-dog.png - mirror://gentoo/${P/_p*}-sakura-nobsd.patch.bz2 -" - -LICENSE="public-domain" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" - -RDEPEND=" - x11-libs/libX11 - x11-libs/libXext -" -DEPEND=" - ${RDEPEND} - app-text/rman - x11-base/xorg-proto - x11-misc/gccmakedep - x11-misc/imake -" -PATCHES=( - "${WORKDIR}"/${P/_p*}-sakura-nobsd.patch - "${FILESDIR}"/${P/_p*}-include.patch -) -S=${WORKDIR}/${P/_*}.sakura.${PV/*_p} - -src_configure() { - xmkmf -a || die -} - -src_compile() { - emake \ - CC="$(tc-getCC)" \ - CCOPTIONS="${CFLAGS}" \ - EXTRA_LDOPTIONS="${LDFLAGS}" -} - -src_install() { - dobin oneko - newman oneko._man oneko.1x - dodoc README README-NEW README-SUPP - - newicon "${DISTDIR}/${P/_*}-cat.png" "cat.png" - newicon "${DISTDIR}/${P/_*}-dog.png" "dog.png" - - make_desktop_entry "oneko" "oneko (cat)" "cat" "Game;Amusement" - make_desktop_entry "oneko -dog" "oneko (dog)" "dog" "Game;Amusement" - make_desktop_entry "killall -TERM oneko" "oneko kill" "" "Game;Amusement" -} diff --git a/app-misc/oneko/oneko-1.2_p6_p14-r1.ebuild b/app-misc/oneko/oneko-1.2_p6_p14-r1.ebuild index eb47a60002a6..262843e5b3d9 100644 --- a/app-misc/oneko/oneko-1.2_p6_p14-r1.ebuild +++ b/app-misc/oneko/oneko-1.2_p6_p14-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -15,7 +15,7 @@ SRC_URI=" LICENSE="public-domain" SLOT="0" -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" +KEYWORDS="amd64 ppc ppc64 x86" RDEPEND=" x11-libs/libX11 diff --git a/app-misc/recoll/Manifest b/app-misc/recoll/Manifest index ec827ce840c5..8b34bab9da1f 100644 --- a/app-misc/recoll/Manifest +++ b/app-misc/recoll/Manifest @@ -1,3 +1,4 @@ DIST recoll-1.25.19.tar.gz 2845683 BLAKE2B 745eac2dd3208619e173abba78f1e03186cdb5deb363c30728184a9d826c698d8e088cc0420178754131792f0d933f395a4fdb209a4315888b733a1209644580 SHA512 d56aff810e335f8212b908118de8fe12fc8d8f8341ebc281244c00dfe2216e008c655f4d39955b6c71928a28ea0aea073036fed17be5b80e8443fe6dfbe374f6 DIST recoll-1.27.12.tar.gz 3184471 BLAKE2B 60bcdee44259fa7f8b9decb9258ca0dae4edbf0cee1e8b1353cb59418503f0fcea9b439ecd6352500ff5b4cccfae08fc2a3f7f786fbd096cf18fd21fb809705b SHA512 3701dff056b8200f3b3c1bb2acaa69356c0def00959a0b74c14e1d500bd9e05fc81d82ce8b7db59d7e5b85617a8a7197700031aab65b31e005a4fedeaff59e97 DIST recoll-1.28.5.tar.gz 3261816 BLAKE2B 6bf9daab0f97ee6fdb4033197d3fa3f4296b2df8a57566195fca3bf170fec621c27e7da00a1a5a8493fbbadca103a0db7b8c3051abe95d5c2aedb7c289c050a5 SHA512 df4c7a5e624933ccc7ce257a767a4621728a4dbcdd5b551b47845ed0fcffdd5a6f7f617a466404c5e8d8b62c81e57986e1f21e01d643899755623a2dc597d712 +DIST recoll-1.29.2.tar.gz 3871580 BLAKE2B ae6ef5628dfac67a192a3d133d5b5d8ddec079ac79be2e8aa7e744669ed0478cb41628a0ed46b4ff2364823f367815b1eb4bca0a6e4b56a9e12d4f78c6842473 SHA512 c87fc054a0c34f1b6bcc10a4f2c84268a51df02b8ba84634c51f9396befe5b2b84fc93d363876158c9d117a164613e91d9c63b228fec5e0e07d234c97c4680c5 diff --git a/app-misc/recoll/recoll-1.29.2.ebuild b/app-misc/recoll/recoll-1.29.2.ebuild new file mode 100644 index 000000000000..f72ea0e76f09 --- /dev/null +++ b/app-misc/recoll/recoll-1.29.2.ebuild @@ -0,0 +1,135 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{6..9} ) + +inherit linux-info optfeature python-single-r1 qmake-utils + +DESCRIPTION="Personal full text search package" +HOMEPAGE="https://www.lesbonscomptes.com/recoll/" +SRC_URI="https://www.lesbonscomptes.com/recoll/${P}.tar.gz" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +IUSE="camelcase chm doc +inotify qt5 session +spell webengine" +REQUIRED_USE=" + session? ( inotify ) + webengine? ( qt5 ) + ${PYTHON_REQUIRED_USE} +" + +DEPEND=" + dev-libs/xapian:= + sys-libs/zlib:= + virtual/libiconv + chm? ( + dev-libs/chmlib + dev-python/pychm + ) + qt5? ( + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtprintsupport:5 + webengine? ( dev-qt/qtwebengine:5[widgets] ) + ) + session? ( + inotify? ( + x11-libs/libSM + x11-libs/libICE + x11-libs/libX11 + ) + ) + spell? ( app-text/aspell ) + ${PYTHON_DEPS} +" + +BDEPEND=" + qt5? ( dev-qt/linguist-tools:5 ) +" + +RDEPEND=" + ${DEPEND} + app-arch/unzip +" + +pkg_pretend() { + if has_version " - - games@gentoo.org - Gentoo Games Project - haskell@gentoo.org Gentoo Haskell - - Goatee is a Go library and game editor, written in Haskell. It provides a - GUI for recording, studying, and editing game records. Underneath this is a - portable library for manipulating SGF files to build UIs and tools. Goatee - aims to be full-featured by supporting all of the SGF spec and allowing for - full and easy customization of the game records you create. - - This package is the shared library. - diff --git a/dev-haskell/Manifest.gz b/dev-haskell/Manifest.gz index 602462c8ba92..dcc4b93510e5 100644 Binary files a/dev-haskell/Manifest.gz and b/dev-haskell/Manifest.gz differ diff --git a/dev-haskell/alex-tools/alex-tools-0.4.ebuild b/dev-haskell/alex-tools/alex-tools-0.4.ebuild index d33a9a66b590..f1f30eb55b20 100644 --- a/dev-haskell/alex-tools/alex-tools-0.4.ebuild +++ b/dev-haskell/alex-tools/alex-tools-0.4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -29,5 +29,5 @@ src_prepare() { cabal_chdeps \ 'base >=4.7 && <4.12' 'base >=4.7' \ - 'template-haskell >=2.9.0 && <2.14' 'template-haskell >=2.9.0 && <2.16' + 'template-haskell >=2.9.0 && <2.14' 'template-haskell >=2.9.0' } diff --git a/dev-haskell/cabal-install/Manifest b/dev-haskell/cabal-install/Manifest index b2cccfa8c911..7a714dca594a 100644 --- a/dev-haskell/cabal-install/Manifest +++ b/dev-haskell/cabal-install/Manifest @@ -1 +1,2 @@ DIST cabal-install-3.0.0.0.tar.gz 654045 BLAKE2B 5036948651098b83f073b5ce29e2aaa31e4382f07e8b1e79d206889bd9c74fb88789f4b1cbb3bddc6d03375a6e3a3e164d6bda4ea19e3f944904ab11d7693fce SHA512 0b15313fc11bc6b6018e01b6a3a65242306977c16ce9333ea1191c1ce0020b180451235a7a65b47bc01791e05d1b246bf9d573fc7e981a46fcfc7da0fed04cca +DIST cabal-install-3.2.0.0.tar.gz 632084 BLAKE2B 55cdbddebed17489f1c031bd867de7868878aa289193b826dd8274860e4f08d48f71cad33af1b62da16f71629ae4ff5745c3ceeada1680dbcc222793eba49a06 SHA512 ad937b2df42b688e4608aa2b91a25daf1042e5573626202e5182cbfeca9acc5933194853405a6396c60d0d28d6d0d5c5276fd85cb6acf4be2c8cd12afe747062 diff --git a/dev-haskell/cabal-install/cabal-install-3.2.0.0.ebuild b/dev-haskell/cabal-install/cabal-install-3.2.0.0.ebuild new file mode 100644 index 000000000000..085a26c438fa --- /dev/null +++ b/dev-haskell/cabal-install/cabal-install-3.2.0.0.ebuild @@ -0,0 +1,74 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +# ebuild generated by hackport 0.6.5.9999 +# hackport: flags: -debug-conflict-sets,-debug-expensive-assertions,-debug-tracetree +CABAL_FEATURES="" +inherit haskell-cabal + +DESCRIPTION="The command-line interface for Cabal and Hackage" +HOMEPAGE="https://www.haskell.org/cabal/" +SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +# keep in sync with ghc-8.10 +KEYWORDS="~amd64 ~x86" +IUSE="+native-dns" + +RDEPEND=">=dev-haskell/async-2.0:= =dev-haskell/base16-bytestring-0.1.1:= =dev-haskell/cabal-3.2:= =dev-haskell/cryptohash-sha256-0.11:= =dev-haskell/echo-0.1.3:= =dev-haskell/edit-distance-0.2.2:= =dev-haskell/fail-4.9:= =dev-haskell/hackage-security-0.6.0.0:= =dev-haskell/hashable-1.0:= =dev-haskell/http-4000.1.5:= =dev-haskell/lukko-0.1:= =dev-haskell/mtl-2.0:= =dev-haskell/network-2.6:= =dev-haskell/network-uri-2.6.0.2:= =dev-haskell/parsec-3.1.13.0:= =dev-haskell/random-1:= =dev-haskell/semigroups-0.18.3:= =dev-haskell/stm-2.0:= =dev-haskell/tar-0.5.0.3:= =dev-haskell/text-1.2.3:= =dev-haskell/zlib-0.5.3:= =dev-lang/ghc-7.10.1:= + native-dns? ( >=dev-haskell/resolv-0.1.1:= = 4.8 && < 4.14' 'base >= 4.8' + #if use noprefs; then + # epatch "${FILESDIR}/${PN}"-0.13.3-nopref.patch + #fi + + # no chance to link to -threaded on ppc64, alpha and others + # who use UNREG, not only ARM + if ! ghc-supports-threaded-runtime; then + cabal_chdeps '-threaded' ' ' + fi + eapply_user +} + +src_configure() { + haskell-cabal_src_configure \ + --flags=-debug-conflict-sets \ + --flags=-debug-expensive-assertions \ + --flags=-debug-tracetree \ + $(cabal_flag native-dns native-dns) +} diff --git a/dev-haskell/cabal-install/files/cabal-install-3.2.0.0-rankntypes.patch b/dev-haskell/cabal-install/files/cabal-install-3.2.0.0-rankntypes.patch new file mode 100644 index 000000000000..fa98278a277d --- /dev/null +++ b/dev-haskell/cabal-install/files/cabal-install-3.2.0.0-rankntypes.patch @@ -0,0 +1,11 @@ +diff --git a/Distribution/Client/Sandbox.hs b/Distribution/Client/Sandbox.hs +index 66b415d..6aa71bb 100644 +--- a/Distribution/Client/Sandbox.hs ++++ b/Distribution/Client/Sandbox.hs +@@ -1,5 +1,6 @@ + {-# LANGUAGE CPP #-} + {-# LANGUAGE FlexibleContexts #-} ++{-# LANGUAGE RankNTypes #-} + ----------------------------------------------------------------------------- + -- | + -- Module : Distribution.Client.Sandbox diff --git a/dev-haskell/cabal/Manifest b/dev-haskell/cabal/Manifest index d1a7a7a8108d..ac7dbabfe313 100644 --- a/dev-haskell/cabal/Manifest +++ b/dev-haskell/cabal/Manifest @@ -1 +1,2 @@ DIST Cabal-3.0.1.0.tar.gz 758808 BLAKE2B 9a0cf7b055be4d6fa55c4dd44037263df54eff059cd22970383ffa1470317cdaeac8d81a521f8c48cf595fc22e64da031d508f6d2b58f32a613160b3e0cfcd67 SHA512 29a5ae9bad0398ab86c64cba9fb1ae3094d67013151a91c8c25b0e95b08d8fd683d1e85b064f7faf166966f855b261d2f131b727c82476a8514119a8922a6b06 +DIST Cabal-3.2.1.0.tar.gz 823331 BLAKE2B 060f4808010f9eefd943312144c75e021bf02083c2a0805128da6c9b93da94ba13fe37cef1fbe27e41fe8a10610e088b923783f4b7bb57150532d3a3ea4a91fc SHA512 279088a2ab9145efc03dbdd10941edcf6034137046ee3b659a8cf0ff075a03e3edff28fd01d432d39701c5a7e05a50b99cf8de95f05d3bd4e75edb3af0e3a598 diff --git a/dev-haskell/cabal/cabal-3.2.1.0-r1.ebuild b/dev-haskell/cabal/cabal-3.2.1.0-r1.ebuild new file mode 100644 index 000000000000..d18123f7001e --- /dev/null +++ b/dev-haskell/cabal/cabal-3.2.1.0-r1.ebuild @@ -0,0 +1,54 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +# ebuild generated by hackport 0.6.7.9999 +#hackport: flags: -bundled-binary-generic + +# Drop test-suite due to "circular" dependencies with quickcheck +CABAL_FEATURES="lib profile haddock hoogle hscolour" +CABAL_FEATURES+=" nocabaldep" # in case installed Cabal is broken +inherit haskell-cabal + +MY_PN="Cabal" +MY_P="${MY_PN}-${PV}" + +DESCRIPTION="A framework for packaging Haskell software" +HOMEPAGE="https://www.haskell.org/cabal/" +SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz" + +LICENSE="BSD" +SLOT="0/${PV}" +KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" # ~ppc ~ppc64 ~ppc-macos ~x86-macos ~x86-solaris +IUSE="" + +RESTRICT=test # circular deps: cabal -> quickcheck -> cabal + +# GHC lower bound set to 8.0 to remove semigroups and fail dependencies. +RDEPEND=" >=dev-haskell/mtl-2.1:=[profile?] =dev-haskell/parsec-3.1.13.0:=[profile?] =dev-haskell/text-1.2.3.0:=[profile?] =dev-lang/ghc-8.0:= +" +DEPEND="${RDEPEND}" + +S="${WORKDIR}/${MY_P}" + +src_prepare() { + default + + # Cabal bootstraps with 'ghc --make' without package cleanup in environment. + # That causes module collisions at build: + # - pulseaudio: Distribution/Utils/Structured.hs:98:1: error: Ambiguous module name ‘Data.Time’: it was found in multiple packages: pulseaudio-0.0.2.1 time-1.9.3 + # - kinds: Distribution/Utils/Structured.hs:106:1: error: Ambiguous module name ‘Data.Kind’: it was found in multiple packages: base-4.14.1.0 kinds-0.0.1.5 + HCFLAGS="${HCFLAGS} -ignore-package=pulseaudio" + HCFLAGS="${HCFLAGS} -ignore-package=kinds" +} + +src_configure() { + haskell-cabal_src_configure \ + --flag=-bundled-binary-generic +} + +CABAL_CORE_LIB_GHC_PV="PM:8.10.3 PM:8.10.4 PM:9999" diff --git a/dev-haskell/cabal/metadata.xml b/dev-haskell/cabal/metadata.xml index 97bee0727e40..b7878815d80d 100644 --- a/dev-haskell/cabal/metadata.xml +++ b/dev-haskell/cabal/metadata.xml @@ -5,12 +5,4 @@ haskell@gentoo.org Gentoo Haskell - - The Haskell Common Architecture for Building Applications and - Libraries: a framework defining a common interface for authors to more - easily build their Haskell applications in a portable way. - - The Haskell Cabal is part of a larger infrastructure for distributing, - organizing, and cataloging Haskell libraries and tools. - diff --git a/dev-haskell/cairo/Manifest b/dev-haskell/cairo/Manifest index 455b6b4e17a2..409bdd948476 100644 --- a/dev-haskell/cairo/Manifest +++ b/dev-haskell/cairo/Manifest @@ -1 +1,2 @@ DIST cairo-0.13.6.1.tar.gz 53029 BLAKE2B 8363b436271bc1666116819d9ac39297e3a8c61e18ef7758e188e194a1a51fd8a335d61707cecc5f5d240fcf1f4c71add7be945ec8686e80b36de97c88ecfda6 SHA512 e268d27298c2b274eb12555ff67e4abb175a1269ed3087b9a5cf1a128252d8d390e3ef393e76f27b857558451fb0a137f4f44e095053a9ca20159a332b8878ef +DIST cairo-0.13.8.1.tar.gz 53026 BLAKE2B a05302d41bda35d3864b675e08b9bc296a218d528d3f2ecda34325650cde67a127cb1d21f2bd8d92dfa9a5e768ff6e622a585b81ac5897d86b9d89227af8dda4 SHA512 9c4ec738fe6e335f635c3fa47a26edb9264ec5a9713ff8c0109f2cf321e21331009402d3715321b63f5423e32ad90a0dd3ca9ca83544d554be5463c9784ab727 diff --git a/dev-haskell/cairo/cairo-0.13.8.1.ebuild b/dev-haskell/cairo/cairo-0.13.8.1.ebuild new file mode 100644 index 000000000000..174a94c5d100 --- /dev/null +++ b/dev-haskell/cairo/cairo-0.13.8.1.ebuild @@ -0,0 +1,38 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +# ebuild generated by hackport 0.6.4.9999 +#hackport: flags: cairo_ps:postscript,cairo_pdf:pdf,cairo_svg:svg + +CABAL_FEATURES="lib profile haddock hoogle hscolour" +inherit haskell-cabal + +DESCRIPTION="Binding to the Cairo library" +HOMEPAGE="http://projects.haskell.org/gtk2hs/" +SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz" + +LICENSE="BSD" +SLOT="0/${PV}" +KEYWORDS="~amd64 ~x86" +IUSE="+pdf +postscript +svg" + +RDEPEND="dev-haskell/mtl:=[profile?] + >=dev-haskell/text-1.0.0.0:=[profile?] =dev-haskell/utf8-string-0.2:=[profile?] =dev-lang/ghc-7.10.1:= + x11-libs/cairo +" +DEPEND="${RDEPEND} + >=dev-haskell/cabal-1.24 =dev-haskell/gtk2hs-buildtools-0.13.2.0 = 4.6 && < 4.14' 'base >= 4.6' \ + 'ghc-prim < 0.6' 'ghc-prim' +} diff --git a/dev-haskell/gtk2hs-buildtools/files/gtk2hs-buildtools-0.13.8.0-gcc-11.patch b/dev-haskell/gtk2hs-buildtools/files/gtk2hs-buildtools-0.13.8.0-gcc-11.patch new file mode 100644 index 000000000000..123c1359ff1b --- /dev/null +++ b/dev-haskell/gtk2hs-buildtools/files/gtk2hs-buildtools-0.13.8.0-gcc-11.patch @@ -0,0 +1,32 @@ +Same fix as https://github.com/visq/language-c/issues/74 + +""" +Lexer: allow zeros as line numbers in preprocessed directives + +Starting from `gcc-11` initial line numbers not related to +actual files are marked as zeros. See the "preprocessor: +Better line info for & " +https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff;h=6bf2ff0d52a9 + +language-c's grammar did not allow it (by accident) + +``` +Prelude> Language.C.parseC (Data.ByteString.Char8.pack "# 0 \"/dev/null\"\n") Language.C.nopos +Left :: [ERROR] >>> Syntax Error ! + Lexical error ! + The character '#' does not fit here. +``` + +The change allows '0' in line numbers as well. +""" +--- a/c2hs/c/CLexer.x ++++ b/c2hs/c/CLexer.x +@@ -130,7 +130,7 @@ $white+ ; + -- * allows further ints after the file name a la GCC; as the GCC CPP docu + -- doesn't say how many ints there can be, we allow an unbound number + -- +-\#$space*@int$space*(\"($infname|@charesc)*\"$space*)?(@int$space*)*$eol ++\#$space*@digits$space*(\"($infname|@charesc)*\"$space*)?(@int$space*)*$eol + { \pos len str -> setPos (adjustPos (take len str) pos) >> lexToken } + + -- #pragma directive (K&R A12.8) diff --git a/dev-haskell/gtk2hs-buildtools/gtk2hs-buildtools-0.13.8.0-r1.ebuild b/dev-haskell/gtk2hs-buildtools/gtk2hs-buildtools-0.13.8.0-r1.ebuild new file mode 100644 index 000000000000..30ffca890e99 --- /dev/null +++ b/dev-haskell/gtk2hs-buildtools/gtk2hs-buildtools-0.13.8.0-r1.ebuild @@ -0,0 +1,37 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +# ebuild generated by hackport 0.6.4 + +CABAL_FEATURES="lib profile haddock hoogle hscolour" +inherit haskell-cabal + +DESCRIPTION="Tools to build the Gtk2Hs suite of User Interface libraries" +HOMEPAGE="http://projects.haskell.org/gtk2hs/" +SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0/${PV}" +KEYWORDS="~amd64 ~x86" +IUSE="+closuresignals" + +RDEPEND=">=dev-haskell/cabal-1.24.0.0:=[profile?] + dev-haskell/fail:=[profile?] + dev-haskell/hashtables:=[profile?] + dev-haskell/random:=[profile?] + >=dev-lang/ghc-7.8.2:= +" +DEPEND="${RDEPEND} + dev-haskell/alex + >=dev-haskell/cabal-1.18.1.3 + dev-haskell/happy +" + +PATCHES=("${FILESDIR}"/${PN}-0.13.8.0-gcc-11.patch) + +src_configure() { + haskell-cabal_src_configure \ + $(cabal_flag closuresignals closuresignals) +} diff --git a/dev-haskell/hackage-security/Manifest b/dev-haskell/hackage-security/Manifest index 4b7cf8c67679..b087e633d8ff 100644 --- a/dev-haskell/hackage-security/Manifest +++ b/dev-haskell/hackage-security/Manifest @@ -1 +1,3 @@ DIST hackage-security-0.5.3.0.tar.gz 87119 BLAKE2B 6e69b13d3ee16fbc6488e1e9d926ba07d975555e9ad80c404ccfec60ff549e7eb2d40302ace8ac5f03ed5532c031f236f8a09edc8a3f8c7d4c2bb48743f88aa1 SHA512 57af812fb3911aed6ebdbc5de733e86a2bdc7845a07246c69346c59f654e7c4ae5bf20ad753cfe71dc1d7f47ce66a37fba49b178e8e6ff74002fc8ffb72d920d +DIST hackage-security-0.6.0.1-r1.cabal 12313 BLAKE2B 41dbb4a5b175fe49ab65dba01aa1cbd1a43fbf55fc9cd06697dc984f9a3917d3da5c9c3234e336b78372899848b0fa5adf09f0507617ed0835dfad1443eb62ab SHA512 f4a8d2adde837af18587d74cf4191bc12dec22802aaafc4cd86968d893a41bf912d3649be339503063f8c698a4b8a62888ad50e0e58d3836cc55de100ca51e30 +DIST hackage-security-0.6.0.1.tar.gz 86006 BLAKE2B 6d057da569beb4e30f91a630ec37247fd47a3467e6037ebf0c4391ff58d95d5477bea09f7d66ab6d0bbe49a445ea15d53ded884f9ea7922583a03ba7497cdd9a SHA512 b83fdda3712c58bcc4237965e40bea16b9ce08f30c0671f45967e69a2eb85488e78a41c8d12b9f339f78f30cc50770a72e9e9a46e5ddf740a20bce4ea4e96fdb diff --git a/dev-haskell/hackage-security/files/hackage-security-0.6.0.1-disable-failing-aeson-canonical-test.patch b/dev-haskell/hackage-security/files/hackage-security-0.6.0.1-disable-failing-aeson-canonical-test.patch new file mode 100644 index 000000000000..fd83a5113c56 --- /dev/null +++ b/dev-haskell/hackage-security/files/hackage-security-0.6.0.1-disable-failing-aeson-canonical-test.patch @@ -0,0 +1,13 @@ +diff --git a/tests/TestSuite.hs b/tests/TestSuite.hs +index 598e151..f62f1c5 100644 +--- a/tests/TestSuite.hs ++++ b/tests/TestSuite.hs +@@ -70,7 +70,7 @@ tests = testGroup "hackage-security" [ + testProperty "prop_roundtrip_canonical" JSON.prop_roundtrip_canonical + , testProperty "prop_roundtrip_pretty" JSON.prop_roundtrip_pretty + , testProperty "prop_canonical_pretty" JSON.prop_canonical_pretty +- , testProperty "prop_aeson_canonical" JSON.prop_aeson_canonical ++ -- , testProperty "prop_aeson_canonical" JSON.prop_aeson_canonical + ] + ] + diff --git a/dev-haskell/hackage-security/hackage-security-0.6.0.1-r1.ebuild b/dev-haskell/hackage-security/hackage-security-0.6.0.1-r1.ebuild new file mode 100644 index 000000000000..e10ab6c3c0b5 --- /dev/null +++ b/dev-haskell/hackage-security/hackage-security-0.6.0.1-r1.ebuild @@ -0,0 +1,63 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +# ebuild generated by hackport 0.6.7.9999 +# hackport: flags: -mtl21,+use-network-uri + +CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite" +inherit haskell-cabal + +DESCRIPTION="Hackage security library" +HOMEPAGE="https://github.com/haskell/hackage-security" +SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz + https://hackage.haskell.org/package/${P}/revision/4.cabal -> ${PF}.cabal" + +LICENSE="BSD" +SLOT="0/${PV}" +# keep in sync with ghc-8.10 +KEYWORDS="~amd64 ~x86" +IUSE="+lukko" + +RDEPEND=">=dev-haskell/base16-bytestring-0.1.1:=[profile?] =dev-haskell/base64-bytestring-1.0:=[profile?] =dev-haskell/cabal-1.14:=[profile?] =dev-haskell/cryptohash-sha256-0.11:=[profile?] =dev-haskell/ed25519-0.0:=[profile?] =dev-haskell/mtl-2.2:=[profile?] =dev-haskell/network-2.6:=[profile?] =dev-haskell/network-uri-2.6:=[profile?] =dev-haskell/parsec-3.1:=[profile?] =dev-haskell/tar-0.5:=[profile?] =dev-haskell/zlib-0.5:=[profile?] =dev-lang/ghc-8.4.3:= + lukko? ( >=dev-haskell/lukko-0.1:=[profile?] + @@ -7,6 +7,7 @@ Get Network.URI from the network-uri package. + Use @lukko@ for file-locking, otherwise use @GHC.IO.Handle.Lock@ The hackage security library provides both server and @@ -22,14 +23,9 @@ facilities for author package signing. The library has two main entry points: - "Hackage.Security.Client" is the main entry point for + "Hackage.Security.Client" is the main entry point for clients (the typical example being @cabal@), and - "Hackage.Security.Server" is the main entry point for + "Hackage.Security.Server" is the main entry point for servers (the typical example being @hackage-server@). - - This is a beta release. - - well-typed/hackage-security - diff --git a/dev-haskell/haddock-api/Manifest b/dev-haskell/haddock-api/Manifest index 3e5c5f973133..de50c543982e 100644 --- a/dev-haskell/haddock-api/Manifest +++ b/dev-haskell/haddock-api/Manifest @@ -1 +1,2 @@ DIST haddock-api-2.23.1.tar.gz 200096 BLAKE2B 0635881e198c1df3690f07185da7cc49f8eb92283d99c581756c86fb9f293b28608ac3eea9090abcc3afa12c646e584939df9b8c38b4844e9c462824426019f5 SHA512 fb7826102476a3f292da336f8f16c7a647df7c4432bed905815509fff0df164255c0856cc17663bb42479114ed9a418e6bcd214fb8594b245d401c9e091ac4ef +DIST haddock-api-2.24.0.tar.gz 200478 BLAKE2B 5c4f7be45066583e3d3afa0b1866070f2c05d71685526b0d915461f75208f13cf6bbf2b91cc820e1f229df9dbf240cfef150fb3a9929878cfdc02db9dc124c99 SHA512 dfbe5bcfd722dc92ec70aca2dd681da9e122f60ec3da5c9583c188f65b11bade314c64d4af1a3a51cf8f618d8bea943bd4052aa9860ece38ab10717b484ed057 diff --git a/dev-haskell/haddock-api/files/haddock-api-2.24.0-ghc-8.10.2.patch b/dev-haskell/haddock-api/files/haddock-api-2.24.0-ghc-8.10.2.patch new file mode 100644 index 000000000000..84c275fbb348 --- /dev/null +++ b/dev-haskell/haddock-api/files/haddock-api-2.24.0-ghc-8.10.2.patch @@ -0,0 +1,147 @@ +From e455bc18e15adf05a1f32bc7c4512eedb7ab889f Mon Sep 17 00:00:00 2001 +From: Alex Biehl +Date: Tue, 8 Dec 2020 19:42:52 +0100 +Subject: [PATCH 1/2] Changes for GHC#17566 + +See https://gitlab.haskell.org/ghc/ghc/merge_requests/2469 +--- + haddock-api/src/Haddock/Backends/LaTeX.hs | 2 +- + haddock-api/src/Haddock/Backends/Xhtml.hs | 2 +- + .../src/Haddock/Backends/Xhtml/Decl.hs | 4 ++- + haddock-api/src/Haddock/GhcUtils.hs | 29 +++++++++++++++++-- + haddock-api/src/Haddock/Types.hs | 1 + + 5 files changed, 32 insertions(+), 6 deletions(-) + +diff --git a/haddock-api/src/Haddock/Backends/LaTeX.hs b/haddock-api/src/Haddock/Backends/LaTeX.hs +index 647812f93..024a6c513 100644 +--- a/src/Haddock/Backends/LaTeX.hs ++++ b/src/Haddock/Backends/LaTeX.hs +@@ -255,7 +255,7 @@ declNames :: LHsDecl DocNameI + , [DocName] -- names being declared + ) + declNames (L _ decl) = case decl of +- TyClD _ d -> (empty, [tcdName d]) ++ TyClD _ d -> (empty, [tcdNameI d]) + SigD _ (TypeSig _ lnames _ ) -> (empty, map unLoc lnames) + SigD _ (PatSynSig _ lnames _) -> (text "pattern", map unLoc lnames) + ForD _ (ForeignImport _ (L _ n) _ _) -> (empty, [n]) +diff --git a/haddock-api/src/Haddock/Backends/Xhtml.hs b/haddock-api/src/Haddock/Backends/Xhtml.hs +index f80a9c05f..541f40c4f 100644 +--- a/src/Haddock/Backends/Xhtml.hs ++++ b/src/Haddock/Backends/Xhtml.hs +@@ -407,7 +407,7 @@ ppJsonIndex odir maybe_source_url maybe_wiki_url unicode pkg qual_opt ifaces = d + exportSubs _ = [] + + exportName :: ExportItem DocNameI -> [IdP DocNameI] +- exportName ExportDecl { expItemDecl } = getMainDeclBinder (unLoc expItemDecl) ++ exportName ExportDecl { expItemDecl } = getMainDeclBinderI (unLoc expItemDecl) + exportName ExportNoDecl { expItemName } = [expItemName] + exportName _ = [] + +diff --git a/haddock-api/src/Haddock/Backends/Xhtml/Decl.hs b/haddock-api/src/Haddock/Backends/Xhtml/Decl.hs +index ef0ba1b67..30b8d43eb 100644 +--- a/src/Haddock/Backends/Xhtml/Decl.hs ++++ b/src/Haddock/Backends/Xhtml/Decl.hs +@@ -536,6 +536,8 @@ ppClassDecl summary links instances fixities loc d subdocs + -- Only the fixity relevant to the class header + fixs = ppFixities [ f | f@(n,_) <- fixities, n == unLoc lname ] qual + ++ nm = tcdNameI decl ++ + hdr = ppClassHdr summary lctxt (unLoc lname) ltyvars lfds + + -- Associated types +@@ -794,7 +796,7 @@ ppDataDecl summary links instances fixities subdocs loc doc dataDecl pats + | otherwise = header_ +++ docSection curname pkg qual doc +++ constrBit +++ patternBit +++ instancesBit + + where +- docname = tcdName dataDecl ++ docname = tcdNameI dataDecl + curname = Just $ getName docname + cons = dd_cons (tcdDataDefn dataDecl) + isH98 = case unLoc (head cons) of +diff --git a/haddock-api/src/Haddock/GhcUtils.hs b/haddock-api/src/Haddock/GhcUtils.hs +index 0874e7b4d..43fe3e774 100644 +--- a/src/Haddock/GhcUtils.hs ++++ b/src/Haddock/GhcUtils.hs +@@ -58,8 +58,7 @@ moduleString = moduleNameString . moduleName + isNameSym :: Name -> Bool + isNameSym = isSymOcc . nameOccName + +-getMainDeclBinder :: (SrcSpanLess (LPat p) ~ Pat p , HasSrcSpan (LPat p)) => +- HsDecl p -> [IdP p] ++getMainDeclBinder :: HsDecl (GhcPass p) -> [IdP (GhcPass p)] + getMainDeclBinder (TyClD _ d) = [tcdName d] + getMainDeclBinder (ValD _ d) = + case collectHsBindBinders d of +@@ -221,6 +220,31 @@ getGADTConType (ConDeclH98 {}) = panic "getGADTConType" + -- Should only be called on ConDeclGADT + getGADTConType (XConDecl nec) = noExtCon nec + ++getMainDeclBinderI :: HsDecl DocNameI -> [IdP DocNameI] ++getMainDeclBinderI (TyClD _ d) = [tcdNameI d] ++getMainDeclBinderI (ValD _ d) = ++ case collectHsBindBinders d of ++ [] -> [] ++ (name:_) -> [name] ++getMainDeclBinderI (SigD _ d) = sigNameNoLoc d ++getMainDeclBinderI (ForD _ (ForeignImport _ name _ _)) = [unLoc name] ++getMainDeclBinderI (ForD _ (ForeignExport _ _ _ _)) = [] ++getMainDeclBinderI _ = [] ++ ++familyDeclLNameI :: FamilyDecl DocNameI -> Located DocName ++familyDeclLNameI (FamilyDecl { fdLName = n }) = n ++familyDeclLNameI (XFamilyDecl nec) = noExtCon nec ++ ++tyClDeclLNameI :: TyClDecl DocNameI -> Located DocName ++tyClDeclLNameI (FamDecl { tcdFam = fd }) = familyDeclLNameI fd ++tyClDeclLNameI (SynDecl { tcdLName = ln }) = ln ++tyClDeclLNameI (DataDecl { tcdLName = ln }) = ln ++tyClDeclLNameI (ClassDecl { tcdLName = ln }) = ln ++tyClDeclLNameI (XTyClDecl nec) = noExtCon nec ++ ++tcdNameI :: TyClDecl DocNameI -> DocName ++tcdNameI = unLoc . tyClDeclLNameI ++ + -- ------------------------------------- + + getGADTConTypeG :: ConDecl (GhcPass p) -> LHsType (GhcPass p) +@@ -761,4 +785,3 @@ defaultRuntimeRepVars = go emptyVarEnv + + go _ ty@(LitTy {}) = ty + go _ ty@(CoercionTy {}) = ty +- +diff --git a/haddock-api/src/Haddock/Types.hs b/haddock-api/src/Haddock/Types.hs +index c2cf08bb2..853f4b1b2 100644 +--- a/src/Haddock/Types.hs ++++ b/src/Haddock/Types.hs +@@ -789,6 +789,7 @@ type instance XDataDecl DocNameI = NoExtField + type instance XSynDecl DocNameI = NoExtField + type instance XFamDecl DocNameI = NoExtField + type instance XXFamilyDecl DocNameI = NoExtCon ++type instance XXTyClDecl DocNameI = NoExtCon + + type instance XHsIB DocNameI _ = NoExtField + type instance XHsWC DocNameI _ = NoExtField + +From e1fe49e9458a5d5161adc8b5b8bfea6437a9eedf Mon Sep 17 00:00:00 2001 +From: alexbiehl +Date: Tue, 8 Dec 2020 20:03:49 +0100 +Subject: [PATCH 2/2] Import intercalate + +--- + haddock-api/src/Haddock/Interface/Rename.hs | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/haddock-api/src/Haddock/Interface/Rename.hs b/haddock-api/src/Haddock/Interface/Rename.hs +index 78c585814..4d9eadac5 100644 +--- a/src/Haddock/Interface/Rename.hs ++++ b/src/Haddock/Interface/Rename.hs +@@ -29,6 +29,7 @@ import TysWiredIn (eqTyCon_RDR) + import Control.Applicative + import Control.Arrow ( first ) + import Control.Monad hiding (mapM) ++import Data.List (intercalate) + import qualified Data.Map as Map hiding ( Map ) + import qualified Data.Set as Set + import Prelude hiding (mapM) diff --git a/dev-haskell/haddock-api/haddock-api-2.24.0.ebuild b/dev-haskell/haddock-api/haddock-api-2.24.0.ebuild new file mode 100644 index 000000000000..d17fc17abb38 --- /dev/null +++ b/dev-haskell/haddock-api/haddock-api-2.24.0.ebuild @@ -0,0 +1,39 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +CABAL_FEATURES="lib hoogle hscolour profile test-suite" # haddock +inherit haskell-cabal + +DESCRIPTION="A documentation-generation tool for Haskell libraries" +HOMEPAGE="https://www.haskell.org/haddock/" +SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz" + +LICENSE="BSD" +SLOT="0/${PV}" +# keep in sync with ghc-8.10 +KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" +IUSE="" + +RDEPEND=">=dev-haskell/ghc-paths-0.1.0.9:=[profile?] =dev-haskell/haddock-library-1.9.0:=[profile?] =dev-haskell/xhtml-3000.2.2:=[profile?] =dev-lang/ghc-8.10.1:= +" +DEPEND="${RDEPEND} + >=dev-haskell/cabal-3.0.0.0 + test? ( >=dev-haskell/ghc-paths-0.1.0.12 =dev-haskell/hspec-2.4.4 =dev-haskell/quickcheck-2.11 + ) +" + +PATCHES=("${FILESDIR}"/${P}-ghc-8.10.2.patch ) + +src_prepare () { + default + + cabal_chdeps \ + 'QuickCheck >= 2.11 && < 2.14' 'QuickCheck >= 2.11' +} diff --git a/dev-haskell/haddock-library/Manifest b/dev-haskell/haddock-library/Manifest index 078c648125d9..d021b2c1e5fc 100644 --- a/dev-haskell/haddock-library/Manifest +++ b/dev-haskell/haddock-library/Manifest @@ -1 +1,2 @@ DIST haddock-library-1.8.0.tar.gz 30918 BLAKE2B a8bcf9e08f6596375186930cf4a98ae547c40d85eb0bd00b7aaf8212c3738e32cd51cea044206f3746d10d228b1e8b8a2ccdb28ae7c7957006f518d090a6ceed SHA512 f84672b67dd4b18402efb8b40eb0e2cb912ecf894cfdedf61b0ada87392e63609cf1101d4fc793686cc4af354665661bf4dc902313bb466efee683a7c64bbe2b +DIST haddock-library-1.9.0.tar.gz 31465 BLAKE2B 785935a7f80831c000db796ed9d0071309de86d36c68d5677b6c948aa914c09a00582af500a25d2d751d96ef6ebb30696fba51a2ed84fa1b4850e5795ae5f55d SHA512 ec41df15a849a59fc41a443ce233dfa6293f0d201ed1847bd8a7732bc0e2138bab2305c127bd60f51919d8eeeb6808eec7a0add38edacd059956d852167477b5 diff --git a/dev-haskell/haddock-library/haddock-library-1.9.0.ebuild b/dev-haskell/haddock-library/haddock-library-1.9.0.ebuild new file mode 100644 index 000000000000..59c2d563d118 --- /dev/null +++ b/dev-haskell/haddock-library/haddock-library-1.9.0.ebuild @@ -0,0 +1,43 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +# ebuild generated by hackport 0.6.4.9999 + +CABAL_FEATURES="lib profile test-suite" # haddock hoogle hscolour +inherit haskell-cabal + +DESCRIPTION="Library exposing some functionality of Haddock" +HOMEPAGE="https://www.haskell.org/haddock/" +SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz" + +LICENSE="BSD-2" +SLOT="0/${PV}" +# keep in sync with ghc-8.10 +KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" +IUSE="" + +RDEPEND=">=dev-haskell/parsec-3.1.13.0:=[profile?] =dev-haskell/text-1.2.3.0:=[profile?] =dev-lang/ghc-7.8.2:= +" +DEPEND="${RDEPEND} + >=dev-haskell/cabal-2.2 + test? ( >=dev-haskell/hspec-2.4.4 + >=dev-haskell/optparse-applicative-0.15 + >=dev-haskell/tree-diff-0.1 + >=dev-haskell/base-compat-0.9.3 + >=dev-haskell/quickcheck-2.11 ) +" + +src_prepare() { + default + + cabal_chdeps \ + 'base-compat ^>= 0.9.3 || ^>= 0.11.0' 'base-compat >= 0.9.3' \ + 'hspec >= 2.4.4 && < 2.8' 'hspec >= 2.4.4' \ + 'optparse-applicative ^>= 0.15' 'optparse-applicative >= 0.15' \ + 'QuickCheck ^>= 2.11 || ^>= 2.13.2' 'QuickCheck >= 2.11' \ + 'tree-diff ^>= 0.1' 'tree-diff >= 0.1' +} diff --git a/dev-haskell/haddock/Manifest b/dev-haskell/haddock/Manifest index c39a4a3f4264..a900dd75f77f 100644 --- a/dev-haskell/haddock/Manifest +++ b/dev-haskell/haddock/Manifest @@ -1 +1,2 @@ DIST haddock-2.23.1.tar.gz 302698 BLAKE2B 1dae0019ddc08c537aec2f0fa71f5bd1570db4061d22bf53f05aa0e211c3280d09c6a6481f704c34895e0bf70fd2b5ac95644dab23b05cc2b6fec59c845f86c5 SHA512 e69b3b5f2dcadeccc33696ee8d0646387860b98d86c08d4c07d829e3eabc4159adac0a11d408850ef54face5fa835ab8217d1057b14d8de8d758efbfc7a700db +DIST haddock-2.24.0.tar.gz 303382 BLAKE2B 3e0c9a92f4f96949ffbdcba4ae26643b715ca8bf930bb26610a3a4b73ddec9a361b00c9c5f529b79fe6e981f23bb9b95d3b0adeff52d1223d97653c7f2573036 SHA512 52748ea2c785faeb9af7c09f9da991e4db8d5b2703eee3824ee1f6c14c82d24b7939746359f147cbc940b2be0d6aac2a1c8ffe2f1b9746e3bc543252859a4003 diff --git a/dev-haskell/haddock/haddock-2.24.0.ebuild b/dev-haskell/haddock/haddock-2.24.0.ebuild new file mode 100644 index 000000000000..08f165ce877f --- /dev/null +++ b/dev-haskell/haddock/haddock-2.24.0.ebuild @@ -0,0 +1,35 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +# ebuild generated by hackport 0.6.1.9999 +#hackport: flags: -in-ghc-tree + +CABAL_FEATURES="" # broken test-suite +inherit haskell-cabal + +DESCRIPTION="A documentation-generation tool for Haskell libraries" +HOMEPAGE="https://www.haskell.org/haddock/" +SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +# keep in sync with ghc-8.10 +KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" +IUSE="" + +RESTRICT=test # test suite unavailable on hackage + +RDEPEND="~dev-haskell/haddock-api-2.24.0:= + >=dev-lang/ghc-8.10.1:= +" +DEPEND="${RDEPEND} + >=dev-haskell/cabal-3.0.0.0" +# test? ( ~dev-haskell/haddock-test-0.0.1 ) +#" + +src_configure() { + haskell-cabal_src_configure \ + --flag=-in-ghc-tree +} diff --git a/dev-haskell/happstack-server/Manifest b/dev-haskell/happstack-server/Manifest index b3efd76a4f91..8507f46b1604 100644 --- a/dev-haskell/happstack-server/Manifest +++ b/dev-haskell/happstack-server/Manifest @@ -1 +1,2 @@ DIST happstack-server-7.6.0.tar.gz 85715 BLAKE2B c4a673b6575a3131b29f00f4463431605bd26b469a366cbab3f87662b1e2c0ab43b4a6d205dec30ede009a71de38f27fcfcbd1ddf938ac1e4f419b1a31119c83 SHA512 cea814b470dd2d7a1dc3cf8a2724aa72e23f7832fc5292a7a1b3fbf8a6ef0980f13db777fadea3bdc5c9cb7dca7b35700ff2b94d6632ff7857a546a19ed1548f +DIST happstack-server-7.6.1.tar.gz 84878 BLAKE2B 5e146a317e41b039d24cac8dc41e7ebd707168193b5fc5cfe482ec53a3b31088438cffb5f91f741822e3ae1db19c98eaae6c1f0e012afebeebcda4182332bd1f SHA512 e75bc986b16777563410ce42010a161790df5f5a575b253dac2a85ca7e724a9bf1a7485406f7235395d3a9adc3d8205dd3549fd718815390927aeed3c0b8a05e diff --git a/dev-haskell/happstack-server/happstack-server-7.6.1.ebuild b/dev-haskell/happstack-server/happstack-server-7.6.1.ebuild new file mode 100644 index 000000000000..fd564869651b --- /dev/null +++ b/dev-haskell/happstack-server/happstack-server-7.6.1.ebuild @@ -0,0 +1,55 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +# ebuild generated by hackport 0.6.7.9999 + +CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite" +inherit haskell-cabal + +DESCRIPTION="Web related tools and services" +HOMEPAGE="http://happstack.com" +SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz" + +LICENSE="BSD" +SLOT="0/${PV}" +KEYWORDS="~amd64 ~x86" +IUSE="+network-uri" + +RDEPEND=">=dev-haskell/base64-bytestring-1.0:=[profile?] =dev-haskell/blaze-html-0.5:=[profile?] =dev-haskell/hslogger-1.0.2:=[profile?] + dev-haskell/html:=[profile?] + >=dev-haskell/monad-control-0.3:=[profile?] =dev-haskell/mtl-2:=[profile?] =dev-haskell/semigroups-0.16:=[profile?] + >=dev-haskell/sendfile-0.7.1:=[profile?] =dev-haskell/system-filepath-0.3.1:=[profile?] + >=dev-haskell/text-0.10:=[profile?] =dev-haskell/threads-0.5:=[profile?] + >=dev-haskell/transformers-base-0.4:=[profile?] =dev-haskell/transformers-compat-0.3:=[profile?] =dev-haskell/utf8-string-0.3.4:=[profile?] =dev-lang/ghc-7.8.2:= + network-uri? ( >=dev-haskell/network-3.0.0:=[profile?] =dev-haskell/network-bsd-2.8.1:=[profile?] =dev-haskell/network-uri-2.6:=[profile?] = 4.5 && < 4.14' 'base >= 4.5' +} diff --git a/dev-haskell/newtype/newtype-0.2.2.0.ebuild b/dev-haskell/newtype/newtype-0.2.2.0.ebuild index 2b424a821927..f3a91654edfc 100644 --- a/dev-haskell/newtype/newtype-0.2.2.0.ebuild +++ b/dev-haskell/newtype/newtype-0.2.2.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -22,3 +22,10 @@ RDEPEND=">=dev-lang/ghc-7.8.2:= DEPEND="${RDEPEND} >=dev-haskell/cabal-1.18.1.3 " + +src_prepare() { + default + + cabal_chdeps \ + 'base >= 4.5 && < 4.14' 'base >= 4.5' +} diff --git a/dev-haskell/punycode/punycode-2.0.ebuild b/dev-haskell/punycode/punycode-2.0.ebuild index 5bf0e711c377..064e6d0602da 100644 --- a/dev-haskell/punycode/punycode-2.0.ebuild +++ b/dev-haskell/punycode/punycode-2.0.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 # ebuild generated by hackport 0.3.2.9999 -CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite" +CABAL_FEATURES="lib profile haddock hoogle hscolour" # test-suite" inherit haskell-cabal DESCRIPTION="Encode unicode strings to ascii forms according to RFC 3492" @@ -17,15 +17,15 @@ SLOT="0/${PV}" KEYWORDS="~amd64 ~x86" IUSE="" -RESTRICT=test # runs slow, finds error +RESTRICT=test # runs slow, finds error. RDEPEND="dev-haskell/cereal:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/text:=[profile?] >=dev-lang/ghc-6.10.4:=" DEPEND="${RDEPEND} - >=dev-haskell/cabal-1.8 - test? ( dev-haskell/encoding - dev-haskell/hunit - dev-haskell/quickcheck - )" + >=dev-haskell/cabal-1.8" + # test? ( dev-haskell/encoding + # dev-haskell/hunit + # dev-haskell/quickcheck + # )" diff --git a/dev-haskell/syb-with-class/Manifest b/dev-haskell/syb-with-class/Manifest index 24ffcc42bf9e..f723a6aa9008 100644 --- a/dev-haskell/syb-with-class/Manifest +++ b/dev-haskell/syb-with-class/Manifest @@ -1 +1,2 @@ DIST syb-with-class-0.6.1.11.tar.gz 13225 BLAKE2B 3c7f25fb942025284bbfba49edc7b16ae04716e42337e8668188a80a193b05a06252a29ac2244a35fa25992bc23d7fa998ddaadb85f017112f903cffb89d4fba SHA512 962eb1bcb63ce7cc1789996ad7191e3ab7c20f3c90828fb3535306ca8509ac210e70f42ebd6ac6fc075d50cc5c5e1c15bb735b5d6040c6348dc82453809330f9 +DIST syb-with-class-0.6.1.13.tar.gz 13225 BLAKE2B a218611f332037968513b3706bc35e903f335477fa490f0c709f085014e833f1969851a74ae0d2a40c6a085c9aec1bbd963a48d4362963d3a89fe8e399a790fc SHA512 40082f8b97ae49929fb2b686a840656fd2a62936ddc4873f3af4bdfe128e213dff509185e412c3c58bd48ec32abcade8ed68dd257d221bb08f9d20433067f371 diff --git a/dev-haskell/syb-with-class/syb-with-class-0.6.1.13.ebuild b/dev-haskell/syb-with-class/syb-with-class-0.6.1.13.ebuild new file mode 100644 index 000000000000..7bd577793d35 --- /dev/null +++ b/dev-haskell/syb-with-class/syb-with-class-0.6.1.13.ebuild @@ -0,0 +1,25 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +# ebuild generated by hackport 0.6.7.9999 + +CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite" +inherit haskell-cabal + +DESCRIPTION="Scrap Your Boilerplate With Class" +HOMEPAGE="https://hackage.haskell.org/package/syb-with-class" +SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz" + +LICENSE="BSD" +SLOT="0/${PV}" +KEYWORDS="~amd64 ~x86" +IUSE="" + +RDEPEND=">=dev-lang/ghc-7.4.1:= +" +DEPEND="${RDEPEND} + >=dev-haskell/cabal-1.10 + test? ( dev-haskell/hunit ) +" diff --git a/dev-haskell/test-framework-th-prime/Manifest b/dev-haskell/test-framework-th-prime/Manifest index 738606e3c151..b25ec4815301 100644 --- a/dev-haskell/test-framework-th-prime/Manifest +++ b/dev-haskell/test-framework-th-prime/Manifest @@ -1 +1,2 @@ +DIST test-framework-th-prime-0.0.10.tar.gz 4035 BLAKE2B 44c0f454ec4018f8aeccc9e7eec33c25778d05e257ce910dd779ac6bbb2acf1d4b54a897d0625e78308def417f1aa1b77194fba353802f2fce7a6e954dea3fbb SHA512 91298214c134821b298270c2770cab284131787a40293c01dba2e88a58f355d6811dea06bf14f237fea5d4aa80987790405644bc09ad64a4d7b4574e2bca97eb DIST test-framework-th-prime-0.0.9.tar.gz 3908 BLAKE2B 4c8794bf66081ffd6eee2b6f0e9d8fd5f2218a90c2522398b13f440aade1244a62e91c3c1e11367f109babd2e78722d94beaac95555be356ce55f25d118adfa3 SHA512 52f64b1705d51f45512da4270d8a80c93602d62a2c33eb3a0146f10a3f737395c9d0294af62cc3ff859dc8292338df892c0262216349109bb4f7b0beb09d3601 diff --git a/dev-haskell/test-framework-th-prime/test-framework-th-prime-0.0.10.ebuild b/dev-haskell/test-framework-th-prime/test-framework-th-prime-0.0.10.ebuild new file mode 100644 index 000000000000..f0c62e9157cd --- /dev/null +++ b/dev-haskell/test-framework-th-prime/test-framework-th-prime-0.0.10.ebuild @@ -0,0 +1,27 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +# ebuild generated by hackport 0.6.7.9999 + +CABAL_FEATURES="lib profile haddock hoogle hscolour" +inherit haskell-cabal + +DESCRIPTION="Template Haskell for test framework" +HOMEPAGE="https://hackage.haskell.org/package/test-framework-th-prime" +SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz" + +LICENSE="BSD" +SLOT="0/${PV}" +KEYWORDS="~amd64 ~x86" +IUSE="" + +RDEPEND=">=dev-haskell/cpphs-0.2.1:=[profile?] + dev-haskell/haskell-src-exts:=[profile?] + dev-haskell/test-framework:=[profile?] + >=dev-lang/ghc-7.4.1:= +" +DEPEND="${RDEPEND} + >=dev-haskell/cabal-1.6 +" diff --git a/dev-haskell/text/Manifest b/dev-haskell/text/Manifest index fe114558e9c6..164a169d083b 100644 --- a/dev-haskell/text/Manifest +++ b/dev-haskell/text/Manifest @@ -1 +1,2 @@ DIST text-1.2.4.0.tar.gz 171477 BLAKE2B 29bb6738f5c61e13b218cc57cb0c900fce25ecad190315aea4b0a92d5200e2d54aeeae26c8dfc88ddc74706549b820272fdb3877330c8e1e5bd119cac99deef3 SHA512 a4bd566c7d0aea1bfeacf27332e9cff3ad894e7eed9f826b7e4fc7fb85e272164d18a34a81c89dd1ea802951a80ec1d82000ebef05748d419ddfff792c4525e3 +DIST text-1.2.4.1_rc1.tar.gz 166148 BLAKE2B c79bbd90c9ccf99668d5a4f0e66b4c75fa7a531d9851355be8a9d859d99578d2e22977ee9514f1743927a8a4fa49d29c252abc39509dd0b6d09bffd96e1f5289 SHA512 27d014d6b870e6cba16ac4a0ac146872d89c363ad1ca786642554bde0cf3ae4876d69ba8dd2655bbdcb88076bf4f5e13b45929ff86cd2bd90d24e607ad7221c6 diff --git a/dev-haskell/text/text-1.2.4.1_rc1.ebuild b/dev-haskell/text/text-1.2.4.1_rc1.ebuild new file mode 100644 index 000000000000..6da0fe1d6e7e --- /dev/null +++ b/dev-haskell/text/text-1.2.4.1_rc1.ebuild @@ -0,0 +1,42 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +# ebuild generated by hackport 0.6.9999 +#hackport: flags: -bytestring-builder,-developer + +CABAL_FEATURES="lib profile haddock hoogle hscolour" # broken test-suite +# break circular dependencies: +# https://github.com/gentoo-haskell/gentoo-haskell/issues/810 +CABAL_FEATURES+=" nocabaldep" +inherit haskell-cabal + +MY_PV="$(ver_rs 4 -)" +MY_P="${PN}-${MY_PV}" + +DESCRIPTION="An efficient packed Unicode text type" +HOMEPAGE="https://github.com/haskell/text" +SRC_URI="https://github.com/haskell/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="BSD-2" +SLOT="0/${PV}" +# keep in sync with ghc-8.10.3 +KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" +IUSE="" +# break cyclic dependencies, test suite requires porting to >=QC-2.11 +RESTRICT=test +RDEPEND=">=dev-lang/ghc-8.10.3:=" + +DEPEND="${RDEPEND} +" + +S="${WORKDIR}/${MY_P}" + +CABAL_CORE_LIB_GHC_PV="PM:8.10.3 PM:8.10.4 PM:9999" + +src_configure() { + haskell-cabal_src_configure \ + --flag=-bytestring-builder \ + --flag=-developer +} diff --git a/dev-haskell/th-utilities/Manifest b/dev-haskell/th-utilities/Manifest index 57244e486db8..76c6f5d1a4c0 100644 --- a/dev-haskell/th-utilities/Manifest +++ b/dev-haskell/th-utilities/Manifest @@ -1 +1,2 @@ DIST th-utilities-0.2.3.0.tar.gz 15577 BLAKE2B fad72515936ba6b7876ff731c7a1e12246014e191282028fc1bd1846dc704d4d1408e82e82a394a1f58350f961c5b7b7f5b9ae0cfbf09551fc5964433d42b113 SHA512 edddde2ea3a9da44bd34cbf51d9f4ea14510eac9527f2f1a199390566e24f10ed84403f5450e47244b0cbfc4b5dc3a5c3f64ec596255f191d8bad83d9043a3ba +DIST th-utilities-0.2.4.1.tar.gz 16134 BLAKE2B f8357f66c7d62f0fb902f933edb63a75474eea5bb90f80f192799ae0f2c3ce535d5888a53256331552661791277388b1cdae0bab472c3bb1d39bf79fe29f20b1 SHA512 b23272db62a0842af56efbc2f4cc0ebb8d0c900ecb3471fd2a984792da76ab57780d0960fa737fa0023dcd06e12b7585b586ae330005570046ba767101840d02 diff --git a/dev-haskell/th-utilities/th-utilities-0.2.4.1.ebuild b/dev-haskell/th-utilities/th-utilities-0.2.4.1.ebuild new file mode 100644 index 000000000000..9f8403689752 --- /dev/null +++ b/dev-haskell/th-utilities/th-utilities-0.2.4.1.ebuild @@ -0,0 +1,30 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +# ebuild generated by hackport 0.6.7.9999 + +CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite" +inherit haskell-cabal + +DESCRIPTION="Collection of useful functions for use with Template Haskell" +HOMEPAGE="https://github.com/fpco/th-utilities#readme" +SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz" + +LICENSE="MIT" +SLOT="0/${PV}" +KEYWORDS="~amd64 ~x86" +IUSE="" + +RDEPEND="dev-haskell/primitive:=[profile?] + dev-haskell/syb:=[profile?] + dev-haskell/text:=[profile?] + dev-haskell/th-orphans:=[profile?] + >=dev-lang/ghc-7.8.2:= +" +DEPEND="${RDEPEND} + >=dev-haskell/cabal-1.18.1.3 + test? ( dev-haskell/hspec + dev-haskell/vector ) +" diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz index 6d112fd412f2..7b202514c9ed 100644 Binary files a/dev-java/Manifest.gz and b/dev-java/Manifest.gz differ diff --git a/dev-java/javacup/javacup-0.11b_p20151001-r1.ebuild b/dev-java/javacup/javacup-0.11b_p20151001-r1.ebuild new file mode 100644 index 000000000000..587cf479708e --- /dev/null +++ b/dev-java/javacup/javacup-0.11b_p20151001-r1.ebuild @@ -0,0 +1,91 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +JAVA_PKG_IUSE="doc source" + +inherit java-pkg-2 java-ant-2 + +MY_PV=${PV/_beta/-} +MY_PV=${MY_PV/_p/-} +MY_PV=${MY_PV#0.} +MY_P=java-cup-${MY_PV%-*} + +DESCRIPTION="CUP Parser Generator for Java" +HOMEPAGE="http://www2.cs.tum.edu/projects/cup/" +SRC_URI="http://www2.cs.tum.edu/projects/cup/releases/java-cup-src-${MY_PV}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + +DEPEND="dev-java/ant-core:0 + dev-java/jflex:0 + >=virtual/jdk-1.8:*" + +RDEPEND=">=virtual/jre-1.8:*" + +JAVA_ANT_REWRITE_CLASSPATH="yes" +JAVA_ANT_CLASSPATH_TAGS+=" taskdef" + +S="${WORKDIR}" + +src_prepare() { + default + # Bizarrely, you can't build from the tarball without this patch. + eapply "${FILESDIR}"/${PN}-0.11b_beta20150326-build-xml-svn.patch + + # The JFlex package name has changed to lower case. + sed -i "s/JFlex\./jflex./g" build.xml || die + + # Remove the bundled JFlex. + rm -v bin/JFlex.jar || die +} + +src_configure() { + EANT_GENTOO_CLASSPATH_EXTRA=$(java-pkg_getjars --build-only ant-core,jflex) + java-ant-2_src_configure +} + +src_compile() { + # Annoyingly javacup bundles an older version of itself that will + # break jflex if that has already been built against this newer + # version beforehand. Even more annoyingly, the binary download is + # built with Java 8, which isn't much use to us. We therefore use + # any installed javacup that is newer than the bundled version where + # possible. If this approach turns out to be unworkable then we may + # just have to use the bundled jflex for bootstrapping. + if has_version \>=${CATEGORY}/${PN}-0.11b:${SLOT}; then + # Use PORTAGE_QUIET to suppress a QA warning that is spurious + # thanks to has_version above. This is Portage-specific but + # showing the warning elsewhere isn't the end of the world. + einfo "Bootstrapping with installed javacup ..." + EANT_GENTOO_CLASSPATH_EXTRA+=":$(PORTAGE_QUIET=1 java-pkg_getjars --build-only javacup)" eant + else + einfo "Bootstrapping with bundled javacup ..." + EANT_GENTOO_CLASSPATH_EXTRA+=":${S}/bin/${MY_P:0:-1}.jar" eant + fi + + # Clean everything except the new jar. + rm -rv java/ classes/ || die + + einfo "Recompiling with newly built javacup ..." + EANT_GENTOO_CLASSPATH_EXTRA+=":${S}/dist/${MY_P}.jar" eant + + use doc && ejavadoc -sourcepath src/ -d javadoc java_cup +} + +src_install() { + java-pkg_newjar dist/${MY_P}.jar + java-pkg_newjar dist/${MY_P}-runtime.jar ${PN}-runtime.jar + java-pkg_dolauncher ${PN} --jar ${PN}.jar + java-pkg_register-ant-task + + dodoc changelog.txt + docinto html + dodoc manual.html + + use source && java-pkg_dosrc java/* + use doc && java-pkg_dojavadoc javadoc +} diff --git a/dev-java/jflex/jflex-1.6.1-r1.ebuild b/dev-java/jflex/jflex-1.6.1-r1.ebuild new file mode 100644 index 000000000000..0306f5b66439 --- /dev/null +++ b/dev-java/jflex/jflex-1.6.1-r1.ebuild @@ -0,0 +1,123 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" + +JAVA_PKG_IUSE="doc source" + +inherit java-pkg-2 java-pkg-simple + +DESCRIPTION="JFlex is a lexical analyzer generator for Java" +HOMEPAGE="https://www.jflex.de/" +SRC_URI="https://${PN}.de/${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~ppc-macos ~x64-macos" +IUSE="examples test vim-syntax" +RESTRICT="!test? ( test )" + +CDEPEND="dev-java/ant-core:0" + +RDEPEND=">=virtual/jre-1.8:* + vim-syntax? ( || ( app-editors/vim app-editors/gvim ) ) + ${CDEPEND}" + +DEPEND="dev-java/javacup:0 + >=virtual/jdk-1.8:* + test? ( dev-java/junit:4 ) + ${CDEPEND}" + +PDEPEND="dev-java/javacup:0" + +S="${WORKDIR}/${P}" +JAVA_SRC_DIR="src/main/java" + +src_prepare() { + # See below for details. + eapply_user "${FILESDIR}/icedtea-arm.patch" + + # We need the bundled jflex.jar. + rm -rv ${JAVA_SRC_DIR}/java_cup examples/pom.xml || die + + # Remove the bundled java-cup.jar if unneeded. + if has_version ${PDEPEND}; then + rm -v lib/java-cup-*.jar || die + fi +} + +src_configure() { + # javacup is a cyclic dependency. Use the package if we have it, + # otherwise use the bundled version and install the package later. + if has_version ${PDEPEND}; then + # Use PORTAGE_QUIET to suppress a QA warning that is spurious + # thanks to has_version above. This is Portage-specific but + # showing the warning elsewhere isn't the end of the world. + JAVACUP=$(PORTAGE_QUIET=1 java-pkg_getjar --build-only javacup javacup.jar) + else + JAVACUP=$(echo lib/java-cup-*.jar) + fi + + JAVA_GENTOO_CLASSPATH_EXTRA="$(java-pkg_getjars --build-only ant-core):${JAVACUP}" +} + +jflex_compile() { + java "${@}" jflex.Main -d ${JAVA_SRC_DIR}/${PN} --skel src/main/${PN}/skeleton.nested src/main/${PN}/LexScan.flex || die + java-pkg-simple_src_compile + java-pkg_addres ${PN}.jar src/main/resources +} + +src_compile() { + java -jar "${JAVACUP}" -destdir ${JAVA_SRC_DIR}/${PN} -package ${PN} -parser LexParse -interface src/main/cup/LexParse.cup || die + + # The IcedTea ARM HotSpot port (as of 2.6.1) hangs when running + # jflex. We have patched jflex to fix it but we have to run the + # bundled version first. -Xint works around the problem. See + # http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2678. + use arm && local JFLEX_ARGS="-Xint" + + # First compile (without doc/source) using the bundled jflex. + JAVA_PKG_IUSE= jflex_compile -cp "lib/${P}.jar:${JAVACUP}" ${JFLEX_ARGS} + + # Then recompile using the fresh jflex. + jflex_compile -cp "${PN}.jar:${JAVACUP}" +} + +src_install() { + java-pkg-simple_src_install + java-pkg_dolauncher ${PN} --main ${PN}.Main + + java-pkg_register-dependency javacup javacup-runtime.jar + java-pkg_register-ant-task + + use examples && java-pkg_doexamples examples + dodoc {changelog,README}.md + + if use doc; then + dodoc doc/*.pdf + docinto html + dodoc doc/*.{css,html,png} doc/COPYRIGHT + fi + + if use vim-syntax; then + insinto /usr/share/vim/vimfiles/syntax + doins lib/${PN}.vim + fi +} + +src_test() { + if use arm && java-pkg_current-vm-matches oracle-jdk-bin-1.8; then + # This results in a StackOverflowError as of 1.8.0.65 but works + # fine on icedtea:7. Don't know about icedtea:8 yet. + rm -v src/test/java/jflex/EmitterTest.java || die + fi + + local CP="src/test/java:${PN}.jar:${JAVA_GENTOO_CLASSPATH_EXTRA}:$(java-pkg_getjars junit-4)" + + local TESTS=$(find src/test/java -name "*Test*.java" -printf "%P\n") + TESTS="${TESTS//.java}" + TESTS="${TESTS//\//.}" + + ejavac -classpath "${CP}" $(find src/test/java -name "*.java") + ejunit4 -classpath "${CP}" ${TESTS} +} diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz index 75b7f3b4614f..fb5f63872858 100644 Binary files a/dev-lang/Manifest.gz and b/dev-lang/Manifest.gz differ diff --git a/dev-lang/ghc/files/ghc-7.10.1-rc3-ghc-7.10-bootstrap.patch b/dev-lang/ghc/files/ghc-7.10.1-rc3-ghc-7.10-bootstrap.patch deleted file mode 100644 index 60db34b8b362..000000000000 --- a/dev-lang/ghc/files/ghc-7.10.1-rc3-ghc-7.10-bootstrap.patch +++ /dev/null @@ -1,78 +0,0 @@ ---- ghc-7.10.0.20150316-orig/compiler/utils/Pair.hs 2015-03-10 05:43:13.000000000 +1100 -+++ ghc-7.10.0.20150316/compiler/utils/Pair.hs 2015-03-17 09:50:48.491115080 +1100 -@@ -15,6 +15,8 @@ - import Data.Foldable - import Data.Monoid - import Data.Traversable -+#else -+import Control.Applicative ((<$>)) - #endif - - data Pair a = Pair { pFst :: a, pSnd :: a } ---- ghc-7.10.0.20150316-orig/compiler/types/Coercion.hs 2015-03-10 05:43:13.000000000 +1100 -+++ ghc-7.10.0.20150316/compiler/types/Coercion.hs 2015-03-17 10:11:21.636047380 +1100 -@@ -104,6 +104,8 @@ - #if __GLASGOW_HASKELL__ < 709 - import Control.Applicative hiding ( empty ) - import Data.Traversable (traverse, sequenceA) -+#else -+import Control.Applicative ((<$>)) - #endif - import FastString - import ListSetOps ---- ghc-7.10.0.20150316-orig/compiler/typecheck/TcEvidence.hs 2015-03-14 08:48:57.000000000 +1100 -+++ ghc-7.10.0.20150316/compiler/typecheck/TcEvidence.hs 2015-03-17 10:26:03.251433371 +1100 -@@ -50,6 +50,8 @@ - #if __GLASGOW_HASKELL__ < 709 - import Control.Applicative - import Data.Traversable (traverse, sequenceA) -+#else -+import Control.Applicative ((<$>)) - #endif - import qualified Data.Data as Data - import Outputable ---- ghc-7.10.0.20150316-orig/compiler/hsSyn/HsBinds.hs 2015-03-10 05:43:13.000000000 +1100 -+++ ghc-7.10.0.20150316/compiler/hsSyn/HsBinds.hs 2015-03-17 10:42:21.459519033 +1100 -@@ -47,6 +47,8 @@ - import Data.Traversable ( Traversable(..) ) - import Data.Monoid ( mappend ) - import Control.Applicative hiding (empty) -+#else -+import Control.Applicative ((<$>)) - #endif - - {- ---- ghc-7.10.0.20150316-orig/compiler/parser/RdrHsSyn.hs 2015-03-10 05:43:13.000000000 +1100 -+++ ghc-7.10.0.20150316/compiler/parser/RdrHsSyn.hs 2015-03-17 11:17:48.950929542 +1100 -@@ -91,9 +91,7 @@ - import Util - import ApiAnnotation - --#if __GLASGOW_HASKELL__ < 709 - import Control.Applicative ((<$>)) --#endif - import Control.Monad - - import Text.ParserCombinators.ReadP as ReadP ---- ghc-7.10.0.20150316-orig/compiler/typecheck/TcGenDeriv.hs 2015-03-14 08:48:57.000000000 +1100 -+++ ghc-7.10.0.20150316/compiler/typecheck/TcGenDeriv.hs 2015-03-17 11:30:39.106508173 +1100 -@@ -59,6 +59,8 @@ - import Var - #if __GLASGOW_HASKELL__ < 709 - import MonadUtils -+#else -+import Control.Applicative ((<$>)) - #endif - import Outputable - import Lexeme ---- ghc-7.10.0.20150316-orig/compiler/vectorise/Vectorise/Exp.hs 2015-03-10 05:43:13.000000000 +1100 -+++ ghc-7.10.0.20150316/compiler/vectorise/Vectorise/Exp.hs 2015-03-17 11:46:41.829481669 +1100 -@@ -46,6 +46,8 @@ - import Util - #if __GLASGOW_HASKELL__ < 709 - import MonadUtils -+#else -+import Control.Applicative ((<$>)) - #endif - - import Control.Monad diff --git a/dev-lang/ghc/files/ghc-7.10.3-hardfloat.patch b/dev-lang/ghc/files/ghc-7.10.3-hardfloat.patch deleted file mode 100644 index 106d07aa31c8..000000000000 --- a/dev-lang/ghc/files/ghc-7.10.3-hardfloat.patch +++ /dev/null @@ -1,26 +0,0 @@ -commit 5cc08ebf2f346992a0abd4440252165c90b5ec05 -Author: Sergei Trofimovich -Date: Sat Jun 20 12:23:00 2015 +0100 - - Recognise 'hardhloat' as a valid vendor in a host tuple - - Observed on a tuple armv7a-hardfloat-linux-gnueabi: - > Unknown vendor hardfloat - - Reported-by: Sergey Alirzaev - Signed-off-by: Sergei Trofimovich - -diff --git a/aclocal.m4 b/aclocal.m4 -index 590edb0..958622c 100644 ---- a/aclocal.m4 -+++ b/aclocal.m4 -@@ -1966,6 +1966,9 @@ AC_DEFUN([GHC_CONVERT_VENDOR],[ - softfloat) # like armv5tel-softfloat-linux-gnueabi - $2="unknown" - ;; -+ hardfloat) # like armv7a-hardfloat-linux-gnueabi -+ $2="unknown" -+ ;; - *) - #pass thru by default - $2="$1" diff --git a/dev-lang/ghc/files/ghc-7.10.3-relnotes.patch b/dev-lang/ghc/files/ghc-7.10.3-relnotes.patch deleted file mode 100644 index 675037946e75..000000000000 --- a/dev-lang/ghc/files/ghc-7.10.3-relnotes.patch +++ /dev/null @@ -1,45 +0,0 @@ -diff --git a/ANNOUNCE b/ANNOUNCE -index 7812eba..0018b37 100644 ---- a/ANNOUNCE -+++ b/ANNOUNCE -@@ -1,6 +1,6 @@ - - ============================================================== -- The (Interactive) Glasgow Haskell Compiler -- version 7.10.2 -+ The (Interactive) Glasgow Haskell Compiler -- version 7.10.3 - ============================================================== - - The GHC Team is pleased to announce a new minor release of GHC. This is a -@@ -29,7 +29,7 @@ bug-fix release and contains a number of important fixes, - A more thorough list of the changes in the release can be found in the release - notes, - -- http://haskell.org/ghc/docs/7.10.2/html/users_guide/release-7-10-2.html -+ http://haskell.org/ghc/docs/7.10.3/html/users_guide/release-7-10-3.html - - - How to get it -diff --git a/docs/users_guide/intro.xml b/docs/users_guide/intro.xml -index 3292334..fb7116e 100644 ---- a/docs/users_guide/intro.xml -+++ b/docs/users_guide/intro.xml -@@ -309,6 +309,7 @@ - - &relnotes1; - &relnotes2; -+&relnotes3; - - - -diff --git a/docs/users_guide/ug-ent.xml.in b/docs/users_guide/ug-ent.xml.in -index b696aad..3629e93 100644 ---- a/docs/users_guide/ug-ent.xml.in -+++ b/docs/users_guide/ug-ent.xml.in -@@ -5,6 +5,7 @@ - - - -+ - - - diff --git a/dev-lang/ghc/files/ghc-7.6.3-preserve-inplace-xattr.patch b/dev-lang/ghc/files/ghc-7.6.3-preserve-inplace-xattr.patch deleted file mode 100644 index 08410fa0cd9b..000000000000 --- a/dev-lang/ghc/files/ghc-7.6.3-preserve-inplace-xattr.patch +++ /dev/null @@ -1,14 +0,0 @@ -On hardened 'cp' drops out XT-pax parking. -perfinion suggested using 'install', where portage -might have a chance to save our marking. - -Reported-by: Jay Yang -Gentoo-bug: https://bugs.gentoo.org/518734 -diff --git a/rules/build-prog.mk b/rules/build-prog.mk -index 399369e..2ee9cd5 100644 ---- a/rules/build-prog.mk -+++ b/rules/build-prog.mk -@@ -288,3 +288,3 @@ endif - $$($1_$2_INPLACE) : $1/$2/build/tmp/$$($1_$2_PROG_INPLACE) | $$$$(dir $$$$@)/. -- "$$(CP)" -p $$< $$@ -+ $$(INSTALL) -m 755 $$< $$@ diff --git a/dev-lang/ghc/files/ghc-7.8.1_rc1-libbfd.patch b/dev-lang/ghc/files/ghc-7.8.1_rc1-libbfd.patch deleted file mode 100644 index d01cb49affbd..000000000000 --- a/dev-lang/ghc/files/ghc-7.8.1_rc1-libbfd.patch +++ /dev/null @@ -1,81 +0,0 @@ -commit bb5953484579968c984d074ca1af5d21e1c9e7a0 -Author: Sergei Trofimovich -Date: Mon Feb 10 12:45:58 2014 +0300 - - rts: unrust 'libbfd' debug symbols parser - - Signed-off-by: Sergei Trofimovich - -diff --git a/configure.ac b/configure.ac -index e7fbc7f..e47979c 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -801,7 +801,8 @@ fi - dnl ** check whether this machine has BFD and libiberty installed (used for debugging) - dnl the order of these tests matters: bfd needs libiberty - AC_CHECK_LIB(iberty, xmalloc) --AC_CHECK_LIB(bfd, bfd_uncompress_section_contents) -+dnl 'bfd_init' is a rare non-macro in libbfd -+AC_CHECK_LIB(bfd, bfd_init) - - dnl ################################################################ - dnl Check for libraries -diff --git a/rts/Printer.c b/rts/Printer.c -index ca9ca49..ce02b02 100644 ---- a/rts/Printer.c -+++ b/rts/Printer.c -@@ -48,6 +48,9 @@ void printPtr( StgPtr p ) - raw = lookupGHCName(p); - if (raw != NULL) { - printZcoded(raw); -+ /* it can be just a C symbol, like 'stg_returnToStackTop' */ -+ debugBelch("<%s>", raw); -+ debugBelch("[%p]", p); - } else { - debugBelch("%p", p); - } -@@ -794,7 +797,7 @@ static void printZcoded( const char *raw ) - disabling this for now. - */ - #ifdef USING_LIBBFD -- -+#include "../mk/config.h" /* silly BFD's requirement */ - #include - - /* Fairly ad-hoc piece of code that seems to filter out a lot of -@@ -863,7 +866,10 @@ extern void DEBUG_LoadSymbols( char *name ) - for( i = 0; i != number_of_symbols; ++i ) { - symbol_info info; - bfd_get_symbol_info(abfd,symbol_table[i],&info); -- /*debugBelch("\t%c\t0x%x \t%s\n",info.type,(nat)info.value,info.name); */ -+ if (0) -+ { -+ debugBelch("\t%c\t0x%x \t%s\n",info.type,(nat)info.value,info.name); -+ } - if (isReal(info.type, info.name)) { - num_real_syms += 1; - } -diff --git a/rts/RtsStartup.c b/rts/RtsStartup.c -index aa7306f..5bdef94 100644 ---- a/rts/RtsStartup.c -+++ b/rts/RtsStartup.c -@@ -19,6 +19,7 @@ - #include "RtsFlags.h" - #include "RtsUtils.h" - #include "Prelude.h" -+#include "Printer.h" /* DEBUG_LoadSymbols */ - #include "Schedule.h" /* initScheduler */ - #include "Stats.h" /* initStats */ - #include "STM.h" /* initSTM */ -@@ -162,6 +163,11 @@ hs_init_ghc(int *argc, char **argv[], RtsConfig rts_config) - rts_config.rts_opts_enabled, rts_config.rts_opts, rts_config.rts_hs_main); - } - -+#ifdef DEBUG -+ /* load debugging symbols */ -+ DEBUG_LoadSymbols((*argv)[0]); -+#endif /* DEBUG */ -+ - /* Initialise the stats department, phase 1 */ - initStats1(); - diff --git a/dev-lang/ghc/files/ghc-7.8.2-cgen-constify.patch b/dev-lang/ghc/files/ghc-7.8.2-cgen-constify.patch deleted file mode 100644 index efdd54fbf3fb..000000000000 --- a/dev-lang/ghc/files/ghc-7.8.2-cgen-constify.patch +++ /dev/null @@ -1,34 +0,0 @@ -commit b0cf3ab7a69b878a4335d21a347b56e4b0ca0b7b -Author: Sergei Trofimovich -Date: Mon Apr 14 19:06:24 2014 +0300 - - compiler/cmm/PprC.hs: constify local string literals - - Consider one-line module - module B (v) where v = "hello" - in -fvia-C mode it generates code like - static char gibberish_str[] = "hello"; - - It uselessly eats data section (precious resource on ia64!). - The patch switches genrator to emit: - static const char gibberish_str[] = "hello"; - - Signed-off-by: Sergei Trofimovich - -diff --git a/compiler/cmm/PprC.hs b/compiler/cmm/PprC.hs -index 2398981..fdb578d 100644 ---- a/compiler/cmm/PprC.hs -+++ b/compiler/cmm/PprC.hs -@@ -112,6 +112,12 @@ pprTop (CmmProc infos clbl _ graph) = - - -- We only handle (a) arrays of word-sized things and (b) strings. - -+pprTop (CmmData ReadOnlyData (Statics lbl [CmmString str])) = -+ hcat [ -+ pprLocalness lbl, ptext (sLit "const char "), ppr lbl, -+ ptext (sLit "[] = "), pprStringInCStyle str, semi -+ ] -+ - pprTop (CmmData _section (Statics lbl [CmmString str])) = - hcat [ - pprLocalness lbl, ptext (sLit "char "), ppr lbl, diff --git a/dev-lang/ghc/files/ghc-7.8.3-linker-warn.patch b/dev-lang/ghc/files/ghc-7.8.3-linker-warn.patch deleted file mode 100644 index c8570c06940b..000000000000 --- a/dev-lang/ghc/files/ghc-7.8.3-linker-warn.patch +++ /dev/null @@ -1,35 +0,0 @@ -commit 326046739801a380c5457ef4c87bce8fb95497ba -Author: Sergei Trofimovich -Date: Sun Aug 10 22:12:28 2014 +0300 - - systools info: fix warning about C compiler (message said about linker) - - Summary: Signed-off-by: Sergei Trofimovich - - Test Plan: build-tested - - Reviewers: austin - - Reviewed By: austin - - Subscribers: phaskell, simonmar, relrod, ezyang, carter - - Differential Revision: https://phabricator.haskell.org/D132 - -diff --git a/compiler/main/SysTools.lhs b/compiler/main/SysTools.lhs -index 1c1c52c..72fa19b 100644 ---- a/compiler/main/SysTools.lhs -+++ b/compiler/main/SysTools.lhs -@@ -809,10 +809,10 @@ getCompilerInfo' dflags = do - ) - (\err -> do - debugTraceMsg dflags 2 -- (text "Error (figuring out compiler information):" <+> -+ (text "Error (figuring out C compiler information):" <+> - text (show err)) - errorMsg dflags $ hang (text "Warning:") 9 $ -- text "Couldn't figure out linker information!" $$ -+ text "Couldn't figure out C compiler information!" $$ - text "Make sure you're using GNU gcc, or clang" - return UnknownCC) - return info diff --git a/dev-lang/ghc/files/ghc-7.8.3-pic-sparc.patch b/dev-lang/ghc/files/ghc-7.8.3-pic-sparc.patch deleted file mode 100644 index 16a552fdd4be..000000000000 --- a/dev-lang/ghc/files/ghc-7.8.3-pic-sparc.patch +++ /dev/null @@ -1,31 +0,0 @@ -commit 78863edbb0751f5c9694ea10c6132a87cfd0ee10 -Author: Sergei Trofimovich -Date: Wed Aug 27 22:20:33 2014 +0300 - - Revert "disable shared libs on sparc (linux/solaris) (fixes #8857)" - - This reverts commit 623883f1ed0ee11cc925c4590fb09565403fd231. - - The commit a93ab43ab5f40cadbedea2f6342b93c245e91434 - driver: pass '-fPIC' option to assembler as well - fixes shared libraries on sparc at least on linux. - - Properly fixes Issue #8857 - - Signed-off-by: Sergei Trofimovich - -diff --git a/mk/config.mk.in b/mk/config.mk.in -index c210cd3..392237f 100644 ---- a/mk/config.mk.in -+++ b/mk/config.mk.in -@@ -97,9 +97,7 @@ endif - # Some platforms don't support shared libraries - NoSharedLibsPlatformList = powerpc-unknown-linux \ - x86_64-unknown-mingw32 \ -- i386-unknown-mingw32 \ -- sparc-sun-solaris2 \ -- sparc-unknown-linux -+ i386-unknown-mingw32 - - ifeq "$(SOLARIS_BROKEN_SHLD)" "YES" - NoSharedLibsPlatformList += i386-unknown-solaris2 diff --git a/dev-lang/ghc/files/ghc-7.8.3-ppc32-fPIC.patch b/dev-lang/ghc/files/ghc-7.8.3-ppc32-fPIC.patch deleted file mode 100644 index 434be8b1bdad..000000000000 --- a/dev-lang/ghc/files/ghc-7.8.3-ppc32-fPIC.patch +++ /dev/null @@ -1,351 +0,0 @@ -commit fa31e8f4a0f853848d96549a429083941877bf8d -Author: Sergei Trofimovich -Date: Sun Dec 14 14:30:12 2014 +0000 - - powerpc: fix and enable shared libraries by default on linux - - Summary: - And fix things all the way down to it. Namely: - - remove 'r30' from free registers, it's an .LCTOC1 register - for gcc. generated .plt stubs expect it to be initialised. - - fix PicBase computation, which originally forgot to use 'tmp' - reg in 'initializePicBase_ppc.fetchPC' - - mark 'ForeighTarget's as implicitly using 'PicBase' register - (see comment for details) - - add 64-bit MO_Sub and test on alloclimit3/4 regtests - - fix dynamic label offsets to match with .LCTOC1 offset - - Signed-off-by: Sergei Trofimovich - - Test Plan: validate passes equal amount of vanilla/dyn tests - - Reviewers: simonmar, erikd, austin - - Reviewed By: erikd, austin - - Subscribers: carter, thomie - - Differential Revision: https://phabricator.haskell.org/D560 - - GHC Trac Issues: #8024, #9831 - -diff --git a/compiler/cmm/CLabel.hs b/compiler/cmm/CLabel.hs -index 0f2c0ae..37b8ada 100644 ---- a/compiler/cmm/CLabel.hs -+++ b/compiler/cmm/CLabel.hs -@@ -1170,7 +1170,8 @@ pprDynamicLinkerAsmLabel platform dllInfo lbl - else if osElfTarget (platformOS platform) - then if platformArch platform == ArchPPC - then case dllInfo of -- CodeStub -> ppr lbl <> text "@plt" -+ CodeStub -> -- See Note [.LCTOC1 in PPC PIC code] -+ ppr lbl <> text "+32768@plt" - SymbolPtr -> text ".LC_" <> ppr lbl - _ -> panic "pprDynamicLinkerAsmLabel" - else if platformArch platform == ArchX86_64 -diff --git a/compiler/nativeGen/PIC.hs b/compiler/nativeGen/PIC.hs -index 9b5c080..6326a8b 100644 ---- a/compiler/nativeGen/PIC.hs -+++ b/compiler/nativeGen/PIC.hs -@@ -54,7 +54,6 @@ import qualified X86.Instr as X86 - - import Platform - import Instruction --import Size - import Reg - import NCGMonad - -@@ -468,11 +467,8 @@ pprGotDeclaration dflags ArchX86 OSDarwin - pprGotDeclaration _ _ OSDarwin - = empty - ---- pprGotDeclaration -+-- Emit GOT declaration - -- Output whatever needs to be output once per .s file. ---- The .LCTOC1 label is defined to point 32768 bytes into the table, ---- to make the most of the PPC's 16-bit displacements. ---- Only needed for PIC. - pprGotDeclaration dflags arch os - | osElfTarget os - , arch /= ArchPPC_64 -@@ -482,6 +478,7 @@ pprGotDeclaration dflags arch os - | osElfTarget os - , arch /= ArchPPC_64 - = vcat [ -+ -- See Note [.LCTOC1 in PPC PIC code] - ptext (sLit ".section \".got2\",\"aw\""), - ptext (sLit ".LCTOC1 = .+32768") ] - -@@ -688,12 +685,7 @@ pprImportedSymbol _ _ _ - - - -- Get a pointer to our own fake GOT, which is defined on a per-module basis. ---- This is exactly how GCC does it, and it's quite horrible: ---- We first fetch the address of a local label (mkPicBaseLabel). ---- Then we add a 16-bit offset to that to get the address of a .long that we ---- define in .text space right next to the proc. This .long literal contains ---- the (32-bit) offset from our local label to our global offset table ---- (.LCTOC1 aka gotOffLabel). -+-- This is exactly how GCC does it in linux. - - initializePicBase_ppc - :: Arch -> OS -> Reg -@@ -704,18 +696,9 @@ initializePicBase_ppc ArchPPC os picReg - (CmmProc info lab live (ListGraph blocks) : statics) - | osElfTarget os - = do -- dflags <- getDynFlags -- gotOffLabel <- getNewLabelNat -- tmp <- getNewRegNat $ intSize (wordWidth dflags) - let -- gotOffset = CmmData Text $ Statics gotOffLabel [ -- CmmStaticLit (CmmLabelDiffOff gotLabel -- mkPicBaseLabel -- 0) -- ] -- offsetToOffset -- = PPC.ImmConstantDiff -- (PPC.ImmCLbl gotOffLabel) -+ gotOffset = PPC.ImmConstantDiff -+ (PPC.ImmCLbl gotLabel) - (PPC.ImmCLbl mkPicBaseLabel) - - blocks' = case blocks of -@@ -726,15 +709,23 @@ initializePicBase_ppc ArchPPC os picReg - | bID `mapMember` info = fetchPC b - | otherwise = b - -+ -- GCC does PIC prologs thusly: -+ -- bcl 20,31,.L1 -+ -- .L1: -+ -- mflr 30 -+ -- addis 30,30,.LCTOC1-.L1@ha -+ -- addi 30,30,.LCTOC1-.L1@l -+ -- TODO: below we use it over temporary register, -+ -- it can and should be optimised by picking -+ -- correct PIC reg. - fetchPC (BasicBlock bID insns) = - BasicBlock bID (PPC.FETCHPC picReg -- : PPC.ADDIS tmp picReg (PPC.HI offsetToOffset) -- : PPC.LD PPC.archWordSize tmp -- (PPC.AddrRegImm tmp (PPC.LO offsetToOffset)) -- : PPC.ADD picReg picReg (PPC.RIReg picReg) -+ : PPC.ADDIS picReg picReg (PPC.HA gotOffset) -+ : PPC.ADDI picReg picReg (PPC.LO gotOffset) -+ : PPC.MR PPC.r30 picReg - : insns) - -- return (CmmProc info lab live (ListGraph blocks') : gotOffset : statics) -+ return (CmmProc info lab live (ListGraph blocks') : statics) - - - initializePicBase_ppc ArchPPC OSDarwin picReg -diff --git a/compiler/nativeGen/PPC/CodeGen.hs b/compiler/nativeGen/PPC/CodeGen.hs -index ddf483a..c1c4a74 100644 ---- a/compiler/nativeGen/PPC/CodeGen.hs -+++ b/compiler/nativeGen/PPC/CodeGen.hs -@@ -54,7 +54,7 @@ import Outputable - import Unique - import DynFlags - --import Control.Monad ( mapAndUnzipM ) -+import Control.Monad ( mapAndUnzipM, when ) - import Data.Bits - import Data.Word - -@@ -355,6 +355,19 @@ iselExpr64 (CmmMachOp (MO_Add _) [e1,e2]) = do - ADDE rhi r1hi r2hi ] - return (ChildCode64 code rlo) - -+iselExpr64 (CmmMachOp (MO_Sub _) [e1,e2]) = do -+ ChildCode64 code1 r1lo <- iselExpr64 e1 -+ ChildCode64 code2 r2lo <- iselExpr64 e2 -+ (rlo,rhi) <- getNewRegPairNat II32 -+ let -+ r1hi = getHiVRegFromLo r1lo -+ r2hi = getHiVRegFromLo r2lo -+ code = code1 `appOL` -+ code2 `appOL` -+ toOL [ SUBFC rlo r2lo r1lo, -+ SUBFE rhi r2hi r1hi ] -+ return (ChildCode64 code rlo) -+ - iselExpr64 (CmmMachOp (MO_UU_Conv W32 W64) [expr]) = do - (expr_reg,expr_code) <- getSomeReg expr - (rlo, rhi) <- getNewRegPairNat II32 -@@ -918,8 +931,12 @@ genCCall' dflags gcp target dest_regs args0 - (toOL []) [] - - (labelOrExpr, reduceToFF32) <- case target of -- ForeignTarget (CmmLit (CmmLabel lbl)) _ -> return (Left lbl, False) -- ForeignTarget expr _ -> return (Right expr, False) -+ ForeignTarget (CmmLit (CmmLabel lbl)) _ -> do -+ uses_pic_base_implicitly -+ return (Left lbl, False) -+ ForeignTarget expr _ -> do -+ uses_pic_base_implicitly -+ return (Right expr, False) - PrimTarget mop -> outOfLineMachOp mop - - let codeBefore = move_sp_down finalStack `appOL` passArgumentsCode -@@ -940,6 +957,13 @@ genCCall' dflags gcp target dest_regs args0 - where - platform = targetPlatform dflags - -+ uses_pic_base_implicitly = do -+ -- See Note [implicit register in PPC PIC code] -+ -- on why we claim to use PIC register here -+ when (gopt Opt_PIC dflags) $ do -+ _ <- getPicBaseNat archWordSize -+ return () -+ - initialStackOffset = case gcp of - GCPDarwin -> 24 - GCPLinux -> 8 -@@ -1431,3 +1455,21 @@ coerceFP2Int _ toRep x = do - -- read low word of value (high word is undefined) - LD II32 dst (spRel dflags 3)] - return (Any (intSize toRep) code') -+ -+-- Note [.LCTOC1 in PPC PIC code] -+-- The .LCTOC1 label is defined to point 32768 bytes into the GOT table -+-- to make the most of the PPC's 16-bit displacements. -+-- As 16-bit signed offset is used (usually via addi/lwz instructions) -+-- first element will have '-32768' offset against .LCTOC1. -+ -+-- Note [implicit register in PPC PIC code] -+-- PPC generates calls by labels in assembly -+-- in form of: -+-- bl puts+32768@plt -+-- in this form it's not seen directly (by GHC NCG) -+-- that r30 (PicBaseReg) is used, -+-- but r30 is a required part of PLT code setup: -+-- puts+32768@plt: -+-- lwz r11,-30484(r30) ; offset in .LCTOC1 -+-- mtctr r11 -+-- bctr -diff --git a/compiler/nativeGen/PPC/Instr.hs b/compiler/nativeGen/PPC/Instr.hs -index f5b9506..b7081f9 100644 ---- a/compiler/nativeGen/PPC/Instr.hs -+++ b/compiler/nativeGen/PPC/Instr.hs -@@ -205,8 +205,11 @@ data Instr - | ADD Reg Reg RI -- dst, src1, src2 - | ADDC Reg Reg Reg -- (carrying) dst, src1, src2 - | ADDE Reg Reg Reg -- (extend) dst, src1, src2 -+ | ADDI Reg Reg Imm -- Add Immediate dst, src1, src2 - | ADDIS Reg Reg Imm -- Add Immediate Shifted dst, src1, src2 - | SUBF Reg Reg Reg -- dst, src1, src2 ; dst = src2 - src1 -+ | SUBFC Reg Reg Reg -- (carrying) dst, src1, src2 ; dst = src2 - src1 -+ | SUBFE Reg Reg Reg -- (extend) dst, src1, src2 ; dst = src2 - src1 - | MULLW Reg Reg RI - | DIVW Reg Reg Reg - | DIVWU Reg Reg Reg -@@ -284,8 +287,11 @@ ppc_regUsageOfInstr platform instr - ADD reg1 reg2 ri -> usage (reg2 : regRI ri, [reg1]) - ADDC reg1 reg2 reg3 -> usage ([reg2,reg3], [reg1]) - ADDE reg1 reg2 reg3 -> usage ([reg2,reg3], [reg1]) -+ ADDI reg1 reg2 _ -> usage ([reg2], [reg1]) - ADDIS reg1 reg2 _ -> usage ([reg2], [reg1]) - SUBF reg1 reg2 reg3 -> usage ([reg2,reg3], [reg1]) -+ SUBFC reg1 reg2 reg3 -> usage ([reg2,reg3], [reg1]) -+ SUBFE reg1 reg2 reg3 -> usage ([reg2,reg3], [reg1]) - MULLW reg1 reg2 ri -> usage (reg2 : regRI ri, [reg1]) - DIVW reg1 reg2 reg3 -> usage ([reg2,reg3], [reg1]) - DIVWU reg1 reg2 reg3 -> usage ([reg2,reg3], [reg1]) -@@ -358,8 +364,11 @@ ppc_patchRegsOfInstr instr env - ADD reg1 reg2 ri -> ADD (env reg1) (env reg2) (fixRI ri) - ADDC reg1 reg2 reg3 -> ADDC (env reg1) (env reg2) (env reg3) - ADDE reg1 reg2 reg3 -> ADDE (env reg1) (env reg2) (env reg3) -+ ADDI reg1 reg2 imm -> ADDI (env reg1) (env reg2) imm - ADDIS reg1 reg2 imm -> ADDIS (env reg1) (env reg2) imm - SUBF reg1 reg2 reg3 -> SUBF (env reg1) (env reg2) (env reg3) -+ SUBFC reg1 reg2 reg3 -> SUBFC (env reg1) (env reg2) (env reg3) -+ SUBFE reg1 reg2 reg3 -> SUBFE (env reg1) (env reg2) (env reg3) - MULLW reg1 reg2 ri -> MULLW (env reg1) (env reg2) (fixRI ri) - DIVW reg1 reg2 reg3 -> DIVW (env reg1) (env reg2) (env reg3) - DIVWU reg1 reg2 reg3 -> DIVWU (env reg1) (env reg2) (env reg3) -diff --git a/compiler/nativeGen/PPC/Ppr.hs b/compiler/nativeGen/PPC/Ppr.hs -index 6851769..f59d51f 100644 ---- a/compiler/nativeGen/PPC/Ppr.hs -+++ b/compiler/nativeGen/PPC/Ppr.hs -@@ -525,6 +525,16 @@ pprInstr (BCTRL _) = hcat [ - ptext (sLit "bctrl") - ] - pprInstr (ADD reg1 reg2 ri) = pprLogic (sLit "add") reg1 reg2 ri -+pprInstr (ADDI reg1 reg2 imm) = hcat [ -+ char '\t', -+ ptext (sLit "addi"), -+ char '\t', -+ pprReg reg1, -+ ptext (sLit ", "), -+ pprReg reg2, -+ ptext (sLit ", "), -+ pprImm imm -+ ] - pprInstr (ADDIS reg1 reg2 imm) = hcat [ - char '\t', - ptext (sLit "addis"), -@@ -539,6 +549,8 @@ pprInstr (ADDIS reg1 reg2 imm) = hcat [ - pprInstr (ADDC reg1 reg2 reg3) = pprLogic (sLit "addc") reg1 reg2 (RIReg reg3) - pprInstr (ADDE reg1 reg2 reg3) = pprLogic (sLit "adde") reg1 reg2 (RIReg reg3) - pprInstr (SUBF reg1 reg2 reg3) = pprLogic (sLit "subf") reg1 reg2 (RIReg reg3) -+pprInstr (SUBFC reg1 reg2 reg3) = pprLogic (sLit "subfc") reg1 reg2 (RIReg reg3) -+pprInstr (SUBFE reg1 reg2 reg3) = pprLogic (sLit "subfe") reg1 reg2 (RIReg reg3) - pprInstr (MULLW reg1 reg2 ri@(RIReg _)) = pprLogic (sLit "mullw") reg1 reg2 ri - pprInstr (MULLW reg1 reg2 ri@(RIImm _)) = pprLogic (sLit "mull") reg1 reg2 ri - pprInstr (DIVW reg1 reg2 reg3) = pprLogic (sLit "divw") reg1 reg2 (RIReg reg3) -diff --git a/compiler/nativeGen/PPC/Regs.hs b/compiler/nativeGen/PPC/Regs.hs -index 0f636bf..69e69c0 100644 ---- a/compiler/nativeGen/PPC/Regs.hs -+++ b/compiler/nativeGen/PPC/Regs.hs -@@ -37,7 +37,8 @@ module PPC.Regs ( - fits16Bits, - makeImmediate, - fReg, -- sp, r3, r4, r27, r28, f1, f20, f21, -+ sp, r3, r4, r27, r28, r30, -+ f1, f20, f21, - - allocatableRegs - -@@ -295,12 +296,13 @@ point registers. - fReg :: Int -> RegNo - fReg x = (32 + x) - --sp, r3, r4, r27, r28, f1, f20, f21 :: Reg -+sp, r3, r4, r27, r28, r30, f1, f20, f21 :: Reg - sp = regSingle 1 - r3 = regSingle 3 - r4 = regSingle 4 - r27 = regSingle 27 - r28 = regSingle 28 -+r30 = regSingle 30 - f1 = regSingle $ fReg 1 - f20 = regSingle $ fReg 20 - f21 = regSingle $ fReg 21 -diff --git a/includes/CodeGen.Platform.hs b/includes/CodeGen.Platform.hs -index 9916e0e..1d46a01 100644 ---- a/includes/CodeGen.Platform.hs -+++ b/includes/CodeGen.Platform.hs -@@ -881,6 +881,8 @@ freeReg 1 = fastBool False -- The Stack Pointer - # if !MACHREGS_darwin - -- most non-darwin powerpc OSes use r2 as a TOC pointer or something like that - freeReg 2 = fastBool False -+-- at least linux in -fPIC relies on r30 in PLT stubs -+freeReg 30 = fastBool False - # endif - # ifdef REG_Base - freeReg REG_Base = fastBool False -diff --git a/mk/config.mk.in b/mk/config.mk.in -index 0f5820f..8f134bc 100644 ---- a/mk/config.mk.in -+++ b/mk/config.mk.in -@@ -95,7 +95,7 @@ TargetElf = YES - endif - - # Some platforms don't support shared libraries --NoSharedLibsPlatformList = powerpc-unknown-linux \ -+NoSharedLibsPlatformList = \ - x86_64-unknown-mingw32 \ - i386-unknown-mingw32 - diff --git a/dev-lang/ghc/files/ghc-7.8.4-gold.patch b/dev-lang/ghc/files/ghc-7.8.4-gold.patch deleted file mode 100644 index a8e9b1e6c857..000000000000 --- a/dev-lang/ghc/files/ghc-7.8.4-gold.patch +++ /dev/null @@ -1,27 +0,0 @@ -Gentoo-bug: https://bugs.gentoo.org/536426 -Reported-by: Eric Siegel -commit 021b7978d14799bae779907faf7490cfd21b3f46 -Author: Austin Seipp -Date: Sun Jul 20 10:13:15 2014 -0500 - - driver: use absolute paths in ld scripts (#7452) - - Patch contributed by slowmo. - - Signed-off-by: Austin Seipp - -diff --git a/compiler/main/DriverPipeline.hs b/compiler/main/DriverPipeline.hs -index 11427e2..49126fe 100644 ---- a/compiler/main/DriverPipeline.hs -+++ b/compiler/main/DriverPipeline.hs -@@ -2166,7 +2166,9 @@ joinObjectFiles dflags o_files output_fn = do - if ldIsGnuLd - then do - script <- newTempName dflags "ldscript" -- writeFile script $ "INPUT(" ++ unwords o_files ++ ")" -+ cwd <- getCurrentDirectory -+ let o_files_abs = map (cwd ) o_files -+ writeFile script $ "INPUT(" ++ unwords o_files_abs ++ ")" - ld_r [SysTools.FileOption "" script] ccInfo - else if sLdSupportsFilelist mySettings - then do diff --git a/dev-lang/ghc/files/ghc-7.8.4-ia64-CLOSUREs.patch b/dev-lang/ghc/files/ghc-7.8.4-ia64-CLOSUREs.patch deleted file mode 100644 index 9d50792bcf45..000000000000 --- a/dev-lang/ghc/files/ghc-7.8.4-ia64-CLOSUREs.patch +++ /dev/null @@ -1,66 +0,0 @@ -From b677ba51cf8131a6f6ddcdfee8dd2a8c4c2b4ac7 Mon Sep 17 00:00:00 2001 -From: Sergei Trofimovich -Date: Sat, 17 Jan 2015 14:27:13 +0000 -Subject: [PATCH 1/3] CMM: add a mechanism to import C data labels - -Fixes threaded runtime on ia64. -sm_mutex there was not referenced correctly. - -Signed-off-by: Sergei Trofimovich ---- - compiler/cmm/CmmParse.y | 4 ++++ - rts/Exception.cmm | 2 +- - rts/PrimOps.cmm | 6 +++--- - 3 files changed, 8 insertions(+), 4 deletions(-) - -diff --git a/compiler/cmm/CmmParse.y.source b/compiler/cmm/CmmParse.y.source -index 6b51e51..fd9489b 100644 ---- a/compiler/cmm/CmmParse.y.source -+++ b/compiler/cmm/CmmParse.y.source -@@ -575,6 +575,10 @@ importName - : NAME - { ($1, mkForeignLabel $1 Nothing ForeignLabelInExternalPackage IsFunction) } - -+ -- as previous 'NAME', but 'IsData' -+ | 'CLOSURE' NAME -+ { ($2, mkForeignLabel $2 Nothing ForeignLabelInExternalPackage IsData) } -+ - -- A label imported with an explicit packageId. - | STRING NAME - { ($2, mkCmmCodeLabel (fsToPackageKey (mkFastString $1)) $2) } -diff --git a/rts/Exception.cmm b/rts/Exception.cmm -index 5007ef3..8d19c14 100644 ---- a/rts/Exception.cmm -+++ b/rts/Exception.cmm -@@ -13,7 +13,7 @@ - #include "Cmm.h" - #include "RaiseAsync.h" - --import ghczmprim_GHCziTypes_True_closure; -+import CLOSURE ghczmprim_GHCziTypes_True_closure; - - /* ----------------------------------------------------------------------------- - Exception Primitives -diff --git a/rts/PrimOps.cmm b/rts/PrimOps.cmm -index 3e8612c..2e6ca46 100644 ---- a/rts/PrimOps.cmm -+++ b/rts/PrimOps.cmm -@@ -28,12 +28,12 @@ - import pthread_mutex_lock; - import pthread_mutex_unlock; - #endif --import base_ControlziExceptionziBase_nestedAtomically_closure; -+import CLOSURE base_ControlziExceptionziBase_nestedAtomically_closure; - import EnterCriticalSection; - import LeaveCriticalSection; --import ghczmprim_GHCziTypes_False_closure; -+import CLOSURE ghczmprim_GHCziTypes_False_closure; - #if defined(USE_MINIINTERPRETER) || !defined(mingw32_HOST_OS) --import sm_mutex; -+import CLOSURE sm_mutex; - #endif - - /*----------------------------------------------------------------------------- --- -2.2.1 - diff --git a/dev-lang/ghc/files/ghc-8.0.1-limit-jN.patch b/dev-lang/ghc/files/ghc-8.0.1-limit-jN.patch deleted file mode 100644 index dc5410da3020..000000000000 --- a/dev-lang/ghc/files/ghc-8.0.1-limit-jN.patch +++ /dev/null @@ -1,50 +0,0 @@ -commit 501e05bb1b8974fc8b6c9eee86c87c367e87a211 -Author: Sergei Trofimovich -Date: Tue Aug 30 12:10:47 2016 +0100 - - GhcMake: limit Capability count to CPU count in parallel mode - - In Trac #9221 one of problems using high --jobs= - is amount of mutator (or GC) threads we crate. - - We use userspace spinning-and-yielding (see ACQUIRE_SPIN_LOCK) - to acess work stealing queues. In case of - N-worker-threads > N-CPUs fraction of time when - thread holding spin lock gets descheduled by kernel - increases. That causes other threads to waste CPU time - before giving up CPU. - - Signed-off-by: Sergei Trofimovich - - Test Plan: - ghc --make -j8 and -j80 have comparable sys time - on a 8-core system. - - Reviewers: austin, gintas, bgamari, simonmar - - Reviewed By: bgamari, simonmar - - Subscribers: thomie - - Differential Revision: https://phabricator.haskell.org/D2482 - - GHC Trac Issues: #9221 - -diff --git a/compiler/main/GhcMake.hs b/compiler/main/GhcMake.hs -index 9dc43cd..905df63 100644 ---- a/compiler/main/GhcMake.hs -+++ b/compiler/main/GhcMake.hs -@@ -761,7 +761,12 @@ parUpsweep n_jobs old_hpt stable_mods cleanup sccs = do - - let updNumCapabilities = liftIO $ do - n_capabilities <- getNumCapabilities -- unless (n_capabilities /= 1) $ setNumCapabilities n_jobs -+ n_cpus <- getNumProcessors -+ -- Setting number of capabilities more than -+ -- CPU count usually leads to high userspace -+ -- lock contention. Trac #9221 -+ let n_caps = min n_jobs n_cpus -+ unless (n_capabilities /= 1) $ setNumCapabilities n_caps - return n_capabilities - -- Reset the number of capabilities once the upsweep ends. - let resetNumCapabilities orig_n = liftIO $ setNumCapabilities orig_n diff --git a/dev-lang/ghc/files/ghc-8.0.1-par-g0-on-A32.patch b/dev-lang/ghc/files/ghc-8.0.1-par-g0-on-A32.patch deleted file mode 100644 index b46e57301782..000000000000 --- a/dev-lang/ghc/files/ghc-8.0.1-par-g0-on-A32.patch +++ /dev/null @@ -1,65 +0,0 @@ -commit bdfc5375f219d6def81effda4e57cb56d01fc917 -Author: Sergei Trofimovich -Date: Tue Aug 30 12:10:54 2016 +0100 - - rts: enable parallel GC scan of large (32M+) allocation area - - Parallel GC does not scan large allocation area (-A) - effectively as it does not do work stealing from nursery - by default. - - That leads to large imbalance when only one of threads - overflows allocation area: most of GC threads finish - quickly (as there is not much to collect) and sit idle - waiting while single GC thread finishes scan of single - allocation area for that thread. - - The patch enables work stealing for (equivalent of -qb0) - allocation area of -A32M or higher. - - Tested on a highlighting-kate package from Trac #9221 - - On 8-core machine the difference is around 5% faster - of wall-clock time. On 24-core VM the speedup is 20%. - - Signed-off-by: Sergei Trofimovich - - Test Plan: measured wall time and GC parallelism on highlighting-kate build - - Reviewers: austin, bgamari, erikd, simonmar - - Reviewed By: bgamari, simonmar - - Subscribers: thomie - - Differential Revision: https://phabricator.haskell.org/D2483 - - GHC Trac Issues: #9221 - -diff --git a/rts/RtsFlags.c b/rts/RtsFlags.c -index fda33f0..7a719b9 100644 ---- a/rts/RtsFlags.c -+++ b/rts/RtsFlags.c -@@ -237,1 +237,1 @@ void initRtsFlagsDefaults(void) -- RtsFlags.ParFlags.parGcLoadBalancingGen = 1; -+ RtsFlags.ParFlags.parGcLoadBalancingGen = ~0u; /* auto, based on -A */ -@@ -1398,2 +1390,19 @@ static void normaliseRtsOpts (void) - } - -+#ifdef THREADED_RTS -+ if (RtsFlags.ParFlags.parGcLoadBalancingGen == ~0u) { -+ StgWord alloc_area_bytes -+ = RtsFlags.GcFlags.minAllocAreaSize * BLOCK_SIZE; -+ -+ // If allocation area is larger that CPU cache -+ // we can finish scanning quicker doing work-stealing -+ // scan. Trac #9221 -+ // 32M looks big enough not to fit into L2 cache -+ // of popular modern CPUs. -+ if (alloc_area_bytes >= 32 * 1024 * 1024) { -+ RtsFlags.ParFlags.parGcLoadBalancingGen = 0; -+ } else { -+ RtsFlags.ParFlags.parGcLoadBalancingGen = 1; -+ } -+ } -+#endif diff --git a/dev-lang/ghc/files/ghc-8.0.1-ww-args-limit.patch b/dev-lang/ghc/files/ghc-8.0.1-ww-args-limit.patch deleted file mode 100644 index 4752f4482678..000000000000 --- a/dev-lang/ghc/files/ghc-8.0.1-ww-args-limit.patch +++ /dev/null @@ -1,127 +0,0 @@ -commit 5efbf0d243984444cf352ad6f0d147e226c64498 -Author: Sergei Trofimovich -Date: Thu Sep 1 17:34:58 2016 +0100 - - restore -fmax-worker-args handling (Trac #11565) - - maxWorkerArgs handling was accidentally lost 3 years ago - in a major update of demand analysis - commit 0831a12ea2fc73c33652eeec1adc79fa19700578 - - Old regression is noticeable as: - - code bloat (requires stack reshuffling) - - compilation slowdown (more code to optimise/generate) - - and increased heap usage (DynFlags unboxing/reboxing?) - - On a simple compile benchmark this change causes heap - allocation drop from 70G don to 67G (ghc perf build). - - Signed-off-by: Sergei Trofimovich - - Reviewers: simonpj, ezyang, goldfire, austin, bgamari - - Reviewed By: simonpj, ezyang - - Subscribers: thomie - - Differential Revision: https://phabricator.haskell.org/D2503 - - GHC Trac Issues: #11565 - -diff --git a/compiler/specialise/SpecConstr.hs b/compiler/specialise/SpecConstr.hs -index 10d5614..7166f57 100644 ---- a/compiler/specialise/SpecConstr.hs -+++ b/compiler/specialise/SpecConstr.hs -@@ -29,7 +29,7 @@ import CoreFVs ( exprsFreeVarsList ) - import CoreMonad - import Literal ( litIsLifted ) - import HscTypes ( ModGuts(..) ) --import WwLib ( mkWorkerArgs ) -+import WwLib ( isWorkerSmallEnough, mkWorkerArgs ) - import DataCon - import Coercion hiding( substCo ) - import Rules -@@ -1533,10 +1533,14 @@ specialise env bind_calls (RI { ri_fn = fn, ri_lam_bndrs = arg_bndrs - - | Just all_calls <- lookupVarEnv bind_calls fn - = -- pprTrace "specialise entry {" (ppr fn <+> ppr (length all_calls)) $ -- do { (boring_call, pats) <- callsToPats env specs arg_occs all_calls -- -+ do { (boring_call, all_pats) <- callsToPats env specs arg_occs all_calls - -- Bale out if too many specialisations -- ; let n_pats = length pats -+ ; let pats = filter (is_small_enough . fst) all_pats -+ is_small_enough vars = isWorkerSmallEnough (sc_dflags env) vars -+ -- We are about to construct w/w pair in 'spec_one'. -+ -- Omit specialisation leading to high arity workers. -+ -- See Note [Limit w/w arity] -+ n_pats = length pats - spec_count' = n_pats + spec_count - ; case sc_count env of - Just max | not (sc_force env) && spec_count' > max -diff --git a/compiler/stranal/WwLib.hs b/compiler/stranal/WwLib.hs -index 09bc204..d9460d9 100644 ---- a/compiler/stranal/WwLib.hs -+++ b/compiler/stranal/WwLib.hs -@@ -8,6 +8,7 @@ - - module WwLib ( mkWwBodies, mkWWstr, mkWorkerArgs - , deepSplitProductType_maybe, findTypeShape -+ , isWorkerSmallEnough - ) where - - #include "HsVersions.h" -@@ -144,7 +145,8 @@ mkWwBodies dflags fam_envs fun_ty demands res_info one_shots - wrapper_body = wrap_fn_args . wrap_fn_cpr . wrap_fn_str . applyToVars work_call_args . Var - worker_body = mkLams work_lam_args. work_fn_str . work_fn_cpr . work_fn_args - -- ; if useful1 && not (only_one_void_argument) || useful2 -+ ; if isWorkerSmallEnough dflags work_args -+ && (useful1 && not only_one_void_argument || useful2) - then return (Just (worker_args_dmds, wrapper_body, worker_body)) - else return Nothing - } -@@ -165,6 +167,12 @@ mkWwBodies dflags fam_envs fun_ty demands res_info one_shots - | otherwise - = False - -+-- See Note [Limit w/w arity] -+isWorkerSmallEnough :: DynFlags -> [Var] -> Bool -+isWorkerSmallEnough dflags vars = count isId vars <= maxWorkerArgs dflags -+ -- We count only Free variables (isId) to skip Type, Kind -+ -- variables which have no runtime representation. -+ - {- - Note [Always do CPR w/w] - ~~~~~~~~~~~~~~~~~~~~~~~~ -@@ -178,6 +186,30 @@ a disaster, because then the enclosing function might say it has the CPR - property, but now doesn't and there a cascade of disaster. A good example - is Trac #5920. - -+Note [Limit w/w arity] -+~~~~~~~~~~~~~~~~~~~~~~~~ -+Guard against high worker arity as it generates a lot of stack traffic. -+A simplified example is Trac #11565#comment:6 -+ -+Current strategy is very simple: don't perform w/w transformation at all -+if the result produces a wrapper with arity higher than -fmax-worker-args=. -+ -+It is a bit all or nothing, consider -+ -+ f (x,y) (a,b,c,d,e ... , z) = rhs -+ -+Currently we will remove all w/w ness entirely. But actually we could -+w/w on the (x,y) pair... it's the huge product that is the problem. -+ -+Could we instead refrain from w/w on an arg-by-arg basis? Yes, that'd -+solve f. But we can get a lot of args from deeply-nested products: -+ -+ g (a, (b, (c, (d, ...)))) = rhs -+ -+This is harder to spot on an arg-by-arg basis. Previously mkWwStr was -+given some "fuel" saying how many arguments it could add; when we ran -+out of fuel it would stop w/wing. -+Still not very clever because it had a left-right bias. - - ************************************************************************ - * * diff --git a/dev-lang/ghc/files/ghc-8.0.1_rc1-cgen-constify.patch b/dev-lang/ghc/files/ghc-8.0.1_rc1-cgen-constify.patch deleted file mode 100644 index 877a5827e4ea..000000000000 --- a/dev-lang/ghc/files/ghc-8.0.1_rc1-cgen-constify.patch +++ /dev/null @@ -1,34 +0,0 @@ -commit b0cf3ab7a69b878a4335d21a347b56e4b0ca0b7b -Author: Sergei Trofimovich -Date: Mon Apr 14 19:06:24 2014 +0300 - - compiler/cmm/PprC.hs: constify local string literals - - Consider one-line module - module B (v) where v = "hello" - in -fvia-C mode it generates code like - static char gibberish_str[] = "hello"; - - It uselessly eats data section (precious resource on ia64!). - The patch switches genrator to emit: - static const char gibberish_str[] = "hello"; - - Signed-off-by: Sergei Trofimovich - -diff --git a/compiler/cmm/PprC.hs b/compiler/cmm/PprC.hs -index 2398981..fdb578d 100644 ---- a/compiler/cmm/PprC.hs -+++ b/compiler/cmm/PprC.hs -@@ -112,6 +112,12 @@ pprTop (CmmProc infos clbl _ graph) = - - -- We only handle (a) arrays of word-sized things and (b) strings. - -+pprTop (CmmData (Section ReadOnlyData _) (Statics lbl [CmmString str])) = -+ hcat [ -+ pprLocalness lbl, ptext (sLit "const char "), ppr lbl, -+ ptext (sLit "[] = "), pprStringInCStyle str, semi -+ ] -+ - pprTop (CmmData _section (Statics lbl [CmmString str])) = - hcat [ - pprLocalness lbl, ptext (sLit "char "), ppr lbl, diff --git a/dev-lang/ghc/files/ghc-8.0.2-O2-unreg.patch b/dev-lang/ghc/files/ghc-8.0.2-O2-unreg.patch deleted file mode 100644 index b64d65b80a05..000000000000 --- a/dev-lang/ghc/files/ghc-8.0.2-O2-unreg.patch +++ /dev/null @@ -1,35 +0,0 @@ -ghc -O2 generates too large C files for unregisterised compiler. -On ia64 it causes DynFlags to compile for 60 minutes (then assembler -crashes). - -To decrease C code inflation we don't use -O2 in UNREG mode. -diff --git a/mk/config.mk.in b/mk/config.mk.in -index bfaaa66..d8f93b3 100644 ---- a/mk/config.mk.in -+++ b/mk/config.mk.in -@@ -72,11 +72,2 @@ GhcStage3HcOpts=-O2 - --# Disable -O2 optimization. Otherwise amount of generated C code --# makes things very slow to compile (~5 minutes on core-i7 for 'compiler/hsSyn/HsExpr.lhs') --# and sometimes not compile at all (powerpc64 overflows something --# on 'compiler/hsSyn/HsExpr.lhs'). --ifeq "$(GhcUnregisterised)" "YES" --GhcStage1HcOpts= --GhcStage2HcOpts= --GhcStage3HcOpts= --endif - -@@ -894 +885,13 @@ CURSES_INCLUDE_DIRS = @CURSES_INCLUDE_DIRS@ - CURSES_LIB_DIRS = @CURSES_LIB_DIRS@ -+ -+# Disable -O2 optimization. Otherwise amount of generated C code -+# makes things very slow to compile (~5 minutes on core-i7 for 'compiler/hsSyn/HsExpr.lhs') -+# and sometimes not compile at all (powerpc64 overflows something -+# on 'compiler/hsSyn/HsExpr.lhs'). -+ifeq "$(GhcUnregisterised)" "YES" -+GhcStage1HcOpts= -+GhcStage2HcOpts= -+GhcStage3HcOpts= -+ -+GhcLibHcOpts= -+endif diff --git a/dev-lang/ghc/files/ghc-8.0.2-binutils-2.30.patch b/dev-lang/ghc/files/ghc-8.0.2-binutils-2.30.patch deleted file mode 100644 index f02cb238c6b9..000000000000 --- a/dev-lang/ghc/files/ghc-8.0.2-binutils-2.30.patch +++ /dev/null @@ -1,65 +0,0 @@ -From 358b508051333882d4099acca8f269e6fb2b7d65 Mon Sep 17 00:00:00 2001 -From: Bertram Felgenhauer -Date: Thu, 3 May 2018 18:03:53 +0300 -Subject: [PATCH] Compute DW_FORM_block length correctly; also fixes #15068 - -Before this patch, the pprUnwindwExpr function computed the length of -by the following assembly fragment: - - .uleb128 1f-.-1 - -1: - -That is, to compute the length, it takes the difference of the label 1 -and the address of the .uleb128 directive, and subtracts 1. - -In #15068 it was reported that `as` from binutils 4.30 has trouble with -evaluating the `.` part of the expression. However, there is actually a -problem with the expression, if the length of the data ever becomes -larger than 128: In that case, the .uleb128 directive will emit more -than 1 byte, and the computed length will be wrong. - -The present patch changes the assembly fragment to use two labels, -which fixes both these problems. - - .uleb128 2f-1f -1: - -2: - -Test Plan: validate - -Reviewers: bgamari, osa1 - -Reviewed By: bgamari - -Subscribers: thomie, carter - -GHC Trac Issues: #15068 - -Differential Revision: https://phabricator.haskell.org/D4654 ---- - compiler/nativeGen/Dwarf/Types.hs | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -diff --git a/compiler/nativeGen/Dwarf/Types.hs b/compiler/nativeGen/Dwarf/Types.hs -index 23a2c920e7..579ed0d256 100644 ---- a/compiler/nativeGen/Dwarf/Types.hs -+++ b/compiler/nativeGen/Dwarf/Types.hs -@@ -492,9 +492,11 @@ pprUnwindExpr spIsCFA expr - pprE (UwPlus u1 u2) = pprE u1 $$ pprE u2 $$ pprByte dW_OP_plus - pprE (UwMinus u1 u2) = pprE u1 $$ pprE u2 $$ pprByte dW_OP_minus - pprE (UwTimes u1 u2) = pprE u1 $$ pprE u2 $$ pprByte dW_OP_mul -- in text "\t.uleb128 1f-.-1" $$ -- DW_FORM_block length -+ in text "\t.uleb128 2f-1f" $$ -- DW_FORM_block length -+ -- computed as the difference of the following local labels 2: and 1: -+ text "1:" $$ - pprE expr $$ -- text "1:" -+ text "2:" - - -- | Generate code for re-setting the unwind information for a - -- register to @undefined@ --- -2.17.0 - diff --git a/dev-lang/ghc/files/ghc-8.0.2-libffi-alpha.patch b/dev-lang/ghc/files/ghc-8.0.2-libffi-alpha.patch deleted file mode 100644 index 166f7fe42991..000000000000 --- a/dev-lang/ghc/files/ghc-8.0.2-libffi-alpha.patch +++ /dev/null @@ -1,57 +0,0 @@ -commit 2c220c4b053c8efb2098ee20910084a42a0b2dcd -Author: Sergei Trofimovich -Date: Sun Jan 29 11:59:36 2017 +0000 - - libffi: fix build COMPLEX build failure on alpha - - libtool: compile: alpha-unknown-linux-gnu-gcc -DHAVE_CONFIG_H -I. -I.. -I. -I../include -Iinclude \ - -I../src -I. -I../include -Iinclude -I../src -Wall -w -mieee -D_REENTRANT -fno-stack-protector \ - -w -MT src/alpha/osf.lo -MMD -MP -MF src/alpha/.deps/osf.Tpo \ - -c ../src/alpha/osf.S -fPIC -DPIC -o src/alpha/.libs/osf.o - - ../src/alpha/osf.S:298:2: error: #error "osf.S out of sync with ffi.h" - #error "osf.S out of sync with ffi.h" - ^ - - Signed-off-by: Sergei Trofimovich - -diff --git a/libffi/ghc.mk b/libffi/ghc.mk -index 7c5bc9e1b3..4297ed449e 100644 ---- a/libffi/ghc.mk -+++ b/libffi/ghc.mk -@@ -63,6 +63,9 @@ $(libffi_STAMP_CONFIGURE): $(TOUCH_DEP) - # will use cygwin symbolic links which cannot be read by mingw gcc. - chmod +x libffi/ln - -+ # fix libffi build failure on alpha -+ ( cd libffi/build && "$(PATCH_CMD)" -p0 < ../libffi.3.2.1-complex_alpha.diff; ) -+ - # We need to use -MMD rather than -MD, as otherwise we get paths - # like c:/... in the dependency files on Windows, and the extra - # colons break make -diff --git a/libffi/libffi.3.2.1-complex_alpha.diff b/libffi/libffi.3.2.1-complex_alpha.diff -new file mode 100644 -index 0000000000..0d6e0bc290 ---- /dev/null -+++ b/libffi/libffi.3.2.1-complex_alpha.diff -@@ -0,0 +1,20 @@ -+--- src/alpha/osf.S.orig 2015-01-16 10:46:15.000000000 +0100 -++++ src/alpha/osf.S 2015-01-16 10:46:24.000000000 +0100 -+@@ -279,6 +279,7 @@ -+ .gprel32 $load_64 # FFI_TYPE_SINT64 -+ .gprel32 $load_none # FFI_TYPE_STRUCT -+ .gprel32 $load_64 # FFI_TYPE_POINTER -++ .gprel32 $load_none # FFI_TYPE_COMPLEX -+ -+ /* Assert that the table above is in sync with ffi.h. */ -+ -+@@ -294,7 +295,8 @@ -+ || FFI_TYPE_SINT64 != 12 \ -+ || FFI_TYPE_STRUCT != 13 \ -+ || FFI_TYPE_POINTER != 14 \ -+- || FFI_TYPE_LAST != 14 -++ || FFI_TYPE_COMPLEX != 15 \ -++ || FFI_TYPE_LAST != 15 -+ #error "osf.S out of sync with ffi.h" -+ #endif -+ diff --git a/dev-lang/ghc/files/ghc-8.0.2_rc2-old-sphinx.patch b/dev-lang/ghc/files/ghc-8.0.2_rc2-old-sphinx.patch deleted file mode 100644 index a4d49d3ef808..000000000000 --- a/dev-lang/ghc/files/ghc-8.0.2_rc2-old-sphinx.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/docs/users_guide/profiling.rst b/docs/users_guide/profiling.rst -index 4d0bb3a..f980f72 100644 ---- a/docs/users_guide/profiling.rst -+++ b/docs/users_guide/profiling.rst -@@ -435,7 +435,2 @@ To generate a heap profile from your program: - --For example, here is a heap profile produced for the ``sphere`` program --from GHC's ``nofib`` benchmark suite, -- --.. image:: images/prof_scc.* -- - You might also want to take a look at diff --git a/dev-lang/ghc/files/ghc-8.10.1-no-relax-everywhere.patch b/dev-lang/ghc/files/ghc-8.10.1-no-relax-everywhere.patch deleted file mode 100644 index 19c8b4bccc48..000000000000 --- a/dev-lang/ghc/files/ghc-8.10.1-no-relax-everywhere.patch +++ /dev/null @@ -1,19 +0,0 @@ -https://github.com/gentoo-haskell/gentoo-haskell/issues/704 - -Allow users to specify -W,--relax externally and pass --Wl,-no-relax unconditonally on all arches. - -Reported-by: wmyrda ---- a/compiler/main/DriverPipeline.hs -+++ b/compiler/main/DriverPipeline.hs -@@ -2144,9 +2144,7 @@ joinObjectFiles dflags o_files output_fn = do - -- gcc on sparc sets -Wl,--relax implicitly, but - -- -r and --relax are incompatible for ld, so - -- disable --relax explicitly. -- ++ (if platformArch (targetPlatform dflags) -- `elem` [ArchSPARC, ArchSPARC64] -- && ldIsGnuLd -+ ++ (if ldIsGnuLd - then [SysTools.Option "-Wl,-no-relax"] - else []) - -- See Note [Produce big objects on Windows] diff --git a/dev-lang/ghc/files/ghc-8.10.2-revert-linker-rtsSymbols_more_linker_symbols.patch b/dev-lang/ghc/files/ghc-8.10.2-revert-linker-rtsSymbols_more_linker_symbols.patch deleted file mode 100644 index eb30d9d9dd4c..000000000000 --- a/dev-lang/ghc/files/ghc-8.10.2-revert-linker-rtsSymbols_more_linker_symbols.patch +++ /dev/null @@ -1,296 +0,0 @@ -From fac083e7ac8a37b61a4082bbbca2848e52fd1bb2 Mon Sep 17 00:00:00 2001 -From: Ben Gamari -Date: Sun, 9 Aug 2020 09:15:16 -0400 -Subject: [PATCH] Revert "[linker/rtsSymbols] More linker symbols" - -This reverts commit aa2e5863699306920513b216f337de09e29b5bb8. ---- - rts/RtsSymbols.c | 224 ++++------------------------------------------- - 1 file changed, 17 insertions(+), 207 deletions(-) - -diff --git a/rts/RtsSymbols.c b/rts/RtsSymbols.c -index d10a6900db..b2f90a892d 100644 ---- a/rts/RtsSymbols.c -+++ b/rts/RtsSymbols.c -@@ -58,6 +58,7 @@ - SymI_HasProto(signal_handlers) \ - SymI_HasProto(stg_sig_install) \ - SymI_HasProto(rtsTimerSignal) \ -+ SymI_HasProto(atexit) \ - SymI_NeedsDataProto(nocldstop) - #endif - -@@ -976,213 +977,29 @@ - RTS_USER_SIGNALS_SYMBOLS \ - RTS_INTCHAR_SYMBOLS - -+ - // 64-bit support functions in libgcc.a --// See https://gcc.gnu.org/onlinedocs/gccint/Libgcc.html#Libgcc --#define RTS_LIBGCC_SYMBOLS_32 \ -- SymI_NeedsProto(__fixunsdfdi) \ -- /* 4 The GCC low-level runtime library */\ -- /* 4.1.1 Arithmetic functions */\ -- /* SymI_NeedsProto(__ashlsi3) */\ -- SymI_NeedsProto(__ashldi3) \ -- /* SymI_NeedsProto(__ashlti3) */\ -- /* These functions return the result of shifting a left by b bits. */\ -- /* SymI_NeedsProto(__ashrsi3) */\ -- SymI_NeedsProto(__ashrdi3) \ -- /* SymI_NeedsProto(__ashrti3) */\ -- /* These functions return the result of arithmetically shifting a right by b bits. */\ -- /* SymI_NeedsProto(__divsi3) */\ -- SymI_NeedsProto(__divdi3) \ -- /* SymI_NeedsProto(__divti3) */\ -- /* These functions return the quotient of the signed division of a and b. */\ -- /* SymI_NeedsProto(__lshrsi3) */ \ -- SymI_NeedsProto(__lshrdi3) \ -- /* SymI_NeedsProto(__lshrti3) */ \ -- /* These functions return the result of logically shifting a right by b bits. */\ -- /* SymI_NeedsProto(__modsi3) */ \ -- SymI_NeedsProto(__moddi3) \ -- /* SymI_NeedsProto(__modti3) */ \ -- /* These functions return the remainder of the signed division of a and b. */\ -- /* SymI_NeedsProto(__mulsi3) */ \ -- SymI_NeedsProto(__muldi3) \ -- /* SymI_NeedsProto(__multi3) */ \ -- /* These functions return the product of a and b. */\ -- SymI_NeedsProto(__negdi2) \ -- /* SymI_NeedsProto(__negti2) */ \ -- /* These functions return the negation of a. */\ -- /* SymI_NeedsProto(__udivsi3) */ \ -- SymI_NeedsProto(__udivdi3) \ -- /* SymI_NeedsProto(__udivti3) */ \ -- /* These functions return the quotient of the unsigned division of a and b. */\ -- SymI_NeedsProto(__udivmoddi4) \ -- /* SymI_NeedsProto(__udivmodti4) */ \ -- /* These functions calculate both the quotient and remainder of the unsigned division of a and b. The return value is the quotient, and the remainder is placed in variable pointed to by c. */\ -- /* SymI_NeedsProto(__umodsi3) */ \ -- SymI_NeedsProto(__umoddi3) \ -- /* SymI_NeedsProto(__umodti3) */ \ -- /* These functions return the remainder of the unsigned division of a and b. */\ -- /* 4.1.2 Comparison functions */\ -- /* The following functions implement integral comparisons. These functions implement a low-level compare, upon which the higher level comparison operators (such as less than and greater than or equal to) can be constructed. The returned values lie in the range zero to two, to allow the high-level operators to be implemented by testing the returned result using either signed or unsigned comparison. */\ -- SymI_NeedsProto(__cmpdi2) \ -- /* SymI_NeedsProto(__cmpti2) */ \ -- /* These functions perform a signed comparison of a and b. If a is less than b, they return 0; if a is greater than b, they return 2; and if a and b are equal they return 1. */\ -- SymI_NeedsProto(__ucmpdi2) \ -- /* SymI_NeedsProto(__ucmpti2) */ \ -- /* These functions perform an unsigned comparison of a and b. If a is less than b, they return 0; if a is greater than b, they return 2; and if a and b are equal they return 1. */\ -- /* 4.1.3 Trapping arithmetic functions */\ -- /* The following functions implement trapping arithmetic. These functions call the libc function abort upon signed arithmetic overflow. */\ -- SymI_NeedsProto(__absvsi2) \ -- SymI_NeedsProto(__absvdi2) \ -- /* These functions return the absolute value of a. */\ -- /* SymI_NeedsProto(__addvsi3) */ \ -- SymI_NeedsProto(__addvdi3) \ -- /* These functions return the sum of a and b; that is a + b. */\ -- /* SymI_NeedsProto(__mulvsi3) */ \ -- SymI_NeedsProto(__mulvdi3) \ -- /* The functions return the product of a and b; that is a * b. */\ -- SymI_NeedsProto(__negvsi2) \ -- SymI_NeedsProto(__negvdi2) \ -- /* These functions return the negation of a; that is -a. */\ -- /* SymI_NeedsProto(__subvsi3) */ \ -- SymI_NeedsProto(__subvdi3) \ -- /* These functions return the difference between b and a; that is a - b. */\ -- /* 4.1.4 Bit operations */\ -- SymI_NeedsProto(__clzsi2) \ -- SymI_NeedsProto(__clzdi2) \ -- /* SymI_NeedsProto(__clzti2) */ \ -- /* These functions return the number of leading 0-bits in a, starting at the most significant bit position. If a is zero, the result is undefined. */\ -- SymI_NeedsProto(__ctzsi2) \ -- SymI_NeedsProto(__ctzdi2) \ -- /* SymI_NeedsProto(__ctzti2) */ \ -- /* These functions return the number of trailing 0-bits in a, starting at the least significant bit position. If a is zero, the result is undefined. */\ -- SymI_NeedsProto(__ffsdi2) \ -- /* SymI_NeedsProto(__ffsti2) */ \ -- /* These functions return the index of the least significant 1-bit in a, or the value zero if a is zero. The least significant bit is index one. */\ -- SymI_NeedsProto(__paritysi2) \ -- SymI_NeedsProto(__paritydi2) \ -- /* SymI_NeedsProto(__parityti2) */\ -- /* These functions return the value zero if the number of bits set in a is even, and the value one otherwise. */\ -- SymI_NeedsProto(__popcountsi2) \ -- SymI_NeedsProto(__popcountdi2) \ -- /* SymI_NeedsProto(__popcountti2) */ \ -- /* These functions return the number of bits set in a. */\ -- SymI_NeedsProto(__bswapsi2) \ -- SymI_NeedsProto(__bswapdi2) --#define RTS_LIBGCC_SYMBOLS_aarch32 \ -- /* armv6l */\ -- /* TODO: should check for __ARM_EABI__ */\ -- SymI_NeedsProto(__aeabi_d2f) \ -- SymI_NeedsProto(__aeabi_d2iz) \ -- SymI_NeedsProto(__aeabi_d2lz) \ -- SymI_NeedsProto(__aeabi_d2uiz) \ -- SymI_NeedsProto(__aeabi_d2ulz) \ -- SymI_NeedsProto(__aeabi_dadd) \ -- SymI_NeedsProto(__aeabi_dcmpeq) \ -- SymI_NeedsProto(__aeabi_dcmpge) \ -- SymI_NeedsProto(__aeabi_dcmpgt) \ -- SymI_NeedsProto(__aeabi_dcmple) \ -- SymI_NeedsProto(__aeabi_dcmplt) \ -- SymI_NeedsProto(__aeabi_dcmpun) \ -- SymI_NeedsProto(__aeabi_ddiv) \ -- SymI_NeedsProto(__aeabi_dmul) \ -- SymI_NeedsProto(__aeabi_dneg) \ -- SymI_NeedsProto(__aeabi_dsub) \ -- SymI_NeedsProto(__aeabi_f2d) \ -- SymI_NeedsProto(__aeabi_f2iz) \ -- SymI_NeedsProto(__aeabi_f2lz) \ -- SymI_NeedsProto(__aeabi_f2uiz) \ -- SymI_NeedsProto(__aeabi_f2ulz) \ -- SymI_NeedsProto(__aeabi_fadd) \ -- SymI_NeedsProto(__aeabi_fcmpeq) \ -- SymI_NeedsProto(__aeabi_fcmpge) \ -- SymI_NeedsProto(__aeabi_fcmpgt) \ -- SymI_NeedsProto(__aeabi_fcmple) \ -- SymI_NeedsProto(__aeabi_fcmplt) \ -- SymI_NeedsProto(__aeabi_fcmpun) \ -- SymI_NeedsProto(__aeabi_fdiv) \ -- SymI_NeedsProto(__aeabi_fmul) \ -- SymI_NeedsProto(__aeabi_fneg) \ -- SymI_NeedsProto(__aeabi_fsub) \ -- SymI_NeedsProto(__aeabi_i2d) \ -- SymI_NeedsProto(__aeabi_i2f) \ -- SymI_NeedsProto(__aeabi_idiv) \ -- SymI_NeedsProto(__aeabi_idivmod) \ -- SymI_NeedsProto(__aeabi_l2d) \ -- SymI_NeedsProto(__aeabi_l2f) \ -- SymI_NeedsProto(__aeabi_lasr) \ -- SymI_NeedsProto(__aeabi_lcmp) \ -- SymI_NeedsProto(__aeabi_ldivmod) \ -- SymI_NeedsProto(__aeabi_llsl) \ -- SymI_NeedsProto(__aeabi_llsr) \ -- SymI_NeedsProto(__aeabi_lmul) \ -- SymI_NeedsProto(__aeabi_ui2d) \ -- SymI_NeedsProto(__aeabi_ui2f) \ -- SymI_NeedsProto(__aeabi_uidiv) \ -- SymI_NeedsProto(__aeabi_uidivmod) \ -- SymI_NeedsProto(__aeabi_ul2d) \ -- SymI_NeedsProto(__aeabi_ul2f) \ -- SymI_NeedsProto(__aeabi_ulcmp) \ -- SymI_NeedsProto(__aeabi_uldivmod) --#define RTS_LIBGCC_SYMBOLS_64 \ -+#if defined(__GNUC__) && SIZEOF_VOID_P <= 4 && !defined(_ABIN32) -+#define RTS_LIBGCC_SYMBOLS \ -+ SymI_NeedsProto(__divdi3) \ -+ SymI_NeedsProto(__udivdi3) \ -+ SymI_NeedsProto(__moddi3) \ -+ SymI_NeedsProto(__umoddi3) \ -+ SymI_NeedsProto(__muldi3) \ -+ SymI_NeedsProto(__ashldi3) \ -+ SymI_NeedsProto(__ashrdi3) \ -+ SymI_NeedsProto(__lshrdi3) \ -+ SymI_NeedsProto(__fixunsdfdi) -+#elif defined(__GNUC__) && SIZEOF_VOID_P == 8 -+#define RTS_LIBGCC_SYMBOLS \ - SymI_NeedsProto(__udivti3) \ - SymI_NeedsProto(__umodti3) -- --/* for aarch64 */ --#define RTS_LIBGCC_SYMBOLS_aarch64 \ -- SymI_NeedsProto(__netf2) \ -- SymI_NeedsProto(__addtf3) \ -- SymI_NeedsProto(__subtf3) \ -- SymI_NeedsProto(__multf3) \ -- SymI_NeedsProto(__extenddftf2) \ -- SymI_NeedsProto(__fixtfsi) \ -- SymI_NeedsProto(__fixunstfsi) \ -- SymI_NeedsProto(__floatsitf) \ -- SymI_NeedsProto(__floatunsitf) -- --#if defined(__GNUC__) && SIZEOF_VOID_P <= 4 && defined(arm_HOST_OS) --#define RTS_LIBGCC_SYMBOLS RTS_LIBGCC_SYMBOLS_32 RTS_LIBGCC_SYMBOLS_aarch32 --#elif defined(__GNUC__) && SIZEOF_VOID_P <= 4 && !defined(_ABIN32) --#define RTS_LIBGCC_SYMBOLS RTS_LIBGCC_SYMBOLS_32 --#elif defined(__GNUC__) && SIZEOF_VOID_P == 8 && defined(aarch64_HOST_OS) --#define RTS_LIBGCC_SYMBOLS RTS_LIBGCC_SYMBOLS_64 RTS_LIBGCC_SYMBOLS_aarch64 --#elif defined(__GNUC__) && SIZEOF_VOID_P == 8 --#define RTS_LIBGCC_SYMBOLS RTS_LIBGCC_SYMBOLS_64 - #else - #define RTS_LIBGCC_SYMBOLS - #endif - --#if !defined(mingw32_HOST_OS) && !defined(DYNAMIC) && (defined(_FORTIFY_SOURCE) || defined(__SSP__)) --#define RTS_SSP_SYMBOLS \ -- SymI_NeedsProto(__stack_chk_guard) \ -- SymI_NeedsProto(__stack_chk_fail) --#else --#define RTS_SSP_SYMBOLS --#endif --#if !defined(DYNAMIC) && defined(linux_HOST_OS) --// we need these for static musl builds. However when --// linking shared objects (DLLs) this will fail, hence --// we do not include them when building with -DDYNAMIC --#define RTS_LINKER_SYMBOLS \ -- SymI_NeedsProto(__fini_array_start) \ -- SymI_NeedsProto(__fini_array_end) --#else --#define RTS_LINKER_SYMBOLS --#endif -- --#if defined(darwin_HOST_OS) && defined(powerpc_HOST_ARCH) -- // Symbols that don't have a leading underscore -- // on Mac OS X. They have to receive special treatment, -- // see machoInitSymbolsWithoutUnderscore() --#define RTS_MACHO_NOUNDERLINE_SYMBOLS \ -- SymI_NeedsProto(saveFP) \ -- SymI_NeedsProto(restFP) --#endif -- - /* entirely bogus claims about types of these symbols */ --/* to prevent a bit of define expansion, SymI_NeedsProto is a variadic -- * macro. And we'll concat vvv with the __VA_ARGS__. This prevents -- * vvv from getting macro expanded. -- */ --#define SymI_NeedsProto(vvv,...) extern void vvv ## __VA_ARGS__ (void); -+#define SymI_NeedsProto(vvv) extern void vvv(void); - #define SymI_NeedsDataProto(vvv) extern StgWord vvv[]; - #if defined(COMPILING_WINDOWS_DLL) - #define SymE_HasProto(vvv) SymE_HasProto(vvv); -@@ -1209,8 +1026,6 @@ RTS_DARWIN_ONLY_SYMBOLS - RTS_OPENBSD_ONLY_SYMBOLS - RTS_LIBGCC_SYMBOLS - RTS_LIBFFI_SYMBOLS --RTS_SSP_SYMBOLS --RTS_LINKER_SYMBOLS - #undef SymI_NeedsProto - #undef SymI_NeedsDataProto - #undef SymI_HasProto -@@ -1230,7 +1045,7 @@ RTS_LINKER_SYMBOLS - #define SymE_HasDataProto(vvv) \ - SymE_HasProto(vvv) - --#define SymI_NeedsProto(vvv,...) SymI_HasProto(vvv ## __VA_ARGS__) -+#define SymI_NeedsProto(vvv) SymI_HasProto(vvv) - #define SymI_NeedsDataProto(vvv) SymI_HasDataProto(vvv) - #define SymE_NeedsProto(vvv) SymE_HasProto(vvv) - #define SymE_NeedsDataProto(vvv) SymE_HasDataProto(vvv) -@@ -1251,8 +1066,6 @@ RTS_LINKER_SYMBOLS - #define SymI_HasProto_deprecated(vvv) \ - { #vvv, (void*)0xBAADF00D, true }, - --void *RTS_DYNAMIC = NULL; -- - RtsSymbolVal rtsSyms[] = { - RTS_SYMBOLS - RTS_RET_SYMBOLS -@@ -1264,14 +1077,11 @@ RtsSymbolVal rtsSyms[] = { - RTS_LIBGCC_SYMBOLS - RTS_LIBFFI_SYMBOLS - SymI_HasDataProto(nonmoving_write_barrier_enabled) -- RTS_SSP_SYMBOLS -- RTS_LINKER_SYMBOLS - #if defined(darwin_HOST_OS) && defined(i386_HOST_ARCH) - // dyld stub code contains references to this, - // but it should never be called because we treat - // lazy pointers as nonlazy. - { "dyld_stub_binding_helper", (void*)0xDEADBEEF, false }, - #endif -- { "_DYNAMIC", (void*)(&RTS_DYNAMIC), false }, - { 0, 0, false } /* sentinel */ - }; --- -2.25.4 - diff --git a/dev-lang/ghc/files/ghc-8.2.1_rc1-cgen-constify.patch b/dev-lang/ghc/files/ghc-8.2.1_rc1-cgen-constify.patch deleted file mode 100644 index 2e1ef932b454..000000000000 --- a/dev-lang/ghc/files/ghc-8.2.1_rc1-cgen-constify.patch +++ /dev/null @@ -1,378 +0,0 @@ -From 7e00046772e053c63ac93630a60b0f396e32a2d7 Mon Sep 17 00:00:00 2001 -From: Sergei Trofimovich -Date: Sun, 16 Apr 2017 10:43:38 +0100 -Subject: [PATCH] compiler/cmm/PprC.hs: constify labels in .rodata - -Summary: -Consider one-line module - module B (v) where v = "hello" -in -fvia-C mode it generates code like - static char gibberish_str[] = "hello"; - -It resides in data section (precious resource on ia64!). -The patch switches genrator to emit: - static const char gibberish_str[] = "hello"; - -Other types if symbols that gained 'const' qualifier are: - -- info tables (from haskell and CMM) -- static reference tables (from haskell and CMM) - -Cleanups along the way: - -- fixed info tables defined in .cmm to reside in .rodata -- split out closure declaration into 'IC_' / 'EC_' -- added label declaration (based on label type) right before - each label definition (based on section type) so that C - compiler could check if declaration and definition matches - at definition site. - -Signed-off-by: Sergei Trofimovich - -Test Plan: ran testsuite on unregisterised x86_64 compiler - -Reviewers: simonmar, ezyang, austin, bgamari, erikd - -Subscribers: rwbarton, thomie - -GHC Trac Issues: #8996 - -Differential Revision: https://phabricator.haskell.org/D3481 ---- - compiler/cmm/CLabel.hs | 24 ++++++++++++++ - compiler/cmm/Cmm.hs | 13 ++++++++ - compiler/cmm/CmmInfo.hs | 2 +- - compiler/cmm/PprC.hs | 62 +++++++++++++++++++++++------------- - compiler/llvmGen/LlvmCodeGen/Data.hs | 12 ------- - includes/Stg.h | 22 +++++++++---- - includes/rts/storage/InfoTables.h | 2 +- - includes/stg/MiscClosures.h | 14 ++++---- - 8 files changed, 102 insertions(+), 49 deletions(-) - -diff --git a/compiler/cmm/CLabel.hs b/compiler/cmm/CLabel.hs -index 3ba4f7647a..62c8037e9c 100644 ---- a/compiler/cmm/CLabel.hs -+++ b/compiler/cmm/CLabel.hs -@@ -89,6 +89,8 @@ module CLabel ( - foreignLabelStdcallInfo, - isBytesLabel, - isForeignLabel, -+ isSomeRODataLabel, -+ isStaticClosureLabel, - mkCCLabel, mkCCSLabel, - - DynamicLinkerLabelInfo(..), -@@ -575,6 +577,28 @@ isForeignLabel :: CLabel -> Bool - isForeignLabel (ForeignLabel _ _ _ _) = True - isForeignLabel _lbl = False - -+-- | Whether label is a static closure label (can come from haskell or cmm) -+isStaticClosureLabel :: CLabel -> Bool -+-- Closure defined in haskell (.hs) -+isStaticClosureLabel (IdLabel _ _ Closure) = True -+-- Closure defined in cmm -+isStaticClosureLabel (CmmLabel _ _ CmmClosure) = True -+isStaticClosureLabel _lbl = False -+ -+-- | Whether label is a .rodata label -+isSomeRODataLabel :: CLabel -> Bool -+-- info table defined in haskell (.hs) -+isSomeRODataLabel (IdLabel _ _ ClosureTable) = True -+isSomeRODataLabel (IdLabel _ _ ConInfoTable) = True -+isSomeRODataLabel (IdLabel _ _ InfoTable) = True -+isSomeRODataLabel (IdLabel _ _ LocalInfoTable) = True -+-- static reference tables defined in haskell (.hs) -+isSomeRODataLabel (IdLabel _ _ SRT) = True -+isSomeRODataLabel (SRTLabel _) = True -+-- info table defined in cmm (.cmm) -+isSomeRODataLabel (CmmLabel _ _ CmmInfo) = True -+isSomeRODataLabel _lbl = False -+ - -- | Get the label size field from a ForeignLabel - foreignLabelStdcallInfo :: CLabel -> Maybe Int - foreignLabelStdcallInfo (ForeignLabel _ info _ _) = info -diff --git a/compiler/cmm/Cmm.hs b/compiler/cmm/Cmm.hs -index d2ee531686..bab20f3fdd 100644 ---- a/compiler/cmm/Cmm.hs -+++ b/compiler/cmm/Cmm.hs -@@ -9,6 +9,7 @@ module Cmm ( - CmmBlock, - RawCmmDecl, RawCmmGroup, - Section(..), SectionType(..), CmmStatics(..), CmmStatic(..), -+ isSecConstant, - - -- ** Blocks containing lists - GenBasicBlock(..), blockId, -@@ -167,6 +168,18 @@ data SectionType - | OtherSection String - deriving (Show) - -+-- | Should a data in this section be considered constant -+isSecConstant :: Section -> Bool -+isSecConstant (Section t _) = case t of -+ Text -> True -+ ReadOnlyData -> True -+ RelocatableReadOnlyData -> True -+ ReadOnlyData16 -> True -+ CString -> True -+ Data -> False -+ UninitialisedData -> False -+ (OtherSection _) -> False -+ - data Section = Section SectionType CLabel - - data CmmStatic -diff --git a/compiler/cmm/CmmInfo.hs b/compiler/cmm/CmmInfo.hs -index b5e800a977..35e3a1888d 100644 ---- a/compiler/cmm/CmmInfo.hs -+++ b/compiler/cmm/CmmInfo.hs -@@ -133,7 +133,7 @@ mkInfoTable dflags proc@(CmmProc infos entry_lbl live blocks) - -- - return (top_decls ++ - [CmmProc mapEmpty entry_lbl live blocks, -- mkDataLits (Section Data info_lbl) info_lbl -+ mkRODataLits info_lbl - (CmmLabel entry_lbl : rel_std_info ++ rel_extra_bits)]) - - -- -diff --git a/compiler/cmm/PprC.hs b/compiler/cmm/PprC.hs -index 56de94079f..21ed6f6516 100644 ---- a/compiler/cmm/PprC.hs -+++ b/compiler/cmm/PprC.hs -@@ -83,12 +83,13 @@ pprC tops = vcat $ intersperse blankLine $ map pprTop tops - -- top level procs - -- - pprTop :: RawCmmDecl -> SDoc --pprTop (CmmProc infos clbl _ graph) = -+pprTop (CmmProc infos clbl _in_live_regs graph) = - - (case mapLookup (g_entry graph) infos of - Nothing -> empty -- Just (Statics info_clbl info_dat) -> pprDataExterns info_dat $$ -- pprWordArray info_clbl info_dat) $$ -+ Just (Statics info_clbl info_dat) -> -+ pprDataExterns info_dat $$ -+ pprWordArray info_is_in_rodata info_clbl info_dat) $$ - (vcat [ - blankLine, - extern_decls, -@@ -99,6 +100,8 @@ pprTop (CmmProc infos clbl _ graph) = - rbrace ] - ) - where -+ -- info tables are always in .rodata -+ info_is_in_rodata = True - blocks = toBlockListEntryFirst graph - (temp_decls, extern_decls) = pprTempAndExternDecls blocks - -@@ -107,21 +110,23 @@ pprTop (CmmProc infos clbl _ graph) = - - -- We only handle (a) arrays of word-sized things and (b) strings. - --pprTop (CmmData _section (Statics lbl [CmmString str])) = -+pprTop (CmmData section (Statics lbl [CmmString str])) = -+ pprExternDecl lbl $$ - hcat [ -- pprLocalness lbl, text "char ", ppr lbl, -+ pprLocalness lbl, pprConstness (isSecConstant section), text "char ", ppr lbl, - text "[] = ", pprStringInCStyle str, semi - ] - --pprTop (CmmData _section (Statics lbl [CmmUninitialised size])) = -+pprTop (CmmData section (Statics lbl [CmmUninitialised size])) = -+ pprExternDecl lbl $$ - hcat [ -- pprLocalness lbl, text "char ", ppr lbl, -+ pprLocalness lbl, pprConstness (isSecConstant section), text "char ", ppr lbl, - brackets (int size), semi - ] - --pprTop (CmmData _section (Statics lbl lits)) = -+pprTop (CmmData section (Statics lbl lits)) = - pprDataExterns lits $$ -- pprWordArray lbl lits -+ pprWordArray (isSecConstant section) lbl lits - - -- -------------------------------------------------------------------------- - -- BasicBlocks are self-contained entities: they always end in a jump. -@@ -141,10 +146,12 @@ pprBBlock block = - -- Info tables. Just arrays of words. - -- See codeGen/ClosureInfo, and nativeGen/PprMach - --pprWordArray :: CLabel -> [CmmStatic] -> SDoc --pprWordArray lbl ds -+pprWordArray :: Bool -> CLabel -> [CmmStatic] -> SDoc -+pprWordArray is_ro lbl ds - = sdocWithDynFlags $ \dflags -> -- hcat [ pprLocalness lbl, text "StgWord" -+ -- TODO: align closures only -+ pprExternDecl lbl $$ -+ hcat [ pprLocalness lbl, pprConstness is_ro, text "StgWord" - , space, ppr lbl, text "[]" - -- See Note [StgWord alignment] - , pprAlignment (wordWidth dflags) -@@ -180,6 +187,10 @@ pprLocalness :: CLabel -> SDoc - pprLocalness lbl | not $ externallyVisibleCLabel lbl = text "static " - | otherwise = empty - -+pprConstness :: Bool -> SDoc -+pprConstness is_ro | is_ro = text "const " -+ | otherwise = empty -+ - -- -------------------------------------------------------------------------- - -- Statements. - -- -@@ -984,31 +995,38 @@ is_cishCC JavaScriptCallConv = False - pprTempAndExternDecls :: [CmmBlock] -> (SDoc{-temps-}, SDoc{-externs-}) - pprTempAndExternDecls stmts - = (pprUFM (getUniqSet temps) (vcat . map pprTempDecl), -- vcat (map (pprExternDecl False{-ToDo-}) (Map.keys lbls))) -+ vcat (map pprExternDecl (Map.keys lbls))) - where (temps, lbls) = runTE (mapM_ te_BB stmts) - - pprDataExterns :: [CmmStatic] -> SDoc - pprDataExterns statics -- = vcat (map (pprExternDecl False{-ToDo-}) (Map.keys lbls)) -+ = vcat (map pprExternDecl (Map.keys lbls)) - where (_, lbls) = runTE (mapM_ te_Static statics) - - pprTempDecl :: LocalReg -> SDoc - pprTempDecl l@(LocalReg _ rep) - = hcat [ machRepCType rep, space, pprLocalReg l, semi ] - --pprExternDecl :: Bool -> CLabel -> SDoc --pprExternDecl _in_srt lbl -+pprExternDecl :: CLabel -> SDoc -+pprExternDecl lbl - -- do not print anything for "known external" things - | not (needsCDecl lbl) = empty - | Just sz <- foreignLabelStdcallInfo lbl = stdcall_decl sz - | otherwise = -- hcat [ visibility, label_type lbl, -- lparen, ppr lbl, text ");" ] -+ hcat [ visibility, label_type lbl , lparen, ppr lbl, text ");" -+ -- occasionally useful to see label type -+ -- , text "/* ", pprDebugCLabel lbl, text " */" -+ ] - where -- label_type lbl | isBytesLabel lbl = text "B_" -- | isForeignLabel lbl && isCFunctionLabel lbl = text "FF_" -- | isCFunctionLabel lbl = text "F_" -- | otherwise = text "I_" -+ label_type lbl | isBytesLabel lbl = text "B_" -+ | isForeignLabel lbl && isCFunctionLabel lbl -+ = text "FF_" -+ | isCFunctionLabel lbl = text "F_" -+ | isStaticClosureLabel lbl = text "C_" -+ -- generic .rodata labels -+ | isSomeRODataLabel lbl = text "RO_" -+ -- generic .data labels (common case) -+ | otherwise = text "RW_" - - visibility - | externallyVisibleCLabel lbl = char 'E' -diff --git a/compiler/llvmGen/LlvmCodeGen/Data.hs b/compiler/llvmGen/LlvmCodeGen/Data.hs -index 9bb5a75bda..adb86d312d 100644 ---- a/compiler/llvmGen/LlvmCodeGen/Data.hs -+++ b/compiler/llvmGen/LlvmCodeGen/Data.hs -@@ -56,18 +56,6 @@ genLlvmData (sec, Statics lbl xs) = do - - return ([globDef], [tyAlias]) - ---- | Should a data in this section be considered constant --isSecConstant :: Section -> Bool --isSecConstant (Section t _) = case t of -- Text -> True -- ReadOnlyData -> True -- RelocatableReadOnlyData -> True -- ReadOnlyData16 -> True -- CString -> True -- Data -> False -- UninitialisedData -> False -- (OtherSection _) -> False -- - -- | Format the section type part of a Cmm Section - llvmSectionType :: Platform -> SectionType -> FastString - llvmSectionType p t = case t of -diff --git a/includes/Stg.h b/includes/Stg.h -index 619984d8e5..b1b3190307 100644 ---- a/includes/Stg.h -+++ b/includes/Stg.h -@@ -223,13 +223,23 @@ typedef StgInt I_; - typedef StgWord StgWordArray[]; - typedef StgFunPtr F_; - --#define EB_(X) extern char X[] --#define IB_(X) static char X[] --#define EI_(X) extern StgWordArray (X) GNU_ATTRIBUTE(aligned (8)) --#define II_(X) static StgWordArray (X) GNU_ATTRIBUTE(aligned (8)) -+/* byte arrays (and strings): */ -+#define EB_(X) extern const char X[] -+#define IB_(X) static const char X[] -+/* static (non-heap) closures (requires alignment for pointer tagging): */ -+#define EC_(X) extern StgWordArray (X) GNU_ATTRIBUTE(aligned (8)) -+#define IC_(X) static StgWordArray (X) GNU_ATTRIBUTE(aligned (8)) -+/* writable data (does not require alignment): */ -+#define ERW_(X) extern StgWordArray (X) -+#define IRW_(X) static StgWordArray (X) -+/* read-only data (does not require alignment): */ -+#define ERO_(X) extern const StgWordArray (X) -+#define IRO_(X) static const StgWordArray (X) -+/* stg-native functions: */ - #define IF_(f) static StgFunPtr GNUC3_ATTRIBUTE(used) f(void) --#define FN_(f) StgFunPtr f(void) --#define EF_(f) StgFunPtr f(void) /* External Cmm functions */ -+#define FN_(f) StgFunPtr f(void) -+#define EF_(f) StgFunPtr f(void) /* External Cmm functions */ -+/* foreign functions: */ - #define EFF_(f) void f() /* See Note [External function prototypes] */ - - /* Note [External function prototypes] See Trac #8965, #11395 -diff --git a/includes/rts/storage/InfoTables.h b/includes/rts/storage/InfoTables.h -index 307aac371c..163f1d1c87 100644 ---- a/includes/rts/storage/InfoTables.h -+++ b/includes/rts/storage/InfoTables.h -@@ -266,7 +266,7 @@ typedef struct { - } StgFunInfoTable; - - // canned bitmap for each arg type, indexed by constants in FunTypes.h --extern StgWord stg_arg_bitmaps[]; -+extern const StgWord stg_arg_bitmaps[]; - - /* ----------------------------------------------------------------------------- - Return info tables -diff --git a/includes/stg/MiscClosures.h b/includes/stg/MiscClosures.h -index 9d907ab3ba..b604f1c42b 100644 ---- a/includes/stg/MiscClosures.h -+++ b/includes/stg/MiscClosures.h -@@ -21,10 +21,10 @@ - #define STGMISCCLOSURES_H - - #if IN_STG_CODE --# define RTS_RET_INFO(i) extern W_(i)[] --# define RTS_FUN_INFO(i) extern W_(i)[] --# define RTS_THUNK_INFO(i) extern W_(i)[] --# define RTS_INFO(i) extern W_(i)[] -+# define RTS_RET_INFO(i) extern const W_(i)[] -+# define RTS_FUN_INFO(i) extern const W_(i)[] -+# define RTS_THUNK_INFO(i) extern const W_(i)[] -+# define RTS_INFO(i) extern const W_(i)[] - # define RTS_CLOSURE(i) extern W_(i)[] - # define RTS_FUN_DECL(f) extern DLL_IMPORT_RTS StgFunPtr f(void) - #else -@@ -489,9 +489,9 @@ extern StgWord RTS_VAR(sched_mutex); - - // Apply.cmm - // canned bitmap for each arg type --extern StgWord stg_arg_bitmaps[]; --extern StgWord stg_ap_stack_entries[]; --extern StgWord stg_stack_save_entries[]; -+extern const StgWord stg_arg_bitmaps[]; -+extern const StgWord stg_ap_stack_entries[]; -+extern const StgWord stg_stack_save_entries[]; - - // Storage.c - extern unsigned int RTS_VAR(g0); --- -2.12.2 - diff --git a/dev-lang/ghc/files/ghc-8.2.1_rc1-ghci-cross.patch b/dev-lang/ghc/files/ghc-8.2.1_rc1-ghci-cross.patch deleted file mode 100644 index dbba18e85c7f..000000000000 --- a/dev-lang/ghc/files/ghc-8.2.1_rc1-ghci-cross.patch +++ /dev/null @@ -1,60 +0,0 @@ -commit 732b3dbbff194eb8650c75afd79d892801afa0dc -Author: Sergei Trofimovich -Date: Thu Apr 6 22:48:13 2017 +0100 - - add $(CrossCompilePrefix) to 'runghc' and 'ghci' - - When Stage1Only=YES install mode is used one of rare tools - that lack $(CrossCompilePrefix) prefix are 'runghc' and 'ghci'. - - This causes file collisions when multiple GHC crosscompilers - are installed in system. - - Signed-off-by: Sergei Trofimovich - -diff --git a/driver/ghci/ghc.mk b/driver/ghci/ghc.mk -index 41d1f15c17..0f31884080 100644 ---- a/driver/ghci/ghc.mk -+++ b/driver/ghci/ghc.mk -@@ -16,16 +16,16 @@ ifneq "$(Windows_Host)" "YES" - install: install_driver_ghci - - .PHONY: install_driver_ghci --install_driver_ghci: WRAPPER=$(DESTDIR)$(bindir)/ghci-$(ProjectVersion) -+install_driver_ghci: WRAPPER=$(DESTDIR)$(bindir)/$(CrossCompilePrefix)ghci-$(ProjectVersion) - install_driver_ghci: - $(INSTALL_DIR) "$(DESTDIR)$(bindir)" - $(call removeFiles, "$(WRAPPER)") - $(CREATE_SCRIPT) "$(WRAPPER)" - echo '#!$(SHELL)' >> "$(WRAPPER)" -- echo 'exec "$(bindir)/ghc-$(ProjectVersion)" --interactive "$$@"' >> "$(WRAPPER)" -+ echo 'exec "$(bindir)/$(CrossCompilePrefix)ghc-$(ProjectVersion)" --interactive "$$@"' >> "$(WRAPPER)" - $(EXECUTABLE_FILE) "$(WRAPPER)" -- $(call removeFiles,"$(DESTDIR)$(bindir)/ghci") -- $(LN_S) ghci-$(ProjectVersion) "$(DESTDIR)$(bindir)/ghci" -+ $(call removeFiles,"$(DESTDIR)$(bindir)/$(CrossCompilePrefix)ghci") -+ $(LN_S) $(CrossCompilePrefix)ghci-$(ProjectVersion) "$(DESTDIR)$(bindir)/$(CrossCompilePrefix)ghci" - - else # Windows_Host... - -diff --git a/utils/runghc/ghc.mk b/utils/runghc/ghc.mk -index 9169ca21bd..50b11a612e 100644 ---- a/utils/runghc/ghc.mk -+++ b/utils/runghc/ghc.mk -@@ -34,11 +34,11 @@ install: install_runhaskell - .PHONY: install_runhaskell - ifeq "$(Windows_Host)" "YES" - install_runhaskell: install_bins -- "$(CP)" $(DESTDIR)$(bindir)/runghc$(exeext1) $(DESTDIR)$(bindir)/runhaskell$(exeext1) -+ "$(CP)" $(DESTDIR)$(bindir)/$(CrossCompilePrefix)runghc$(exeext1) $(DESTDIR)$(bindir)/$(CrossCompilePrefix)runhaskell$(exeext1) - else - install_runhaskell: -- $(call removeFiles,"$(DESTDIR)$(bindir)/runhaskell") -- $(LN_S) runghc "$(DESTDIR)$(bindir)/runhaskell" -- $(call removeFiles,"$(DESTDIR)$(bindir)/runghc") -- $(LN_S) runghc-$(ProjectVersion) "$(DESTDIR)$(bindir)/runghc" -+ $(call removeFiles,"$(DESTDIR)$(bindir)/$(CrossCompilePrefix)runhaskell") -+ $(LN_S) $(CrossCompilePrefix)runghc "$(DESTDIR)$(bindir)/$(CrossCompilePrefix)runhaskell" -+ $(call removeFiles,"$(DESTDIR)$(bindir)/$(CrossCompilePrefix)runghc") -+ $(LN_S) $(CrossCompilePrefix)runghc-$(ProjectVersion) "$(DESTDIR)$(bindir)/$(CrossCompilePrefix)runghc" - endif diff --git a/dev-lang/ghc/files/ghc-8.2.1_rc1-stage2-cross.patch b/dev-lang/ghc/files/ghc-8.2.1_rc1-stage2-cross.patch deleted file mode 100644 index 1439d722fef4..000000000000 --- a/dev-lang/ghc/files/ghc-8.2.1_rc1-stage2-cross.patch +++ /dev/null @@ -1,81 +0,0 @@ -commit 54895c90440cb81f18657537b91f2aa35bd54173 -Author: Sergei Trofimovich -Date: Fri Apr 7 10:08:58 2017 +0100 - - fix 'make install' for cross-stage2 - - When cross-built GHC is being installed one of - latest steps is to register installed libraries - with 'ghc-pkg'. - - GHC uses freshly installed 'ghc-pkg' and 'ghc-stage2' - for that. - - Tested as: - ./configure --target=aarch64-unknown-linux-gnu - make install DESTDIR=$(pwd)/__s2 STRIP_CMD=: - - Before the change install failed on ghc-pkg execution phase: - - ".../ghc-cross/__s2/usr/local/lib/ghc-8.3.20170406/bin/ghc-pkg" \ - --force \ - --global-package-db \ - ".../ghc-cross/__s2/usr/local/lib/ghc-8.3.20170406/package.conf.d" \ - update rts/dist/package.conf.install - /bin/sh: .../ghc-cross/__s2/usr/local/lib/ghc-8.3.20170406/bin/ghc-pkg: \ - No such file or directory - - To avoid breakage we use 'ghc' and 'ghc-pkg' built by stage0. - - Signed-off-by: Sergei Trofimovich - - Test Plan: run 'make install' on stage2 crosscompiler - - Reviewers: rwbarton, austin, bgamari - - Subscribers: thomie, snowleopard - - Differential Revision: https://phabricator.haskell.org/D3432 - -diff --git a/ghc.mk b/ghc.mk -index caa6c38fbb..8971f25981 100644 ---- a/ghc.mk -+++ b/ghc.mk -@@ -962,6 +962,12 @@ endif - - INSTALLED_PACKAGE_CONF=$(DESTDIR)$(topdir)/package.conf.d - -+ifeq "$(CrossCompiling)" "YES" -+# when installing ghc-stage2 we can't run target's -+# 'ghc-pkg' and 'ghc-stage2' but those are needed for registration. -+INSTALLED_GHC_REAL=$(TOP)/inplace/bin/ghc-stage1 -+INSTALLED_GHC_PKG_REAL=$(TOP)/$(ghc-pkg_DIST_BINARY) -+else # CrossCompiling - # Install packages in the right order, so that ghc-pkg doesn't complain. - # Also, install ghc-pkg first. - ifeq "$(Windows_Host)" "NO" -@@ -971,6 +977,7 @@ else - INSTALLED_GHC_REAL=$(DESTDIR)$(bindir)/ghc.exe - INSTALLED_GHC_PKG_REAL=$(DESTDIR)$(bindir)/ghc-pkg.exe - endif -+endif # CrossCompiling - - # Set the INSTALL_DISTDIR_p for each package; compiler is special - $(foreach p,$(filter-out compiler,$(INSTALL_PACKAGES)),\ -diff --git a/utils/ghc-pkg/ghc.mk b/utils/ghc-pkg/ghc.mk -index 002c8122f2..4d5ef4e108 100644 ---- a/utils/ghc-pkg/ghc.mk -+++ b/utils/ghc-pkg/ghc.mk -@@ -49,6 +49,12 @@ utils/ghc-pkg_dist_PROGNAME = ghc-pkg - utils/ghc-pkg_dist_SHELL_WRAPPER = YES - utils/ghc-pkg_dist_INSTALL_INPLACE = YES - -+# When cross-built ghc-stage2 is installed 'make install' needs to call -+# native ghc-pkg (not the cross-built one) to register installed packages -+# 'ghc-pkg_DIST_BINARY' variable only refer to native binary. -+ghc-pkg_DIST_BINARY_NAME = ghc-pkg$(exeext0) -+ghc-pkg_DIST_BINARY = utils/ghc-pkg/dist/build/tmp/$(ghc-pkg_DIST_BINARY_NAME) -+ - # See Note [Stage1Only vs stage=1] in mk/config.mk.in. - ifeq "$(Stage1Only)" "YES" - # Install the copy of ghc-pkg from the dist directory when running 'make diff --git a/dev-lang/ghc/files/ghc-8.2.1_rc1-staged-cross.patch b/dev-lang/ghc/files/ghc-8.2.1_rc1-staged-cross.patch deleted file mode 100644 index 7e4ea7a9f610..000000000000 --- a/dev-lang/ghc/files/ghc-8.2.1_rc1-staged-cross.patch +++ /dev/null @@ -1,43 +0,0 @@ -commit f2685df3b10e13f142736f28835e9064334bc143 -Author: Sergei Trofimovich -Date: Wed Apr 5 22:31:37 2017 +0100 - - avoid $(CrossCompilerPrefix) for stage2 install - - Suppose we are crossbuilding ghc (when ghc-stage2 - is a normal compiler for $target): - - For this case 'make install' should install unprefixed - stage2 'ghc' and not '$(CorssCompilePrefix)-ghc'. - - That way cross-built ghc is installable and - usable on target as if it would be built natively - on a target. - - Signed-off-by: Sergei Trofimovich - -diff --git a/mk/config.mk.in b/mk/config.mk.in -index 4d5d82aa80..5e274bb71f 100644 ---- a/mk/config.mk.in -+++ b/mk/config.mk.in -@@ -530,7 +530,7 @@ SUPPORTS_THIS_UNIT_ID = @SUPPORTS_THIS_UNIT_ID@ - # needs to know which gcc you're using in order to perform its tests. - - GccVersion = @GccVersion@ --CrossCompilePrefix = @CrossCompilePrefix@ -+ - # TargetPlatformFull retains the string passed to configure so we have it in - # the necessary format to pass to libffi's configure. - TargetPlatformFull = @TargetPlatformFull@ -@@ -567,6 +567,11 @@ CrossCompiling = @CrossCompiling@ - # See Note [Stage1Only vs stage=1] - Stage1Only = NO - -+# Installed tools prefix: -+# we add prefix to crosscompiler GHC only (ghc-stage1), -+# not cross-built GHC (not ghc-stage2). -+CrossCompilePrefix = $(if $(filter YES,$(Stage1Only)),@CrossCompilePrefix@,) -+ - # Install stage 2 by default, or stage 1 in the cross compiler - # case. Can be changed to 3 - INSTALL_GHC_STAGE= $(if $(filter YES,$(Stage1Only)),1,2) diff --git a/dev-lang/ghc/files/ghc-8.2.1_rc1-unphased-cross.patch b/dev-lang/ghc/files/ghc-8.2.1_rc1-unphased-cross.patch deleted file mode 100644 index a5528956de14..000000000000 --- a/dev-lang/ghc/files/ghc-8.2.1_rc1-unphased-cross.patch +++ /dev/null @@ -1,30 +0,0 @@ -commit 6ff98b962db15d18eb1d082fe344cef692ecef8e -Author: Sergei Trofimovich -Date: Thu Apr 6 08:55:56 2017 +0100 - - config.mk.in: remove phase=0 hack for CrossCompilePrefix - - $(CrossCompilePrefix) is used only in 'make install' - target filenames in $(DESTDIR). None of inplace (or boot) - files contain $(CrossCompilePrefix). - - Thus we don't need to worry about phases. - - Signed-off-by: Sergei Trofimovich - -diff --git a/mk/config.mk.in b/mk/config.mk.in -index 4e61eea821..4d5d82aa80 100644 ---- a/mk/config.mk.in -+++ b/mk/config.mk.in -@@ -530,11 +530,7 @@ SUPPORTS_THIS_UNIT_ID = @SUPPORTS_THIS_UNIT_ID@ - # needs to know which gcc you're using in order to perform its tests. - - GccVersion = @GccVersion@ --ifeq "$(phase)" "0" --CrossCompilePrefix = --else - CrossCompilePrefix = @CrossCompilePrefix@ --endif - # TargetPlatformFull retains the string passed to configure so we have it in - # the necessary format to pass to libffi's configure. - TargetPlatformFull = @TargetPlatformFull@ diff --git a/dev-lang/ghc/files/ghc-8.2.1_rc1-win32-cross-1.patch b/dev-lang/ghc/files/ghc-8.2.1_rc1-win32-cross-1.patch deleted file mode 100644 index 79751e1ecbda..000000000000 --- a/dev-lang/ghc/files/ghc-8.2.1_rc1-win32-cross-1.patch +++ /dev/null @@ -1,124 +0,0 @@ -commit a691f6a7a191a268380805481d8e63134764a4a1 -Author: Sergei Trofimovich -Date: Sat Apr 29 22:02:24 2017 +0100 - - add basic cross-compilation support (#87) - - * fix include case: s/#include /#include - - Noticed when cross-compiling win32 on linux to i686-w64-mingw32-gcc. - i686-w64-mingw32 provides all headers in lowercase. - - Signed-off-by: Sergei Trofimovich - - * Pen.hsc: don't use c99-style comments in enum declarations - - Ths change workarounds hsc2hs bug in cross-compile mode: - https://ghc.haskell.org/trac/ghc/ticket/13619 - - To reproduce the build failure it's enough to run - $ cabal configure --hsc2hs-options='--cross-safe --cross-compile' - $ cabal build --hsc2hs-options='--cross-safe --cross-compile' - - Signed-off-by: Sergei Trofimovich - - * SimpleMAPI.hsc: don't use #ifdef in enum declarations - - This change workarounds hsc2hs bug in cross-compile mode: - https://ghc.haskell.org/trac/ghc/ticket/13620 - - To reproduce the build failure it's enough to run - $ cabal configure --hsc2hs-options='--cross-safe --cross-compile' - $ cabal build --hsc2hs-options='--cross-safe --cross-compile' - - Signed-off-by: Sergei Trofimovich - -diff --git a/Graphics/Win32/GDI/Pen.hsc b/Graphics/Win32/GDI/Pen.hsc -index c880170..8d8df5d 100644 ---- a/Graphics/Win32/GDI/Pen.hsc -+++ b/Graphics/Win32/GDI/Pen.hsc -@@ -56,7 +56,7 @@ foreign import WINDOWS_CCONV unsafe "windows.h DeleteObject" - - type PenStyle = INT - --#{enum PenStyle, // Pick one of these -+#{enum PenStyle, - , pS_SOLID = PS_SOLID // default - , pS_DASH = PS_DASH // ------- - , pS_DOT = PS_DOT // ....... -@@ -69,14 +69,14 @@ type PenStyle = INT - , pS_STYLE_MASK = PS_STYLE_MASK // all the above - } - --#{enum PenStyle , // "or" with one of these -+#{enum PenStyle, - , pS_ENDCAP_ROUND = PS_ENDCAP_ROUND // default - , pS_ENDCAP_SQUARE = PS_ENDCAP_SQUARE - , pS_ENDCAP_FLAT = PS_ENDCAP_FLAT - , pS_ENDCAP_MASK = PS_ENDCAP_MASK // all the above - } - --#{enum PenStyle, // "or" with one of these -+#{enum PenStyle, - , pS_JOIN_ROUND = PS_JOIN_ROUND // default - , pS_JOIN_BEVEL = PS_JOIN_BEVEL - , pS_JOIN_MITER = PS_JOIN_MITER -@@ -87,7 +87,7 @@ If PS_JOIN_MASK is not defined with your GNU Windows32 header files, - you'll have to define it. - -} - --#{enum PenStyle, // "or" with one of these -+#{enum PenStyle, - , pS_COSMETIC = PS_COSMETIC // default - , pS_GEOMETRIC = PS_GEOMETRIC - , pS_TYPE_MASK = PS_TYPE_MASK // all the above -diff --git a/System/Win32/Info/Computer.hsc b/System/Win32/Info/Computer.hsc -index bb2eb72..65ae8dc 100644 ---- a/System/Win32/Info/Computer.hsc -+++ b/System/Win32/Info/Computer.hsc -@@ -65,7 +65,7 @@ import System.Win32.Utils ( tryWithoutNull ) - import System.Win32.Word ( DWORD, LPDWORD ) - - #include --#include -+#include - #include "alignment.h" - ##include "windows_cconv.h" - -diff --git a/System/Win32/SimpleMAPI.hsc b/System/Win32/SimpleMAPI.hsc -index 9727cfc..5ebf06b 100644 ---- a/System/Win32/SimpleMAPI.hsc -+++ b/System/Win32/SimpleMAPI.hsc -@@ -53,12 +53,6 @@ type MapiFlag = ULONG - , mAPI_LOGON_UI = MAPI_LOGON_UI - , mAPI_NEW_SESSION = MAPI_NEW_SESSION - , mAPI_FORCE_DOWNLOAD = MAPI_FORCE_DOWNLOAD --#ifdef MAPI_LOGOFF_SHARED -- , mAPI_LOGOFF_SHARED = MAPI_LOGOFF_SHARED --#endif --#ifdef MAPI_LOGOFF_UI -- , mAPI_LOGOFF_UI = MAPI_LOGOFF_UI --#endif - , mAPI_DIALOG = MAPI_DIALOG - , mAPI_UNREAD_ONLY = MAPI_UNREAD_ONLY - , mAPI_LONG_MSGID = MAPI_LONG_MSGID -@@ -74,6 +68,19 @@ type MapiFlag = ULONG - , mAPI_RECEIPT_REQUESTED = MAPI_RECEIPT_REQUESTED - , mAPI_SENT = MAPI_SENT - } -+-- Have to define enum values outside previous declaration due to -+-- hsc2hs bug in --cross-compile mode: -+-- https://ghc.haskell.org/trac/ghc/ticket/13620 -+#ifdef MAPI_LOGOFF_SHARED -+#{enum MapiFlag, -+ , mAPI_LOGOFF_SHARED = MAPI_LOGOFF_SHARED -+} -+#endif -+#ifdef MAPI_LOGOFF_UI -+#{enum MapiFlag, -+ , mAPI_LOGOFF_UI = MAPI_LOGOFF_UI -+} -+#endif - - mapiErrors :: [(ULONG,String)] - mapiErrors = diff --git a/dev-lang/ghc/files/ghc-8.2.1_rc2-O2-unreg.patch b/dev-lang/ghc/files/ghc-8.2.1_rc2-O2-unreg.patch deleted file mode 100644 index 00f9ca4fdff9..000000000000 --- a/dev-lang/ghc/files/ghc-8.2.1_rc2-O2-unreg.patch +++ /dev/null @@ -1,35 +0,0 @@ -ghc -O2 generates too large C files for unregisterised compiler. -On ia64 it causes DynFlags to compile for 60 minutes (then assembler -crashes). - -To decrease C code inflation we don't use -O2 in UNREG mode. -diff --git a/mk/config.mk.in b/mk/config.mk.in -index 4e61eea..15a56e9 100644 ---- a/mk/config.mk.in -+++ b/mk/config.mk.in -@@ -72,11 +72,2 @@ GhcStage3HcOpts=-O2 - --# Disable -O2 optimization. Otherwise amount of generated C code --# makes things very slow to compile (~5 minutes on core-i7 for 'compiler/hsSyn/HsExpr.hs') --# and sometimes not compile at all (powerpc64 overflows something --# on 'compiler/hsSyn/HsExpr.hs'). --ifeq "$(GhcUnregisterised)" "YES" --GhcStage1HcOpts= --GhcStage2HcOpts= --GhcStage3HcOpts= --endif - -@@ -904 +895,13 @@ CURSES_INCLUDE_DIRS = @CURSES_INCLUDE_DIRS@ - CURSES_LIB_DIRS = @CURSES_LIB_DIRS@ -+ -+# Disable -O2 optimization. Otherwise amount of generated C code -+# makes things very slow to compile (~5 minutes on core-i7 for 'compiler/hsSyn/HsExpr.hs') -+# and sometimes not compile at all (powerpc64 overflows something -+# on 'compiler/hsSyn/HsExpr.hs'). -+ifeq "$(GhcUnregisterised)" "YES" -+GhcStage1HcOpts= -+GhcStage2HcOpts= -+GhcStage3HcOpts= -+ -+GhcLibHcOpts= -+endif diff --git a/dev-lang/ghc/files/ghc-8.2.1_rc3-any-vendor.patch b/dev-lang/ghc/files/ghc-8.2.1_rc3-any-vendor.patch deleted file mode 100644 index b55e37a8bf94..000000000000 --- a/dev-lang/ghc/files/ghc-8.2.1_rc3-any-vendor.patch +++ /dev/null @@ -1,44 +0,0 @@ -From c2303dff95aa174021a1950656fdf9a1cf983959 Mon Sep 17 00:00:00 2001 -From: Sergei Trofimovich -Date: Sat, 8 Jul 2017 09:47:12 +0100 -Subject: [PATCH] aclocal.m4: allow arbitrary string in toolchain - triplets - -Canonical triplets have a form of - --[-] - -Checking for vendor is almost never correct as it's an -arbitrary string. - -It's useful to have multiple "vendors" to denote -otherwise the same (WRT , , ) target: - --target=x86_64-pc-linux-gnu - --target=x86_64-unknown-linux-gnu - --target=x86_64-ghc80-linux-gnu - --target=x86_64-ghchead-linux-gnu - -Do not fail unknown vendors. Only emit a warning. -Ideally configure checks should never use "vendor". - -Signed-off-by: Sergei Trofimovich ---- - aclocal.m4 | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/aclocal.m4 b/aclocal.m4 -index 001f813dfc..1d9c09b0cd 100644 ---- a/aclocal.m4 -+++ b/aclocal.m4 -@@ -230,8 +230,7 @@ AC_DEFUN([FPTOOLS_SET_HASKELL_PLATFORM_VARS], - dec|none|unknown|hp|apple|next|sun|sgi|ibm|montavista|portbld) - ;; - *) -- echo "Unknown vendor [$]1" -- exit 1 -+ AC_MSG_WARN([Unknown vendor [$]1]) - ;; - esac - } --- -2.13.3 - diff --git a/dev-lang/ghc/files/ghc-8.2.1_rc3-stginit-data.patch b/dev-lang/ghc/files/ghc-8.2.1_rc3-stginit-data.patch deleted file mode 100644 index 81e751d778c8..000000000000 --- a/dev-lang/ghc/files/ghc-8.2.1_rc3-stginit-data.patch +++ /dev/null @@ -1,27 +0,0 @@ -Fix label type for __stginit_* labels: those are .data labels, not .text - -Noticed when was building --enable-unregisterised build for x86_64: - -/tmp/ghc22931_0/ghc_3.hc:5:9: error: - error: '__stginit_ghczmprim_GHCziTypes' redeclared as different kind of symbol - StgWord __stginit_ghczmprim_GHCziTypes[]__attribute__((aligned(8)))= { - ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - | -5 | StgWord __stginit_ghczmprim_GHCziTypes[]__attribute__((aligned(8)))= { - | ^ - -In file included from /tmp/ghc22931_0/ghc_3.hc:3:0: error: - -/tmp/ghc22931_0/ghc_3.hc:4:5: error: - note: previous declaration of '__stginit_ghczmprim_GHCziTypes' was here - EF_(__stginit_ghczmprim_GHCziTypes); - ^ -diff --git a/compiler/cmm/CLabel.hs b/compiler/cmm/CLabel.hs -index 77a889a..05d71ab 100644 ---- a/compiler/cmm/CLabel.hs -+++ b/compiler/cmm/CLabel.hs -@@ -956,3 +956,3 @@ labelType (CaseLabel _ CaseReturnInfo) = DataLabel - labelType (CaseLabel _ _) = CodeLabel --labelType (PlainModuleInitLabel _) = CodeLabel -+labelType (PlainModuleInitLabel _) = DataLabel - labelType (SRTLabel _) = DataLabel diff --git a/dev-lang/ghc/files/ghc-8.8.1-no-alex.patch b/dev-lang/ghc/files/ghc-8.8.1-no-alex.patch deleted file mode 100644 index 39b6eeedd566..000000000000 --- a/dev-lang/ghc/files/ghc-8.8.1-no-alex.patch +++ /dev/null @@ -1,33 +0,0 @@ -https://github.com/gentoo-haskell/gentoo-haskell/issues/959 - -From 144abba394c6a23eb877fbde727111a5e75b9d47 Mon Sep 17 00:00:00 2001 -From: Ben Gamari -Date: Wed, 18 Sep 2019 23:50:20 -0400 -Subject: [PATCH] configure: Don't depend upon alex in source dist build - -This fixes #16860 by verifying that the generated sources don't already -exist before asserting that the `alex` executable was found. This -replicates the logic already used for `happy` in the case of `alex`. ---- - aclocal.m4 | 7 +++++-- - 1 file changed, 5 insertions(+), 2 deletions(-) - ---- a/aclocal.m4 -+++ b/aclocal.m4 -@@ -984,8 +984,11 @@ else - fi; - changequote([, ])dnl - ]) --FP_COMPARE_VERSIONS([$fptools_cv_alex_version],[-lt],[3.1.7], -- [AC_MSG_ERROR([Alex version 3.1.7 or later is required to compile GHC.])])[] -+if test ! -f compiler/parser/Lexer.hs -+then -+ FP_COMPARE_VERSIONS([$fptools_cv_alex_version],[-lt],[3.1.7], -+ [AC_MSG_ERROR([Alex version 3.1.7 or later is required to compile GHC.])])[] -+fi - AlexVersion=$fptools_cv_alex_version; - AC_SUBST(AlexVersion) - ]) --- -2.23.0 - diff --git a/dev-lang/ghc/ghc-8.10.4.ebuild b/dev-lang/ghc/ghc-8.10.4.ebuild index a0a3d692f588..7257681ccbe7 100644 --- a/dev-lang/ghc/ghc-8.10.4.ebuild +++ b/dev-lang/ghc/ghc-8.10.4.ebuild @@ -75,8 +75,7 @@ BUMP_LIBRARIES=( LICENSE="BSD" SLOT="0/${PV}" -# no binaries yet -#KEYWORDS="~amd64 ~x86" +KEYWORDS="~amd64 ~x86" IUSE="big-endian doc elfutils ghcbootstrap ghcmakebinary +gmp numa profile test" IUSE+=" binary" RESTRICT="!test? ( test )" diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz index d99db7c57986..97aaa9f842d0 100644 Binary files a/dev-libs/Manifest.gz and b/dev-libs/Manifest.gz differ diff --git a/dev-libs/libedit/Manifest b/dev-libs/libedit/Manifest index a823a21029ed..daa6124fd5b6 100644 --- a/dev-libs/libedit/Manifest +++ b/dev-libs/libedit/Manifest @@ -1 +1,2 @@ DIST libedit-20191211-3.1.tar.gz 516620 BLAKE2B 765926c035143e8e409d87d4f75709c861d83e2d725ec02c7ecfc3cccebe895be7d2902dd41970811207db32e6847689368f6544ea49ad42a600037a3a4edb58 SHA512 8393477a87e65d330b037494110501b5d6d2c1cbe80d82b9bc7a6315a21fd1327fe91354346966d30541015e2c277be2187fa4bb737b14f706957c70f4083547 +DIST libedit-20210216-3.1.tar.gz 518381 BLAKE2B 4b29f08ddccd77148c7ae810c3c4e378f6eab4b6d2c530f21aa9c0da1bc156d646bac6404408510639c34298ef3583fd7f2bde5051c0dac8b3a125e2659d8412 SHA512 2577c66b3f20a7f3cdaac529bda7f55dbed1cd902f39971b8f792885dec7f8c137a980c570dbab195d3d45989cc9d16a96a3567e02c5ac32ed4757fa36e46b4c diff --git a/dev-libs/libedit/libedit-20210216.3.1.ebuild b/dev-libs/libedit/libedit-20210216.3.1.ebuild new file mode 100644 index 000000000000..f615587f5f2b --- /dev/null +++ b/dev-libs/libedit/libedit-20210216.3.1.ebuild @@ -0,0 +1,43 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" +inherit autotools multilib-minimal toolchain-funcs usr-ldscript + +MY_PV=${PV/./-} +MY_P=${PN}-${MY_PV} + +DESCRIPTION="BSD replacement for libreadline" +HOMEPAGE="https://thrysoee.dk/editline/" +SRC_URI="https://thrysoee.dk/editline/${MY_P}.tar.gz" +S=${WORKDIR}/${MY_P} + +LICENSE="BSD-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" +IUSE="static-libs" + +RDEPEND=">=sys-libs/ncurses-5.9-r3[static-libs?,${MULTILIB_USEDEP}]" +DEPEND=${RDEPEND} + +multilib_src_configure() { + local myconf=( + $(use_enable static-libs static) + --enable-widec + --enable-fast-install + ) + + ECONF_SOURCE="${S}" econf "${myconf[@]}" +} + +multilib_src_install() { + emake DESTDIR="${D}" install + gen_usr_ldscript -a edit +} + +multilib_src_install_all() { + einstalldocs + find "${D}" -name '*.la' -delete || die + # file collision with sys-libs/readline + rm "${ED}/usr/share/man/man3/history.3" || die +} diff --git a/dev-libs/libfilezilla/Manifest b/dev-libs/libfilezilla/Manifest index 03a704912ea8..8dae12f54c08 100644 --- a/dev-libs/libfilezilla/Manifest +++ b/dev-libs/libfilezilla/Manifest @@ -1,3 +1,4 @@ DIST libfilezilla-0.25.0.tar.bz2 562726 BLAKE2B 8e6f381d2eb00445b4553418aafca750ee2a49a10410fe8de0f31ee15a3d33bf679ee1a10bc6e77800747d14bd79e0e90a585a8a090a09e55adb392a96020907 SHA512 7c07807a6d11f3455e41c9593ddeab8b5947448c5205f10e1e7306e0df27df24821189c75167007e00671b5d573ded72208e6f923406e37e8e5e3c28181ebe1a DIST libfilezilla-0.26.0.tar.bz2 564361 BLAKE2B 962f513846cf74a419a281c751266360196225c06577e7f5fe6b67f23ef3a4759f7372cac8fe11918e49a0ed20e08995c4bd971a02e692979dc09726be51fea9 SHA512 96ccc61e66dae744c092389a570f591e4f4e62ebf4fc39ed5a60206ea96b47b1aeb3d8f2fb7e22b4920560af4ec212540cc177d23ddbeea879dcd80143b86af6 DIST libfilezilla-0.27.0.tar.bz2 567792 BLAKE2B d20013746a0a90b9e95436a2b408e9d95eb6b2d32e5cbd0bb827f401a9917c2f376fce45108f332e0a8b71c55d29a78946396440b18f345d8214775a3b7f3b39 SHA512 f7545d0220bc83d66dd6b66494696a8799428d065037c98d7752d841e03fa5ea2198751cd22e22b9b1ad8023210725dd1af8afcffa6f61bcfe6aa12671200011 +DIST libfilezilla-0.27.1.tar.bz2 568252 BLAKE2B 5ab11e60a3df1e56275b0a1eeb94a91a5e036306c8d65c95ecdf26737ad5c73782d69e50f81749864293bc827b2502988b45a2268bb8020e685a4c864168af5e SHA512 30db720a8fbc806f498aa94ca9bdbbfa6ef04b4b4853e2c38744c2ba26dc8e34d3b006a057dcb527f6d745bf594ccffbb424f9b59dca6d1cb028b0f13bdd466a diff --git a/dev-libs/libfilezilla/libfilezilla-0.27.0.ebuild b/dev-libs/libfilezilla/libfilezilla-0.27.0-r1.ebuild similarity index 96% rename from dev-libs/libfilezilla/libfilezilla-0.27.0.ebuild rename to dev-libs/libfilezilla/libfilezilla-0.27.0-r1.ebuild index 2f343c359bae..f77f65fc8d91 100644 --- a/dev-libs/libfilezilla/libfilezilla-0.27.0.ebuild +++ b/dev-libs/libfilezilla/libfilezilla-0.27.0-r1.ebuild @@ -9,7 +9,7 @@ HOMEPAGE="https://lib.filezilla-project.org/" SRC_URI="https://download.filezilla-project.org/${PN}/${P}.tar.bz2" LICENSE="GPL-2+" -SLOT="0/11" # libfilezilla.so version +SLOT="0/12" # libfilezilla.so version KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86" IUSE="test" diff --git a/dev-libs/libfilezilla/libfilezilla-0.27.1.ebuild b/dev-libs/libfilezilla/libfilezilla-0.27.1.ebuild new file mode 100644 index 000000000000..f77f65fc8d91 --- /dev/null +++ b/dev-libs/libfilezilla/libfilezilla-0.27.1.ebuild @@ -0,0 +1,48 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +inherit flag-o-matic + +DESCRIPTION="C++ library offering some basic functionality for platform-independent programs" +HOMEPAGE="https://lib.filezilla-project.org/" +SRC_URI="https://download.filezilla-project.org/${PN}/${P}.tar.bz2" + +LICENSE="GPL-2+" +SLOT="0/12" # libfilezilla.so version +KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86" +IUSE="test" + +RESTRICT="!test? ( test )" + +RDEPEND=" + dev-libs/nettle:0= + >=net-libs/gnutls-3.5.7:= +" +DEPEND="${RDEPEND} + test? ( dev-util/cppunit )" + +pkg_pretend() { + if [[ ${MERGE_TYPE} != binary ]]; then + if ! test-flag-CXX -std=c++14; then + eerror "${P} requires C++14-capable C++ compiler. Your current compiler" + eerror "does not seem to support -std=c++14 option. Please upgrade your compiler" + eerror "to gcc-4.9 or an equivalent version supporting C++14." + die "Currently active compiler does not support -std=c++14" + fi + fi +} + +src_configure() { + if use ppc || use arm || use hppa; then + # bug 727652 + append-libs -latomic + fi + + default +} + +src_install() { + default + find "${ED}" -type f \( -name "*.a" -o -name "*.la" \) -delete || die +} diff --git a/dev-libs/libuev/Manifest b/dev-libs/libuev/Manifest index cd63db86b153..f86427927bda 100644 --- a/dev-libs/libuev/Manifest +++ b/dev-libs/libuev/Manifest @@ -1,3 +1,3 @@ -DIST libuev-2.2.0.tar.xz 245680 BLAKE2B 40d0912dcec56d58863411e034c6ddded3470bc2ea3a9f49d36fa0ef924e9ff206cb96ef93582134881ce8377938688d44cfa04d7e533321baf7cfd754f0dff0 SHA512 700c91100c61af2101a6d1756eed97aaf51d6b1dc3a59f90f668d8bb6e3d817aa6f765af5acbbdaeccd4382a97c8e99d2a13ad679fc8582891e0546baa6f001f DIST libuev-2.3.0.tar.xz 247932 BLAKE2B dea136cbd34788b7156a5ce1b8390467fde77a21b6fb4c7b27068b87254eb42034579bcaed3228dcfacd00b320668db915557230ebbb8da9487ade2359a5fabe SHA512 dc6cd2d1df5336027d8df77fda17b9d9521d955ffa013a5e83958d6b4f981f14f5b0caac3e68e4fa4a8a00bbe8001a18de54ebc441b4231a2d17600c762f80d2 DIST libuev-2.3.1.tar.xz 247596 BLAKE2B b2d6a7034aa27a80c17438e4329cba59bc4f047b2879662f9900e886f13a948f2c507732d5c5a4abbb130e42af9ba8a935724d1542f3c929a60198889ac7cce9 SHA512 bd463604a89f5bd3e749375f450b376ed1d57b1195b69a5bcfd247fe92c4d42d245bbce9a7950f5aa5a13ce75abeeee028073b7d4356b7770d8821aa501113a9 +DIST libuev-2.3.2.tar.xz 247784 BLAKE2B 30f9ca2d71c2f05173d4c5863e0dce64e7a77987e3472b11ac5f3ecf677712ddc5fe9e9cc9587f73d6a5acfb716d02dfa744bb301d55b834d44e944bf09f3bd0 SHA512 dccf83ea61dd4841d2b7e1e75b8c46f41607b26aeefd49bc3d594d864408a282c2ff4cf6ff84cf596fe3382c02e53631593f12d5b79afd9f2e57fb9d021b60a8 diff --git a/dev-libs/libuev/libuev-2.2.0.ebuild b/dev-libs/libuev/libuev-2.3.2.ebuild similarity index 81% rename from dev-libs/libuev/libuev-2.2.0.ebuild rename to dev-libs/libuev/libuev-2.3.2.ebuild index b5c9b2d941bd..4aa8d00bd3fa 100644 --- a/dev-libs/libuev/libuev-2.2.0.ebuild +++ b/dev-libs/libuev/libuev-2.3.2.ebuild @@ -1,10 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 - -DESCRIPTION="Lightweight event loop library for Linux" +EAPI=7 +DESCRIPTION="A collection of useful BSD APIs" HOMEPAGE="https://github.com/troglobit/libuev" SRC_URI="https://github.com/troglobit/${PN}/releases/download/v${PV}/${P}.tar.xz" diff --git a/dev-python/Faker/Faker-6.6.1.ebuild b/dev-python/Faker/Faker-6.6.1.ebuild new file mode 100644 index 000000000000..44adab5d87c2 --- /dev/null +++ b/dev-python/Faker/Faker-6.6.1.ebuild @@ -0,0 +1,28 @@ +# Copyright 2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{7..9} ) +DISTUTILS_USE_SETUPTOOLS=rdepend +inherit distutils-r1 + +DESCRIPTION="A Python package that generates fake data for you" +HOMEPAGE="https://github.com/joke2k/faker" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +RDEPEND=">=dev-python/python-dateutil-2.4.2[${PYTHON_USEDEP}] + >=dev-python/text-unidecode-1.3[${PYTHON_USEDEP}] + !dev-ruby/faker" +BDEPEND=" + test? ( + dev-python/freezegun[${PYTHON_USEDEP}] + dev-python/random2[${PYTHON_USEDEP}] + dev-python/validators[${PYTHON_USEDEP}] + )" + +distutils_enable_tests pytest diff --git a/dev-python/Faker/Manifest b/dev-python/Faker/Manifest index e3eac113d68c..87a039824665 100644 --- a/dev-python/Faker/Manifest +++ b/dev-python/Faker/Manifest @@ -2,3 +2,4 @@ DIST Faker-5.6.5.tar.gz 1058615 BLAKE2B 2a730b79ca11a80b33f5249541e2de68e5c53832 DIST Faker-6.4.1.tar.gz 1073921 BLAKE2B 1434375b8341ad3143e5977b26fd22af69aee2e30da92072937308341f22151764c8a72361c93112b5818dc9858e8e565ab2b45bd0fabc9e59613c1015e6ea63 SHA512 8ae2014b27f07b41afc67dc9a3d65e39f1073987c0c4bac6da5d625145e1d43783e4134bafdfe4e94035be9ff4367e5a19ab63635bf8ce7ff353a8745cf96269 DIST Faker-6.5.1.tar.gz 1074618 BLAKE2B dfcd80c170ae1f68c4eb541804b4f91c5c2821669e51d3231daa92c6b2818b30e6ff6a6328e5836f534a7d1ddd24d4b089adffc461e785642d7663088ba47251 SHA512 7681e9afa48f39c3a7dd41ef48e70025a4a225de3cbb6b8272279f353df7d4b956a2398ae0d84926fc1e72530accda4b2407e1b0cee116494bccfbaaf21bc38d DIST Faker-6.6.0.tar.gz 1114719 BLAKE2B 2e3639eba6ad74784ef30e2e7e6aa8b9fdc61c1d64babb256994068e1f54133841225b6549b4edde3539c3888acdcacf3029fe7daa414fd1142e2c1df8ac201d SHA512 1e72fa5672e310ff846f0945481d60db3749d916b37cd4e267c8ca4ffc5a2eab067622f618e9b4c8bc704155be413424f197b5796a86975b86219556116e0d47 +DIST Faker-6.6.1.tar.gz 1115484 BLAKE2B b5c99a61cf0937c10bf2eab0e34c51f38eb1aa7e87f47bbd8618874a24278bc7c2230acaffbea69f51cca760e3f3de73d32ccc487201c3bae7a544511aadac94 SHA512 a15c42291656d32f962ee50217e67cfd4038e39a6c4ba4cca6708d4ad9b4698a2b946d899e53968f4a9c2fee02c494ba756cbcc4014b16a8adeb73c83b9b428a diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz index 9762f82f9fab..26a5a54c2c35 100644 Binary files a/dev-python/Manifest.gz and b/dev-python/Manifest.gz differ diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest index 3ca4647e2d87..ddc6da7ea77d 100644 --- a/dev-python/boto3/Manifest +++ b/dev-python/boto3/Manifest @@ -11,4 +11,5 @@ DIST boto3-1.17.24.tar.gz 349323 BLAKE2B 41a15fb92218d9aa936300054805b4cda52f373 DIST boto3-1.17.25.tar.gz 349475 BLAKE2B 272c5bebed211d015638a652109f2b56475e0d682ff585915061a495ce26ca6c12a5e844f9d4b73fca105c2f40e3fe7c1aa5bee045af284f45e74899cde3fde2 SHA512 d24c118a4af747360f226c9c6e98e26ad3dacf34f13dadb084fef4e7404d1141c66cf5d7074eeea2c792b134e7b83174bc0be0c387c478fd61de646118b41b9e DIST boto3-1.17.26.tar.gz 349529 BLAKE2B 8510b229aea7b725c6286772dff6d54a9df684eac7e455929c059fd02919238335c88af5c655e89bfb5821ac4b70415c8dbd2c549563d008823104d6d54088be SHA512 5ceb9dc557796471f4d582bdf47614a078285a83f9463acb92e5e59e9f82dbca379bf02c2288cf38cb5741f7860d6c8b23872305209d8a4ece697943cd06932d DIST boto3-1.17.27.tar.gz 349887 BLAKE2B 1fde4af489c98b8c4f77660ad278abf6641f70da3a0f84ff33d29d082cd283cd8a9faa17a3d9675ca26453f8928c57bb2e3966c607ab677ed814e544c6c928bb SHA512 9c3e45d17a179edf6ff75c9392a3e16323029e4bcefec757a6dd94ccfad5afe718bf91ca6a72ea59fa2791d5a87e9c4b84d147d35b7f584d2df0f73a623c13fb +DIST boto3-1.17.28.tar.gz 350316 BLAKE2B a6fab50a064fd81337c013bb2516ba2baaa520aa8e7f08418ddaf9b6f0d99a1c8b8eb29b8fee6ab48620430153a0caf4bd296448e1de35a26a972d2e4bbf6df8 SHA512 c26800e18bb254707f0c7e7005b22b1270eae8bf0b8c13f6bcbbe46105ff7439b36c9c80863aefd1037df314abc687bf9b00045d12fb0d3b7337b02605810876 DIST boto3-1.17.7.tar.gz 346682 BLAKE2B 08c06dda1d59b4f555cad075673917b38cbf9ad8d0037f66027b17076e60b4d5fd32a93e088635320ebc3226a9cd8809c9208ec84f8588c26a77766b21dbee98 SHA512 2ba1817575c4a64c232c84a75a9d3b0db1de8634ded9aa31844930a82ccf4611805c6dd31b2e4d36cc9a2cc1813d233b4d7366305eaf28efd46a3b843d3c2993 diff --git a/dev-python/boto3/boto3-1.17.28.ebuild b/dev-python/boto3/boto3-1.17.28.ebuild new file mode 100644 index 000000000000..74b9170a9119 --- /dev/null +++ b/dev-python/boto3/boto3-1.17.28.ebuild @@ -0,0 +1,56 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +PYTHON_COMPAT=( python3_{7..9} ) +DISTUTILS_USE_SETUPTOOLS=bdepend +inherit distutils-r1 + +DESCRIPTION="The AWS SDK for Python" +HOMEPAGE="https://github.com/boto/boto3" +LICENSE="Apache-2.0" +SLOT="0" + +if [[ "${PV}" == "9999" ]]; then + EGIT_REPO_URI="https://github.com/boto/boto3" + inherit git-r3 + BOTOCORE_PV=${PV} +else + SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux" + + # botocore is x.(y+3).z + BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)" +fi + +RDEPEND=" + >=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}] + >=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}] + >=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}] +" +BDEPEND=" + test? ( + dev-python/mock[${PYTHON_USEDEP}] + ) +" + +distutils_enable_sphinx docs/source \ + 'dev-python/guzzle_sphinx_theme' +distutils_enable_tests nose + +python_prepare_all() { + # don't lock versions to narrow ranges + sed -e '/botocore/ d' \ + -e '/jmespath/ d' \ + -e '/s3transfer/ d' \ + -i setup.py || die + + # prevent an infinite loop + rm tests/functional/docs/test_smoke.py || die + + distutils-r1_python_prepare_all +} + +python_test() { + nosetests -v tests/unit/ tests/functional/ || die "test failed under ${EPYTHON}" +} diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest index 2312f401776a..5c5b3019d50d 100644 --- a/dev-python/botocore/Manifest +++ b/dev-python/botocore/Manifest @@ -11,4 +11,5 @@ DIST botocore-1.20.24.tar.gz 7503493 BLAKE2B fdc1de907a8201ecc63435b2f3cef38ec40 DIST botocore-1.20.25.tar.gz 7508526 BLAKE2B 244b578cc0596e4fc6b225cd29d0b5ca2e42159dcc506ff3f0a730e3602166ca52bb1a4a2ea8049b86fe6409ac521e30d1f0ff02deec8550a4187579b9a43f9f SHA512 010aac3c0021c7406471cae2c0b13a33dde620b2d7e5df96170971459b9f425d9ffb2a3ad08a650c3097924ff12b34354983ef36336e2afd0172fc3a73f988e7 DIST botocore-1.20.26.tar.gz 7510615 BLAKE2B bc8716642c09ec74f7d057bcd9608cbbad98fcb4caf09e0684a03744fda81c0483aebaa4c85e416dac7d54d0f2804aba59f15e714211b59edd824cd3067ed412 SHA512 30ce061c1b7e1830caaf7382352180f9316f8d1d806269726ef3bc00eeb7a3fc7689e43eb4666fe700ca2de564b427c4916289a555aca0138a630059462216c9 DIST botocore-1.20.27.tar.gz 7518860 BLAKE2B 73a5a5302a0adfe9c72ec40f0edec8fc97f9dcec0428f5785f2546d50e4b8eb8a9c287b29218ebd8ebe091ef0fd022a5b0ba459aae435c363511484a936d2ffb SHA512 1b63295a2f6cdf2c06cc10cd35c350a07eb5326bbd42f2dc2084bb54cac3ebb40f0635180e227632184a6bbff3b58b67bd90878acbfa4cc61879b7b8e77f3fbc +DIST botocore-1.20.28.tar.gz 7526082 BLAKE2B 523db8ca7ff9ae87ad30fe539f20b34f4627b3a60f58635778d81b7ab055ac7cfbe04b4c4ca6508284dd37f2e6b953210ed2def9608026490332d200f306f7a9 SHA512 f3af2bd784b96a2778361a83d0ad61e5108b0a90b3756575bc4b93aaddb13a0a07e6589f582f03ca95252b272e1f84c350c5a2e1f342f98627f70e8f42350c18 DIST botocore-1.20.7.tar.gz 7458254 BLAKE2B 8b9a1edda73e2564d3a3d67c6b3542d1ec9372403cb4d88396e58dfbcb5987821f278f2757e079e1ab32e03243ed3a6d1023ecc591b965512b3af5e2d43ea7b0 SHA512 9b023a31be866a50b94017a28aca40b5fe2e720959c928a3fd93db96041f3886049717f50461222a09572c0c56c5961a4614b80e400e4fa6d8b3ff4b4ab681df diff --git a/dev-python/botocore/botocore-1.20.28.ebuild b/dev-python/botocore/botocore-1.20.28.ebuild new file mode 100644 index 000000000000..4e5d698e619b --- /dev/null +++ b/dev-python/botocore/botocore-1.20.28.ebuild @@ -0,0 +1,59 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +PYTHON_COMPAT=( python3_{7..9} ) + +inherit distutils-r1 + +DESCRIPTION="Low-level, data-driven core of boto 3" +HOMEPAGE="https://github.com/boto/botocore" +LICENSE="Apache-2.0" +SLOT="0" + +if [[ "${PV}" == "9999" ]]; then + EGIT_REPO_URI="https://github.com/boto/botocore" + inherit git-r3 +else + SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux" +fi + +RDEPEND=" + dev-python/six[${PYTHON_USEDEP}] + dev-python/jmespath[${PYTHON_USEDEP}] + dev-python/python-dateutil[${PYTHON_USEDEP}] + >=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}] +" +BDEPEND=" + test? ( + dev-python/mock[${PYTHON_USEDEP}] + dev-python/jsonschema[${PYTHON_USEDEP}] + ) +" + +PATCHES=( + "${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch" +) + +distutils_enable_sphinx docs/source \ + 'dev-python/guzzle_sphinx_theme' +distutils_enable_tests nose + +src_prepare() { + # unpin deps + sed -i -e "s:>=.*':':" setup.py || die + # very unstable + sed -i -e 's:test_stress_test_token_bucket:_&:' \ + tests/functional/retries/test_bucket.py || die + distutils-r1_src_prepare +} + +python_test() { + # note: suites need to be run separately as one of the unit tests + # seems to be leaking mocks and breaking a few functional tests + nosetests -v tests/unit || + die "unit tests failed under ${EPYTHON}" + nosetests -v tests/functional || + die "functional tests failed under ${EPYTHON}" +} diff --git a/dev-python/httpx/Manifest b/dev-python/httpx/Manifest index 5f476ecf403c..8232ca755430 100644 --- a/dev-python/httpx/Manifest +++ b/dev-python/httpx/Manifest @@ -1,2 +1,3 @@ DIST httpx-0.16.1.tar.gz 965347 BLAKE2B a6c5bcdda595ffcfb824194564ebd93760a9180e60665a9540fc6a2822b1be4273b940fee61cb4b49c2d97a5f4d71b1caf32deddec18d2fb636465b3868aece4 SHA512 d76b2c94c655c187ab150f20b16906034574d017a67c4a06c456d55071434cc0ba7752bdceda86aa6b1a1fe9109fa11594e4ea679cd7d2a77898fb40fa5153d3 DIST httpx-0.17.0.tar.gz 1651681 BLAKE2B 46eec46d5f2006667ab51e5e4d98c1a22783351d9e2fa50ccab2431bf6e52dd9b124d50b32f151fc171561c913d879cfec4f717ea22fd2a333c13190368ab505 SHA512 9471c404c02481a10d42e10e36a55cd55cdecd2cd98a8f3ca1f453a7f1ad7f1ce3b292b8fe583b1c95119f27c0b2eefc756b4e4ed353e3383c12009f3bde21cd +DIST httpx-0.17.1.tar.gz 1651788 BLAKE2B 445e61dba5a2648191f57352b664a33785af01bb9ca29c7f553d10111894d0b4011a6987bdea880dd3fc87a60ddee7813a2d51e12178277b60ac27ac6fa930ef SHA512 260040e266144f56b8d1cd085e0d97f2b570c685560fd2bc6baca633e8c9e88a666d0ba072048d63f826dd380df7116ce676dcfb48406e39a7480c44f73368c6 diff --git a/dev-python/httpx/httpx-0.17.1.ebuild b/dev-python/httpx/httpx-0.17.1.ebuild new file mode 100644 index 000000000000..8c321dc80c6a --- /dev/null +++ b/dev-python/httpx/httpx-0.17.1.ebuild @@ -0,0 +1,46 @@ +# Copyright 2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{7..9} ) + +inherit distutils-r1 + +DESCRIPTION="Fully-featured HTTP client which provides sync and async APIs" +HOMEPAGE="https://www.python-httpx.org/" +SRC_URI="https://github.com/encode/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +RDEPEND=" + dev-python/certifi[${PYTHON_USEDEP}] + dev-python/sniffio[${PYTHON_USEDEP}] + =dev-python/httpcore-0.12.1[${PYTHON_USEDEP}] + >=dev-python/rfc3986-1.3[${PYTHON_USEDEP}] + = 3.2). +RDEPEND=" + >=dev-python/PySocks-1.5.8[${PYTHON_USEDEP}] + =dev-python/trustme-0.5.3[\${PYTHON_USEDEP}] + >=www-servers/tornado-4.2.1[\${PYTHON_USEDEP}] + " python3_{6,7,8,9}) + ) +" + +python_prepare_all() { + # tests failing if 'localhost.' cannot be resolved + sed -e 's:test_dotted_fqdn:_&:' \ + -i test/with_dummyserver/test_https.py || die + sed -e 's:test_request_host_header_ignores_fqdn_dot:_&:' \ + -i test/with_dummyserver/test_socketlevel.py || die + + distutils-r1_python_prepare_all +} + +python_test() { + local -x CI=1 + # FIXME: get tornado ported + [[ ${EPYTHON} == python3* ]] || continue + + local deselect=( + # TODO? + test/with_dummyserver/test_socketlevel.py::TestSocketClosing::test_timeout_errors_cause_retries + ) + + epytest ${deselect[@]/#/--deselect } +} diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz index 531eda6d62dd..72d9156c385a 100644 Binary files a/dev-util/Manifest.gz and b/dev-util/Manifest.gz differ diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest index 6e9d6883fb48..cf9c3785543d 100644 --- a/dev-util/cmake/Manifest +++ b/dev-util/cmake/Manifest @@ -1,5 +1,5 @@ DIST cmake-3.13.5.tar.gz 8618821 BLAKE2B 765678bc92821207c53bfb4ac995a791b938f20236c3a6fda873b8edd11cd1401b4f4c05f170b8f600f38bde5f1227c715499eee072a8de3bb29d4f5cd230226 SHA512 99e3a8f5bc147dd90b9cab11f06892d87f289aa1354ad323711fe96ebc9c32b1e887e8f9d3575a37831c4d2153a070ff9115c5e27a185d54170bad9dbbaabc26 DIST cmake-3.18.5.tar.gz 8975784 BLAKE2B 62ea68b602e7e352c22ba6122aa010fb78fb5c4e484aa51bc336e750280d5fc03ffa439bd8005d2c43176f5a5db4ebfd419beca65cc59c5b8cd5666e38394fb8 SHA512 c15e0937a9c0ce0b6164c3d02a147e679ea57e1119cff4189a15de71429a7facb3c04eb8db467471876b5da5dbd4a25acb228efa7101fe78efd205f0d2c96343 -DIST cmake-3.19.5.tar.gz 9270284 BLAKE2B 4620f5f2a08e16a90350559e539a701606a0e8b4ee358ae5d1668c1f1d43674ac75a06ae335e52363fad9750bde430938faa2497108c2db6038479058412969a SHA512 de8645c7c03bd48987f6eefc19bc2856c2a939e537cf204e1c9749d5a3e21c71695080bee246e94871f82996ede9d1a8771972266434549b48df9924fbb4c6f2 DIST cmake-3.19.6.tar.gz 9270931 BLAKE2B 5480ea3f3d159cd6471623ec73dfd73ab20ceb21744b2acc8bdbd27b8be7338e2ab8ae81366bbc3af474be49723567421450dfd6b7c51c65f36494c04fe13946 SHA512 556655c0fd17d5c70d5c1725f49ccad0d8088e6cbb3370d48d5a548d49d0e066d21c69978ed9b49d786fbb8eb79e086e719882245c9261c692b9457ba23b76f9 +DIST cmake-3.19.7.tar.gz 9271358 BLAKE2B 379b89c0d6bcfe81a397257cb3f95e4b4a8987566258f6d5b312e8ffd455fd07f09ed570c47111f9a519d76f43014b680e8242cddef13810ba87f9b9ec7e2e2f SHA512 6af1fe3ea41906324d4c29f5f982281d92145d086f4a47fa2220b93483bc65d59b1e23f5b51d82305c630690be7c552827bb795560674b03620763e0917bf14a DIST cmake-3.20.0-rc4.tar.gz 9427202 BLAKE2B dccf8c6815198acf44e8f6a6e0d080ec2ae6c13888c59a275ea2b010dc14ab4eca766a2a1e7cb26674ae67e7cb5a6700591845c945675dc2d87666624bef347e SHA512 967f0d56d5a7ce6cee3255852109cc9f121478a91a2ad387f26401e9024b3f36669ac9c393bfc20bbf06994668180fe12446936fdf5e7c2a095ee40972fa8f36 diff --git a/dev-util/cmake/cmake-3.19.5.ebuild b/dev-util/cmake/cmake-3.19.7.ebuild similarity index 100% rename from dev-util/cmake/cmake-3.19.5.ebuild rename to dev-util/cmake/cmake-3.19.7.ebuild diff --git a/dev-util/howdoi/Manifest b/dev-util/howdoi/Manifest index d0adfb2cfe5b..f83f485bef24 100644 --- a/dev-util/howdoi/Manifest +++ b/dev-util/howdoi/Manifest @@ -1,4 +1,3 @@ -DIST howdoi-2.0.10.tar.gz 25921 BLAKE2B 6af903f11ca240eeaf773957a34f8eb585067c589d3a51b449f044bcc5b4e885637d3f4e7f266fbe39ccebbfbe6da7f12feba75f196e99d4215c270a58afb506 SHA512 534d292bfbd3b2c44dd4101faa5642ae71d6c0161d45fe082dfb4129e6a594d13148970029e9c91e3672911fe55ab570fddad352c1efa405e6312b3c3c16eca4 DIST howdoi-2.0.13.tar.gz 26143 BLAKE2B 39eb23c94ec8883a88a1b6205af69668396ab4bfeccdab9994bddd3fcbe90b78d2348b4b3b9b935bdaa936edb1fce31c05aab6308195612c535d516e5aff332d SHA512 b44e506ecbaf8d10590168ab62ab4e943bfe832e8b981109647c9304d46956afb343239575e1196dbb3284c9db9831839cb9933aca0eaff037f6454434c8194b +DIST howdoi-2.0.14.tar.gz 26675 BLAKE2B 901a39d7f9dd9f2dd5931e0c9710083280f067687a6be985188f459cf9b82e89993f352128e3dc616ea6395bf853762f1d8a7b1fd79c0e457d71af8859e9dc7f SHA512 7c913a0b3d6fda60a140520406956c6ada291ae9e9d7116a10adcb1b31a6fc6d22d221285e852d07bade33e1c075f0dc489eee39c3f4db420454d4813ab33254 DIST howdoi-2.0.7.tar.gz 25167 BLAKE2B 5923aaae6d6aaee4da7e02cd283d6e794c31d600d2834d1354e0d90194ac573d80140517ba7289bbf97b01923b6ed8c9c2ab6abe0beea0534fc41ecf24196c24 SHA512 9f8278e6ea688c40fee5227aa23375cb7dc7339d579953c73dbf7111087550ece412e26508e129f377e2326ce4635c38d96ad99f98c8c6f1131a01bbaf062275 -DIST howdoi-2.0.8.tar.gz 25366 BLAKE2B f444b600f80c60cea658781b2b1e12dbb241b6707f51f419e55099334cd45c8bfda402ada052473b2ef35ffbc77c88d33000b210fada5eb4f09b529589fe8d60 SHA512 c2a62f5e6669fcca41a706cdeec8827e39816d31d37464d061b881ed3731995163cab56322d73362863acf5064d35dc82c383db1fad78434152bd36678ec0794 diff --git a/dev-util/howdoi/howdoi-2.0.10.ebuild b/dev-util/howdoi/howdoi-2.0.14.ebuild similarity index 100% rename from dev-util/howdoi/howdoi-2.0.10.ebuild rename to dev-util/howdoi/howdoi-2.0.14.ebuild diff --git a/dev-util/howdoi/howdoi-2.0.8.ebuild b/dev-util/howdoi/howdoi-2.0.8.ebuild deleted file mode 100644 index a9a2eb1a0456..000000000000 --- a/dev-util/howdoi/howdoi-2.0.8.ebuild +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DISTUTILS_USE_SETUPTOOLS="manual" -PYTHON_COMPAT=( python{3_7,3_8} ) -inherit distutils-r1 - -DESCRIPTION="A code search tool" -HOMEPAGE="https://pypi.org/project/howdoi/" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" -RDEPEND=" - dev-python/appdirs[${PYTHON_USEDEP}] - dev-python/cachelib[${PYTHON_USEDEP}] - dev-python/keep[${PYTHON_USEDEP}] - dev-python/pygments[${PYTHON_USEDEP}] - >=dev-python/pyquery-1.4.1[${PYTHON_USEDEP}] - >=dev-python/requests-2.24.0[${PYTHON_USEDEP}] -" diff --git a/dev-vcs/Manifest.gz b/dev-vcs/Manifest.gz index af3712b8d99e..635e94c96fe9 100644 Binary files a/dev-vcs/Manifest.gz and b/dev-vcs/Manifest.gz differ diff --git a/dev-vcs/git/Manifest b/dev-vcs/git/Manifest index 1a586840dc0d..d9dc1dd79544 100644 --- a/dev-vcs/git/Manifest +++ b/dev-vcs/git/Manifest @@ -1,30 +1,18 @@ DIST git-2.26.2.tar.xz 6007864 BLAKE2B efce003a95e24dbb6e14feebd35874c9ed1a5c06d7f0722d4dfefae830613b64b81faa41d5952400fa382b385d15d48829f8ee3b4d065e134bd38fa0e10bf570 SHA512 5d92d07b171c5cd6e89a29c1211c73c1c900cd51c74d690aebfb4a3d0e93b541b09b42b6d6a1a82f5c3d953096771f9a8605c63be139f559f58698c1a0eabcfc DIST git-2.26.3.tar.xz 6009184 BLAKE2B 12c0b8fb460024e7767919cac3e36ecb215e25566eb907e11495c086e1d43d790c2aa8edd178d53abc3f7eaee968a6c89e92a6575d4d11f9740567b357056aee SHA512 a88f8ab156f12770590110b30da83631f19a349f3b7af25fd0a5e8f03c78daec0a4935e9a1a5637f100c147cc57fca4aa3386e18756a6382983e7baa7456e398 -DIST git-2.28.0.tar.xz 6117608 BLAKE2B 81c834dfda5b8e3065d098e411eb2408a1e7ccfde9c447a4164c131c9c2c32dcfd888980bcd180952435c05976a4fa18c155830432170deff70aa1aa2989cd2a SHA512 a6159c0a15e3c5f9603157d4010664a6d74e7d65b9fe97a03b36fac12607248ed57980d96565841e88eae343001c167222232737d3af812608c8db011941df1a DIST git-2.28.1.tar.xz 6119248 BLAKE2B 69999a39d1c5c1dc69b8c7721a594104b51d2af691e1f2ef6a2f2bee99bd5b319c856cfccc4166cfd3426cf8eb58b3b4aea5ed2ae15061fba0f0f3e44c7d24e4 SHA512 6acd7f42eeaf4fcb085fe2ab3d65f53a264fd38ef84321b77eb7c21bbb146e42ec9f27cc36cd9f3569f6d1758742119efd0af9bf6414fe7c577c434ed154fb8f -DIST git-2.29.2.tar.xz 6187988 BLAKE2B 15c2446a266d7cc3032e4b3bd32f57a2c2ff3d377848f307225ea585883c993ed835c8ffe02202386360b94f5a1f4bd3124322f0034c0d65ed15aa28b7e45ffa SHA512 34117628c6d43ac0940c43bffaa1bda7f12af863728f391492725a3e57d1bbda523cf7734e90f463fe9a9ae4e70fc1cc2523643dbb3c27377d98dc4736b0ea62 DIST git-2.29.3.tar.xz 6189996 BLAKE2B 9e30b7c4eab0d74a7d3d1387774958fc1ce7fde6239bd8daaa277304cde1f3249484fd703a1827c703ec9400ac2c1e7c288bd2956a3854521bf561437de58617 SHA512 3a21be5005675e5406964519f3c8441826b311274de8c5bacdc3ede564efef3d87f085682f31c89166a5022738a3cbd8e767d2bca3bd57d6f55b2451e36681dd -DIST git-2.30.0.tar.xz 6325652 BLAKE2B c5a67ccb7790f1747d714b402f22de6bd5cf783de8765fade7af0ad51ac780c80d43ab22b33431b57db246a11ef073dfd291961476a3c9414339f133221cbea6 SHA512 2ce154d6e224e78d7da2ea9b954d8cf56bdfe43636b93dd5045a950a7362d3943866b4949eb5ed03528d6e5f0466c33c233b502d84430ed9d90326bcc696101d -DIST git-2.30.1.tar.xz 6327976 BLAKE2B 3b459d10a2b8d601e0882da8346bba1c0fb9aa01823e9cf9f6d50557d7cd6b6b89eea17209a5b3bfb199c37ae8bf33b730784686a166d7ed9ef36dd0975d5624 SHA512 b3567d251c73807857f05f46cae3acb4e0d876590d122229c05509d5eb17fc3eee0ba97a1b2068070b399085f7a92aa2493c4833b98f65b8ef15fc279798caa3 DIST git-2.30.2.tar.xz 6329820 BLAKE2B 1c553c183d5426c524852bfba38b39196d9f0fb83854fec3291959474374db41a68a4118785412037ba16230662d94f03b05bb7ea577f0272552e63b68086f95 SHA512 4f7e1c30f8eee849d1febeda872d56c60c5d051a31726505a4c7bab11b274d3a2ab5588f910b7b49c5c0ec5228a18457f705c7b66e8bbdf809d3c75c59032b7e -DIST git-2.31.0.rc2.tar.xz 6394212 BLAKE2B 749b2d18969bdd3fd5d72273b9068775cf9c1042553879f8e7abcbbf3c0b8e9d99a5365939b8df5012dcc499c2bccb5651f7943f76389ae315bc1fbaa08298eb SHA512 0e717c27320d6747e5f7c928765c91859a22f5a5de02a99bab2f0923283b5da2fd755a50ba527160ca23ffa8daf087dc4014441a58100cffbabe58fb7d9b64c3 +DIST git-2.31.0.tar.xz 6414252 BLAKE2B c9186c0e212767956cbabc685989408860600a19ff56637453f9cd45e143b6fb5b7104b188726506481782fcdfe3e7b28d5c9cf374172b81e5bfedf249292793 SHA512 b8f7608d4349c983c426494227b0ec9d032e67c775382a32675418f629f365817ac99a61c24e3a380bc5eb65351058dbf55d526890055acf58ad4f028022f513 DIST git-htmldocs-2.26.2.tar.xz 1304788 BLAKE2B e0de88c5c41646d5fb9b54e2ee873c7904e1b85c67f971499f0227eb2dd59cabd4ffc58c468cf8a7a7466920af972dbc7f95d78003e487edac9a15a9c49b80a2 SHA512 b577693180b4fc035af211e3b83e98ad5e1bfbb98706924858df6558383b82ca05f870bdae90f8a14c8bf664f091ee928af52dcdebdfb98dc7387fdfe2e3a396 DIST git-htmldocs-2.26.3.tar.xz 1305208 BLAKE2B d5bb834b00a9d0cd3cdcd671e33142595e4ac28be8eab2326263f548718d52cf141b7fa6afee8da05a15ac75252455945dd34d60ffe5cda6cf1d612b7ee35953 SHA512 ff6c912572d32a1f32ec4c73e07e1404155ccbf81509a741e25e9dbcf42e5348dce59c40b0bb5d64993d8a981e2afd773393b2aeacde457870aa1f03feb9a1a6 -DIST git-htmldocs-2.28.0.tar.xz 1347596 BLAKE2B 9c447f951cc31eb306841d12a94aefd3bb9699f374f2919f7eed0789f6b49cd54df74ecddaa1475203a5dca33140787f53272774f71ccbb48e5da5f1ab6bfbde SHA512 bbe7a7c221d1bb8d9852d5210a80b3d60c5b66f159591971abb2d9a08570cb7bf85686c7eba8cf37e04d37d63702906b308692a68c05fdbd0e3f3d60322003f0 DIST git-htmldocs-2.28.1.tar.xz 1348296 BLAKE2B 6bbaf94a963204d85100554578fb2520c44b74332e6dfd0f468fa3217efad2a484ef427359411569ca503a809aec00edde21ab577ee9ddc9779f0b702402ed4c SHA512 9e672673f271a136f9c2d1ed827dbc76656b40315cb5d11d95aa18c006fad8ea2c2535f2092f1b6514a6ae7f88589178fc90299b496f446debb673e8f36f8909 -DIST git-htmldocs-2.29.2.tar.xz 1364856 BLAKE2B 76498ef5bfdc058ad1e7c3b2c0c5ba715fa2682c7429db837cfeb7abe64ae3561e8b3f2dc032dd193514778271a040b1b120071d12ae5082a415db5084c7b6aa SHA512 d7223160af9bc97201bff59b94c8c09d331cdb9f979c878698230bb579b3f4751b6a455d8413ce09a507799744d7e3c77a2ad4d265386de7ef3ba9e11fb20445 DIST git-htmldocs-2.29.3.tar.xz 1365468 BLAKE2B b8b2d46a5b35f6962f06bd9837ddc613aa5f4096dcdabea4308fcc52bf4f639fbdade2f91e01738cce6befb8b63faf57f8ecab1200048794d873f12055f04bdd SHA512 217a313636b5e7470e58d21428c81262f9d9909227f6a47c8445eb301bb20dd8393d0e600b8e7dad04b030a688561f93cdce317ad714cecd0505c198e1fe44a2 -DIST git-htmldocs-2.30.0.tar.xz 1340536 BLAKE2B 2204b276b941497e0ff5f1710c55b42f573b4eebd96619041db7afabb5a5d36252b2582b29e3d083abaf5da478810d056df83bdfa1d08c5396ffe03d0d858820 SHA512 3fc53a508497621c8af5ea26337407ed9489e768160c7063cfcc4bb53f51631ef968057f1498e37a901313aa08b4153533ca15a9bdfcbd04d2ed11256007db3e -DIST git-htmldocs-2.30.1.tar.xz 1341796 BLAKE2B b282d16af234256ccb4e1099d42800d674b5ff4ea1e365557aa6672aac573b4e98e43ddbeb02291cd6925bfd217d2e8e99aae47e9f46fd06ad013fec87b8d3fe SHA512 e2debb0dde49f1e6a5944ed35dfa62d6d2e6f71d745e6f6adfb477513f21004f04cd5de8e8444d4a24d9818c3cb85f5720848991a763fbc3541e89cfdf21dd49 DIST git-htmldocs-2.30.2.tar.xz 1342648 BLAKE2B a81b2111a79b7b211f99c0ac2b3d397d627316fc1eab56f091088b4ff26d80c353efcea4154f84640dea952dddaf496f3c8f63d2c371d6ce97bf888fad2db237 SHA512 7fc8bb1a9e484f5f49ad41c89ee8e5059970e3091e1d72b86800f8d255fe00be3d8072194cbc913ef6d98aa014ba9e8efae062a9ae595f4dcafaa0c3e637d297 -DIST git-htmldocs-2.31.0.rc2.tar.xz 1357684 BLAKE2B 8ea0ebc11650bf4f67e15fcdb1c6a7b8e33b5740e50c5817d09c6d4dfc23556b8735347807ec08d56c4124a38e3892c4690984a57d9f24b80a919b5a9820c5f2 SHA512 dfe7f2ef385ddfcdebe83f4f785bcf9c710357635cbc26702c6dcdd056e62075f937d92802c056dda678db3d9258ad7f75b8cc1d11ca86a26c022827c22ea10a +DIST git-htmldocs-2.31.0.tar.xz 1357332 BLAKE2B 06fe5fdde4193ffccf243eae8c112b6bf74b3a554283e0f688a47275a47de4c1c4dce9fe6dfa550885786ab8df46fa83fadd22746bc64e430af42785eda30583 SHA512 31a7d715454060bbc260a6001d971df0eea16c819de96a9316bb465a67661ebe805a8ea2f5f223c070b6aa1affd1e72970b223474e6221bf87ac3b233d229fdd DIST git-manpages-2.26.2.tar.xz 462052 BLAKE2B 27fc44360c9f890e9f7754e8423f5596548f076f5fec5dfc6c752e8b3caa5f64ba182c1566b67878b19fbb115297e08def1bf9d2711c7334cbb8e1b20fc039a1 SHA512 9591e94683a6b49d8b9f2afddc826576023fdfa6de6db4af3a28a2af00b175d5be710d86a31d0f1b8320cc38b6f27698e17fb3e8c1f2b0c5ced37296ef1109b6 DIST git-manpages-2.26.3.tar.xz 462116 BLAKE2B 3191f719c5f2f0df34a66a041ab8590cbb43ed8df6d4b430df04e4255544048a982c00dbcbc7d7d9057830d5354c595d853e9f7558efdd6049be74e81d61a20d SHA512 8f9b64b0554867a56a647ac4f76351858342f84a38fd9977c606612c034dcad552afba8489a81ce227ed48a90d78f23d203452086175e218efb3f0fe8429f9f9 -DIST git-manpages-2.28.0.tar.xz 472524 BLAKE2B 84752bee094eb879be8905dd561593e9f2a71d91971be7be83ed421bdeef83f7165f9506297bf23127a46a1d05c718999dab6b3ac3bda0ce0fba95ca64145de8 SHA512 ba4d41c2c2efd1eb5ab8ccf00efcebbc2fbbd31ab325da66b05181d15f677c2fc97c9eefd58c3b1c75a07276b399214f398df8d084c1a5092f982ce392876a2f DIST git-manpages-2.28.1.tar.xz 472404 BLAKE2B d6b411dee47439b91e61f93fdca24fc5a707807c9445b69df81be8cdf6b78e24ea8424c0a36a3b4bd7db82e303b4139449a3fdc7de43d65d50f8b9e936e73669 SHA512 b543934fb9a91636033a2a7262180bf62b5493be3c222fb882aa992fe15f9fc0b9cc6723f3afa65fe8c60b8909af4337139bc0c355df0ac063f9e915d4b574bd -DIST git-manpages-2.29.2.tar.xz 478516 BLAKE2B d9a9840a8c869e2f7f9dade12c780032a7eeff59314b4d45c8c65e3f076e0335f0674c484fe7cebbc70d13b51a17b5fcf69b1bd51dca7ff226d76b1fed33d8bf SHA512 f2af31f8b2242961a0633258dd4668dbf21b26eff440e302608bc5bee2ed45a3e573528cdd0f11503d0ac4745e03cb457d99f5529fc96c105ce441ece07e4fe8 DIST git-manpages-2.29.3.tar.xz 478456 BLAKE2B e568b92badda851be5d5c0524455d1eb728e4633dd88144edc8e22d84c64ad195538d906ae3443789ea14607be536d1de0f30b448ab0860d605b65a6476455fb SHA512 5d1a26c1342c31ca3501f2e40ec55c6e5dddd1ee2de909ec65425dea92455f00ca23a10e7475dcfe5b9a60dc4c2012778e86797cc8922de20638fcc07c60d941 -DIST git-manpages-2.30.0.tar.xz 481792 BLAKE2B 9f6273e36e06a0296506d43b25a826cef9e459fdd25ad2f844de323b998fe9b5a7e5181b21257e7b297ea4ce2e16cfaacf7f1c7486ce26b59e39e643361d4745 SHA512 9593d9bef8b3bdcd5645cf89e0f0c53989342414363ce85cfd46da181750c92e8f6dbd860c6badc9d871b383bb9cf273b4fb3af7f6d46a8df6b95fddeab578ae -DIST git-manpages-2.30.1.tar.xz 482128 BLAKE2B 2e7f3943b5e95a3b00dda95f74c519889218e908aa3872f5ae93d88ac9602ad389e9be9df99ec7daafb0a324c03a3a50c7f3c697a1a7e9f35f795682ba85fb4c SHA512 1cd535fff2a658d9ecb99c1f26663e2b37df429dfcff417c298e00fb5de107ef54848447ad63c2f78d8621f431f8f8b92bc871474a701db48deff04a0b595d07 DIST git-manpages-2.30.2.tar.xz 482180 BLAKE2B 97180d13ba73f229d205b662ca16d497baff57a23b9b621fab69bc1bb4f2ac4f52b861443917ae01ebab7130640e1b7352aa193d7c0cd945cb552749ee1367c9 SHA512 fcb2ab9dd4c29593d08b80f6731ccc3b9a54514d6cc002434f8e36277fd814d4be7e69f0563291cea4f16c35e4822def57ade50d7d10a897619b13c6a6893aa7 -DIST git-manpages-2.31.0.rc2.tar.xz 487804 BLAKE2B fb146efbf7f31b45e6c1a15e8fac1c6cc75d067ad16e588fa8a71bdbf970d26b123a6453cfc0210a454374fe319a83cc94b0df95134b602b67c2f1e1f895715f SHA512 b4b776ea9281557d3a521de7437723217178422998f81bb81b4843f02fadf38a743c7d74abb36d1354ca87fc352b442fae02bed11d2612b1f35dddac89ff8e64 +DIST git-manpages-2.31.0.tar.xz 487764 BLAKE2B e5acc25fe28c666afd017d29a9cce7b0e37d2b1dee93f911683c5e54972fe4def59964409bd232666963b4509d4ca30fb9b95757e2fdfe308559e455bf8160d3 SHA512 9bf426d5aadd4ac011f9b3694547da795bf5e8bc77a79ef69de56d6f39c3a0fdc039db25d4671810a5320a6c057f2364ec096413eebbbeabc26a7d3b65c9c787 diff --git a/dev-vcs/git/git-2.28.0.ebuild b/dev-vcs/git/git-2.28.0.ebuild deleted file mode 100644 index d725b8e79c39..000000000000 --- a/dev-vcs/git/git-2.28.0.ebuild +++ /dev/null @@ -1,711 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -GENTOO_DEPEND_ON_PERL=no - -# bug #329479: git-remote-testgit is not multiple-version aware -PYTHON_COMPAT=( python3_{7,8} ) - -inherit toolchain-funcs elisp-common l10n perl-module bash-completion-r1 python-single-r1 systemd - -PLOCALES="bg ca de es fr is it ko pt_PT ru sv vi zh_CN" -if [[ ${PV} == *9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git" - # Please ensure that all _four_ 9999 ebuilds get updated; they track the 4 upstream branches. - # See https://git-scm.com/docs/gitworkflows#_graduation - # In order of stability: - # 9999-r0: maint - # 9999-r1: master - # 9999-r2: next - # 9999-r3: seen - case "${PVR}" in - 9999) EGIT_BRANCH=maint ;; - 9999-r1) EGIT_BRANCH=master ;; - 9999-r2) EGIT_BRANCH=next;; - 9999-r3) EGIT_BRANCH=seen ;; - esac -fi - -MY_PV="${PV/_rc/.rc}" -MY_P="${PN}-${MY_PV}" - -DOC_VER="${MY_PV}" - -DESCRIPTION="stupid content tracker: distributed VCS designed for speed and efficiency" -HOMEPAGE="https://www.git-scm.com/" -if [[ ${PV} != *9999 ]]; then - SRC_URI_SUFFIX="xz" - SRC_URI_KORG="https://www.kernel.org/pub/software/scm/git" - [[ "${PV/rc}" != "${PV}" ]] && SRC_URI_KORG+='/testing' - SRC_URI="${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX} - ${SRC_URI_KORG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX} - doc? ( - ${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} - )" - [[ "${PV}" == *_rc* ]] || \ - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -fi - -LICENSE="GPL-2" -SLOT="0" -IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit perforce +perl +ppcsha1 tk +threads +webdav xinetd cvs subversion test" - -# Common to both DEPEND and RDEPEND -DEPEND=" - gnome-keyring? ( app-crypt/libsecret ) - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:= ) - sys-libs/zlib - pcre? ( - pcre-jit? ( dev-libs/libpcre2[jit(+)] ) - !pcre-jit? ( dev-libs/libpcre ) - ) - perl? ( dev-lang/perl:=[-build(-)] ) - tk? ( dev-lang/tk:0= ) - curl? ( - net-misc/curl - webdav? ( dev-libs/expat ) - ) - emacs? ( >=app-editors/emacs-23.1:* ) - iconv? ( virtual/libiconv ) -" - -RDEPEND="${DEPEND} - gpg? ( app-crypt/gnupg ) - perl? ( - dev-perl/Error - dev-perl/MailTools - dev-perl/Authen-SASL - cgi? ( - dev-perl/CGI - highlight? ( app-text/highlight ) - ) - cvs? ( - >=dev-vcs/cvsps-2.1:0 - dev-perl/DBI - dev-perl/DBD-SQLite - ) - mediawiki? ( - dev-perl/DateTime-Format-ISO8601 - dev-perl/HTML-Tree - dev-perl/MediaWiki-API - ) - subversion? ( - dev-vcs/subversion[-dso(-),perl] - dev-perl/libwww-perl - dev-perl/TermReadKey - ) - ) - perforce? ( ${PYTHON_DEPS} ) -" - -# This is how info docs are created with Git: -# .txt/asciidoc --(asciidoc)---------> .xml/docbook -# .xml/docbook --(docbook2texi.pl)--> .texi -# .texi --(makeinfo)---------> .info -BDEPEND=" - doc? ( - app-text/asciidoc - app-text/docbook2X - app-text/xmlto - sys-apps/texinfo - ) - nls? ( sys-devel/gettext ) - test? ( app-crypt/gnupg ) -" - -# Live ebuild builds man pages and HTML docs, additionally -if [[ ${PV} == *9999 ]]; then - BDEPEND="${BDEPEND} - app-text/asciidoc" -fi - -SITEFILE="50${PN}-gentoo.el" -S="${WORKDIR}/${MY_P}" - -REQUIRED_USE=" - cgi? ( perl ) - cvs? ( perl ) - mediawiki? ( perl ) - mediawiki-experimental? ( mediawiki ) - subversion? ( perl ) - webdav? ( curl ) - pcre-jit? ( pcre ) - perforce? ( ${PYTHON_REQUIRED_USE} ) -" - -RESTRICT="!test? ( test )" - -PATCHES=( - # bug #350330 - automagic CVS when we don't want it is bad. - "${FILESDIR}"/git-2.22.0_rc0-optional-cvs.patch - - "${FILESDIR}"/git-2.2.0-svn-fe-linking.patch - - # Make submodule output quiet - "${FILESDIR}"/git-2.21.0-quiet-submodules-testcase.patch -) - -pkg_setup() { - if use subversion && has_version "dev-vcs/subversion[dso]"; then - ewarn "Per Gentoo bugs #223747, #238586, when subversion is built" - ewarn "with USE=dso, there may be weird crashes in git-svn. You" - ewarn "have been warned." - fi - if use perforce ; then - python-single-r1_pkg_setup - fi -} - -# This is needed because for some obscure reasons future calls to make don't -# pick up these exports if we export them in src_unpack() -exportmakeopts() { - local extlibs myopts - - myopts=( - ASCIIDOC_NO_ROFF=YesPlease - $(usex cvs '' NO_CVS=YesPlease) - $(usex elibc_musl NO_REGEX=YesPlease '') - $(usex iconv '' NO_ICONV=YesPlease) - $(usex nls '' NO_GETTEXT=YesPlease) - $(usex perl 'INSTALLDIRS=vendor NO_PERL_CPAN_FALLBACKS=YesPlease' NO_PERL=YesPlease) - $(usex perforce '' NO_PYTHON=YesPlease) - $(usex subversion '' NO_SVN_TESTS=YesPlease) - $(usex threads '' NO_PTHREADS=YesPlease) - $(usex tk '' NO_TCLTK=YesPlease) - ) - - if use blksha1 ; then - myopts+=( BLK_SHA1=YesPlease ) - elif use ppcsha1 ; then - myopts+=( PPC_SHA1=YesPlease ) - fi - - if use curl ; then - use webdav || myopts+=( NO_EXPAT=YesPlease ) - else - myopts+=( NO_CURL=YesPlease ) - fi - - # broken assumptions, because of static build system ... - myopts+=( - NO_FINK=YesPlease - NO_DARWIN_PORTS=YesPlease - INSTALL=install - TAR=tar - SHELL_PATH="${EPREFIX}/bin/sh" - SANE_TOOL_PATH= - OLD_ICONV= - NO_EXTERNAL_GREP= - ) - - # For svn-fe - extlibs=( -lz -lssl ${S}/xdiff/lib.a $(usex threads -lpthread '') ) - - # can't define this to null, since the entire makefile depends on it - sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile || die - - if use pcre; then - if use pcre-jit; then - myopts+=( USE_LIBPCRE2=YesPlease ) - extlibs+=( -lpcre2-8 ) - else - myopts+=( - USE_LIBPCRE1=YesPlease - NO_LIBPCRE1_JIT=YesPlease - ) - extlibs+=( -lpcre ) - fi - fi - if [[ ${CHOST} == *-solaris* ]]; then - myopts+=( - NEEDS_LIBICONV=YesPlease - HAVE_CLOCK_MONOTONIC=1 - ) - if grep -q getdelim "${EROOT}"/usr/include/stdio.h ; then - myopts+=( HAVE_GETDELIM=1 ) - fi - fi - - if has_version '>=app-text/asciidoc-8.0' ; then - myopts+=( ASCIIDOC8=YesPlease ) - fi - - # Bug 290465: - # builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim' - if [[ "${CHOST}" == *-uclibc* ]] ; then - myopts+=( NO_NSEC=YesPlease ) - use iconv && myopts+=( NEEDS_LIBICONV=YesPlease ) - fi - - export MY_MAKEOPTS="${myopts[@]}" - export EXTLIBS="${extlibs[@]}" -} - -src_unpack() { - if [[ ${PV} != *9999 ]]; then - unpack ${MY_P}.tar.${SRC_URI_SUFFIX} - cd "${S}" || die - unpack ${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX} - if use doc ; then - pushd "${S}"/Documentation &>/dev/null || die - unpack ${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} - popd &>/dev/null || die - fi - else - git-r3_src_unpack - #cp "${FILESDIR}"/GIT-VERSION-GEN . - fi - -} - -src_prepare() { - # add experimental patches to improve mediawiki support - # see patches for origin - if use mediawiki-experimental ; then - PATCHES+=( - "${FILESDIR}"/git-2.7.0-mediawiki-namespaces.patch - "${FILESDIR}"/git-2.7.0-mediawiki-subpages.patch - "${FILESDIR}"/git-2.7.0-mediawiki-500pages.patch - ) - fi - - default - - sed -i \ - -e 's:^\(CFLAGS[[:space:]]*=\).*$:\1 $(OPTCFLAGS) -Wall:' \ - -e 's:^\(LDFLAGS[[:space:]]*=\).*$:\1 $(OPTLDFLAGS):' \ - -e 's:^\(CC[[:space:]]* =\).*$:\1$(OPTCC):' \ - -e 's:^\(AR[[:space:]]* =\).*$:\1$(OPTAR):' \ - -e "s:\(PYTHON_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \ - -e "s:\(PERL_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \ - Makefile contrib/svn-fe/Makefile || die - - # Fix docbook2texi command - sed -r -i 's/DOCBOOK2X_TEXI[[:space:]]*=[[:space:]]*docbook2x-texi/DOCBOOK2X_TEXI = docbook2texi.pl/' \ - Documentation/Makefile || die -} - -git_emake() { - # bug #320647: PYTHON_PATH - local PYTHON_PATH="" - use perforce && PYTHON_PATH="${PYTHON}" - emake ${MY_MAKEOPTS} \ - prefix="${EPREFIX}"/usr \ - htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \ - perllibdir="$(use perl && perl_get_raw_vendorlib)" \ - sysconfdir="${EPREFIX}"/etc \ - DESTDIR="${D}" \ - GIT_TEST_OPTS="--no-color" \ - OPTAR="$(tc-getAR)" \ - OPTCC="$(tc-getCC)" \ - OPTCFLAGS="${CFLAGS}" \ - OPTLDFLAGS="${LDFLAGS}" \ - PERL_PATH="${EPREFIX}/usr/bin/perl" \ - PERL_MM_OPT="" \ - PYTHON_PATH="${PYTHON_PATH}" \ - V=1 \ - "$@" -} - -src_configure() { - exportmakeopts -} - -src_compile() { - git_emake || die "emake failed" - - if use emacs ; then - elisp-compile contrib/emacs/git{,-blame}.el - fi - - if use perl && use cgi ; then - git_emake \ - gitweb \ - || die "emake gitweb (cgi) failed" - fi - - if [[ ${CHOST} == *-darwin* ]]; then - pushd contrib/credential/osxkeychain &>/dev/null || die - git_emake CC=$(tc-getCC) CFLAGS="${CFLAGS}" \ - || die "emake credential-osxkeychain" - popd &>/dev/null || die - fi - - pushd Documentation &>/dev/null || die - if [[ ${PV} == *9999 ]] ; then - git_emake man \ - || die "emake man failed" - if use doc ; then - git_emake info html \ - || die "emake info html failed" - fi - else - if use doc ; then - git_emake info \ - || die "emake info html failed" - fi - fi - popd &>/dev/null || die - - if use subversion ; then - pushd contrib/svn-fe &>/dev/null || die - # by defining EXTLIBS we override the detection for libintl and - # libiconv, bug #516168 - local nlsiconv=() - use nls && use !elibc_glibc && nlsiconv+=( -lintl ) - use iconv && use !elibc_glibc && nlsiconv+=( -liconv ) - git_emake EXTLIBS="${EXTLIBS} ${nlsiconv[@]}" \ - || die "emake svn-fe failed" - if use doc ; then - # svn-fe.1 requires the full USE=doc dependency stack - git_emake svn-fe.1 \ - || die "emake svn-fe.1 failed" - git_emake svn-fe.html \ - || die "svn-fe.html failed" - fi - popd &>/dev/null || die - fi - - if use gnome-keyring ; then - pushd contrib/credential/libsecret &>/dev/null || die - git_emake || die "emake git-credential-libsecret failed" - popd &>/dev/null || die - fi - - pushd contrib/subtree &>/dev/null || die - git_emake git-subtree - # git-subtree.1 requires the full USE=doc dependency stack - use doc && git_emake git-subtree.html git-subtree.1 - popd &>/dev/null || die - - pushd contrib/diff-highlight &>/dev/null || die - git_emake - popd &>/dev/null || die - - if use mediawiki ; then - pushd contrib/mw-to-git &>/dev/null || die - git_emake - popd &>/dev/null || die - - fi -} - -src_install() { - git_emake install || die "make install failed" - - if [[ ${CHOST} == *-darwin* ]]; then - dobin contrib/credential/osxkeychain/git-credential-osxkeychain - fi - - # Depending on the tarball and manual rebuild of the documentation, the - # manpages may exist in either OR both of these directories. - find man?/*.[157] >/dev/null 2>&1 && doman man?/*.[157] - find Documentation/*.[157] >/dev/null 2>&1 && doman Documentation/*.[157] - dodoc README* Documentation/{SubmittingPatches,CodingGuidelines} - use doc && dodir /usr/share/doc/${PF}/html - local d - for d in / /howto/ /technical/ ; do - docinto ${d} - dodoc Documentation${d}*.txt - if use doc ; then - docinto ${d}/html - dodoc Documentation${d}*.html - fi - done - docinto / - # Upstream does not ship this pre-built :-( - use doc && doinfo Documentation/{git,gitman}.info - - newbashcomp contrib/completion/git-completion.bash ${PN} - bashcomp_alias git gitk - # Not really a bash-completion file (bug #477920) - # but still needed uncompressed (bug #507480) - insinto /usr/share/${PN} - doins contrib/completion/git-prompt.sh - - if use emacs ; then - elisp-install ${PN} contrib/emacs/git.{el,elc} - elisp-install ${PN} contrib/emacs/git-blame.{el,elc} - #elisp-install ${PN}/compat contrib/emacs/vc-git.{el,elc} - # don't add automatically to the load-path, so the sitefile - # can do a conditional loading - touch "${ED}${SITELISP}/${PN}/compat/.nosearch" - elisp-site-file-install "${FILESDIR}"/${SITEFILE} - fi - - #dobin contrib/fast-import/git-p4 # Moved upstream - #dodoc contrib/fast-import/git-p4.txt # Moved upstream - newbin contrib/fast-import/import-tars.perl import-tars - exeinto /usr/libexec/git-core/ - newexe contrib/git-resurrect.sh git-resurrect - - # git-subtree - pushd contrib/subtree &>/dev/null || die - git_emake install || die "Failed to emake install for git-subtree" - if use doc ; then - # Do not move git subtree install-man outside USE=doc! - git_emake install-man install-html || die "Failed to emake install-html install-man for git-subtree" - fi - newdoc README README.git-subtree - dodoc git-subtree.txt - popd &>/dev/null || die - - if use mediawiki ; then - pushd contrib/mw-to-git &>/dev/null || die - git_emake install - popd &>/dev/null || die - fi - - # diff-highlight - dobin contrib/diff-highlight/diff-highlight - newdoc contrib/diff-highlight/README README.diff-highlight - - # git-jump - exeinto /usr/libexec/git-core/ - doexe contrib/git-jump/git-jump - newdoc contrib/git-jump/README git-jump.txt - - # git-contacts - exeinto /usr/libexec/git-core/ - doexe contrib/contacts/git-contacts - dodoc contrib/contacts/git-contacts.txt - - if use gnome-keyring ; then - pushd contrib/credential/libsecret &>/dev/null || die - dobin git-credential-libsecret - popd &>/dev/null || die - fi - - if use subversion ; then - pushd contrib/svn-fe &>/dev/null || die - dobin svn-fe - dodoc svn-fe.txt - if use doc ; then - # Do not move svn-fe.1 outside USE=doc! - doman svn-fe.1 - docinto html - dodoc svn-fe.html - fi - popd &>/dev/null || die - fi - - dodir /usr/share/${PN}/contrib - # The following are excluded: - # completion - installed above - # diff-highlight - done above - # emacs - installed above - # examples - these are stuff that is not used in Git anymore actually - # git-jump - done above - # gitview - installed above - # p4import - excluded because fast-import has a better one - # patches - stuff the Git guys made to go upstream to other places - # persistent-https - TODO - # mw-to-git - TODO - # subtree - build seperately - # svnimport - use git-svn - # thunderbird-patch-inline - fixes thunderbird - local contrib_objects=( - buildsystems - fast-import - hg-to-git - hooks - remotes2config.sh - rerere-train.sh - stats - workdir - ) - local i - for i in "${contrib_objects[@]}" ; do - cp -rf \ - "${S}"/contrib/${i} \ - "${ED}"/usr/share/${PN}/contrib \ - || die "Failed contrib ${i}" - done - - if use perl && use cgi ; then - # We used to install in /usr/share/${PN}/gitweb - # but upstream installs in /usr/share/gitweb - # so we will install a symlink and use their location for compat with other - # distros - dosym ../gitweb /usr/share/${PN}/gitweb - - # INSTALL discusses configuration issues, not just installation - docinto / - newdoc "${S}"/gitweb/INSTALL INSTALL.gitweb - newdoc "${S}"/gitweb/README README.gitweb - - for d in "${ED}"/usr/lib{,64}/perl5/ ; do - if test -d "${d}" ; then find "${d}" \ - -name .packlist \ - -delete || die - fi - done - else - rm -rf "${ED}"/usr/share/gitweb - fi - - if ! use subversion ; then - rm -f "${ED}"/usr/libexec/git-core/git-svn \ - "${ED}"/usr/share/man/man1/git-svn.1* - fi - - if use xinetd ; then - insinto /etc/xinetd.d - newins "${FILESDIR}"/git-daemon.xinetd git-daemon - fi - - if use !prefix ; then - newinitd "${FILESDIR}"/git-daemon-r1.initd git-daemon - newconfd "${FILESDIR}"/git-daemon.confd git-daemon - systemd_newunit "${FILESDIR}/git-daemon_at-r1.service" "git-daemon@.service" - systemd_dounit "${FILESDIR}/git-daemon.socket" - fi - - perl_delete_localpod - - # Remove disabled linguas - # we could remove sources in src_prepare, but install does not - # handle missing locale dir well - rm_loc() { - if [[ -e "${ED}/usr/share/locale/${1}" ]]; then - rm -r "${ED}/usr/share/locale/${1}" || die - fi - } - l10n_for_each_disabled_locale_do rm_loc -} - -src_test() { - local disabled=() - local tests_cvs=( - t9200-git-cvsexportcommit.sh - t9400-git-cvsserver-server.sh - t9401-git-cvsserver-crlf.sh - t9402-git-cvsserver-refs.sh - t9600-cvsimport.sh - t9601-cvsimport-vendor-branch.sh - t9602-cvsimport-branches-tags.sh - t9603-cvsimport-patchsets.sh - t9604-cvsimport-timestamps.sh - ) - local tests_perl=( - t3701-add-interactive.sh - t5502-quickfetch.sh - t5512-ls-remote.sh - t5520-pull.sh - t7106-reset-unborn-branch.sh - t7501-commit.sh - ) - # Bug #225601 - t0004 is not suitable for root perm - # Bug #219839 - t1004 is not suitable for root perm - # t0001-init.sh - check for init notices EPERM* fails - local tests_nonroot=( - t0001-init.sh - t0004-unwritable.sh - t0070-fundamental.sh - t1004-read-tree-m-u-wf.sh - t3700-add.sh - t7300-clean.sh - ) - # t9100 still fails with symlinks in SVN 1.7 - local test_svn=( t9100-git-svn-basic.sh ) - - # Unzip is used only for the testcase code, not by any normal parts of Git. - if ! has_version app-arch/unzip ; then - einfo "Disabling tar-tree tests" - disabled+=( t5000-tar-tree.sh ) - fi - - local cvs=0 - use cvs && let cvs=${cvs}+1 - if [[ ${EUID} -eq 0 ]]; then - if [[ ${cvs} -eq 1 ]]; then - ewarn "Skipping CVS tests because CVS does not work as root!" - ewarn "You should retest with FEATURES=userpriv!" - disabled+=( ${tests_cvs[@]} ) - fi - einfo "Skipping other tests that require being non-root" - disabled+=( ${tests_nonroot[@]} ) - else - [[ ${cvs} -gt 0 ]] && \ - has_version dev-vcs/cvs && \ - let cvs=${cvs}+1 - [[ ${cvs} -gt 1 ]] && \ - has_version "dev-vcs/cvs[server]" && \ - let cvs=${cvs}+1 - if [[ ${cvs} -lt 3 ]]; then - einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])" - disabled+=( ${tests_cvs[@]} ) - fi - fi - - if ! use perl ; then - einfo "Disabling tests that need Perl" - disabled+=( ${tests_perl[@]} ) - fi - - einfo "Disabling tests that fail with SVN 1.7" - disabled+=( ${test_svn[@]} ) - - # Reset all previously disabled tests - pushd t &>/dev/null || die - local i - for i in *.sh.DISABLED ; do - [[ -f "${i}" ]] && mv -f "${i}" "${i%.DISABLED}" - done - einfo "Disabled tests:" - for i in ${disabled[@]} ; do - [[ -f "${i}" ]] && mv -f "${i}" "${i}.DISABLED" && einfo "Disabled ${i}" - done - - # Avoid the test system removing the results because we want them ourselves - sed -e '/^[[:space:]]*$(MAKE) clean/s,^,#,g' \ - -i Makefile || die - - # Clean old results first, must always run - nonfatal git_emake clean - popd &>/dev/null || die - - # Now run the tests, keep going if we hit an error, and don't terminate on - # failure - local rc - einfo "Start test run" - #MAKEOPTS=-j1 - nonfatal git_emake --keep-going test - rc=$? - - # Display nice results, now print the results - pushd t &>/dev/null || die - nonfatal git_emake aggregate-results - - # And bail if there was a problem - [[ ${rc} -eq 0 ]] || die "tests failed. Please file a bug." -} - -showpkgdeps() { - local pkg=$1 - shift - elog " $(printf "%-17s:" ${pkg}) ${@}" -} - -pkg_postinst() { - use emacs && elisp-site-regen - elog "Please read /usr/share/bash-completion/completions/git for Git bash command" - elog "completion." - elog "Please read /usr/share/git/git-prompt.sh for Git bash prompt" - elog "Note that the prompt bash code is now in that separate script" - elog "These additional scripts need some dependencies:" - echo - showpkgdeps git-quiltimport "dev-util/quilt" - showpkgdeps git-instaweb \ - "|| ( www-servers/lighttpd www-servers/apache www-servers/nginx )" - echo - use mediawiki-experimental && ewarn "Using experimental git-mediawiki patches. The stability of cloned wiki filesystems is not guaranteed." -} - -pkg_postrm() { - use emacs && elisp-site-regen -} diff --git a/dev-vcs/git/git-2.29.2.ebuild b/dev-vcs/git/git-2.29.2.ebuild deleted file mode 100644 index d73a1120a380..000000000000 --- a/dev-vcs/git/git-2.29.2.ebuild +++ /dev/null @@ -1,676 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -GENTOO_DEPEND_ON_PERL=no - -# bug #329479: git-remote-testgit is not multiple-version aware -PYTHON_COMPAT=( python3_{7,8} ) - -inherit toolchain-funcs elisp-common l10n perl-module bash-completion-r1 python-single-r1 systemd - -PLOCALES="bg ca de es fr is it ko pt_PT ru sv vi zh_CN" -if [[ ${PV} == *9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git" - # Please ensure that all _four_ 9999 ebuilds get updated; they track the 4 upstream branches. - # See https://git-scm.com/docs/gitworkflows#_graduation - # In order of stability: - # 9999-r0: maint - # 9999-r1: master - # 9999-r2: next - # 9999-r3: seen - case "${PVR}" in - 9999) EGIT_BRANCH=maint ;; - 9999-r1) EGIT_BRANCH=master ;; - 9999-r2) EGIT_BRANCH=next;; - 9999-r3) EGIT_BRANCH=seen ;; - esac -fi - -MY_PV="${PV/_rc/.rc}" -MY_P="${PN}-${MY_PV}" - -DOC_VER="${MY_PV}" - -DESCRIPTION="stupid content tracker: distributed VCS designed for speed and efficiency" -HOMEPAGE="https://www.git-scm.com/" -if [[ ${PV} != *9999 ]]; then - SRC_URI_SUFFIX="xz" - SRC_URI_KORG="https://www.kernel.org/pub/software/scm/git" - [[ "${PV/rc}" != "${PV}" ]] && SRC_URI_KORG+='/testing' - SRC_URI="${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX} - ${SRC_URI_KORG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX} - doc? ( - ${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} - )" - [[ "${PV}" == *_rc* ]] || \ - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -fi - -LICENSE="GPL-2" -SLOT="0" -IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit perforce +perl +ppcsha1 subversion tk +threads +webdav xinetd cvs test" - -# Common to both DEPEND and RDEPEND -DEPEND=" - gnome-keyring? ( app-crypt/libsecret ) - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:= ) - sys-libs/zlib - pcre? ( - pcre-jit? ( dev-libs/libpcre2[jit(+)] ) - !pcre-jit? ( dev-libs/libpcre ) - ) - perl? ( dev-lang/perl:=[-build(-)] ) - tk? ( dev-lang/tk:0= ) - curl? ( - net-misc/curl - webdav? ( dev-libs/expat ) - ) - emacs? ( >=app-editors/emacs-23.1:* ) - iconv? ( virtual/libiconv ) -" - -RDEPEND="${DEPEND} - gpg? ( app-crypt/gnupg ) - perl? ( - dev-perl/Error - dev-perl/MailTools - dev-perl/Authen-SASL - >=virtual/perl-libnet-3.110.0-r4[ssl] - cgi? ( - dev-perl/CGI - highlight? ( app-text/highlight ) - ) - cvs? ( - >=dev-vcs/cvsps-2.1:0 - dev-perl/DBI - dev-perl/DBD-SQLite - ) - mediawiki? ( - dev-perl/DateTime-Format-ISO8601 - dev-perl/HTML-Tree - dev-perl/MediaWiki-API - ) - subversion? ( - dev-vcs/subversion[-dso(-),perl] - dev-perl/libwww-perl - dev-perl/TermReadKey - ) - ) - perforce? ( ${PYTHON_DEPS} ) -" - -# This is how info docs are created with Git: -# .txt/asciidoc --(asciidoc)---------> .xml/docbook -# .xml/docbook --(docbook2texi.pl)--> .texi -# .texi --(makeinfo)---------> .info -BDEPEND=" - doc? ( - app-text/asciidoc - app-text/docbook2X - app-text/xmlto - sys-apps/texinfo - ) - nls? ( sys-devel/gettext ) - test? ( app-crypt/gnupg ) -" - -# Live ebuild builds man pages and HTML docs, additionally -if [[ ${PV} == *9999 ]]; then - BDEPEND="${BDEPEND} - app-text/asciidoc" -fi - -SITEFILE="50${PN}-gentoo.el" -S="${WORKDIR}/${MY_P}" - -REQUIRED_USE=" - cgi? ( perl ) - cvs? ( perl ) - mediawiki? ( perl ) - mediawiki-experimental? ( mediawiki ) - pcre-jit? ( pcre ) - perforce? ( ${PYTHON_REQUIRED_USE} ) - subversion? ( perl ) - webdav? ( curl ) -" - -RESTRICT="!test? ( test )" - -PATCHES=( - # bug #350330 - automagic CVS when we don't want it is bad. - "${FILESDIR}"/git-2.22.0_rc0-optional-cvs.patch - - # Make submodule output quiet - "${FILESDIR}"/git-2.21.0-quiet-submodules-testcase.patch -) - -pkg_setup() { - if use subversion && has_version "dev-vcs/subversion[dso]" ; then - ewarn "Per Gentoo bugs #223747, #238586, when subversion is built" - ewarn "with USE=dso, there may be weird crashes in git-svn. You" - ewarn "have been warned." - fi - - if use perforce ; then - python-single-r1_pkg_setup - fi -} - -# This is needed because for some obscure reasons future calls to make don't -# pick up these exports if we export them in src_unpack() -exportmakeopts() { - local extlibs myopts - - myopts=( - ASCIIDOC_NO_ROFF=YesPlease - $(usex cvs '' NO_CVS=YesPlease) - $(usex elibc_musl NO_REGEX=YesPlease '') - $(usex iconv '' NO_ICONV=YesPlease) - $(usex nls '' NO_GETTEXT=YesPlease) - $(usex perl 'INSTALLDIRS=vendor NO_PERL_CPAN_FALLBACKS=YesPlease' NO_PERL=YesPlease) - $(usex perforce '' NO_PYTHON=YesPlease) - $(usex subversion '' NO_SVN_TESTS=YesPlease) - $(usex threads '' NO_PTHREADS=YesPlease) - $(usex tk '' NO_TCLTK=YesPlease) - ) - - if use blksha1 ; then - myopts+=( BLK_SHA1=YesPlease ) - elif use ppcsha1 ; then - myopts+=( PPC_SHA1=YesPlease ) - fi - - if use curl ; then - use webdav || myopts+=( NO_EXPAT=YesPlease ) - else - myopts+=( NO_CURL=YesPlease ) - fi - - # broken assumptions, because of static build system ... - myopts+=( - NO_FINK=YesPlease - NO_DARWIN_PORTS=YesPlease - INSTALL=install - TAR=tar - SHELL_PATH="${EPREFIX}/bin/sh" - SANE_TOOL_PATH= - OLD_ICONV= - NO_EXTERNAL_GREP= - ) - - # can't define this to null, since the entire makefile depends on it - sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile || die - - if use pcre; then - if use pcre-jit; then - myopts+=( USE_LIBPCRE2=YesPlease ) - extlibs+=( -lpcre2-8 ) - else - myopts+=( - USE_LIBPCRE1=YesPlease - NO_LIBPCRE1_JIT=YesPlease - ) - extlibs+=( -lpcre ) - fi - fi - if [[ ${CHOST} == *-solaris* ]]; then - myopts+=( - NEEDS_LIBICONV=YesPlease - HAVE_CLOCK_MONOTONIC=1 - ) - if grep -q getdelim "${EROOT}"/usr/include/stdio.h ; then - myopts+=( HAVE_GETDELIM=1 ) - fi - fi - - if has_version '>=app-text/asciidoc-8.0' ; then - myopts+=( ASCIIDOC8=YesPlease ) - fi - - # Bug 290465: - # builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim' - if [[ "${CHOST}" == *-uclibc* ]] ; then - myopts+=( NO_NSEC=YesPlease ) - use iconv && myopts+=( NEEDS_LIBICONV=YesPlease ) - fi - - export MY_MAKEOPTS="${myopts[@]}" - export EXTLIBS="${extlibs[@]}" -} - -src_unpack() { - if [[ ${PV} != *9999 ]]; then - unpack ${MY_P}.tar.${SRC_URI_SUFFIX} - cd "${S}" || die - unpack ${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX} - if use doc ; then - pushd "${S}"/Documentation &>/dev/null || die - unpack ${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} - popd &>/dev/null || die - fi - else - git-r3_src_unpack - #cp "${FILESDIR}"/GIT-VERSION-GEN . - fi - -} - -src_prepare() { - # add experimental patches to improve mediawiki support - # see patches for origin - if use mediawiki-experimental ; then - PATCHES+=( - "${FILESDIR}"/git-2.7.0-mediawiki-namespaces.patch - "${FILESDIR}"/git-2.7.0-mediawiki-subpages.patch - "${FILESDIR}"/git-2.7.0-mediawiki-500pages.patch - ) - fi - - default - - sed -i \ - -e 's:^\(CFLAGS[[:space:]]*=\).*$:\1 $(OPTCFLAGS) -Wall:' \ - -e 's:^\(LDFLAGS[[:space:]]*=\).*$:\1 $(OPTLDFLAGS):' \ - -e 's:^\(CC[[:space:]]* =\).*$:\1$(OPTCC):' \ - -e 's:^\(AR[[:space:]]* =\).*$:\1$(OPTAR):' \ - -e "s:\(PYTHON_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \ - -e "s:\(PERL_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \ - Makefile || die - - # Fix docbook2texi command - sed -r -i 's/DOCBOOK2X_TEXI[[:space:]]*=[[:space:]]*docbook2x-texi/DOCBOOK2X_TEXI = docbook2texi.pl/' \ - Documentation/Makefile || die -} - -git_emake() { - # bug #320647: PYTHON_PATH - local PYTHON_PATH="" - use perforce && PYTHON_PATH="${PYTHON}" - emake ${MY_MAKEOPTS} \ - prefix="${EPREFIX}"/usr \ - htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \ - perllibdir="$(use perl && perl_get_raw_vendorlib)" \ - sysconfdir="${EPREFIX}"/etc \ - DESTDIR="${D}" \ - GIT_TEST_OPTS="--no-color" \ - OPTAR="$(tc-getAR)" \ - OPTCC="$(tc-getCC)" \ - OPTCFLAGS="${CFLAGS}" \ - OPTLDFLAGS="${LDFLAGS}" \ - PERL_PATH="${EPREFIX}/usr/bin/perl" \ - PERL_MM_OPT="" \ - PYTHON_PATH="${PYTHON_PATH}" \ - V=1 \ - "$@" -} - -src_configure() { - exportmakeopts -} - -src_compile() { - git_emake || die "emake failed" - - if use emacs ; then - elisp-compile contrib/emacs/git{,-blame}.el - fi - - if use perl && use cgi ; then - git_emake \ - gitweb \ - || die "emake gitweb (cgi) failed" - fi - - if [[ ${CHOST} == *-darwin* && ! tc-is-gcc ]]; then - pushd contrib/credential/osxkeychain &>/dev/null || die - git_emake CC=$(tc-getCC) CFLAGS="${CFLAGS}" \ - || die "emake credential-osxkeychain" - popd &>/dev/null || die - fi - - pushd Documentation &>/dev/null || die - if [[ ${PV} == *9999 ]] ; then - git_emake man \ - || die "emake man failed" - if use doc ; then - git_emake info html \ - || die "emake info html failed" - fi - else - if use doc ; then - git_emake info \ - || die "emake info html failed" - fi - fi - popd &>/dev/null || die - - if use gnome-keyring ; then - pushd contrib/credential/libsecret &>/dev/null || die - git_emake || die "emake git-credential-libsecret failed" - popd &>/dev/null || die - fi - - pushd contrib/subtree &>/dev/null || die - git_emake git-subtree - # git-subtree.1 requires the full USE=doc dependency stack - use doc && git_emake git-subtree.html git-subtree.1 - popd &>/dev/null || die - - pushd contrib/diff-highlight &>/dev/null || die - git_emake - popd &>/dev/null || die - - if use mediawiki ; then - pushd contrib/mw-to-git &>/dev/null || die - git_emake - popd &>/dev/null || die - - fi -} - -src_install() { - git_emake install || die "make install failed" - - if [[ ${CHOST} == *-darwin* && ! tc-is-gcc ]]; then - dobin contrib/credential/osxkeychain/git-credential-osxkeychain - fi - - # Depending on the tarball and manual rebuild of the documentation, the - # manpages may exist in either OR both of these directories. - find man?/*.[157] >/dev/null 2>&1 && doman man?/*.[157] - find Documentation/*.[157] >/dev/null 2>&1 && doman Documentation/*.[157] - dodoc README* Documentation/{SubmittingPatches,CodingGuidelines} - use doc && dodir /usr/share/doc/${PF}/html - local d - for d in / /howto/ /technical/ ; do - docinto ${d} - dodoc Documentation${d}*.txt - if use doc ; then - docinto ${d}/html - dodoc Documentation${d}*.html - fi - done - docinto / - # Upstream does not ship this pre-built :-( - use doc && doinfo Documentation/{git,gitman}.info - - newbashcomp contrib/completion/git-completion.bash ${PN} - bashcomp_alias git gitk - # Not really a bash-completion file (bug #477920) - # but still needed uncompressed (bug #507480) - insinto /usr/share/${PN} - doins contrib/completion/git-prompt.sh - - if use emacs ; then - elisp-install ${PN} contrib/emacs/git.{el,elc} - elisp-install ${PN} contrib/emacs/git-blame.{el,elc} - #elisp-install ${PN}/compat contrib/emacs/vc-git.{el,elc} - # don't add automatically to the load-path, so the sitefile - # can do a conditional loading - touch "${ED}${SITELISP}/${PN}/compat/.nosearch" - elisp-site-file-install "${FILESDIR}"/${SITEFILE} - fi - - #dobin contrib/fast-import/git-p4 # Moved upstream - #dodoc contrib/fast-import/git-p4.txt # Moved upstream - newbin contrib/fast-import/import-tars.perl import-tars - exeinto /usr/libexec/git-core/ - newexe contrib/git-resurrect.sh git-resurrect - - # git-subtree - pushd contrib/subtree &>/dev/null || die - git_emake install || die "Failed to emake install for git-subtree" - if use doc ; then - # Do not move git subtree install-man outside USE=doc! - git_emake install-man install-html || die "Failed to emake install-html install-man for git-subtree" - fi - newdoc README README.git-subtree - dodoc git-subtree.txt - popd &>/dev/null || die - - if use mediawiki ; then - pushd contrib/mw-to-git &>/dev/null || die - git_emake install - popd &>/dev/null || die - fi - - # diff-highlight - dobin contrib/diff-highlight/diff-highlight - newdoc contrib/diff-highlight/README README.diff-highlight - - # git-jump - exeinto /usr/libexec/git-core/ - doexe contrib/git-jump/git-jump - newdoc contrib/git-jump/README git-jump.txt - - # git-contacts - exeinto /usr/libexec/git-core/ - doexe contrib/contacts/git-contacts - dodoc contrib/contacts/git-contacts.txt - - if use gnome-keyring ; then - pushd contrib/credential/libsecret &>/dev/null || die - dobin git-credential-libsecret - popd &>/dev/null || die - fi - - dodir /usr/share/${PN}/contrib - # The following are excluded: - # completion - installed above - # diff-highlight - done above - # emacs - installed above - # examples - these are stuff that is not used in Git anymore actually - # git-jump - done above - # gitview - installed above - # p4import - excluded because fast-import has a better one - # patches - stuff the Git guys made to go upstream to other places - # persistent-https - TODO - # mw-to-git - TODO - # subtree - build seperately - # svnimport - use git-svn - # thunderbird-patch-inline - fixes thunderbird - local contrib_objects=( - buildsystems - fast-import - hg-to-git - hooks - remotes2config.sh - rerere-train.sh - stats - workdir - ) - local i - for i in "${contrib_objects[@]}" ; do - cp -rf \ - "${S}"/contrib/${i} \ - "${ED}"/usr/share/${PN}/contrib \ - || die "Failed contrib ${i}" - done - - if use perl && use cgi ; then - # We used to install in /usr/share/${PN}/gitweb - # but upstream installs in /usr/share/gitweb - # so we will install a symlink and use their location for compat with other - # distros - dosym ../gitweb /usr/share/${PN}/gitweb - - # INSTALL discusses configuration issues, not just installation - docinto / - newdoc "${S}"/gitweb/INSTALL INSTALL.gitweb - newdoc "${S}"/gitweb/README README.gitweb - - for d in "${ED}"/usr/lib{,64}/perl5/ ; do - if test -d "${d}" ; then find "${d}" \ - -name .packlist \ - -delete || die - fi - done - else - rm -rf "${ED}"/usr/share/gitweb - fi - - if ! use subversion ; then - rm -f "${ED}"/usr/libexec/git-core/git-svn \ - "${ED}"/usr/share/man/man1/git-svn.1* - fi - - if use xinetd ; then - insinto /etc/xinetd.d - newins "${FILESDIR}"/git-daemon.xinetd git-daemon - fi - - if use !prefix ; then - newinitd "${FILESDIR}"/git-daemon-r1.initd git-daemon - newconfd "${FILESDIR}"/git-daemon.confd git-daemon - systemd_newunit "${FILESDIR}/git-daemon_at-r1.service" "git-daemon@.service" - systemd_dounit "${FILESDIR}/git-daemon.socket" - fi - - perl_delete_localpod - - # Remove disabled linguas - # we could remove sources in src_prepare, but install does not - # handle missing locale dir well - rm_loc() { - if [[ -e "${ED}/usr/share/locale/${1}" ]]; then - rm -r "${ED}/usr/share/locale/${1}" || die - fi - } - l10n_for_each_disabled_locale_do rm_loc -} - -src_test() { - local disabled=() - local tests_cvs=( - t9200-git-cvsexportcommit.sh - t9400-git-cvsserver-server.sh - t9401-git-cvsserver-crlf.sh - t9402-git-cvsserver-refs.sh - t9600-cvsimport.sh - t9601-cvsimport-vendor-branch.sh - t9602-cvsimport-branches-tags.sh - t9603-cvsimport-patchsets.sh - t9604-cvsimport-timestamps.sh - ) - local tests_perl=( - t3701-add-interactive.sh - t5502-quickfetch.sh - t5512-ls-remote.sh - t5520-pull.sh - t7106-reset-unborn-branch.sh - t7501-commit.sh - ) - # Bug #225601 - t0004 is not suitable for root perm - # Bug #219839 - t1004 is not suitable for root perm - # t0001-init.sh - check for init notices EPERM* fails - local tests_nonroot=( - t0001-init.sh - t0004-unwritable.sh - t0070-fundamental.sh - t1004-read-tree-m-u-wf.sh - t3700-add.sh - t7300-clean.sh - ) - # t9100 still fails with symlinks in SVN 1.7 - local test_svn=( t9100-git-svn-basic.sh ) - - # Unzip is used only for the testcase code, not by any normal parts of Git. - if ! has_version app-arch/unzip ; then - einfo "Disabling tar-tree tests" - disabled+=( t5000-tar-tree.sh ) - fi - - local cvs=0 - use cvs && let cvs=${cvs}+1 - if [[ ${EUID} -eq 0 ]]; then - if [[ ${cvs} -eq 1 ]]; then - ewarn "Skipping CVS tests because CVS does not work as root!" - ewarn "You should retest with FEATURES=userpriv!" - disabled+=( ${tests_cvs[@]} ) - fi - einfo "Skipping other tests that require being non-root" - disabled+=( ${tests_nonroot[@]} ) - else - [[ ${cvs} -gt 0 ]] && \ - has_version dev-vcs/cvs && \ - let cvs=${cvs}+1 - [[ ${cvs} -gt 1 ]] && \ - has_version "dev-vcs/cvs[server]" && \ - let cvs=${cvs}+1 - if [[ ${cvs} -lt 3 ]]; then - einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])" - disabled+=( ${tests_cvs[@]} ) - fi - fi - - if ! use perl ; then - einfo "Disabling tests that need Perl" - disabled+=( ${tests_perl[@]} ) - fi - - einfo "Disabling tests that fail with SVN 1.7" - disabled+=( ${test_svn[@]} ) - - # Reset all previously disabled tests - pushd t &>/dev/null || die - local i - for i in *.sh.DISABLED ; do - [[ -f "${i}" ]] && mv -f "${i}" "${i%.DISABLED}" - done - einfo "Disabled tests:" - for i in ${disabled[@]} ; do - [[ -f "${i}" ]] && mv -f "${i}" "${i}.DISABLED" && einfo "Disabled ${i}" - done - - # Avoid the test system removing the results because we want them ourselves - sed -e '/^[[:space:]]*$(MAKE) clean/s,^,#,g' \ - -i Makefile || die - - # Clean old results first, must always run - nonfatal git_emake clean - popd &>/dev/null || die - - # Now run the tests, keep going if we hit an error, and don't terminate on - # failure - local rc - einfo "Start test run" - #MAKEOPTS=-j1 - nonfatal git_emake --keep-going test - rc=$? - - # Display nice results, now print the results - pushd t &>/dev/null || die - nonfatal git_emake aggregate-results - - # And bail if there was a problem - [[ ${rc} -eq 0 ]] || die "tests failed. Please file a bug." -} - -showpkgdeps() { - local pkg=$1 - shift - elog " $(printf "%-17s:" ${pkg}) ${@}" -} - -pkg_postinst() { - use emacs && elisp-site-regen - elog "Please read /usr/share/bash-completion/completions/git for Git bash command" - elog "completion." - elog "Please read /usr/share/git/git-prompt.sh for Git bash prompt" - elog "Note that the prompt bash code is now in that separate script" - elog "These additional scripts need some dependencies:" - echo - showpkgdeps git-quiltimport "dev-util/quilt" - showpkgdeps git-instaweb \ - "|| ( www-servers/lighttpd www-servers/apache www-servers/nginx )" - echo - use mediawiki-experimental && ewarn "Using experimental git-mediawiki patches. The stability of cloned wiki filesystems is not guaranteed." -} - -pkg_postrm() { - use emacs && elisp-site-regen -} diff --git a/dev-vcs/git/git-2.30.0.ebuild b/dev-vcs/git/git-2.30.0.ebuild deleted file mode 100644 index d73a1120a380..000000000000 --- a/dev-vcs/git/git-2.30.0.ebuild +++ /dev/null @@ -1,676 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -GENTOO_DEPEND_ON_PERL=no - -# bug #329479: git-remote-testgit is not multiple-version aware -PYTHON_COMPAT=( python3_{7,8} ) - -inherit toolchain-funcs elisp-common l10n perl-module bash-completion-r1 python-single-r1 systemd - -PLOCALES="bg ca de es fr is it ko pt_PT ru sv vi zh_CN" -if [[ ${PV} == *9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git" - # Please ensure that all _four_ 9999 ebuilds get updated; they track the 4 upstream branches. - # See https://git-scm.com/docs/gitworkflows#_graduation - # In order of stability: - # 9999-r0: maint - # 9999-r1: master - # 9999-r2: next - # 9999-r3: seen - case "${PVR}" in - 9999) EGIT_BRANCH=maint ;; - 9999-r1) EGIT_BRANCH=master ;; - 9999-r2) EGIT_BRANCH=next;; - 9999-r3) EGIT_BRANCH=seen ;; - esac -fi - -MY_PV="${PV/_rc/.rc}" -MY_P="${PN}-${MY_PV}" - -DOC_VER="${MY_PV}" - -DESCRIPTION="stupid content tracker: distributed VCS designed for speed and efficiency" -HOMEPAGE="https://www.git-scm.com/" -if [[ ${PV} != *9999 ]]; then - SRC_URI_SUFFIX="xz" - SRC_URI_KORG="https://www.kernel.org/pub/software/scm/git" - [[ "${PV/rc}" != "${PV}" ]] && SRC_URI_KORG+='/testing' - SRC_URI="${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX} - ${SRC_URI_KORG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX} - doc? ( - ${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} - )" - [[ "${PV}" == *_rc* ]] || \ - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -fi - -LICENSE="GPL-2" -SLOT="0" -IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit perforce +perl +ppcsha1 subversion tk +threads +webdav xinetd cvs test" - -# Common to both DEPEND and RDEPEND -DEPEND=" - gnome-keyring? ( app-crypt/libsecret ) - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:= ) - sys-libs/zlib - pcre? ( - pcre-jit? ( dev-libs/libpcre2[jit(+)] ) - !pcre-jit? ( dev-libs/libpcre ) - ) - perl? ( dev-lang/perl:=[-build(-)] ) - tk? ( dev-lang/tk:0= ) - curl? ( - net-misc/curl - webdav? ( dev-libs/expat ) - ) - emacs? ( >=app-editors/emacs-23.1:* ) - iconv? ( virtual/libiconv ) -" - -RDEPEND="${DEPEND} - gpg? ( app-crypt/gnupg ) - perl? ( - dev-perl/Error - dev-perl/MailTools - dev-perl/Authen-SASL - >=virtual/perl-libnet-3.110.0-r4[ssl] - cgi? ( - dev-perl/CGI - highlight? ( app-text/highlight ) - ) - cvs? ( - >=dev-vcs/cvsps-2.1:0 - dev-perl/DBI - dev-perl/DBD-SQLite - ) - mediawiki? ( - dev-perl/DateTime-Format-ISO8601 - dev-perl/HTML-Tree - dev-perl/MediaWiki-API - ) - subversion? ( - dev-vcs/subversion[-dso(-),perl] - dev-perl/libwww-perl - dev-perl/TermReadKey - ) - ) - perforce? ( ${PYTHON_DEPS} ) -" - -# This is how info docs are created with Git: -# .txt/asciidoc --(asciidoc)---------> .xml/docbook -# .xml/docbook --(docbook2texi.pl)--> .texi -# .texi --(makeinfo)---------> .info -BDEPEND=" - doc? ( - app-text/asciidoc - app-text/docbook2X - app-text/xmlto - sys-apps/texinfo - ) - nls? ( sys-devel/gettext ) - test? ( app-crypt/gnupg ) -" - -# Live ebuild builds man pages and HTML docs, additionally -if [[ ${PV} == *9999 ]]; then - BDEPEND="${BDEPEND} - app-text/asciidoc" -fi - -SITEFILE="50${PN}-gentoo.el" -S="${WORKDIR}/${MY_P}" - -REQUIRED_USE=" - cgi? ( perl ) - cvs? ( perl ) - mediawiki? ( perl ) - mediawiki-experimental? ( mediawiki ) - pcre-jit? ( pcre ) - perforce? ( ${PYTHON_REQUIRED_USE} ) - subversion? ( perl ) - webdav? ( curl ) -" - -RESTRICT="!test? ( test )" - -PATCHES=( - # bug #350330 - automagic CVS when we don't want it is bad. - "${FILESDIR}"/git-2.22.0_rc0-optional-cvs.patch - - # Make submodule output quiet - "${FILESDIR}"/git-2.21.0-quiet-submodules-testcase.patch -) - -pkg_setup() { - if use subversion && has_version "dev-vcs/subversion[dso]" ; then - ewarn "Per Gentoo bugs #223747, #238586, when subversion is built" - ewarn "with USE=dso, there may be weird crashes in git-svn. You" - ewarn "have been warned." - fi - - if use perforce ; then - python-single-r1_pkg_setup - fi -} - -# This is needed because for some obscure reasons future calls to make don't -# pick up these exports if we export them in src_unpack() -exportmakeopts() { - local extlibs myopts - - myopts=( - ASCIIDOC_NO_ROFF=YesPlease - $(usex cvs '' NO_CVS=YesPlease) - $(usex elibc_musl NO_REGEX=YesPlease '') - $(usex iconv '' NO_ICONV=YesPlease) - $(usex nls '' NO_GETTEXT=YesPlease) - $(usex perl 'INSTALLDIRS=vendor NO_PERL_CPAN_FALLBACKS=YesPlease' NO_PERL=YesPlease) - $(usex perforce '' NO_PYTHON=YesPlease) - $(usex subversion '' NO_SVN_TESTS=YesPlease) - $(usex threads '' NO_PTHREADS=YesPlease) - $(usex tk '' NO_TCLTK=YesPlease) - ) - - if use blksha1 ; then - myopts+=( BLK_SHA1=YesPlease ) - elif use ppcsha1 ; then - myopts+=( PPC_SHA1=YesPlease ) - fi - - if use curl ; then - use webdav || myopts+=( NO_EXPAT=YesPlease ) - else - myopts+=( NO_CURL=YesPlease ) - fi - - # broken assumptions, because of static build system ... - myopts+=( - NO_FINK=YesPlease - NO_DARWIN_PORTS=YesPlease - INSTALL=install - TAR=tar - SHELL_PATH="${EPREFIX}/bin/sh" - SANE_TOOL_PATH= - OLD_ICONV= - NO_EXTERNAL_GREP= - ) - - # can't define this to null, since the entire makefile depends on it - sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile || die - - if use pcre; then - if use pcre-jit; then - myopts+=( USE_LIBPCRE2=YesPlease ) - extlibs+=( -lpcre2-8 ) - else - myopts+=( - USE_LIBPCRE1=YesPlease - NO_LIBPCRE1_JIT=YesPlease - ) - extlibs+=( -lpcre ) - fi - fi - if [[ ${CHOST} == *-solaris* ]]; then - myopts+=( - NEEDS_LIBICONV=YesPlease - HAVE_CLOCK_MONOTONIC=1 - ) - if grep -q getdelim "${EROOT}"/usr/include/stdio.h ; then - myopts+=( HAVE_GETDELIM=1 ) - fi - fi - - if has_version '>=app-text/asciidoc-8.0' ; then - myopts+=( ASCIIDOC8=YesPlease ) - fi - - # Bug 290465: - # builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim' - if [[ "${CHOST}" == *-uclibc* ]] ; then - myopts+=( NO_NSEC=YesPlease ) - use iconv && myopts+=( NEEDS_LIBICONV=YesPlease ) - fi - - export MY_MAKEOPTS="${myopts[@]}" - export EXTLIBS="${extlibs[@]}" -} - -src_unpack() { - if [[ ${PV} != *9999 ]]; then - unpack ${MY_P}.tar.${SRC_URI_SUFFIX} - cd "${S}" || die - unpack ${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX} - if use doc ; then - pushd "${S}"/Documentation &>/dev/null || die - unpack ${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} - popd &>/dev/null || die - fi - else - git-r3_src_unpack - #cp "${FILESDIR}"/GIT-VERSION-GEN . - fi - -} - -src_prepare() { - # add experimental patches to improve mediawiki support - # see patches for origin - if use mediawiki-experimental ; then - PATCHES+=( - "${FILESDIR}"/git-2.7.0-mediawiki-namespaces.patch - "${FILESDIR}"/git-2.7.0-mediawiki-subpages.patch - "${FILESDIR}"/git-2.7.0-mediawiki-500pages.patch - ) - fi - - default - - sed -i \ - -e 's:^\(CFLAGS[[:space:]]*=\).*$:\1 $(OPTCFLAGS) -Wall:' \ - -e 's:^\(LDFLAGS[[:space:]]*=\).*$:\1 $(OPTLDFLAGS):' \ - -e 's:^\(CC[[:space:]]* =\).*$:\1$(OPTCC):' \ - -e 's:^\(AR[[:space:]]* =\).*$:\1$(OPTAR):' \ - -e "s:\(PYTHON_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \ - -e "s:\(PERL_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \ - Makefile || die - - # Fix docbook2texi command - sed -r -i 's/DOCBOOK2X_TEXI[[:space:]]*=[[:space:]]*docbook2x-texi/DOCBOOK2X_TEXI = docbook2texi.pl/' \ - Documentation/Makefile || die -} - -git_emake() { - # bug #320647: PYTHON_PATH - local PYTHON_PATH="" - use perforce && PYTHON_PATH="${PYTHON}" - emake ${MY_MAKEOPTS} \ - prefix="${EPREFIX}"/usr \ - htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \ - perllibdir="$(use perl && perl_get_raw_vendorlib)" \ - sysconfdir="${EPREFIX}"/etc \ - DESTDIR="${D}" \ - GIT_TEST_OPTS="--no-color" \ - OPTAR="$(tc-getAR)" \ - OPTCC="$(tc-getCC)" \ - OPTCFLAGS="${CFLAGS}" \ - OPTLDFLAGS="${LDFLAGS}" \ - PERL_PATH="${EPREFIX}/usr/bin/perl" \ - PERL_MM_OPT="" \ - PYTHON_PATH="${PYTHON_PATH}" \ - V=1 \ - "$@" -} - -src_configure() { - exportmakeopts -} - -src_compile() { - git_emake || die "emake failed" - - if use emacs ; then - elisp-compile contrib/emacs/git{,-blame}.el - fi - - if use perl && use cgi ; then - git_emake \ - gitweb \ - || die "emake gitweb (cgi) failed" - fi - - if [[ ${CHOST} == *-darwin* && ! tc-is-gcc ]]; then - pushd contrib/credential/osxkeychain &>/dev/null || die - git_emake CC=$(tc-getCC) CFLAGS="${CFLAGS}" \ - || die "emake credential-osxkeychain" - popd &>/dev/null || die - fi - - pushd Documentation &>/dev/null || die - if [[ ${PV} == *9999 ]] ; then - git_emake man \ - || die "emake man failed" - if use doc ; then - git_emake info html \ - || die "emake info html failed" - fi - else - if use doc ; then - git_emake info \ - || die "emake info html failed" - fi - fi - popd &>/dev/null || die - - if use gnome-keyring ; then - pushd contrib/credential/libsecret &>/dev/null || die - git_emake || die "emake git-credential-libsecret failed" - popd &>/dev/null || die - fi - - pushd contrib/subtree &>/dev/null || die - git_emake git-subtree - # git-subtree.1 requires the full USE=doc dependency stack - use doc && git_emake git-subtree.html git-subtree.1 - popd &>/dev/null || die - - pushd contrib/diff-highlight &>/dev/null || die - git_emake - popd &>/dev/null || die - - if use mediawiki ; then - pushd contrib/mw-to-git &>/dev/null || die - git_emake - popd &>/dev/null || die - - fi -} - -src_install() { - git_emake install || die "make install failed" - - if [[ ${CHOST} == *-darwin* && ! tc-is-gcc ]]; then - dobin contrib/credential/osxkeychain/git-credential-osxkeychain - fi - - # Depending on the tarball and manual rebuild of the documentation, the - # manpages may exist in either OR both of these directories. - find man?/*.[157] >/dev/null 2>&1 && doman man?/*.[157] - find Documentation/*.[157] >/dev/null 2>&1 && doman Documentation/*.[157] - dodoc README* Documentation/{SubmittingPatches,CodingGuidelines} - use doc && dodir /usr/share/doc/${PF}/html - local d - for d in / /howto/ /technical/ ; do - docinto ${d} - dodoc Documentation${d}*.txt - if use doc ; then - docinto ${d}/html - dodoc Documentation${d}*.html - fi - done - docinto / - # Upstream does not ship this pre-built :-( - use doc && doinfo Documentation/{git,gitman}.info - - newbashcomp contrib/completion/git-completion.bash ${PN} - bashcomp_alias git gitk - # Not really a bash-completion file (bug #477920) - # but still needed uncompressed (bug #507480) - insinto /usr/share/${PN} - doins contrib/completion/git-prompt.sh - - if use emacs ; then - elisp-install ${PN} contrib/emacs/git.{el,elc} - elisp-install ${PN} contrib/emacs/git-blame.{el,elc} - #elisp-install ${PN}/compat contrib/emacs/vc-git.{el,elc} - # don't add automatically to the load-path, so the sitefile - # can do a conditional loading - touch "${ED}${SITELISP}/${PN}/compat/.nosearch" - elisp-site-file-install "${FILESDIR}"/${SITEFILE} - fi - - #dobin contrib/fast-import/git-p4 # Moved upstream - #dodoc contrib/fast-import/git-p4.txt # Moved upstream - newbin contrib/fast-import/import-tars.perl import-tars - exeinto /usr/libexec/git-core/ - newexe contrib/git-resurrect.sh git-resurrect - - # git-subtree - pushd contrib/subtree &>/dev/null || die - git_emake install || die "Failed to emake install for git-subtree" - if use doc ; then - # Do not move git subtree install-man outside USE=doc! - git_emake install-man install-html || die "Failed to emake install-html install-man for git-subtree" - fi - newdoc README README.git-subtree - dodoc git-subtree.txt - popd &>/dev/null || die - - if use mediawiki ; then - pushd contrib/mw-to-git &>/dev/null || die - git_emake install - popd &>/dev/null || die - fi - - # diff-highlight - dobin contrib/diff-highlight/diff-highlight - newdoc contrib/diff-highlight/README README.diff-highlight - - # git-jump - exeinto /usr/libexec/git-core/ - doexe contrib/git-jump/git-jump - newdoc contrib/git-jump/README git-jump.txt - - # git-contacts - exeinto /usr/libexec/git-core/ - doexe contrib/contacts/git-contacts - dodoc contrib/contacts/git-contacts.txt - - if use gnome-keyring ; then - pushd contrib/credential/libsecret &>/dev/null || die - dobin git-credential-libsecret - popd &>/dev/null || die - fi - - dodir /usr/share/${PN}/contrib - # The following are excluded: - # completion - installed above - # diff-highlight - done above - # emacs - installed above - # examples - these are stuff that is not used in Git anymore actually - # git-jump - done above - # gitview - installed above - # p4import - excluded because fast-import has a better one - # patches - stuff the Git guys made to go upstream to other places - # persistent-https - TODO - # mw-to-git - TODO - # subtree - build seperately - # svnimport - use git-svn - # thunderbird-patch-inline - fixes thunderbird - local contrib_objects=( - buildsystems - fast-import - hg-to-git - hooks - remotes2config.sh - rerere-train.sh - stats - workdir - ) - local i - for i in "${contrib_objects[@]}" ; do - cp -rf \ - "${S}"/contrib/${i} \ - "${ED}"/usr/share/${PN}/contrib \ - || die "Failed contrib ${i}" - done - - if use perl && use cgi ; then - # We used to install in /usr/share/${PN}/gitweb - # but upstream installs in /usr/share/gitweb - # so we will install a symlink and use their location for compat with other - # distros - dosym ../gitweb /usr/share/${PN}/gitweb - - # INSTALL discusses configuration issues, not just installation - docinto / - newdoc "${S}"/gitweb/INSTALL INSTALL.gitweb - newdoc "${S}"/gitweb/README README.gitweb - - for d in "${ED}"/usr/lib{,64}/perl5/ ; do - if test -d "${d}" ; then find "${d}" \ - -name .packlist \ - -delete || die - fi - done - else - rm -rf "${ED}"/usr/share/gitweb - fi - - if ! use subversion ; then - rm -f "${ED}"/usr/libexec/git-core/git-svn \ - "${ED}"/usr/share/man/man1/git-svn.1* - fi - - if use xinetd ; then - insinto /etc/xinetd.d - newins "${FILESDIR}"/git-daemon.xinetd git-daemon - fi - - if use !prefix ; then - newinitd "${FILESDIR}"/git-daemon-r1.initd git-daemon - newconfd "${FILESDIR}"/git-daemon.confd git-daemon - systemd_newunit "${FILESDIR}/git-daemon_at-r1.service" "git-daemon@.service" - systemd_dounit "${FILESDIR}/git-daemon.socket" - fi - - perl_delete_localpod - - # Remove disabled linguas - # we could remove sources in src_prepare, but install does not - # handle missing locale dir well - rm_loc() { - if [[ -e "${ED}/usr/share/locale/${1}" ]]; then - rm -r "${ED}/usr/share/locale/${1}" || die - fi - } - l10n_for_each_disabled_locale_do rm_loc -} - -src_test() { - local disabled=() - local tests_cvs=( - t9200-git-cvsexportcommit.sh - t9400-git-cvsserver-server.sh - t9401-git-cvsserver-crlf.sh - t9402-git-cvsserver-refs.sh - t9600-cvsimport.sh - t9601-cvsimport-vendor-branch.sh - t9602-cvsimport-branches-tags.sh - t9603-cvsimport-patchsets.sh - t9604-cvsimport-timestamps.sh - ) - local tests_perl=( - t3701-add-interactive.sh - t5502-quickfetch.sh - t5512-ls-remote.sh - t5520-pull.sh - t7106-reset-unborn-branch.sh - t7501-commit.sh - ) - # Bug #225601 - t0004 is not suitable for root perm - # Bug #219839 - t1004 is not suitable for root perm - # t0001-init.sh - check for init notices EPERM* fails - local tests_nonroot=( - t0001-init.sh - t0004-unwritable.sh - t0070-fundamental.sh - t1004-read-tree-m-u-wf.sh - t3700-add.sh - t7300-clean.sh - ) - # t9100 still fails with symlinks in SVN 1.7 - local test_svn=( t9100-git-svn-basic.sh ) - - # Unzip is used only for the testcase code, not by any normal parts of Git. - if ! has_version app-arch/unzip ; then - einfo "Disabling tar-tree tests" - disabled+=( t5000-tar-tree.sh ) - fi - - local cvs=0 - use cvs && let cvs=${cvs}+1 - if [[ ${EUID} -eq 0 ]]; then - if [[ ${cvs} -eq 1 ]]; then - ewarn "Skipping CVS tests because CVS does not work as root!" - ewarn "You should retest with FEATURES=userpriv!" - disabled+=( ${tests_cvs[@]} ) - fi - einfo "Skipping other tests that require being non-root" - disabled+=( ${tests_nonroot[@]} ) - else - [[ ${cvs} -gt 0 ]] && \ - has_version dev-vcs/cvs && \ - let cvs=${cvs}+1 - [[ ${cvs} -gt 1 ]] && \ - has_version "dev-vcs/cvs[server]" && \ - let cvs=${cvs}+1 - if [[ ${cvs} -lt 3 ]]; then - einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])" - disabled+=( ${tests_cvs[@]} ) - fi - fi - - if ! use perl ; then - einfo "Disabling tests that need Perl" - disabled+=( ${tests_perl[@]} ) - fi - - einfo "Disabling tests that fail with SVN 1.7" - disabled+=( ${test_svn[@]} ) - - # Reset all previously disabled tests - pushd t &>/dev/null || die - local i - for i in *.sh.DISABLED ; do - [[ -f "${i}" ]] && mv -f "${i}" "${i%.DISABLED}" - done - einfo "Disabled tests:" - for i in ${disabled[@]} ; do - [[ -f "${i}" ]] && mv -f "${i}" "${i}.DISABLED" && einfo "Disabled ${i}" - done - - # Avoid the test system removing the results because we want them ourselves - sed -e '/^[[:space:]]*$(MAKE) clean/s,^,#,g' \ - -i Makefile || die - - # Clean old results first, must always run - nonfatal git_emake clean - popd &>/dev/null || die - - # Now run the tests, keep going if we hit an error, and don't terminate on - # failure - local rc - einfo "Start test run" - #MAKEOPTS=-j1 - nonfatal git_emake --keep-going test - rc=$? - - # Display nice results, now print the results - pushd t &>/dev/null || die - nonfatal git_emake aggregate-results - - # And bail if there was a problem - [[ ${rc} -eq 0 ]] || die "tests failed. Please file a bug." -} - -showpkgdeps() { - local pkg=$1 - shift - elog " $(printf "%-17s:" ${pkg}) ${@}" -} - -pkg_postinst() { - use emacs && elisp-site-regen - elog "Please read /usr/share/bash-completion/completions/git for Git bash command" - elog "completion." - elog "Please read /usr/share/git/git-prompt.sh for Git bash prompt" - elog "Note that the prompt bash code is now in that separate script" - elog "These additional scripts need some dependencies:" - echo - showpkgdeps git-quiltimport "dev-util/quilt" - showpkgdeps git-instaweb \ - "|| ( www-servers/lighttpd www-servers/apache www-servers/nginx )" - echo - use mediawiki-experimental && ewarn "Using experimental git-mediawiki patches. The stability of cloned wiki filesystems is not guaranteed." -} - -pkg_postrm() { - use emacs && elisp-site-regen -} diff --git a/dev-vcs/git/git-2.30.1.ebuild b/dev-vcs/git/git-2.30.1.ebuild deleted file mode 100644 index f6a6fb30a9e9..000000000000 --- a/dev-vcs/git/git-2.30.1.ebuild +++ /dev/null @@ -1,676 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -GENTOO_DEPEND_ON_PERL=no - -# bug #329479: git-remote-testgit is not multiple-version aware -PYTHON_COMPAT=( python3_{7..9} ) - -inherit toolchain-funcs elisp-common l10n perl-module bash-completion-r1 python-single-r1 systemd - -PLOCALES="bg ca de es fr is it ko pt_PT ru sv vi zh_CN" -if [[ ${PV} == *9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git" - # Please ensure that all _four_ 9999 ebuilds get updated; they track the 4 upstream branches. - # See https://git-scm.com/docs/gitworkflows#_graduation - # In order of stability: - # 9999-r0: maint - # 9999-r1: master - # 9999-r2: next - # 9999-r3: seen - case "${PVR}" in - 9999) EGIT_BRANCH=maint ;; - 9999-r1) EGIT_BRANCH=master ;; - 9999-r2) EGIT_BRANCH=next;; - 9999-r3) EGIT_BRANCH=seen ;; - esac -fi - -MY_PV="${PV/_rc/.rc}" -MY_P="${PN}-${MY_PV}" - -DOC_VER="${MY_PV}" - -DESCRIPTION="stupid content tracker: distributed VCS designed for speed and efficiency" -HOMEPAGE="https://www.git-scm.com/" -if [[ ${PV} != *9999 ]]; then - SRC_URI_SUFFIX="xz" - SRC_URI_KORG="https://www.kernel.org/pub/software/scm/git" - [[ "${PV/rc}" != "${PV}" ]] && SRC_URI_KORG+='/testing' - SRC_URI="${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX} - ${SRC_URI_KORG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX} - doc? ( - ${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} - )" - [[ "${PV}" == *_rc* ]] || \ - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -fi - -LICENSE="GPL-2" -SLOT="0" -IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit perforce +perl +ppcsha1 subversion tk +threads +webdav xinetd cvs test" - -# Common to both DEPEND and RDEPEND -DEPEND=" - gnome-keyring? ( app-crypt/libsecret ) - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:= ) - sys-libs/zlib - pcre? ( - pcre-jit? ( dev-libs/libpcre2[jit(+)] ) - !pcre-jit? ( dev-libs/libpcre ) - ) - perl? ( dev-lang/perl:=[-build(-)] ) - tk? ( dev-lang/tk:0= ) - curl? ( - net-misc/curl - webdav? ( dev-libs/expat ) - ) - emacs? ( >=app-editors/emacs-23.1:* ) - iconv? ( virtual/libiconv ) -" - -RDEPEND="${DEPEND} - gpg? ( app-crypt/gnupg ) - perl? ( - dev-perl/Error - dev-perl/MailTools - dev-perl/Authen-SASL - >=virtual/perl-libnet-3.110.0-r4[ssl] - cgi? ( - dev-perl/CGI - highlight? ( app-text/highlight ) - ) - cvs? ( - >=dev-vcs/cvsps-2.1:0 - dev-perl/DBI - dev-perl/DBD-SQLite - ) - mediawiki? ( - dev-perl/DateTime-Format-ISO8601 - dev-perl/HTML-Tree - dev-perl/MediaWiki-API - ) - subversion? ( - dev-vcs/subversion[-dso(-),perl] - dev-perl/libwww-perl - dev-perl/TermReadKey - ) - ) - perforce? ( ${PYTHON_DEPS} ) -" - -# This is how info docs are created with Git: -# .txt/asciidoc --(asciidoc)---------> .xml/docbook -# .xml/docbook --(docbook2texi.pl)--> .texi -# .texi --(makeinfo)---------> .info -BDEPEND=" - doc? ( - app-text/asciidoc - app-text/docbook2X - app-text/xmlto - sys-apps/texinfo - ) - nls? ( sys-devel/gettext ) - test? ( app-crypt/gnupg ) -" - -# Live ebuild builds man pages and HTML docs, additionally -if [[ ${PV} == *9999 ]]; then - BDEPEND="${BDEPEND} - app-text/asciidoc" -fi - -SITEFILE="50${PN}-gentoo.el" -S="${WORKDIR}/${MY_P}" - -REQUIRED_USE=" - cgi? ( perl ) - cvs? ( perl ) - mediawiki? ( perl ) - mediawiki-experimental? ( mediawiki ) - pcre-jit? ( pcre ) - perforce? ( ${PYTHON_REQUIRED_USE} ) - subversion? ( perl ) - webdav? ( curl ) -" - -RESTRICT="!test? ( test )" - -PATCHES=( - # bug #350330 - automagic CVS when we don't want it is bad. - "${FILESDIR}"/git-2.22.0_rc0-optional-cvs.patch - - # Make submodule output quiet - "${FILESDIR}"/git-2.21.0-quiet-submodules-testcase.patch -) - -pkg_setup() { - if use subversion && has_version "dev-vcs/subversion[dso]" ; then - ewarn "Per Gentoo bugs #223747, #238586, when subversion is built" - ewarn "with USE=dso, there may be weird crashes in git-svn. You" - ewarn "have been warned." - fi - - if use perforce ; then - python-single-r1_pkg_setup - fi -} - -# This is needed because for some obscure reasons future calls to make don't -# pick up these exports if we export them in src_unpack() -exportmakeopts() { - local extlibs myopts - - myopts=( - ASCIIDOC_NO_ROFF=YesPlease - $(usex cvs '' NO_CVS=YesPlease) - $(usex elibc_musl NO_REGEX=YesPlease '') - $(usex iconv '' NO_ICONV=YesPlease) - $(usex nls '' NO_GETTEXT=YesPlease) - $(usex perl 'INSTALLDIRS=vendor NO_PERL_CPAN_FALLBACKS=YesPlease' NO_PERL=YesPlease) - $(usex perforce '' NO_PYTHON=YesPlease) - $(usex subversion '' NO_SVN_TESTS=YesPlease) - $(usex threads '' NO_PTHREADS=YesPlease) - $(usex tk '' NO_TCLTK=YesPlease) - ) - - if use blksha1 ; then - myopts+=( BLK_SHA1=YesPlease ) - elif use ppcsha1 ; then - myopts+=( PPC_SHA1=YesPlease ) - fi - - if use curl ; then - use webdav || myopts+=( NO_EXPAT=YesPlease ) - else - myopts+=( NO_CURL=YesPlease ) - fi - - # broken assumptions, because of static build system ... - myopts+=( - NO_FINK=YesPlease - NO_DARWIN_PORTS=YesPlease - INSTALL=install - TAR=tar - SHELL_PATH="${EPREFIX}/bin/sh" - SANE_TOOL_PATH= - OLD_ICONV= - NO_EXTERNAL_GREP= - ) - - # can't define this to null, since the entire makefile depends on it - sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile || die - - if use pcre; then - if use pcre-jit; then - myopts+=( USE_LIBPCRE2=YesPlease ) - extlibs+=( -lpcre2-8 ) - else - myopts+=( - USE_LIBPCRE1=YesPlease - NO_LIBPCRE1_JIT=YesPlease - ) - extlibs+=( -lpcre ) - fi - fi - if [[ ${CHOST} == *-solaris* ]]; then - myopts+=( - NEEDS_LIBICONV=YesPlease - HAVE_CLOCK_MONOTONIC=1 - ) - if grep -q getdelim "${EROOT}"/usr/include/stdio.h ; then - myopts+=( HAVE_GETDELIM=1 ) - fi - fi - - if has_version '>=app-text/asciidoc-8.0' ; then - myopts+=( ASCIIDOC8=YesPlease ) - fi - - # Bug 290465: - # builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim' - if [[ "${CHOST}" == *-uclibc* ]] ; then - myopts+=( NO_NSEC=YesPlease ) - use iconv && myopts+=( NEEDS_LIBICONV=YesPlease ) - fi - - export MY_MAKEOPTS="${myopts[@]}" - export EXTLIBS="${extlibs[@]}" -} - -src_unpack() { - if [[ ${PV} != *9999 ]]; then - unpack ${MY_P}.tar.${SRC_URI_SUFFIX} - cd "${S}" || die - unpack ${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX} - if use doc ; then - pushd "${S}"/Documentation &>/dev/null || die - unpack ${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} - popd &>/dev/null || die - fi - else - git-r3_src_unpack - #cp "${FILESDIR}"/GIT-VERSION-GEN . - fi - -} - -src_prepare() { - # add experimental patches to improve mediawiki support - # see patches for origin - if use mediawiki-experimental ; then - PATCHES+=( - "${FILESDIR}"/git-2.7.0-mediawiki-namespaces.patch - "${FILESDIR}"/git-2.7.0-mediawiki-subpages.patch - "${FILESDIR}"/git-2.7.0-mediawiki-500pages.patch - ) - fi - - default - - sed -i \ - -e 's:^\(CFLAGS[[:space:]]*=\).*$:\1 $(OPTCFLAGS) -Wall:' \ - -e 's:^\(LDFLAGS[[:space:]]*=\).*$:\1 $(OPTLDFLAGS):' \ - -e 's:^\(CC[[:space:]]* =\).*$:\1$(OPTCC):' \ - -e 's:^\(AR[[:space:]]* =\).*$:\1$(OPTAR):' \ - -e "s:\(PYTHON_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \ - -e "s:\(PERL_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \ - Makefile || die - - # Fix docbook2texi command - sed -r -i 's/DOCBOOK2X_TEXI[[:space:]]*=[[:space:]]*docbook2x-texi/DOCBOOK2X_TEXI = docbook2texi.pl/' \ - Documentation/Makefile || die -} - -git_emake() { - # bug #320647: PYTHON_PATH - local PYTHON_PATH="" - use perforce && PYTHON_PATH="${PYTHON}" - emake ${MY_MAKEOPTS} \ - prefix="${EPREFIX}"/usr \ - htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \ - perllibdir="$(use perl && perl_get_raw_vendorlib)" \ - sysconfdir="${EPREFIX}"/etc \ - DESTDIR="${D}" \ - GIT_TEST_OPTS="--no-color" \ - OPTAR="$(tc-getAR)" \ - OPTCC="$(tc-getCC)" \ - OPTCFLAGS="${CFLAGS}" \ - OPTLDFLAGS="${LDFLAGS}" \ - PERL_PATH="${EPREFIX}/usr/bin/perl" \ - PERL_MM_OPT="" \ - PYTHON_PATH="${PYTHON_PATH}" \ - V=1 \ - "$@" -} - -src_configure() { - exportmakeopts -} - -src_compile() { - git_emake || die "emake failed" - - if use emacs ; then - elisp-compile contrib/emacs/git{,-blame}.el - fi - - if use perl && use cgi ; then - git_emake \ - gitweb \ - || die "emake gitweb (cgi) failed" - fi - - if [[ ${CHOST} == *-darwin* && ! tc-is-gcc ]]; then - pushd contrib/credential/osxkeychain &>/dev/null || die - git_emake CC=$(tc-getCC) CFLAGS="${CFLAGS}" \ - || die "emake credential-osxkeychain" - popd &>/dev/null || die - fi - - pushd Documentation &>/dev/null || die - if [[ ${PV} == *9999 ]] ; then - git_emake man \ - || die "emake man failed" - if use doc ; then - git_emake info html \ - || die "emake info html failed" - fi - else - if use doc ; then - git_emake info \ - || die "emake info html failed" - fi - fi - popd &>/dev/null || die - - if use gnome-keyring ; then - pushd contrib/credential/libsecret &>/dev/null || die - git_emake || die "emake git-credential-libsecret failed" - popd &>/dev/null || die - fi - - pushd contrib/subtree &>/dev/null || die - git_emake git-subtree - # git-subtree.1 requires the full USE=doc dependency stack - use doc && git_emake git-subtree.html git-subtree.1 - popd &>/dev/null || die - - pushd contrib/diff-highlight &>/dev/null || die - git_emake - popd &>/dev/null || die - - if use mediawiki ; then - pushd contrib/mw-to-git &>/dev/null || die - git_emake - popd &>/dev/null || die - - fi -} - -src_install() { - git_emake install || die "make install failed" - - if [[ ${CHOST} == *-darwin* && ! tc-is-gcc ]]; then - dobin contrib/credential/osxkeychain/git-credential-osxkeychain - fi - - # Depending on the tarball and manual rebuild of the documentation, the - # manpages may exist in either OR both of these directories. - find man?/*.[157] >/dev/null 2>&1 && doman man?/*.[157] - find Documentation/*.[157] >/dev/null 2>&1 && doman Documentation/*.[157] - dodoc README* Documentation/{SubmittingPatches,CodingGuidelines} - use doc && dodir /usr/share/doc/${PF}/html - local d - for d in / /howto/ /technical/ ; do - docinto ${d} - dodoc Documentation${d}*.txt - if use doc ; then - docinto ${d}/html - dodoc Documentation${d}*.html - fi - done - docinto / - # Upstream does not ship this pre-built :-( - use doc && doinfo Documentation/{git,gitman}.info - - newbashcomp contrib/completion/git-completion.bash ${PN} - bashcomp_alias git gitk - # Not really a bash-completion file (bug #477920) - # but still needed uncompressed (bug #507480) - insinto /usr/share/${PN} - doins contrib/completion/git-prompt.sh - - if use emacs ; then - elisp-install ${PN} contrib/emacs/git.{el,elc} - elisp-install ${PN} contrib/emacs/git-blame.{el,elc} - #elisp-install ${PN}/compat contrib/emacs/vc-git.{el,elc} - # don't add automatically to the load-path, so the sitefile - # can do a conditional loading - touch "${ED}${SITELISP}/${PN}/compat/.nosearch" - elisp-site-file-install "${FILESDIR}"/${SITEFILE} - fi - - #dobin contrib/fast-import/git-p4 # Moved upstream - #dodoc contrib/fast-import/git-p4.txt # Moved upstream - newbin contrib/fast-import/import-tars.perl import-tars - exeinto /usr/libexec/git-core/ - newexe contrib/git-resurrect.sh git-resurrect - - # git-subtree - pushd contrib/subtree &>/dev/null || die - git_emake install || die "Failed to emake install for git-subtree" - if use doc ; then - # Do not move git subtree install-man outside USE=doc! - git_emake install-man install-html || die "Failed to emake install-html install-man for git-subtree" - fi - newdoc README README.git-subtree - dodoc git-subtree.txt - popd &>/dev/null || die - - if use mediawiki ; then - pushd contrib/mw-to-git &>/dev/null || die - git_emake install - popd &>/dev/null || die - fi - - # diff-highlight - dobin contrib/diff-highlight/diff-highlight - newdoc contrib/diff-highlight/README README.diff-highlight - - # git-jump - exeinto /usr/libexec/git-core/ - doexe contrib/git-jump/git-jump - newdoc contrib/git-jump/README git-jump.txt - - # git-contacts - exeinto /usr/libexec/git-core/ - doexe contrib/contacts/git-contacts - dodoc contrib/contacts/git-contacts.txt - - if use gnome-keyring ; then - pushd contrib/credential/libsecret &>/dev/null || die - dobin git-credential-libsecret - popd &>/dev/null || die - fi - - dodir /usr/share/${PN}/contrib - # The following are excluded: - # completion - installed above - # diff-highlight - done above - # emacs - installed above - # examples - these are stuff that is not used in Git anymore actually - # git-jump - done above - # gitview - installed above - # p4import - excluded because fast-import has a better one - # patches - stuff the Git guys made to go upstream to other places - # persistent-https - TODO - # mw-to-git - TODO - # subtree - build seperately - # svnimport - use git-svn - # thunderbird-patch-inline - fixes thunderbird - local contrib_objects=( - buildsystems - fast-import - hg-to-git - hooks - remotes2config.sh - rerere-train.sh - stats - workdir - ) - local i - for i in "${contrib_objects[@]}" ; do - cp -rf \ - "${S}"/contrib/${i} \ - "${ED}"/usr/share/${PN}/contrib \ - || die "Failed contrib ${i}" - done - - if use perl && use cgi ; then - # We used to install in /usr/share/${PN}/gitweb - # but upstream installs in /usr/share/gitweb - # so we will install a symlink and use their location for compat with other - # distros - dosym ../gitweb /usr/share/${PN}/gitweb - - # INSTALL discusses configuration issues, not just installation - docinto / - newdoc "${S}"/gitweb/INSTALL INSTALL.gitweb - newdoc "${S}"/gitweb/README README.gitweb - - for d in "${ED}"/usr/lib{,64}/perl5/ ; do - if test -d "${d}" ; then find "${d}" \ - -name .packlist \ - -delete || die - fi - done - else - rm -rf "${ED}"/usr/share/gitweb - fi - - if ! use subversion ; then - rm -f "${ED}"/usr/libexec/git-core/git-svn \ - "${ED}"/usr/share/man/man1/git-svn.1* - fi - - if use xinetd ; then - insinto /etc/xinetd.d - newins "${FILESDIR}"/git-daemon.xinetd git-daemon - fi - - if use !prefix ; then - newinitd "${FILESDIR}"/git-daemon-r1.initd git-daemon - newconfd "${FILESDIR}"/git-daemon.confd git-daemon - systemd_newunit "${FILESDIR}/git-daemon_at-r1.service" "git-daemon@.service" - systemd_dounit "${FILESDIR}/git-daemon.socket" - fi - - perl_delete_localpod - - # Remove disabled linguas - # we could remove sources in src_prepare, but install does not - # handle missing locale dir well - rm_loc() { - if [[ -e "${ED}/usr/share/locale/${1}" ]]; then - rm -r "${ED}/usr/share/locale/${1}" || die - fi - } - l10n_for_each_disabled_locale_do rm_loc -} - -src_test() { - local disabled=() - local tests_cvs=( - t9200-git-cvsexportcommit.sh - t9400-git-cvsserver-server.sh - t9401-git-cvsserver-crlf.sh - t9402-git-cvsserver-refs.sh - t9600-cvsimport.sh - t9601-cvsimport-vendor-branch.sh - t9602-cvsimport-branches-tags.sh - t9603-cvsimport-patchsets.sh - t9604-cvsimport-timestamps.sh - ) - local tests_perl=( - t3701-add-interactive.sh - t5502-quickfetch.sh - t5512-ls-remote.sh - t5520-pull.sh - t7106-reset-unborn-branch.sh - t7501-commit.sh - ) - # Bug #225601 - t0004 is not suitable for root perm - # Bug #219839 - t1004 is not suitable for root perm - # t0001-init.sh - check for init notices EPERM* fails - local tests_nonroot=( - t0001-init.sh - t0004-unwritable.sh - t0070-fundamental.sh - t1004-read-tree-m-u-wf.sh - t3700-add.sh - t7300-clean.sh - ) - # t9100 still fails with symlinks in SVN 1.7 - local test_svn=( t9100-git-svn-basic.sh ) - - # Unzip is used only for the testcase code, not by any normal parts of Git. - if ! has_version app-arch/unzip ; then - einfo "Disabling tar-tree tests" - disabled+=( t5000-tar-tree.sh ) - fi - - local cvs=0 - use cvs && let cvs=${cvs}+1 - if [[ ${EUID} -eq 0 ]]; then - if [[ ${cvs} -eq 1 ]]; then - ewarn "Skipping CVS tests because CVS does not work as root!" - ewarn "You should retest with FEATURES=userpriv!" - disabled+=( ${tests_cvs[@]} ) - fi - einfo "Skipping other tests that require being non-root" - disabled+=( ${tests_nonroot[@]} ) - else - [[ ${cvs} -gt 0 ]] && \ - has_version dev-vcs/cvs && \ - let cvs=${cvs}+1 - [[ ${cvs} -gt 1 ]] && \ - has_version "dev-vcs/cvs[server]" && \ - let cvs=${cvs}+1 - if [[ ${cvs} -lt 3 ]]; then - einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])" - disabled+=( ${tests_cvs[@]} ) - fi - fi - - if ! use perl ; then - einfo "Disabling tests that need Perl" - disabled+=( ${tests_perl[@]} ) - fi - - einfo "Disabling tests that fail with SVN 1.7" - disabled+=( ${test_svn[@]} ) - - # Reset all previously disabled tests - pushd t &>/dev/null || die - local i - for i in *.sh.DISABLED ; do - [[ -f "${i}" ]] && mv -f "${i}" "${i%.DISABLED}" - done - einfo "Disabled tests:" - for i in ${disabled[@]} ; do - [[ -f "${i}" ]] && mv -f "${i}" "${i}.DISABLED" && einfo "Disabled ${i}" - done - - # Avoid the test system removing the results because we want them ourselves - sed -e '/^[[:space:]]*$(MAKE) clean/s,^,#,g' \ - -i Makefile || die - - # Clean old results first, must always run - nonfatal git_emake clean - popd &>/dev/null || die - - # Now run the tests, keep going if we hit an error, and don't terminate on - # failure - local rc - einfo "Start test run" - #MAKEOPTS=-j1 - nonfatal git_emake --keep-going test - rc=$? - - # Display nice results, now print the results - pushd t &>/dev/null || die - nonfatal git_emake aggregate-results - - # And bail if there was a problem - [[ ${rc} -eq 0 ]] || die "tests failed. Please file a bug." -} - -showpkgdeps() { - local pkg=$1 - shift - elog " $(printf "%-17s:" ${pkg}) ${@}" -} - -pkg_postinst() { - use emacs && elisp-site-regen - elog "Please read /usr/share/bash-completion/completions/git for Git bash command" - elog "completion." - elog "Please read /usr/share/git/git-prompt.sh for Git bash prompt" - elog "Note that the prompt bash code is now in that separate script" - elog "These additional scripts need some dependencies:" - echo - showpkgdeps git-quiltimport "dev-util/quilt" - showpkgdeps git-instaweb \ - "|| ( www-servers/lighttpd www-servers/apache www-servers/nginx )" - echo - use mediawiki-experimental && ewarn "Using experimental git-mediawiki patches. The stability of cloned wiki filesystems is not guaranteed." -} - -pkg_postrm() { - use emacs && elisp-site-regen -} diff --git a/dev-vcs/git/git-2.31.0_rc2.ebuild b/dev-vcs/git/git-2.31.0.ebuild similarity index 100% rename from dev-vcs/git/git-2.31.0_rc2.ebuild rename to dev-vcs/git/git-2.31.0.ebuild diff --git a/games-board/Manifest.gz b/games-board/Manifest.gz index 365c2a89c576..786dfe791495 100644 Binary files a/games-board/Manifest.gz and b/games-board/Manifest.gz differ diff --git a/games-board/goatee-gtk/Manifest b/games-board/goatee-gtk/Manifest index 352677c37fd3..6b8829403619 100644 --- a/games-board/goatee-gtk/Manifest +++ b/games-board/goatee-gtk/Manifest @@ -1 +1,2 @@ DIST goatee-gtk-0.3.1.1.tar.gz 60560 BLAKE2B f58420c1b625b0be47da43ea006cbe68d465ed2ed44e640ad7ffd9f17d738f612321c42bb9bbf76404b1bfd91ae4baee73381881e5185afe653dd10992417dfc SHA512 d745e981171fb1267d4765d90e4906b51a0cd7e7e3804c7f418feea21cc6f047e5e4e70f86f3ed3abbe11800e91ecd4669d566c194ad9b340941e509e6061f70 +DIST goatee-gtk-0.4.0.tar.gz 60655 BLAKE2B 628a43c4e55f7d5d16052a798c5bf7b829aca08a0c27ae176548dbb908508cb5d8bb24d3ee48d8fc8a96e89b59200672a0ed1ab6d811312c7949cbaec4353fb0 SHA512 cb95f2703d21b83e86a5a31ec2a9896170a18e8e7660c657f72e85779af92beb07dea015f3608a6bab58d2ce745f6338a0a7e8c03f46f300bf357d5392672b68 diff --git a/games-board/goatee-gtk/goatee-gtk-0.4.0.ebuild b/games-board/goatee-gtk/goatee-gtk-0.4.0.ebuild new file mode 100644 index 000000000000..16c70308b226 --- /dev/null +++ b/games-board/goatee-gtk/goatee-gtk-0.4.0.ebuild @@ -0,0 +1,30 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +# ebuild generated by hackport 0.6.7.9999 + +CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite" +inherit haskell-cabal + +DESCRIPTION="A monadic take on a 2,500-year-old board game - GTK+ UI" +HOMEPAGE="http://khumba.net/projects/goatee" +SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz" + +LICENSE="AGPL-3" +SLOT="0/${PV}" +KEYWORDS="~amd64 ~x86" + +RDEPEND=">=dev-games/goatee-0.4:=[profile?] =dev-haskell/cairo-0.13:=[profile?] =dev-haskell/glib-0.13:=[profile?] =dev-haskell/gtk-0.13:=[profile?] =dev-haskell/mtl-2.1:=[profile?] =dev-haskell/parsec-3.1:=[profile?] =dev-lang/ghc-8.4.3:= +" +DEPEND="${RDEPEND} + >=dev-haskell/cabal-2.2.0.1 + test? ( >=dev-haskell/hunit-1.2 - - games@gentoo.org - Gentoo Games Project - haskell@gentoo.org Gentoo Haskell - - Goatee is a Go library and game editor, written in Haskell. It provides a - GUI for recording, studying, and editing game records. Underneath this is a - portable library for manipulating SGF files to build UIs and tools. Goatee - aims to be full-featured by supporting all of the SGF spec and allowing for - full and easy customization of the game records you create. - - This package is the GTK+ UI. - diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz index 7b40ee709fde..9e62ae53b2b5 100644 Binary files a/media-gfx/Manifest.gz and b/media-gfx/Manifest.gz differ diff --git a/media-gfx/engauge/engauge-10.6.ebuild b/media-gfx/engauge/engauge-10.6.ebuild index e1145ca2e153..57437e9947cc 100644 --- a/media-gfx/engauge/engauge-10.6.ebuild +++ b/media-gfx/engauge/engauge-10.6.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,7 +11,7 @@ SRC_URI="https://github.com/markummitchell/engauge-digitizer/archive/v$PV.tar.gz LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 ~x86" IUSE="doc examples jpeg2k pdf" RDEPEND="dev-qt/qtcore:5 diff --git a/media-gfx/engauge/metadata.xml b/media-gfx/engauge/metadata.xml index fa3fced03f31..339348097beb 100644 --- a/media-gfx/engauge/metadata.xml +++ b/media-gfx/engauge/metadata.xml @@ -1,7 +1,10 @@ - + + dilfridge@gentoo.org + Andreas K. Huettel + digitizer diff --git a/media-gfx/gnofract4d/Manifest b/media-gfx/gnofract4d/Manifest index fc42b5ddf035..e7d2dfa22977 100644 --- a/media-gfx/gnofract4d/Manifest +++ b/media-gfx/gnofract4d/Manifest @@ -1,2 +1 @@ -DIST gnofract4d-4.0.1_p1.tar.gz 7638038 BLAKE2B c12bade5f219d2d41dc50569c0df315273b0c2a0a6a40543f48f3e4cb766512ed18b979463574db65ac443b1a8dffbcc1f3c9dc04d7c6b89881fdfcfce95c41c SHA512 d7f3a081b3681866d2da911eedab6ec74f22f36d5175a85f93751519e96971cf147b99ddcda32c597283b39e9da4f0fc6a8843331334a18efa3bf459cfd00af5 DIST gnofract4d-4.3_p20201029.tar.gz 18270417 BLAKE2B 82d9f9528c33cf73478fa48d8692617237029944e68d9626d0c39e088b1b6aebc02a8c32a1a0e14c8d115cf3f0434940ec8a8c3d915fc9967b22f7e51353dd6b SHA512 f5844a88c41941429379efe99d1e0593a994a42d600e6e05f722c01c4ced48ceff730bf6bc797e083bd558931d39a31ffe86021eac0f0c6ec0f3047569962e3f diff --git a/media-gfx/gnofract4d/gnofract4d-4.0.1_p1-r1.ebuild b/media-gfx/gnofract4d/gnofract4d-4.0.1_p1-r1.ebuild deleted file mode 100644 index ddede64604e6..000000000000 --- a/media-gfx/gnofract4d/gnofract4d-4.0.1_p1-r1.ebuild +++ /dev/null @@ -1,75 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7,8} ) -DISTUTILS_SINGLE_IMPL=1 -DISTUTILS_USE_SETUPTOOLS=no - -inherit distutils-r1 optfeature virtualx xdg - -COMMIT=bd600c20921afff7b02fc0a76ab79242ebd0896d - -DESCRIPTION="A program for drawing beautiful mathematically-based images known as fractals" -HOMEPAGE="https://github.com/fract4d/gnofract4d" -SRC_URI="https://github.com/fract4d/gnofract4d/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="+doc" -REQUIRED_USE="test? ( doc )" - -COMMON_DEPEND=" - media-libs/libpng:0= - virtual/jpeg:0" -RDEPEND="${COMMON_DEPEND} - $(python_gen_cond_dep ' - dev-python/pycairo[${PYTHON_MULTI_USEDEP}] - dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}] - ') - x11-libs/gtk+:3[introspection]" -BDEPEND="virtual/pkgconfig" -DEPEND="${COMMON_DEPEND} - doc? ( - app-text/docbook-xsl-stylesheets - $(python_gen_cond_dep ' - dev-python/pygobject[${PYTHON_MULTI_USEDEP}] - ') - dev-libs/libxslt - x11-libs/gtk+:3[introspection] - )" - -distutils_enable_tests pytest - -S="${WORKDIR}/${PN}-${COMMIT}" - -src_prepare() { - distutils-r1_src_prepare -} - -python_test() { - virtx pytest fract4d fract4dgui test.py -} - -python_compile_all() { - if use doc; then - ln -s "${BUILD_DIR}"/lib/fract4d/*.so fract4d/ || die - "${EPYTHON}" createdocs.py || die - fi -} - -python_install_all() { - distutils-r1_python_install_all - rm -r "${ED}"/usr/share/doc/${PN} || die - if ! use doc; then - rm -r "${ED}"/usr/share/gnome/help/${PN} || die - fi -} - -pkg_postinst() { - xdg_pkg_postinst - elog "Optional missing features:" - optfeature "creating videos" media-video/ffmpeg[vpx,zlib] -} diff --git a/media-gfx/gnofract4d/metadata.xml b/media-gfx/gnofract4d/metadata.xml index d11e338560d8..660509b7c14e 100644 --- a/media-gfx/gnofract4d/metadata.xml +++ b/media-gfx/gnofract4d/metadata.xml @@ -12,7 +12,4 @@ edyoung/gnofract4d - - Install user manual - diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz index 758eaf084ba9..d514a1058dfb 100644 Binary files a/media-sound/Manifest.gz and b/media-sound/Manifest.gz differ diff --git a/media-sound/gmusicbrowser/Manifest b/media-sound/gmusicbrowser/Manifest index c9e7ccd87d9d..43e54d001c58 100644 --- a/media-sound/gmusicbrowser/Manifest +++ b/media-sound/gmusicbrowser/Manifest @@ -1 +1,2 @@ DIST gmusicbrowser-1.1.15_p20190315.tar.gz 1306390 BLAKE2B e74a3ce80e031c64e381e226d2905ebc5e6826758e984edaf6ad71b414438091f21eb068ce248f3a954bdac34d3027f88a36abaea07265904a5ae40a8da01bf5 SHA512 d9d92c670724daf3ccec5445bcafa9616a8995d1416c0d1a671a42ea14c4d74c4475546e45bb55c6c5015ecf770ed4a7cf1a0e8801d281096818758483c14e2e +DIST gmusicbrowser-1.1.16.tar.gz 2369434 BLAKE2B 952c4a75d8018b890a787e69cdde06f1c1d588384e220950ab46d0ddcd785cd30d477c52926421b72c7cae4078342e6f5f07fa0b41fe6d0ef2a0b4ec4e15c8ce SHA512 76213a6634208c66cff33ab947450553e656d121e8aff99e47bc983f752f6095019aa67bef834681594a81f6f5fdb241bb98d374027622704d961c1d816bd12a diff --git a/media-sound/gmusicbrowser/gmusicbrowser-1.1.16.ebuild b/media-sound/gmusicbrowser/gmusicbrowser-1.1.16.ebuild new file mode 100644 index 000000000000..ea8fe1e9691b --- /dev/null +++ b/media-sound/gmusicbrowser/gmusicbrowser-1.1.16.ebuild @@ -0,0 +1,49 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit gnome2-utils xdg + +DESCRIPTION="An open-source jukebox for large collections of mp3/ogg/flac files" +HOMEPAGE="https://gmusicbrowser.org/" +SRC_URI="https://${PN}.org/download/${P}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="dbus doc extras gstreamer libnotify mplayer" + +RDEPEND="dev-lang/perl + dev-perl/Gtk2 + virtual/perl-MIME-Base64 + || ( net-misc/wget dev-perl/AnyEvent-HTTP ) + dbus? ( dev-perl/Net-DBus ) + gstreamer? ( dev-perl/Glib-Object-Introspection ) + mplayer? ( || ( media-video/mplayer media-video/mpv ) ) + !gstreamer? ( !mplayer? ( + media-sound/alsa-utils + media-sound/flac123 + || ( media-sound/mpg123 media-sound/mpg321 ) + media-sound/vorbis-tools + ) + ) + extras? ( dev-perl/gnome2-wnck ) + libnotify? ( dev-perl/Gtk2-Notify )" +DEPEND="${RDEPEND}" + +src_prepare() { + default + # silence QA warnings + sed -i '/^OnlyShowIn/d' gmusicbrowser.desktop || die +} + +src_install() { + emake \ + DESTDIR="${D}" \ + iconsdir="${D}/usr/share/icons/hicolor" \ + install + + use doc && local HTML_DOCS=( layout_doc.html ) + einstalldocs +} diff --git a/media-sound/gmusicbrowser/gmusicbrowser-9999.ebuild b/media-sound/gmusicbrowser/gmusicbrowser-9999.ebuild index 6813cf60326b..c6fdb5a5b4f9 100644 --- a/media-sound/gmusicbrowser/gmusicbrowser-9999.ebuild +++ b/media-sound/gmusicbrowser/gmusicbrowser-9999.ebuild @@ -3,28 +3,20 @@ EAPI=7 -inherit eutils gnome2-utils xdg - -if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="https://github.com/squentin/${PN}.git" - inherit git-r3 - SRC_URI="" -else - GIT_COMMIT="4538a5af5fb6c11f07bd7a9c50d6fd73b18c840d" - SRC_URI="https://github.com/squentin/${PN}/archive/${GIT_COMMIT}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~x86" - S="${WORKDIR}/${PN}-${GIT_COMMIT}" -fi +inherit git-r3 gnome2-utils xdg DESCRIPTION="An open-source jukebox for large collections of mp3/ogg/flac files" HOMEPAGE="https://gmusicbrowser.org/" +EGIT_REPO_URI="https://github.com/squentin/${PN}.git" LICENSE="GPL-3" SLOT="0" IUSE="dbus doc extras gstreamer libnotify mplayer" +BDEPEND="sys-devel/gettext + doc? ( dev-perl/Text-Markdown )" RDEPEND="dev-lang/perl - dev-perl/Gtk2 + dev-perl/Gtk3 virtual/perl-MIME-Base64 || ( net-misc/wget dev-perl/AnyEvent-HTTP ) dbus? ( dev-perl/Net-DBus ) @@ -39,13 +31,18 @@ RDEPEND="dev-lang/perl ) extras? ( dev-perl/gnome2-wnck ) libnotify? ( dev-perl/Gtk2-Notify )" -DEPEND="sys-devel/gettext - doc? ( dev-perl/Text-Markdown )" +DEPEND="${RDEPEND}" src_compile() { emake MARKDOWN=$(usex doc "Markdown.pl" "echo") } +src_prepare() { + default + # silence QA warnings + sed -i '/^OnlyShowIn/d' gmusicbrowser.desktop || die +} + src_install() { emake \ DESTDIR="${D}" \ diff --git a/media-sound/gmusicbrowser/metadata.xml b/media-sound/gmusicbrowser/metadata.xml index 1663c00e8552..0daa038b6d94 100644 --- a/media-sound/gmusicbrowser/metadata.xml +++ b/media-sound/gmusicbrowser/metadata.xml @@ -1,6 +1,10 @@ + + Sergiy.Borodych@gmail.com + Sergiy Borodych + sound@gentoo.org Gentoo Sound project diff --git a/media-sound/qjackctl/Manifest b/media-sound/qjackctl/Manifest index 7718cb21d904..6ebf1ac01392 100644 --- a/media-sound/qjackctl/Manifest +++ b/media-sound/qjackctl/Manifest @@ -1 +1,2 @@ DIST qjackctl-0.9.1.tar.gz 1092787 BLAKE2B 1ae68d3b61591bb31f7c8c31f35f8a42f0048cf34c49ff0eadca9155c1a770d9880728582f6b7abdaf27a28ccb3d6a20ca87e3a6178b090579b6ead811f091f0 SHA512 7d3a6efdeedff9335897f9d943dd51d13bf7c48d55ee2bf31d53fe685cef88e281133c164cf6cdb95669b9fe394eb06d3544a78b9d760f4420a9acb3c800c612 +DIST qjackctl-0.9.2.tar.gz 1093486 BLAKE2B 43e3f3d48295727d7a3848ed6c59c72fb6c2947476720af802d53d152848a355aac79448d88fce78c2b12fbae54d64b4a1582f334b2a416f0b235cdf8d557e40 SHA512 87e5cbf241139b1e225ea2e2cc45b6f44f19fddf866560e5b9e690ef3a2f7a358ff6a28065841c9599b321568a85d5b4767907aff071c4a768608fc273a7e8fb diff --git a/media-sound/qjackctl/qjackctl-0.9.2.ebuild b/media-sound/qjackctl/qjackctl-0.9.2.ebuild new file mode 100644 index 000000000000..15137741a070 --- /dev/null +++ b/media-sound/qjackctl/qjackctl-0.9.2.ebuild @@ -0,0 +1,46 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit xdg cmake + +DESCRIPTION="Qt GUI to control the JACK Audio Connection Kit and ALSA sequencer connections" +HOMEPAGE="https://qjackctl.sourceforge.io/" +SRC_URI="mirror://sourceforge/qjackctl/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="alsa dbus debug portaudio" + +BDEPEND="dev-qt/linguist-tools:5" +DEPEND=" + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtnetwork:5 + dev-qt/qtwidgets:5 + dev-qt/qtx11extras:5 + dev-qt/qtxml:5 + virtual/jack + alsa? ( media-libs/alsa-lib ) + dbus? ( dev-qt/qtdbus:5 ) + portaudio? ( media-libs/portaudio ) +" +RDEPEND="${DEPEND} + dev-qt/qtsvg:5 +" + +PATCHES=( + "${FILESDIR}/${PN}-0.9.1-disable-git.patch" +) + +src_configure() { + local mycmakeargs=( + -DCONFIG_ALSA_SEQ=$(usex alsa 1 0) + -DCONFIG_DBUS=$(usex dbus 1 0) + -DCONFIG_DEBUG=$(usex debug 1 0) + -DCONFIG_PORTAUDIO=$(usex portaudio 1 0) + ) + cmake_src_configure +} diff --git a/media-sound/qtractor/Manifest b/media-sound/qtractor/Manifest index 48e72e2e7271..aad4d493dc3b 100644 --- a/media-sound/qtractor/Manifest +++ b/media-sound/qtractor/Manifest @@ -1,2 +1 @@ -DIST qtractor-0.9.19.tar.gz 1943040 BLAKE2B 33ccb2e4002a8a666dc9f325dd7f14e66a2f624e0dda9eb916f8b958d01e2a8f72b5e8390946482e6170de9e2fcc28a4efcf8447b6610b21003288e7c7b9f9b7 SHA512 cab7ef6dc259ba570645a7f20efd6816377ae9707e004370f24745e00e20df90be9316543c5cb5ddbdc6bb1c749053bfb964e53ac97dc8ae2dd468e371274bfc DIST qtractor-0.9.20.tar.gz 1944885 BLAKE2B 7989e827bdfb72cf8402a87a2e219fc2767fa971ce8f958cd8fb5aa0536aa12d486fc854b2d3a407de9e2b0ac3d6737420163d39b194bcd1d08e831f26cfab0c SHA512 663d43f0ca2a2ee8deb260c29c7dc39ac36d2a4f4f3b1b6e3074e66fe5bb60c37a93fde89c09ceedfd6848ba1519de8d38d613d68b2693356fbda97a5d1c2c00 diff --git a/media-sound/qtractor/files/qtractor-0.9.17-dont-compress-manpages.patch b/media-sound/qtractor/files/qtractor-0.9.17-dont-compress-manpages.patch deleted file mode 100644 index cb4d5a4bbae7..000000000000 --- a/media-sound/qtractor/files/qtractor-0.9.17-dont-compress-manpages.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/Makefile.in b/Makefile.in -index 42849a9..3f05f9d 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -346,10 +346,8 @@ install: $(target) translations_lrelease $(name).1 - @install -v -m 0644 $(translations_targets) $(DESTDIR)$(translations_dir) - @install -d -v -m 0755 $(DESTDIR)$(mandir)/man1 - @install -v -m 0644 $(name).1 $(DESTDIR)$(mandir)/man1/$(name).1 -- @gzip -nvf $(DESTDIR)$(mandir)/man1/$(name).1 - @install -d -v -m 0755 $(DESTDIR)$(mandir)/fr/man1 - @install -v -m 0644 $(name).fr.1 $(DESTDIR)$(mandir)/fr/man1/$(name).1 -- @gzip -nvf $(DESTDIR)$(mandir)/fr/man1/$(name).1 - - uninstall: $(DESTDIR)$(prefix)/bin/$(name) - @$(MAKE) INSTALL_ROOT=$(DESTDIR) -f $(name).mak uninstall diff --git a/media-sound/qtractor/qtractor-0.9.19.ebuild b/media-sound/qtractor/qtractor-0.9.19.ebuild deleted file mode 100644 index 372261f84c4d..000000000000 --- a/media-sound/qtractor/qtractor-0.9.19.ebuild +++ /dev/null @@ -1,67 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit flag-o-matic qmake-utils xdg - -DESCRIPTION="Audio/MIDI multi-track sequencer written in C++ with the Qt framework" -HOMEPAGE="https://qtractor.sourceforge.io" -SRC_URI="mirror://sourceforge/qtractor/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86" - -IUSE="aubio cpu_flags_x86_sse debug dssi libsamplerate mad osc rubberband vorbis zlib" - -BDEPEND=" - dev-qt/linguist-tools:5 - virtual/pkgconfig -" -DEPEND=" - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtwidgets:5 - dev-qt/qtxml:5 - dev-qt/qtx11extras:5 - media-libs/alsa-lib - media-libs/ladspa-sdk - media-libs/libsndfile - media-libs/lilv - media-libs/lv2 - media-libs/suil - virtual/jack - aubio? ( media-libs/aubio ) - dssi? ( media-libs/dssi ) - libsamplerate? ( media-libs/libsamplerate ) - mad? ( media-libs/libmad ) - osc? ( media-libs/liblo ) - rubberband? ( media-libs/rubberband ) - vorbis? ( media-libs/libvorbis ) - zlib? ( sys-libs/zlib ) -" -RDEPEND="${DEPEND}" - -PATCHES=( - "${FILESDIR}/${PN}-0.9.17-dont-compress-manpages.patch" -) - -src_configure() { - append-cxxflags -std=c++11 - econf \ - --enable-ladspa \ - --enable-liblilv \ - $(use_enable debug) \ - $(use_enable aubio libaubio) \ - $(use_enable dssi) \ - $(use_enable libsamplerate) \ - $(use_enable mad libmad) \ - $(use_enable osc liblo) \ - $(use_enable rubberband librubberband) \ - $(use_enable cpu_flags_x86_sse sse) \ - $(use_enable vorbis libvorbis) \ - $(use_enable zlib libz) - - eqmake5 ${PN}.pro -o ${PN}.mak -} diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz index 98c9f5c7e1ed..b5261fe1a838 100644 Binary files a/metadata/Manifest.gz and b/metadata/Manifest.gz differ diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk index e0f0edffbd5c..db53ff6d2000 100644 --- a/metadata/dtd/timestamp.chk +++ b/metadata/dtd/timestamp.chk @@ -1 +1 @@ -Mon, 15 Mar 2021 20:08:41 +0000 +Tue, 16 Mar 2021 11:08:37 +0000 diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk index e0f0edffbd5c..4612a5b80f28 100644 --- a/metadata/glsa/timestamp.chk +++ b/metadata/glsa/timestamp.chk @@ -1 +1 @@ -Mon, 15 Mar 2021 20:08:41 +0000 +Tue, 16 Mar 2021 11:08:38 +0000 diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz index d1c9c736d021..eea1d946bedf 100644 Binary files a/metadata/md5-cache/Manifest.gz and b/metadata/md5-cache/Manifest.gz differ diff --git a/metadata/md5-cache/app-admin/Manifest.gz b/metadata/md5-cache/app-admin/Manifest.gz index cca9cac131d5..a94e00d827a2 100644 Binary files a/metadata/md5-cache/app-admin/Manifest.gz and b/metadata/md5-cache/app-admin/Manifest.gz differ diff --git a/metadata/md5-cache/app-admin/hcloud-1.21.0 b/metadata/md5-cache/app-admin/hcloud-1.21.0 new file mode 100644 index 000000000000..83508eb6edf5 --- /dev/null +++ b/metadata/md5-cache/app-admin/hcloud-1.21.0 @@ -0,0 +1,11 @@ +DEFINED_PHASES=compile install test +DEPEND=dev-lang/go:= +DESCRIPTION=A command-line interface for Hetzner Cloud +EAPI=7 +HOMEPAGE=https://github.com/hetznercloud/cli +KEYWORDS=~amd64 +LICENSE=MIT +RESTRICT=strip +SLOT=0 +SRC_URI=https://dev.gentoo.org/~ago/distfiles/hcloud-1.21.0.tar.xz +_md5_=56012406d96b2c878b2bc62b17fa0dac diff --git a/metadata/md5-cache/app-admin/sudo-1.9.6 b/metadata/md5-cache/app-admin/sudo-1.9.6_p1 similarity index 94% rename from metadata/md5-cache/app-admin/sudo-1.9.6 rename to metadata/md5-cache/app-admin/sudo-1.9.6_p1 index 57cef935c1b0..75f26f082dce 100644 --- a/metadata/md5-cache/app-admin/sudo-1.9.6 +++ b/metadata/md5-cache/app-admin/sudo-1.9.6_p1 @@ -10,6 +10,6 @@ LICENSE=ISC BSD RDEPEND=sys-libs/zlib:= gcrypt? ( dev-libs/libgcrypt:= ) ldap? ( >=net-nds/openldap-2.1.30-r1 sasl? ( dev-libs/cyrus-sasl net-nds/openldap[sasl] ) ) pam? ( sys-libs/pam ) sasl? ( dev-libs/cyrus-sasl ) skey? ( >=sys-auth/skey-1.1.5-r1 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) sssd? ( sys-auth/sssd[sudo] ) >=app-misc/editor-wrapper-3 virtual/editor ldap? ( dev-lang/perl ) pam? ( sys-auth/pambase ) selinux? ( sec-policy/selinux-sudo ) sendmail? ( virtual/mta ) virtual/tmpfiles REQUIRED_USE=?? ( pam skey ) ?? ( gcrypt ssl ) SLOT=0 -SRC_URI=https://www.sudo.ws/sudo/dist/sudo-1.9.6.tar.gz ftp://ftp.sudo.ws/pub/sudo/sudo-1.9.6.tar.gz +SRC_URI=https://www.sudo.ws/sudo/dist/sudo-1.9.6p1.tar.gz ftp://ftp.sudo.ws/pub/sudo/sudo-1.9.6p1.tar.gz _eclasses_=edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic 09a8beb8e6a8e02dc1e1bd83ac353741 l10n 8cdd85e169b835d518bc2fd59f780d8e libtool f143db5a74ccd9ca28c1234deffede96 multilib d410501a125f99ffb560b0c523cd3d1e pam b097695df28f3974e3af860d6704d4f2 systemd 74b223e42834adf09a2d21fe5fe13741 tmpfiles dc8e4917d734a019caa04ad3b8db560b toolchain-funcs 24921b57d6561d87cbef4916a296ada4 wrapper 4251d4c84c25f59094fd557e0063a974 _md5_=c354f833c88783285ade37a119d03ca6 diff --git a/metadata/md5-cache/app-antivirus/Manifest.gz b/metadata/md5-cache/app-antivirus/Manifest.gz index 70520736fb92..f8f1910fbb08 100644 Binary files a/metadata/md5-cache/app-antivirus/Manifest.gz and b/metadata/md5-cache/app-antivirus/Manifest.gz differ diff --git a/metadata/md5-cache/app-antivirus/clamtk-6.09 b/metadata/md5-cache/app-antivirus/clamtk-6.10 similarity index 76% rename from metadata/md5-cache/app-antivirus/clamtk-6.09 rename to metadata/md5-cache/app-antivirus/clamtk-6.10 index 2388a6b93ef1..e85fc7e7ddad 100644 --- a/metadata/md5-cache/app-antivirus/clamtk-6.09 +++ b/metadata/md5-cache/app-antivirus/clamtk-6.10 @@ -9,6 +9,6 @@ LICENSE=|| ( Artistic GPL-1+ ) RDEPEND=app-antivirus/clamav dev-perl/File-chdir dev-perl/Gtk3 dev-perl/JSON dev-perl/LWP-Protocol-https dev-perl/LWP-UserAgent-Cached dev-perl/Locale-gettext dev-perl/Text-CSV dev-perl/glib-perl dev-perl/libwww-perl virtual/perl-Digest-MD5 virtual/perl-Digest-SHA virtual/perl-Encode virtual/perl-MIME-Base64 virtual/perl-Time-Piece nautilus? ( python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) dev-python/nautilus-python[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) REQUIRED_USE=nautilus? ( ^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 ) ) SLOT=0 -SRC_URI=https://bitbucket.org/davem_/clamtk/downloads/clamtk-6.09.tar.xz kde? ( https://bitbucket.org/davem_/clamtk-kde/downloads/clamtk-kde-0.18.tar.xz ) nautilus? ( https://bitbucket.org/davem_/clamtk-gnome/downloads/clamtk-gnome-0.05.tar.xz ) nemo? ( https://bitbucket.org/davem_/nemo-sendto-clamtk/downloads/nemo-sendto-clamtk-0.04.tar.xz ) thunar? ( https://bitbucket.org/davem_/thunar-sendto-clamtk/downloads/thunar-sendto-clamtk-0.06.tar.xz ) +SRC_URI=https://github.com/dave-theunsub/clamtk/releases/download/v6.10/clamtk-6.10.tar.xz kde? ( https://bitbucket.org/davem_/clamtk-kde/downloads/clamtk-kde-0.18.tar.xz ) nautilus? ( https://bitbucket.org/davem_/clamtk-gnome/downloads/clamtk-gnome-0.05.tar.xz ) nemo? ( https://bitbucket.org/davem_/nemo-sendto-clamtk/downloads/nemo-sendto-clamtk-0.04.tar.xz ) thunar? ( https://bitbucket.org/davem_/thunar-sendto-clamtk/downloads/thunar-sendto-clamtk-0.06.tar.xz ) _eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 multilib d410501a125f99ffb560b0c523cd3d1e perl-functions 6ec4c4d8fc8324200f1c14e8d158c59b python-single-r1 d3100de905f978df912135806cf27188 python-utils-r1 2dc8e06a3429719b43e9140f7292a425 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 xdg-utils ff2ff954e6b17929574eee4efc5152ba -_md5_=dcdd9643997c6aff11cd5e2fe7c86b99 +_md5_=dc12d7bce0daa4e66f2c596f02b42957 diff --git a/metadata/md5-cache/app-cdr/Manifest.gz b/metadata/md5-cache/app-cdr/Manifest.gz index 524039f888fe..254311b9ac19 100644 Binary files a/metadata/md5-cache/app-cdr/Manifest.gz and b/metadata/md5-cache/app-cdr/Manifest.gz differ diff --git a/metadata/md5-cache/app-cdr/dvd+rw-tools-7.1-r4 b/metadata/md5-cache/app-cdr/dvd+rw-tools-7.1-r4 new file mode 100644 index 000000000000..9b57b48baed8 --- /dev/null +++ b/metadata/md5-cache/app-cdr/dvd+rw-tools-7.1-r4 @@ -0,0 +1,12 @@ +DEFINED_PHASES=compile install postinst prepare +DEPEND=app-cdr/cdrtools sys-devel/m4 +DESCRIPTION=A set of tools for DVD+RW/-RW drives +EAPI=7 +HOMEPAGE=http://fy.chalmers.se/~appro/linux/DVD+RW/ +KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux +LICENSE=GPL-2 +RDEPEND=app-cdr/cdrtools +SLOT=0 +SRC_URI=http://fy.chalmers.se/~appro/linux/DVD+RW/tools/dvd+rw-tools-7.1.tar.gz +_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 +_md5_=aa8d5145bc8d0df6a5454af8994b40c1 diff --git a/metadata/md5-cache/app-emacs/Manifest.gz b/metadata/md5-cache/app-emacs/Manifest.gz index a45e4ed668eb..97ffc25a84a2 100644 Binary files a/metadata/md5-cache/app-emacs/Manifest.gz and b/metadata/md5-cache/app-emacs/Manifest.gz differ diff --git a/metadata/md5-cache/app-emacs/auctex-12.3 b/metadata/md5-cache/app-emacs/auctex-12.3 index 61ee9306449b..476d8134acbc 100644 --- a/metadata/md5-cache/app-emacs/auctex-12.3 +++ b/metadata/md5-cache/app-emacs/auctex-12.3 @@ -4,10 +4,10 @@ DESCRIPTION=Extensible package for writing and formatting TeX files in Emacs EAPI=7 HOMEPAGE=https://www.gnu.org/software/auctex/ IUSE=preview-latex -KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris +KEYWORDS=amd64 arm ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris LICENSE=GPL-3+ FDL-1.3+ RDEPEND=virtual/latex-base preview-latex? ( app-text/dvipng app-text/ghostscript-gpl ) >=app-editors/emacs-24:* SLOT=0 SRC_URI=mirror://gnu/auctex/auctex-12.3.tar.gz _eclasses_=elisp 00840e1f4eb277c757dbfa5abf73c4c7 elisp-common d4b53ec63c580b993ed19445f411e1d2 -_md5_=6b0dce74332211351065340cf9f9bb2d +_md5_=3817cba598317249bc4d3e472ee31a78 diff --git a/metadata/md5-cache/app-emacs/nxml-gentoo-schemas-20210203 b/metadata/md5-cache/app-emacs/nxml-gentoo-schemas-20210203 deleted file mode 100644 index febfbe118c3d..000000000000 --- a/metadata/md5-cache/app-emacs/nxml-gentoo-schemas-20210203 +++ /dev/null @@ -1,12 +0,0 @@ -BDEPEND=>=app-editors/emacs-23.1:* -DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack -DESCRIPTION=Extension for nxml-mode with Gentoo-specific schemas -EAPI=7 -HOMEPAGE=https://gitweb.gentoo.org/proj/nxml-gentoo-schemas.git/ -KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 -LICENSE=HPND MIT GPL-2+ -RDEPEND=>=app-editors/emacs-23.1:* -SLOT=0 -SRC_URI=https://dev.gentoo.org/~ulm/distfiles/nxml-gentoo-schemas-20210203.tar.xz -_eclasses_=elisp 00840e1f4eb277c757dbfa5abf73c4c7 elisp-common d4b53ec63c580b993ed19445f411e1d2 -_md5_=c0f31e6d39f5fa5d1e4f039d9631ba7c diff --git a/metadata/md5-cache/app-emacs/nxml-gentoo-schemas-20210314 b/metadata/md5-cache/app-emacs/nxml-gentoo-schemas-20210314 index 05722064ee1b..1e8bc0e89b55 100644 --- a/metadata/md5-cache/app-emacs/nxml-gentoo-schemas-20210314 +++ b/metadata/md5-cache/app-emacs/nxml-gentoo-schemas-20210314 @@ -3,10 +3,10 @@ DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack DESCRIPTION=Extension for nxml-mode with Gentoo-specific schemas EAPI=7 HOMEPAGE=https://gitweb.gentoo.org/proj/nxml-gentoo-schemas.git/ -KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 +KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 LICENSE=HPND MIT GPL-2+ RDEPEND=>=app-editors/emacs-23.1:* SLOT=0 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/nxml-gentoo-schemas-20210314.tar.xz _eclasses_=elisp 00840e1f4eb277c757dbfa5abf73c4c7 elisp-common d4b53ec63c580b993ed19445f411e1d2 -_md5_=c0f31e6d39f5fa5d1e4f039d9631ba7c +_md5_=7ccf14db5981339fbd4cd3214521d145 diff --git a/metadata/md5-cache/app-emacs/org-mode-9.4.4 b/metadata/md5-cache/app-emacs/org-mode-9.4.4 index 179fa7d2525e..82f03c203812 100644 --- a/metadata/md5-cache/app-emacs/org-mode-9.4.4 +++ b/metadata/md5-cache/app-emacs/org-mode-9.4.4 @@ -4,11 +4,11 @@ DESCRIPTION=An Emacs mode for notes and project planning EAPI=7 HOMEPAGE=https://www.orgmode.org/ IUSE=contrib doc odt-schema -KEYWORDS=~amd64 ~ppc ~x86 +KEYWORDS=amd64 ppc x86 LICENSE=GPL-3+ FDL-1.3+ contrib? ( GPL-2+ MIT ) odt-schema? ( OASIS-Open ) RDEPEND=>=app-editors/emacs-24:* RESTRICT=test SLOT=0 SRC_URI=https://orgmode.org/org-9.4.4.tar.gz _eclasses_=elisp 00840e1f4eb277c757dbfa5abf73c4c7 elisp-common d4b53ec63c580b993ed19445f411e1d2 readme.gentoo-r1 22ae82e140bdd95d17a34fd5fd733190 -_md5_=f8a7b43e5ebeb138bfe3ad90d7b01c9f +_md5_=fede4d363250c1deddd688d1df5614f2 diff --git a/metadata/md5-cache/app-misc/Manifest.gz b/metadata/md5-cache/app-misc/Manifest.gz index cdebba24ae04..4dcd0961a05a 100644 Binary files a/metadata/md5-cache/app-misc/Manifest.gz and b/metadata/md5-cache/app-misc/Manifest.gz differ diff --git a/metadata/md5-cache/app-misc/banner-1.3.5 b/metadata/md5-cache/app-misc/banner-1.3.5 index 26a1fbf9b0c4..db35403f3691 100644 --- a/metadata/md5-cache/app-misc/banner-1.3.5 +++ b/metadata/md5-cache/app-misc/banner-1.3.5 @@ -2,9 +2,9 @@ DEFINED_PHASES=- DESCRIPTION=The well known banner program for Linux EAPI=7 HOMEPAGE=https://github.com/pronovic/banner -KEYWORDS=~alpha ~amd64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux +KEYWORDS=~alpha amd64 ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux LICENSE=GPL-2 RDEPEND=!games-misc/bsd-games SLOT=0 SRC_URI=https://github.com/pronovic/banner/archive/BANNER_V1.3.5.tar.gz -_md5_=bfa71d36e499632da08b719ac3420129 +_md5_=ce6cc27c9bed8cb6c6c87baaae4b2b3a diff --git a/metadata/md5-cache/app-misc/oneko-1.2-r2 b/metadata/md5-cache/app-misc/oneko-1.2-r2 deleted file mode 100644 index daca76ac91b3..000000000000 --- a/metadata/md5-cache/app-misc/oneko-1.2-r2 +++ /dev/null @@ -1,12 +0,0 @@ -DEFINED_PHASES=compile configure install postinst prepare -DEPEND=x11-libs/libX11 x11-libs/libXext app-text/rman x11-base/xorg-proto x11-misc/gccmakedep x11-misc/imake -DESCRIPTION=A cat, dog and others which chase the mouse or windows around the screen -EAPI=5 -HOMEPAGE=http://www.daidouji.com/oneko/ -KEYWORDS=amd64 ppc ppc64 x86 -LICENSE=public-domain -RDEPEND=x11-libs/libX11 x11-libs/libXext -SLOT=0 -SRC_URI=http://www.daidouji.com/oneko/distfiles/oneko-1.2.sakura.5.tar.gz mirror://gentoo/oneko-1.2-cat.png mirror://gentoo/oneko-1.2-dog.png mirror://gentoo/oneko-1.2-sakura-nobsd.patch.bz2 -_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 epatch e8f1ec13660dc2f44b32775765d85e42 estack 055c42df72f76a4f45ec92b35e83cd56 eutils 2d5b3f4b315094768576b6799e4f926e l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa multilib d410501a125f99ffb560b0c523cd3d1e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 -_md5_=7debdebf97b916a2357e3b2fb34e04c8 diff --git a/metadata/md5-cache/app-misc/oneko-1.2_p5 b/metadata/md5-cache/app-misc/oneko-1.2_p5 deleted file mode 100644 index 390a29a7b051..000000000000 --- a/metadata/md5-cache/app-misc/oneko-1.2_p5 +++ /dev/null @@ -1,12 +0,0 @@ -DEFINED_PHASES=compile configure install -DEPEND=x11-libs/libX11 x11-libs/libXext app-text/rman x11-base/xorg-proto x11-misc/gccmakedep x11-misc/imake -DESCRIPTION=A cat, dog and others which chase the mouse or windows around the screen -EAPI=7 -HOMEPAGE=http://www.daidouji.com/oneko/ -KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 -LICENSE=public-domain -RDEPEND=x11-libs/libX11 x11-libs/libXext -SLOT=0 -SRC_URI=http://www.daidouji.com/oneko/distfiles/oneko-1.2.sakura.5.tar.gz mirror://gentoo/oneko-1.2-cat.png mirror://gentoo/oneko-1.2-dog.png mirror://gentoo/oneko-1.2-sakura-nobsd.patch.bz2 -_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 -_md5_=582e5c2559ba186d31e2a8093fa03ccd diff --git a/metadata/md5-cache/app-misc/oneko-1.2_p6_p14-r1 b/metadata/md5-cache/app-misc/oneko-1.2_p6_p14-r1 index 9a589ced71f4..06035ee74345 100644 --- a/metadata/md5-cache/app-misc/oneko-1.2_p6_p14-r1 +++ b/metadata/md5-cache/app-misc/oneko-1.2_p6_p14-r1 @@ -4,10 +4,10 @@ DEPEND=x11-libs/libX11 x11-libs/libXext x11-base/xorg-proto DESCRIPTION=A cat, dog and others which chase the mouse or windows around the screen EAPI=7 HOMEPAGE=http://www.daidouji.com/oneko/ -KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 +KEYWORDS=amd64 ppc ppc64 x86 LICENSE=public-domain RDEPEND=x11-libs/libX11 x11-libs/libXext SLOT=0 SRC_URI=mirror://debian/pool/main/o/oneko/oneko_1.2.sakura.6-14.debian.tar.xz mirror://debian/pool/main/o/oneko/oneko_1.2.sakura.6.orig.tar.gz mirror://gentoo/oneko-1.2-cat.png mirror://gentoo/oneko-1.2-dog.png _eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 -_md5_=1102f4357bb60429bdb6793bd361415b +_md5_=359801083db587c29a1da6d05a4ba2fc diff --git a/metadata/md5-cache/app-misc/recoll-1.29.2 b/metadata/md5-cache/app-misc/recoll-1.29.2 new file mode 100644 index 000000000000..8fd05d8c6412 --- /dev/null +++ b/metadata/md5-cache/app-misc/recoll-1.29.2 @@ -0,0 +1,15 @@ +BDEPEND=qt5? ( dev-qt/linguist-tools:5 ) +DEFINED_PHASES=configure install postinst prepare pretend setup +DEPEND=dev-libs/xapian:= sys-libs/zlib:= virtual/libiconv chm? ( dev-libs/chmlib dev-python/pychm ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 webengine? ( dev-qt/qtwebengine:5[widgets] ) ) session? ( inotify? ( x11-libs/libSM x11-libs/libICE x11-libs/libX11 ) ) spell? ( app-text/aspell ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) +DESCRIPTION=Personal full text search package +EAPI=7 +HOMEPAGE=https://www.lesbonscomptes.com/recoll/ +IUSE=camelcase chm doc +inotify qt5 session +spell webengine kernel_linux python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 +KEYWORDS=~amd64 ~x86 +LICENSE=GPL-2+ +RDEPEND=dev-libs/xapian:= sys-libs/zlib:= virtual/libiconv chm? ( dev-libs/chmlib dev-python/pychm ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 webengine? ( dev-qt/qtwebengine:5[widgets] ) ) session? ( inotify? ( x11-libs/libSM x11-libs/libICE x11-libs/libX11 ) ) spell? ( app-text/aspell ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) app-arch/unzip +REQUIRED_USE=session? ( inotify ) webengine? ( qt5 ) ^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 ) +SLOT=0 +SRC_URI=https://www.lesbonscomptes.com/recoll/recoll-1.29.2.tar.gz +_eclasses_=linux-info c90a203b1c14cfa77bd3e37a0e96c955 multilib d410501a125f99ffb560b0c523cd3d1e optfeature 6a2add34e06e5a05d88471a33ccdd73e python-single-r1 d3100de905f978df912135806cf27188 python-utils-r1 2dc8e06a3429719b43e9140f7292a425 qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 +_md5_=a0d9cf123b1b1b607b06a3c0044a5a36 diff --git a/metadata/md5-cache/app-text/Manifest.gz b/metadata/md5-cache/app-text/Manifest.gz index 6d21db08da18..4b62d95eca29 100644 Binary files a/metadata/md5-cache/app-text/Manifest.gz and b/metadata/md5-cache/app-text/Manifest.gz differ diff --git a/metadata/md5-cache/app-text/zathura-djvu-0.2.9 b/metadata/md5-cache/app-text/zathura-djvu-0.2.9 index a0ef5fd4dfff..6f1236723e89 100644 --- a/metadata/md5-cache/app-text/zathura-djvu-0.2.9 +++ b/metadata/md5-cache/app-text/zathura-djvu-0.2.9 @@ -9,5 +9,5 @@ LICENSE=ZLIB RDEPEND=app-text/djvu >=app-text/zathura-0.3.9 dev-libs/girara dev-libs/glib:2 x11-libs/cairo SLOT=0 SRC_URI=https://pwmt.org/projects/zathura-djvu/download/zathura-djvu-0.2.9.tar.xz -_eclasses_=edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 2d5b3f4b315094768576b6799e4f926e gnome2-utils c8e3fff820d850c0e003e22208d2eea3 l10n 8cdd85e169b835d518bc2fd59f780d8e meson e43eef9331f54965a573ed380854ff47 multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-utils-r1 2dc8e06a3429719b43e9140f7292a425 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 wrapper 4251d4c84c25f59094fd557e0063a974 xdg-utils ff2ff954e6b17929574eee4efc5152ba -_md5_=4cf3826bb7fb820981e92dd81a7d5372 +_eclasses_=meson e43eef9331f54965a573ed380854ff47 multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-utils-r1 2dc8e06a3429719b43e9140f7292a425 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 xdg-utils ff2ff954e6b17929574eee4efc5152ba +_md5_=e4c39b7939ef04c559fbce5e5a1c4b6c diff --git a/metadata/md5-cache/dev-db/Manifest.gz b/metadata/md5-cache/dev-db/Manifest.gz index 5f619964cb3b..15f6153cf80e 100644 Binary files a/metadata/md5-cache/dev-db/Manifest.gz and b/metadata/md5-cache/dev-db/Manifest.gz differ diff --git a/metadata/md5-cache/dev-db/lmdb-0.9.28 b/metadata/md5-cache/dev-db/lmdb-0.9.28 index 308cce644843..35b4cc5eaee6 100644 --- a/metadata/md5-cache/dev-db/lmdb-0.9.28 +++ b/metadata/md5-cache/dev-db/lmdb-0.9.28 @@ -3,9 +3,9 @@ DESCRIPTION=An ultra-fast, ultra-compact key-value embedded data store EAPI=7 HOMEPAGE=https://symas.com/lmdb/technical/ IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 -KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris +KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris LICENSE=OPENLDAP SLOT=0/0.9.28 SRC_URI=https://git.openldap.org/openldap/openldap/-/archive/LMDB_0.9.28/openldap-LMDB_0.9.28.tar.gz _eclasses_=edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic 09a8beb8e6a8e02dc1e1bd83ac353741 l10n 8cdd85e169b835d518bc2fd59f780d8e multibuild 6b3d5ee849dafe6cdfd7b859c211fb01 multilib d410501a125f99ffb560b0c523cd3d1e multilib-build 9a65133006c608964888346a412cc454 multilib-minimal 8bddda43703ba94d8341f4e247f97566 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 wrapper 4251d4c84c25f59094fd557e0063a974 -_md5_=5075ad261a1241338adf85ff0007c58a +_md5_=979ba3bba2bde821346454fe228e766b diff --git a/metadata/md5-cache/dev-games/Manifest.gz b/metadata/md5-cache/dev-games/Manifest.gz index 5b289b0d497a..af7949ae338c 100644 Binary files a/metadata/md5-cache/dev-games/Manifest.gz and b/metadata/md5-cache/dev-games/Manifest.gz differ diff --git a/metadata/md5-cache/dev-games/goatee-0.4.0 b/metadata/md5-cache/dev-games/goatee-0.4.0 new file mode 100644 index 000000000000..a3cc9bbcd1d3 --- /dev/null +++ b/metadata/md5-cache/dev-games/goatee-0.4.0 @@ -0,0 +1,14 @@ +DEFINED_PHASES=compile configure install postinst postrm setup test +DEPEND=>=dev-haskell/mtl-2.1:=[profile?] =dev-haskell/parsec-3.1:=[profile?] =dev-lang/ghc-8.6.3:= >=dev-haskell/cabal-2.4.0.1 test? ( >=dev-haskell/hunit-1.2 =dev-haskell/mtl-2.1:=[profile?] =dev-haskell/parsec-3.1:=[profile?] =dev-lang/ghc-8.6.3:= +RESTRICT=!test? ( test ) +SLOT=0/0.4.0 +SRC_URI=https://hackage.haskell.org/package/goatee-0.4.0/goatee-0.4.0.tar.gz +_eclasses_=edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 2d5b3f4b315094768576b6799e4f926e ghc-package e3a4a688accbd5f1226e46b379cc1c3e haskell-cabal 9d756e2e026abb59bf29f5b777bb34b2 l10n 8cdd85e169b835d518bc2fd59f780d8e multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 wrapper 4251d4c84c25f59094fd557e0063a974 +_md5_=bdd85c63ba0cfc71fb8508469bab9fbd diff --git a/metadata/md5-cache/dev-haskell/Manifest.gz b/metadata/md5-cache/dev-haskell/Manifest.gz index ce4486b616ac..3c0727ac50cc 100644 Binary files a/metadata/md5-cache/dev-haskell/Manifest.gz and b/metadata/md5-cache/dev-haskell/Manifest.gz differ diff --git a/metadata/md5-cache/dev-haskell/alex-tools-0.4 b/metadata/md5-cache/dev-haskell/alex-tools-0.4 index 2813e3c7986e..f3cc1e4f47be 100644 --- a/metadata/md5-cache/dev-haskell/alex-tools-0.4 +++ b/metadata/md5-cache/dev-haskell/alex-tools-0.4 @@ -10,4 +10,4 @@ RDEPEND=>=dev-haskell/text-1.2:=[profile?] =d SLOT=0/0.4 SRC_URI=https://hackage.haskell.org/package/alex-tools-0.4/alex-tools-0.4.tar.gz _eclasses_=edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 2d5b3f4b315094768576b6799e4f926e ghc-package e3a4a688accbd5f1226e46b379cc1c3e haskell-cabal 9d756e2e026abb59bf29f5b777bb34b2 l10n 8cdd85e169b835d518bc2fd59f780d8e multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 wrapper 4251d4c84c25f59094fd557e0063a974 -_md5_=5a7761ed4a1fd56021b8e0493fcecaff +_md5_=39bd0631930b5b2d4c6d068e0219b043 diff --git a/metadata/md5-cache/dev-haskell/cabal-3.2.1.0-r1 b/metadata/md5-cache/dev-haskell/cabal-3.2.1.0-r1 new file mode 100644 index 000000000000..572e869d995f --- /dev/null +++ b/metadata/md5-cache/dev-haskell/cabal-3.2.1.0-r1 @@ -0,0 +1,14 @@ +DEFINED_PHASES=compile configure install postinst postrm prepare setup test +DEPEND=>=dev-haskell/mtl-2.1:=[profile?] =dev-haskell/parsec-3.1.13.0:=[profile?] =dev-haskell/text-1.2.3.0:=[profile?] =dev-lang/ghc-8.0:= hscolour? ( dev-haskell/hscolour ) +DESCRIPTION=A framework for packaging Haskell software +EAPI=7 +HOMEPAGE=https://www.haskell.org/cabal/ +IUSE=doc hscolour profile +KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux +LICENSE=BSD +RDEPEND=>=dev-haskell/mtl-2.1:=[profile?] =dev-haskell/parsec-3.1.13.0:=[profile?] =dev-haskell/text-1.2.3.0:=[profile?] =dev-lang/ghc-8.0:= +RESTRICT=test +SLOT=0/3.2.1.0 +SRC_URI=https://hackage.haskell.org/package/Cabal-3.2.1.0/Cabal-3.2.1.0.tar.gz +_eclasses_=edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 2d5b3f4b315094768576b6799e4f926e ghc-package e3a4a688accbd5f1226e46b379cc1c3e haskell-cabal 9d756e2e026abb59bf29f5b777bb34b2 l10n 8cdd85e169b835d518bc2fd59f780d8e multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 wrapper 4251d4c84c25f59094fd557e0063a974 +_md5_=af9ae8217872bc2d730592a0c8f2d5f2 diff --git a/metadata/md5-cache/dev-haskell/cabal-install-3.2.0.0 b/metadata/md5-cache/dev-haskell/cabal-install-3.2.0.0 new file mode 100644 index 000000000000..bfaa2049e0d4 --- /dev/null +++ b/metadata/md5-cache/dev-haskell/cabal-install-3.2.0.0 @@ -0,0 +1,13 @@ +DEFINED_PHASES=compile configure install postinst postrm prepare setup test +DEPEND=>=dev-haskell/async-2.0:= =dev-haskell/base16-bytestring-0.1.1:= =dev-haskell/cabal-3.2:= =dev-haskell/cryptohash-sha256-0.11:= =dev-haskell/echo-0.1.3:= =dev-haskell/edit-distance-0.2.2:= =dev-haskell/fail-4.9:= =dev-haskell/hackage-security-0.6.0.0:= =dev-haskell/hashable-1.0:= =dev-haskell/http-4000.1.5:= =dev-haskell/lukko-0.1:= =dev-haskell/mtl-2.0:= =dev-haskell/network-2.6:= =dev-haskell/network-uri-2.6.0.2:= =dev-haskell/parsec-3.1.13.0:= =dev-haskell/random-1:= =dev-haskell/semigroups-0.18.3:= =dev-haskell/stm-2.0:= =dev-haskell/tar-0.5.0.3:= =dev-haskell/text-1.2.3:= =dev-haskell/zlib-0.5.3:= =dev-lang/ghc-7.10.1:= native-dns? ( >=dev-haskell/resolv-0.1.1:= =dev-haskell/cabal-1.22.2.0 +DESCRIPTION=The command-line interface for Cabal and Hackage +EAPI=7 +HOMEPAGE=https://www.haskell.org/cabal/ +IUSE=+native-dns +KEYWORDS=~amd64 ~x86 +LICENSE=BSD +RDEPEND=>=dev-haskell/async-2.0:= =dev-haskell/base16-bytestring-0.1.1:= =dev-haskell/cabal-3.2:= =dev-haskell/cryptohash-sha256-0.11:= =dev-haskell/echo-0.1.3:= =dev-haskell/edit-distance-0.2.2:= =dev-haskell/fail-4.9:= =dev-haskell/hackage-security-0.6.0.0:= =dev-haskell/hashable-1.0:= =dev-haskell/http-4000.1.5:= =dev-haskell/lukko-0.1:= =dev-haskell/mtl-2.0:= =dev-haskell/network-2.6:= =dev-haskell/network-uri-2.6.0.2:= =dev-haskell/parsec-3.1.13.0:= =dev-haskell/random-1:= =dev-haskell/semigroups-0.18.3:= =dev-haskell/stm-2.0:= =dev-haskell/tar-0.5.0.3:= =dev-haskell/text-1.2.3:= =dev-haskell/zlib-0.5.3:= =dev-lang/ghc-7.10.1:= native-dns? ( >=dev-haskell/resolv-0.1.1:= =dev-haskell/text-1.0.0.0:=[profile?] =dev-haskell/utf8-string-0.2:=[profile?] =dev-lang/ghc-7.10.1:= x11-libs/cairo >=dev-haskell/cabal-1.24 =dev-haskell/gtk2hs-buildtools-0.13.2.0 =dev-haskell/text-1.0.0.0:=[profile?] =dev-haskell/utf8-string-0.2:=[profile?] =dev-lang/ghc-7.10.1:= x11-libs/cairo +SLOT=0/0.13.8.1 +SRC_URI=https://hackage.haskell.org/package/cairo-0.13.8.1/cairo-0.13.8.1.tar.gz +_eclasses_=edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 2d5b3f4b315094768576b6799e4f926e ghc-package e3a4a688accbd5f1226e46b379cc1c3e haskell-cabal 9d756e2e026abb59bf29f5b777bb34b2 l10n 8cdd85e169b835d518bc2fd59f780d8e multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 wrapper 4251d4c84c25f59094fd557e0063a974 +_md5_=12c5eb7278018838f5b7f3af334160ab diff --git a/metadata/md5-cache/dev-haskell/ekg-core-0.1.1.7 b/metadata/md5-cache/dev-haskell/ekg-core-0.1.1.7 new file mode 100644 index 000000000000..4e20e7bdf13c --- /dev/null +++ b/metadata/md5-cache/dev-haskell/ekg-core-0.1.1.7 @@ -0,0 +1,13 @@ +DEFINED_PHASES=compile configure install postinst postrm prepare setup test +DEPEND==dev-lang/ghc-7.6.2:= >=dev-haskell/cabal-1.18 hscolour? ( dev-haskell/hscolour ) +DESCRIPTION=Tracking of system metrics +EAPI=7 +HOMEPAGE=https://github.com/tibbe/ekg-core +IUSE=doc hscolour profile +KEYWORDS=~amd64 ~x86 +LICENSE=BSD +RDEPEND==dev-lang/ghc-7.6.2:= +SLOT=0/0.1.1.7 +SRC_URI=https://hackage.haskell.org/package/ekg-core-0.1.1.7/ekg-core-0.1.1.7.tar.gz +_eclasses_=edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 2d5b3f4b315094768576b6799e4f926e ghc-package e3a4a688accbd5f1226e46b379cc1c3e haskell-cabal 9d756e2e026abb59bf29f5b777bb34b2 l10n 8cdd85e169b835d518bc2fd59f780d8e multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 wrapper 4251d4c84c25f59094fd557e0063a974 +_md5_=18464830e3fa1aacc02f2163c38b1cb7 diff --git a/metadata/md5-cache/dev-haskell/gtk2hs-buildtools-0.13.8.0-r1 b/metadata/md5-cache/dev-haskell/gtk2hs-buildtools-0.13.8.0-r1 new file mode 100644 index 000000000000..6ca0f7d02d24 --- /dev/null +++ b/metadata/md5-cache/dev-haskell/gtk2hs-buildtools-0.13.8.0-r1 @@ -0,0 +1,13 @@ +DEFINED_PHASES=compile configure install postinst postrm setup test +DEPEND=>=dev-haskell/cabal-1.24.0.0:=[profile?] dev-haskell/fail:=[profile?] dev-haskell/hashtables:=[profile?] dev-haskell/random:=[profile?] >=dev-lang/ghc-7.8.2:= dev-haskell/alex >=dev-haskell/cabal-1.18.1.3 dev-haskell/happy hscolour? ( dev-haskell/hscolour ) +DESCRIPTION=Tools to build the Gtk2Hs suite of User Interface libraries +EAPI=7 +HOMEPAGE=http://projects.haskell.org/gtk2hs/ +IUSE=+closuresignals doc hscolour profile +KEYWORDS=~amd64 ~x86 +LICENSE=GPL-2 +RDEPEND=>=dev-haskell/cabal-1.24.0.0:=[profile?] dev-haskell/fail:=[profile?] dev-haskell/hashtables:=[profile?] dev-haskell/random:=[profile?] >=dev-lang/ghc-7.8.2:= +SLOT=0/0.13.8.0 +SRC_URI=https://hackage.haskell.org/package/gtk2hs-buildtools-0.13.8.0/gtk2hs-buildtools-0.13.8.0.tar.gz +_eclasses_=edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 2d5b3f4b315094768576b6799e4f926e ghc-package e3a4a688accbd5f1226e46b379cc1c3e haskell-cabal 9d756e2e026abb59bf29f5b777bb34b2 l10n 8cdd85e169b835d518bc2fd59f780d8e multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 wrapper 4251d4c84c25f59094fd557e0063a974 +_md5_=3d3fe9e7c54da142da1e044256740e87 diff --git a/metadata/md5-cache/dev-haskell/hackage-security-0.6.0.1-r1 b/metadata/md5-cache/dev-haskell/hackage-security-0.6.0.1-r1 new file mode 100644 index 000000000000..a49618bff0e9 --- /dev/null +++ b/metadata/md5-cache/dev-haskell/hackage-security-0.6.0.1-r1 @@ -0,0 +1,14 @@ +DEFINED_PHASES=compile configure install postinst postrm prepare setup test +DEPEND=>=dev-haskell/base16-bytestring-0.1.1:=[profile?] =dev-haskell/base64-bytestring-1.0:=[profile?] =dev-haskell/cabal-1.14:=[profile?] =dev-haskell/cryptohash-sha256-0.11:=[profile?] =dev-haskell/ed25519-0.0:=[profile?] =dev-haskell/mtl-2.2:=[profile?] =dev-haskell/network-2.6:=[profile?] =dev-haskell/network-uri-2.6:=[profile?] =dev-haskell/parsec-3.1:=[profile?] =dev-haskell/tar-0.5:=[profile?] =dev-haskell/zlib-0.5:=[profile?] =dev-lang/ghc-8.4.3:= lukko? ( >=dev-haskell/lukko-0.1:=[profile?] =dev-haskell/cabal-2.2.0.1 test? ( >=dev-haskell/aeson-1.4 =dev-haskell/quickcheck-2.11 =dev-haskell/tasty-1.2 =dev-haskell/tasty-hunit-0.10 =dev-haskell/tasty-quickcheck-0.10 =dev-haskell/temporary-1.2 =dev-haskell/unordered-containers-0.2.8.0 =dev-haskell/vector-0.12 =dev-haskell/base16-bytestring-0.1.1:=[profile?] =dev-haskell/base64-bytestring-1.0:=[profile?] =dev-haskell/cabal-1.14:=[profile?] =dev-haskell/cryptohash-sha256-0.11:=[profile?] =dev-haskell/ed25519-0.0:=[profile?] =dev-haskell/mtl-2.2:=[profile?] =dev-haskell/network-2.6:=[profile?] =dev-haskell/network-uri-2.6:=[profile?] =dev-haskell/parsec-3.1:=[profile?] =dev-haskell/tar-0.5:=[profile?] =dev-haskell/zlib-0.5:=[profile?] =dev-lang/ghc-8.4.3:= lukko? ( >=dev-haskell/lukko-0.1:=[profile?] hackage-security-0.6.0.1-r1.cabal +_eclasses_=edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 2d5b3f4b315094768576b6799e4f926e ghc-package e3a4a688accbd5f1226e46b379cc1c3e haskell-cabal 9d756e2e026abb59bf29f5b777bb34b2 l10n 8cdd85e169b835d518bc2fd59f780d8e multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 wrapper 4251d4c84c25f59094fd557e0063a974 +_md5_=1e3fcb2cf4eea62d7b246ea94701a6f0 diff --git a/metadata/md5-cache/dev-haskell/haddock-2.24.0 b/metadata/md5-cache/dev-haskell/haddock-2.24.0 new file mode 100644 index 000000000000..b161c4b936af --- /dev/null +++ b/metadata/md5-cache/dev-haskell/haddock-2.24.0 @@ -0,0 +1,13 @@ +DEFINED_PHASES=compile configure install postinst postrm setup test +DEPEND=~dev-haskell/haddock-api-2.24.0:= >=dev-lang/ghc-8.10.1:= >=dev-haskell/cabal-3.0.0.0 +DESCRIPTION=A documentation-generation tool for Haskell libraries +EAPI=7 +HOMEPAGE=https://www.haskell.org/haddock/ +KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux +LICENSE=BSD +RDEPEND=~dev-haskell/haddock-api-2.24.0:= >=dev-lang/ghc-8.10.1:= +RESTRICT=test +SLOT=0 +SRC_URI=https://hackage.haskell.org/package/haddock-2.24.0/haddock-2.24.0.tar.gz +_eclasses_=edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 2d5b3f4b315094768576b6799e4f926e ghc-package e3a4a688accbd5f1226e46b379cc1c3e haskell-cabal 9d756e2e026abb59bf29f5b777bb34b2 l10n 8cdd85e169b835d518bc2fd59f780d8e multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 wrapper 4251d4c84c25f59094fd557e0063a974 +_md5_=af18caebd4f411c8ed746469dc6d7476 diff --git a/metadata/md5-cache/dev-haskell/haddock-api-2.24.0 b/metadata/md5-cache/dev-haskell/haddock-api-2.24.0 new file mode 100644 index 000000000000..495d7a99b547 --- /dev/null +++ b/metadata/md5-cache/dev-haskell/haddock-api-2.24.0 @@ -0,0 +1,14 @@ +DEFINED_PHASES=compile configure install postinst postrm prepare setup test +DEPEND=>=dev-haskell/ghc-paths-0.1.0.9:=[profile?] =dev-haskell/haddock-library-1.9.0:=[profile?] =dev-haskell/xhtml-3000.2.2:=[profile?] =dev-lang/ghc-8.10.1:= >=dev-haskell/cabal-3.0.0.0 test? ( >=dev-haskell/ghc-paths-0.1.0.12 =dev-haskell/hspec-2.4.4 =dev-haskell/quickcheck-2.11 ) hscolour? ( dev-haskell/hscolour ) +DESCRIPTION=A documentation-generation tool for Haskell libraries +EAPI=7 +HOMEPAGE=https://www.haskell.org/haddock/ +IUSE=hscolour profile test +KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux +LICENSE=BSD +RDEPEND=>=dev-haskell/ghc-paths-0.1.0.9:=[profile?] =dev-haskell/haddock-library-1.9.0:=[profile?] =dev-haskell/xhtml-3000.2.2:=[profile?] =dev-lang/ghc-8.10.1:= +RESTRICT=!test? ( test ) +SLOT=0/2.24.0 +SRC_URI=https://hackage.haskell.org/package/haddock-api-2.24.0/haddock-api-2.24.0.tar.gz +_eclasses_=edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 2d5b3f4b315094768576b6799e4f926e ghc-package e3a4a688accbd5f1226e46b379cc1c3e haskell-cabal 9d756e2e026abb59bf29f5b777bb34b2 l10n 8cdd85e169b835d518bc2fd59f780d8e multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 wrapper 4251d4c84c25f59094fd557e0063a974 +_md5_=ae0e73c3d5843468481953cd1c9da092 diff --git a/metadata/md5-cache/dev-haskell/haddock-library-1.9.0 b/metadata/md5-cache/dev-haskell/haddock-library-1.9.0 new file mode 100644 index 000000000000..bb7adba6c115 --- /dev/null +++ b/metadata/md5-cache/dev-haskell/haddock-library-1.9.0 @@ -0,0 +1,14 @@ +DEFINED_PHASES=compile configure install postinst postrm prepare setup test +DEPEND=>=dev-haskell/parsec-3.1.13.0:=[profile?] =dev-haskell/text-1.2.3.0:=[profile?] =dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-2.2 test? ( >=dev-haskell/hspec-2.4.4 >=dev-haskell/optparse-applicative-0.15 >=dev-haskell/tree-diff-0.1 >=dev-haskell/base-compat-0.9.3 >=dev-haskell/quickcheck-2.11 ) +DESCRIPTION=Library exposing some functionality of Haddock +EAPI=7 +HOMEPAGE=https://www.haskell.org/haddock/ +IUSE=profile test +KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux +LICENSE=BSD-2 +RDEPEND=>=dev-haskell/parsec-3.1.13.0:=[profile?] =dev-haskell/text-1.2.3.0:=[profile?] =dev-lang/ghc-7.8.2:= +RESTRICT=!test? ( test ) +SLOT=0/1.9.0 +SRC_URI=https://hackage.haskell.org/package/haddock-library-1.9.0/haddock-library-1.9.0.tar.gz +_eclasses_=edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 2d5b3f4b315094768576b6799e4f926e ghc-package e3a4a688accbd5f1226e46b379cc1c3e haskell-cabal 9d756e2e026abb59bf29f5b777bb34b2 l10n 8cdd85e169b835d518bc2fd59f780d8e multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 wrapper 4251d4c84c25f59094fd557e0063a974 +_md5_=94150257c4ceec76a03f81269d72404e diff --git a/metadata/md5-cache/dev-haskell/happstack-server-7.6.1 b/metadata/md5-cache/dev-haskell/happstack-server-7.6.1 new file mode 100644 index 000000000000..647fbe5f05c4 --- /dev/null +++ b/metadata/md5-cache/dev-haskell/happstack-server-7.6.1 @@ -0,0 +1,14 @@ +DEFINED_PHASES=compile configure install postinst postrm setup test +DEPEND=>=dev-haskell/base64-bytestring-1.0:=[profile?] =dev-haskell/blaze-html-0.5:=[profile?] =dev-haskell/hslogger-1.0.2:=[profile?] dev-haskell/html:=[profile?] >=dev-haskell/monad-control-0.3:=[profile?] =dev-haskell/mtl-2:=[profile?] =dev-haskell/semigroups-0.16:=[profile?] >=dev-haskell/sendfile-0.7.1:=[profile?] =dev-haskell/system-filepath-0.3.1:=[profile?] >=dev-haskell/text-0.10:=[profile?] =dev-haskell/threads-0.5:=[profile?] >=dev-haskell/transformers-base-0.4:=[profile?] =dev-haskell/transformers-compat-0.3:=[profile?] =dev-haskell/utf8-string-0.3.4:=[profile?] =dev-lang/ghc-7.8.2:= network-uri? ( >=dev-haskell/network-3.0.0:=[profile?] =dev-haskell/network-bsd-2.8.1:=[profile?] =dev-haskell/network-uri-2.6:=[profile?] =dev-haskell/cabal-1.18.1.3 test? ( dev-haskell/hunit ) hscolour? ( dev-haskell/hscolour ) +DESCRIPTION=Web related tools and services +EAPI=7 +HOMEPAGE=http://happstack.com +IUSE=+network-uri doc hscolour profile test +KEYWORDS=~amd64 ~x86 +LICENSE=BSD +RDEPEND=>=dev-haskell/base64-bytestring-1.0:=[profile?] =dev-haskell/blaze-html-0.5:=[profile?] =dev-haskell/hslogger-1.0.2:=[profile?] dev-haskell/html:=[profile?] >=dev-haskell/monad-control-0.3:=[profile?] =dev-haskell/mtl-2:=[profile?] =dev-haskell/semigroups-0.16:=[profile?] >=dev-haskell/sendfile-0.7.1:=[profile?] =dev-haskell/system-filepath-0.3.1:=[profile?] >=dev-haskell/text-0.10:=[profile?] =dev-haskell/threads-0.5:=[profile?] >=dev-haskell/transformers-base-0.4:=[profile?] =dev-haskell/transformers-compat-0.3:=[profile?] =dev-haskell/utf8-string-0.3.4:=[profile?] =dev-lang/ghc-7.8.2:= network-uri? ( >=dev-haskell/network-3.0.0:=[profile?] =dev-haskell/network-bsd-2.8.1:=[profile?] =dev-haskell/network-uri-2.6:=[profile?] =dev-haskell/aeson-1.3.0.0:=[profile?] =dev-haskell/binary-0.8.3:=[profile?] >=dev-haskell/exceptions-0.8.3:=[profile?] =dev-haskell/http-conduit-2.1:=[profile?] =dev-haskell/http-types-0.11:=[profile?] =dev-haskell/microlens-0.4.0:=[profile?] =dev-haskell/text-0.11:=[profile?] =dev-haskell/unordered-containers-0.2.5:=[profile?] >=dev-haskell/uri-bytestring-0.2.3.1:=[profile?] =dev-haskell/uri-bytestring-aeson-0.1:=[profile?] =dev-lang/ghc-8.0.1:= >=dev-haskell/cabal-2.4 hscolour? ( dev-haskell/hscolour ) +DESCRIPTION=Haskell OAuth2 authentication client +EAPI=7 +HOMEPAGE=https://github.com/freizl/hoauth2 +IUSE=doc hscolour profile +KEYWORDS=~amd64 ~x86 +LICENSE=BSD +RDEPEND=>=dev-haskell/aeson-1.3.0.0:=[profile?] =dev-haskell/binary-0.8.3:=[profile?] >=dev-haskell/exceptions-0.8.3:=[profile?] =dev-haskell/http-conduit-2.1:=[profile?] =dev-haskell/http-types-0.11:=[profile?] =dev-haskell/microlens-0.4.0:=[profile?] =dev-haskell/text-0.11:=[profile?] =dev-haskell/unordered-containers-0.2.5:=[profile?] >=dev-haskell/uri-bytestring-0.2.3.1:=[profile?] =dev-haskell/uri-bytestring-aeson-0.1:=[profile?] =dev-lang/ghc-8.0.1:= +SLOT=0/1.16.0 +SRC_URI=https://hackage.haskell.org/package/hoauth2-1.16.0/hoauth2-1.16.0.tar.gz +_eclasses_=edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 2d5b3f4b315094768576b6799e4f926e ghc-package e3a4a688accbd5f1226e46b379cc1c3e haskell-cabal 9d756e2e026abb59bf29f5b777bb34b2 l10n 8cdd85e169b835d518bc2fd59f780d8e multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 wrapper 4251d4c84c25f59094fd557e0063a974 +_md5_=f7bd7e89d446e30a55561954b3bfaac9 diff --git a/metadata/md5-cache/dev-haskell/language-lua-0.11.0.1 b/metadata/md5-cache/dev-haskell/language-lua-0.11.0.1 index f3f0be1488e3..5feaba8e7366 100644 --- a/metadata/md5-cache/dev-haskell/language-lua-0.11.0.1 +++ b/metadata/md5-cache/dev-haskell/language-lua-0.11.0.1 @@ -1,4 +1,4 @@ -DEFINED_PHASES=compile configure install postinst postrm setup test +DEFINED_PHASES=compile configure install postinst postrm prepare setup test DEPEND=>=dev-haskell/alex-tools-0.4:=[profile?] =dev-haskell/text-1.2:=[profile?] =dev-lang/ghc-7.6.1:= dev-haskell/alex >=dev-haskell/cabal-1.16.0 dev-haskell/happy test? ( dev-haskell/quickcheck dev-haskell/tasty dev-haskell/tasty-hunit dev-haskell/tasty-quickcheck ) hscolour? ( dev-haskell/hscolour ) DESCRIPTION=Lua parser and pretty-printer EAPI=7 @@ -11,4 +11,4 @@ RESTRICT=!test? ( test ) SLOT=0/0.11.0.1 SRC_URI=https://hackage.haskell.org/package/language-lua-0.11.0.1/language-lua-0.11.0.1.tar.gz _eclasses_=edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 2d5b3f4b315094768576b6799e4f926e ghc-package e3a4a688accbd5f1226e46b379cc1c3e haskell-cabal 9d756e2e026abb59bf29f5b777bb34b2 l10n 8cdd85e169b835d518bc2fd59f780d8e multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 wrapper 4251d4c84c25f59094fd557e0063a974 -_md5_=73911692f34b7b47fd36d393e6bb0dc6 +_md5_=65f00d5bb20d41715aabcb71457b46d1 diff --git a/metadata/md5-cache/dev-haskell/newtype-0.2.2.0 b/metadata/md5-cache/dev-haskell/newtype-0.2.2.0 index ec0c103496c2..7509a4fbf8a9 100644 --- a/metadata/md5-cache/dev-haskell/newtype-0.2.2.0 +++ b/metadata/md5-cache/dev-haskell/newtype-0.2.2.0 @@ -1,4 +1,4 @@ -DEFINED_PHASES=compile configure install postinst postrm setup test +DEFINED_PHASES=compile configure install postinst postrm prepare setup test DEPEND=>=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 hscolour? ( dev-haskell/hscolour ) DESCRIPTION=A typeclass and set of functions for working with newtypes EAPI=7 @@ -10,4 +10,4 @@ RDEPEND=>=dev-lang/ghc-7.8.2:= SLOT=0/0.2.2.0 SRC_URI=https://hackage.haskell.org/package/newtype-0.2.2.0/newtype-0.2.2.0.tar.gz _eclasses_=edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 2d5b3f4b315094768576b6799e4f926e ghc-package e3a4a688accbd5f1226e46b379cc1c3e haskell-cabal 9d756e2e026abb59bf29f5b777bb34b2 l10n 8cdd85e169b835d518bc2fd59f780d8e multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 wrapper 4251d4c84c25f59094fd557e0063a974 -_md5_=fbd7b253873237f29d66d6ba1f7078f8 +_md5_=c29b06277e9bce5753f7fb87982aff14 diff --git a/metadata/md5-cache/dev-haskell/punycode-2.0 b/metadata/md5-cache/dev-haskell/punycode-2.0 index 10f2fa105568..fe1e9eccc5e7 100644 --- a/metadata/md5-cache/dev-haskell/punycode-2.0 +++ b/metadata/md5-cache/dev-haskell/punycode-2.0 @@ -1,9 +1,9 @@ DEFINED_PHASES=compile configure install postinst postrm setup test -DEPEND=dev-haskell/cereal:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/text:=[profile?] >=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.8 test? ( dev-haskell/encoding dev-haskell/hunit dev-haskell/quickcheck ) hscolour? ( dev-haskell/hscolour ) +DEPEND=dev-haskell/cereal:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/text:=[profile?] >=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.8 hscolour? ( dev-haskell/hscolour ) DESCRIPTION=Encode unicode strings to ascii forms according to RFC 3492 EAPI=7 HOMEPAGE=https://github.com/litherum/punycode -IUSE=doc hscolour profile test +IUSE=doc hscolour profile KEYWORDS=~amd64 ~x86 LICENSE=BSD RDEPEND=dev-haskell/cereal:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/text:=[profile?] >=dev-lang/ghc-6.10.4:= @@ -11,4 +11,4 @@ RESTRICT=test SLOT=0/2.0 SRC_URI=https://hackage.haskell.org/package/punycode-2.0/punycode-2.0.tar.gz _eclasses_=edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 2d5b3f4b315094768576b6799e4f926e ghc-package e3a4a688accbd5f1226e46b379cc1c3e haskell-cabal 9d756e2e026abb59bf29f5b777bb34b2 l10n 8cdd85e169b835d518bc2fd59f780d8e multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 wrapper 4251d4c84c25f59094fd557e0063a974 -_md5_=c9f6ed120b49920248cfee91bcf19513 +_md5_=e2e0a26478b155f68a37a67f0debb5fc diff --git a/metadata/md5-cache/dev-haskell/syb-with-class-0.6.1.13 b/metadata/md5-cache/dev-haskell/syb-with-class-0.6.1.13 new file mode 100644 index 000000000000..014bab051987 --- /dev/null +++ b/metadata/md5-cache/dev-haskell/syb-with-class-0.6.1.13 @@ -0,0 +1,14 @@ +DEFINED_PHASES=compile configure install postinst postrm setup test +DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 test? ( dev-haskell/hunit ) hscolour? ( dev-haskell/hscolour ) +DESCRIPTION=Scrap Your Boilerplate With Class +EAPI=7 +HOMEPAGE=https://hackage.haskell.org/package/syb-with-class +IUSE=doc hscolour profile test +KEYWORDS=~amd64 ~x86 +LICENSE=BSD +RDEPEND=>=dev-lang/ghc-7.4.1:= +RESTRICT=!test? ( test ) +SLOT=0/0.6.1.13 +SRC_URI=https://hackage.haskell.org/package/syb-with-class-0.6.1.13/syb-with-class-0.6.1.13.tar.gz +_eclasses_=edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 2d5b3f4b315094768576b6799e4f926e ghc-package e3a4a688accbd5f1226e46b379cc1c3e haskell-cabal 9d756e2e026abb59bf29f5b777bb34b2 l10n 8cdd85e169b835d518bc2fd59f780d8e multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 wrapper 4251d4c84c25f59094fd557e0063a974 +_md5_=158359255d7bd157f2ea91beaee3d63e diff --git a/metadata/md5-cache/dev-haskell/test-framework-th-prime-0.0.10 b/metadata/md5-cache/dev-haskell/test-framework-th-prime-0.0.10 new file mode 100644 index 000000000000..1645dcc46fb0 --- /dev/null +++ b/metadata/md5-cache/dev-haskell/test-framework-th-prime-0.0.10 @@ -0,0 +1,13 @@ +DEFINED_PHASES=compile configure install postinst postrm setup test +DEPEND=>=dev-haskell/cpphs-0.2.1:=[profile?] dev-haskell/haskell-src-exts:=[profile?] dev-haskell/test-framework:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 hscolour? ( dev-haskell/hscolour ) +DESCRIPTION=Template Haskell for test framework +EAPI=7 +HOMEPAGE=https://hackage.haskell.org/package/test-framework-th-prime +IUSE=doc hscolour profile +KEYWORDS=~amd64 ~x86 +LICENSE=BSD +RDEPEND=>=dev-haskell/cpphs-0.2.1:=[profile?] dev-haskell/haskell-src-exts:=[profile?] dev-haskell/test-framework:=[profile?] >=dev-lang/ghc-7.4.1:= +SLOT=0/0.0.10 +SRC_URI=https://hackage.haskell.org/package/test-framework-th-prime-0.0.10/test-framework-th-prime-0.0.10.tar.gz +_eclasses_=edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 2d5b3f4b315094768576b6799e4f926e ghc-package e3a4a688accbd5f1226e46b379cc1c3e haskell-cabal 9d756e2e026abb59bf29f5b777bb34b2 l10n 8cdd85e169b835d518bc2fd59f780d8e multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 wrapper 4251d4c84c25f59094fd557e0063a974 +_md5_=dc9d69dc07645b5b9cda61132b7aec60 diff --git a/metadata/md5-cache/dev-haskell/text-1.2.4.1_rc1 b/metadata/md5-cache/dev-haskell/text-1.2.4.1_rc1 new file mode 100644 index 000000000000..3992247de7e1 --- /dev/null +++ b/metadata/md5-cache/dev-haskell/text-1.2.4.1_rc1 @@ -0,0 +1,14 @@ +DEFINED_PHASES=compile configure install postinst postrm setup test +DEPEND=>=dev-lang/ghc-8.10.3:= hscolour? ( dev-haskell/hscolour ) +DESCRIPTION=An efficient packed Unicode text type +EAPI=7 +HOMEPAGE=https://github.com/haskell/text +IUSE=doc hscolour profile +KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux +LICENSE=BSD-2 +RDEPEND=>=dev-lang/ghc-8.10.3:= +RESTRICT=test +SLOT=0/1.2.4.1_rc1 +SRC_URI=https://github.com/haskell/text/archive/v1.2.4.1-rc1.tar.gz -> text-1.2.4.1_rc1.tar.gz +_eclasses_=edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 2d5b3f4b315094768576b6799e4f926e ghc-package e3a4a688accbd5f1226e46b379cc1c3e haskell-cabal 9d756e2e026abb59bf29f5b777bb34b2 l10n 8cdd85e169b835d518bc2fd59f780d8e multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 wrapper 4251d4c84c25f59094fd557e0063a974 +_md5_=010ee59db4d7deec2f014f4da0fe3cdf diff --git a/metadata/md5-cache/dev-haskell/th-utilities-0.2.4.1 b/metadata/md5-cache/dev-haskell/th-utilities-0.2.4.1 new file mode 100644 index 000000000000..5f192ac9224b --- /dev/null +++ b/metadata/md5-cache/dev-haskell/th-utilities-0.2.4.1 @@ -0,0 +1,14 @@ +DEFINED_PHASES=compile configure install postinst postrm setup test +DEPEND=dev-haskell/primitive:=[profile?] dev-haskell/syb:=[profile?] dev-haskell/text:=[profile?] dev-haskell/th-orphans:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 test? ( dev-haskell/hspec dev-haskell/vector ) hscolour? ( dev-haskell/hscolour ) +DESCRIPTION=Collection of useful functions for use with Template Haskell +EAPI=7 +HOMEPAGE=https://github.com/fpco/th-utilities#readme +IUSE=doc hscolour profile test +KEYWORDS=~amd64 ~x86 +LICENSE=MIT +RDEPEND=dev-haskell/primitive:=[profile?] dev-haskell/syb:=[profile?] dev-haskell/text:=[profile?] dev-haskell/th-orphans:=[profile?] >=dev-lang/ghc-7.8.2:= +RESTRICT=!test? ( test ) +SLOT=0/0.2.4.1 +SRC_URI=https://hackage.haskell.org/package/th-utilities-0.2.4.1/th-utilities-0.2.4.1.tar.gz +_eclasses_=edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 2d5b3f4b315094768576b6799e4f926e ghc-package e3a4a688accbd5f1226e46b379cc1c3e haskell-cabal 9d756e2e026abb59bf29f5b777bb34b2 l10n 8cdd85e169b835d518bc2fd59f780d8e multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 wrapper 4251d4c84c25f59094fd557e0063a974 +_md5_=fc3df5ec6952d1d30c0215e43184644a diff --git a/metadata/md5-cache/dev-java/Manifest.gz b/metadata/md5-cache/dev-java/Manifest.gz index d3c7b13c273f..d9330147cb13 100644 Binary files a/metadata/md5-cache/dev-java/Manifest.gz and b/metadata/md5-cache/dev-java/Manifest.gz differ diff --git a/metadata/md5-cache/dev-java/javacup-0.11b_p20151001-r1 b/metadata/md5-cache/dev-java/javacup-0.11b_p20151001-r1 new file mode 100644 index 000000000000..d8d8b40cbc7d --- /dev/null +++ b/metadata/md5-cache/dev-java/javacup-0.11b_p20151001-r1 @@ -0,0 +1,13 @@ +DEFINED_PHASES=compile configure install preinst prepare setup +DEPEND=dev-java/ant-core:0 dev-java/jflex:0 >=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2 +DESCRIPTION=CUP Parser Generator for Java +EAPI=7 +HOMEPAGE=http://www2.cs.tum.edu/projects/cup/ +IUSE=elibc_FreeBSD doc source elibc_FreeBSD +KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris +LICENSE=GPL-2 +RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) +SLOT=0 +SRC_URI=http://www2.cs.tum.edu/projects/cup/releases/java-cup-src-11b-20151001.tar.gz +_eclasses_=java-ant-2 fb9e1462d72ecaf7c91ae1d169606d9f java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 378e4cda228ea0231a0ac283cb2ad25c multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 +_md5_=654eab80a87c41c015447f1f339b4669 diff --git a/metadata/md5-cache/dev-java/jflex-1.6.1-r1 b/metadata/md5-cache/dev-java/jflex-1.6.1-r1 new file mode 100644 index 000000000000..40a845c3e47b --- /dev/null +++ b/metadata/md5-cache/dev-java/jflex-1.6.1-r1 @@ -0,0 +1,15 @@ +DEFINED_PHASES=compile configure install preinst prepare setup test +DEPEND=dev-java/javacup:0 >=virtual/jdk-1.8:* test? ( dev-java/junit:4 ) dev-java/ant-core:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) +DESCRIPTION=JFlex is a lexical analyzer generator for Java +EAPI=7 +HOMEPAGE=https://www.jflex.de/ +IUSE=examples test vim-syntax elibc_FreeBSD doc source elibc_FreeBSD +KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~ppc-macos ~x64-macos +LICENSE=BSD +PDEPEND=dev-java/javacup:0 +RDEPEND=>=virtual/jre-1.8:* vim-syntax? ( || ( app-editors/vim app-editors/gvim ) ) dev-java/ant-core:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) +RESTRICT=!test? ( test ) +SLOT=0 +SRC_URI=https://jflex.de/jflex-1.6.1.tar.gz +_eclasses_=java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-pkg-simple a814c0c1adac3d7902bc7023902a2e1a java-utils-2 378e4cda228ea0231a0ac283cb2ad25c +_md5_=15f8d0db980743c9fc9d4dc68b4e60ad diff --git a/metadata/md5-cache/dev-lang/Manifest.gz b/metadata/md5-cache/dev-lang/Manifest.gz index cd064ce1a607..7a1a96979166 100644 Binary files a/metadata/md5-cache/dev-lang/Manifest.gz and b/metadata/md5-cache/dev-lang/Manifest.gz differ diff --git a/metadata/md5-cache/dev-lang/ghc-8.10.4 b/metadata/md5-cache/dev-lang/ghc-8.10.4 index f6f560dd1c10..7805bca6c449 100644 --- a/metadata/md5-cache/dev-lang/ghc-8.10.4 +++ b/metadata/md5-cache/dev-lang/ghc-8.10.4 @@ -5,6 +5,7 @@ DESCRIPTION=The Glasgow Haskell Compiler EAPI=7 HOMEPAGE=https://www.haskell.org/ghc/ IUSE=big-endian doc elfutils ghcbootstrap ghcmakebinary +gmp numa profile test binary +KEYWORDS=~amd64 ~x86 LICENSE=BSD PDEPEND=!ghcbootstrap? ( >=app-admin/haskell-updater-1.2 ) RDEPEND=>=dev-lang/perl-5.6.1 dev-libs/gmp:0= sys-libs/ncurses:0=[unicode] elfutils? ( dev-libs/elfutils ) !ghcmakebinary? ( dev-libs/libffi:= ) numa? ( sys-process/numactl ) binary? ( !prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.17 ) ) sys-libs/ncurses:0/6 ) @@ -13,4 +14,4 @@ RESTRICT=!test? ( test ) SLOT=0/8.10.4 SRC_URI=!binary? ( https://downloads.haskell.org/ghc/8.10.4/ghc-8.10.4-src.tar.xz test? ( https://downloads.haskell.org/ghc/8.10.4/ghc-8.10.4-testsuite.tar.xz ) ) !ghcbootstrap? ( amd64? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-8.10.4-x86_64-pc-linux-gnu.tbz2 ) x86? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-8.10.4-i686-pc-linux-gnu.tbz2 ) ) _eclasses_=autotools 9988ecbe04129214297a7bbf3d253710 bash-completion-r1 be99724bde4274de21e581204e9d164a check-reqs 7e3fd1855a5e1b50bb9e80827b3f672d edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic 09a8beb8e6a8e02dc1e1bd83ac353741 ghc-package e3a4a688accbd5f1226e46b379cc1c3e l10n 8cdd85e169b835d518bc2fd59f780d8e libtool f143db5a74ccd9ca28c1234deffede96 multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 pax-utils a41d1fd1c111289ffa04490de6ee79d7 prefix de7d8e2b10085ed5ff09ad70e4753e5c toolchain-funcs 24921b57d6561d87cbef4916a296ada4 wrapper 4251d4c84c25f59094fd557e0063a974 -_md5_=7329f57faeffdcde082f7ddcf6e8a0e1 +_md5_=31622e2537eb93910f24ea30869b83b1 diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz index ce4600c18ccd..7a1aaf473d8f 100644 Binary files a/metadata/md5-cache/dev-libs/Manifest.gz and b/metadata/md5-cache/dev-libs/Manifest.gz differ diff --git a/metadata/md5-cache/dev-libs/libedit-20210216.3.1 b/metadata/md5-cache/dev-libs/libedit-20210216.3.1 new file mode 100644 index 000000000000..6cdae4afaa6d --- /dev/null +++ b/metadata/md5-cache/dev-libs/libedit-20210216.3.1 @@ -0,0 +1,14 @@ +BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 +DEFINED_PHASES=compile configure install test +DEPEND=>=sys-libs/ncurses-5.9-r3[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] +DESCRIPTION=BSD replacement for libreadline +EAPI=7 +HOMEPAGE=https://thrysoee.dk/editline/ +IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 split-usr +KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos +LICENSE=BSD-2 +RDEPEND=>=sys-libs/ncurses-5.9-r3[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] +SLOT=0 +SRC_URI=https://thrysoee.dk/editline/libedit-20210216-3.1.tar.gz +_eclasses_=autotools 9988ecbe04129214297a7bbf3d253710 libtool f143db5a74ccd9ca28c1234deffede96 multibuild 6b3d5ee849dafe6cdfd7b859c211fb01 multilib d410501a125f99ffb560b0c523cd3d1e multilib-build 9a65133006c608964888346a412cc454 multilib-minimal 8bddda43703ba94d8341f4e247f97566 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 usr-ldscript 7c918d239d0f9098867d0c8e33348fc9 +_md5_=b785e2f3383092c4604b02b47d1b9c6d diff --git a/metadata/md5-cache/dev-libs/libfilezilla-0.27.0 b/metadata/md5-cache/dev-libs/libfilezilla-0.27.0-r1 similarity index 94% rename from metadata/md5-cache/dev-libs/libfilezilla-0.27.0 rename to metadata/md5-cache/dev-libs/libfilezilla-0.27.0-r1 index 84e5fa7a667c..186e133d90cc 100644 --- a/metadata/md5-cache/dev-libs/libfilezilla-0.27.0 +++ b/metadata/md5-cache/dev-libs/libfilezilla-0.27.0-r1 @@ -8,7 +8,7 @@ KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86 LICENSE=GPL-2+ RDEPEND=dev-libs/nettle:0= >=net-libs/gnutls-3.5.7:= RESTRICT=!test? ( test ) -SLOT=0/11 +SLOT=0/12 SRC_URI=https://download.filezilla-project.org/libfilezilla/libfilezilla-0.27.0.tar.bz2 _eclasses_=edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic 09a8beb8e6a8e02dc1e1bd83ac353741 l10n 8cdd85e169b835d518bc2fd59f780d8e multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 wrapper 4251d4c84c25f59094fd557e0063a974 -_md5_=7bc64b7298286633806d09ffa099d067 +_md5_=439e066587c05225d636fe90a4f41c69 diff --git a/metadata/md5-cache/dev-libs/libfilezilla-0.27.1 b/metadata/md5-cache/dev-libs/libfilezilla-0.27.1 new file mode 100644 index 000000000000..8929601f1665 --- /dev/null +++ b/metadata/md5-cache/dev-libs/libfilezilla-0.27.1 @@ -0,0 +1,14 @@ +DEFINED_PHASES=configure install pretend +DEPEND=dev-libs/nettle:0= >=net-libs/gnutls-3.5.7:= test? ( dev-util/cppunit ) +DESCRIPTION=C++ library offering some basic functionality for platform-independent programs +EAPI=7 +HOMEPAGE=https://lib.filezilla-project.org/ +IUSE=test +KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86 +LICENSE=GPL-2+ +RDEPEND=dev-libs/nettle:0= >=net-libs/gnutls-3.5.7:= +RESTRICT=!test? ( test ) +SLOT=0/12 +SRC_URI=https://download.filezilla-project.org/libfilezilla/libfilezilla-0.27.1.tar.bz2 +_eclasses_=edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic 09a8beb8e6a8e02dc1e1bd83ac353741 l10n 8cdd85e169b835d518bc2fd59f780d8e multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 wrapper 4251d4c84c25f59094fd557e0063a974 +_md5_=439e066587c05225d636fe90a4f41c69 diff --git a/metadata/md5-cache/dev-libs/libuev-2.2.0 b/metadata/md5-cache/dev-libs/libuev-2.3.2 similarity index 61% rename from metadata/md5-cache/dev-libs/libuev-2.2.0 rename to metadata/md5-cache/dev-libs/libuev-2.3.2 index 3e6d30e75198..f7f584c6dfcf 100644 --- a/metadata/md5-cache/dev-libs/libuev-2.2.0 +++ b/metadata/md5-cache/dev-libs/libuev-2.3.2 @@ -1,10 +1,10 @@ DEFINED_PHASES=configure install -DESCRIPTION=Lightweight event loop library for Linux -EAPI=6 +DESCRIPTION=A collection of useful BSD APIs +EAPI=7 HOMEPAGE=https://github.com/troglobit/libuev IUSE=static-libs KEYWORDS=~amd64 ~x86 LICENSE=MIT SLOT=0 -SRC_URI=https://github.com/troglobit/libuev/releases/download/v2.2.0/libuev-2.2.0.tar.xz -_md5_=df1c070f71766266c9a15f00de6b575f +SRC_URI=https://github.com/troglobit/libuev/releases/download/v2.3.2/libuev-2.3.2.tar.xz +_md5_=4e3cf86b964b5ff9b301cf3de8efe34a diff --git a/metadata/md5-cache/dev-python/Faker-6.6.1 b/metadata/md5-cache/dev-python/Faker-6.6.1 new file mode 100644 index 000000000000..a2e18d2646d5 --- /dev/null +++ b/metadata/md5-cache/dev-python/Faker-6.6.1 @@ -0,0 +1,15 @@ +BDEPEND=test? ( dev-python/freezegun[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/random2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/validators[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( >=dev-python/python-dateutil-2.4.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/text-unidecode-1.3[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] !dev-ruby/faker >=dev-python/pytest-4.5.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] +DEFINED_PHASES=compile configure install prepare test +DESCRIPTION=A Python package that generates fake data for you +EAPI=7 +HOMEPAGE=https://github.com/joke2k/faker +IUSE=test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 +KEYWORDS=~amd64 ~x86 +LICENSE=MIT +RDEPEND=>=dev-python/python-dateutil-2.4.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/text-unidecode-1.3[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] !dev-ruby/faker python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] +REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 ) +RESTRICT=!test? ( test ) +SLOT=0 +SRC_URI=mirror://pypi/F/Faker/Faker-6.6.1.tar.gz +_eclasses_=distutils-r1 16579e06f8839831bd5c03455bb87e3f multibuild 6b3d5ee849dafe6cdfd7b859c211fb01 multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 6d099888c5b4dd4868c26508df307e95 python-utils-r1 2dc8e06a3429719b43e9140f7292a425 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 +_md5_=8a924b44f974c84613e3216a45187207 diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz index f540790cb87a..bc9da41af79c 100644 Binary files a/metadata/md5-cache/dev-python/Manifest.gz and b/metadata/md5-cache/dev-python/Manifest.gz differ diff --git a/metadata/md5-cache/dev-python/boto3-1.17.28 b/metadata/md5-cache/dev-python/boto3-1.17.28 new file mode 100644 index 000000000000..383ebc69b273 --- /dev/null +++ b/metadata/md5-cache/dev-python/boto3-1.17.28 @@ -0,0 +1,15 @@ +BDEPEND=test? ( dev-python/mock[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),-python_single_target_python3_9(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) ) test? ( >=dev-python/botocore-1.20.28[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/jmespath-0.7.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/s3transfer-0.3.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/nose-1.3.7-r4[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] +DEFINED_PHASES=compile configure install prepare test +DESCRIPTION=The AWS SDK for Python +EAPI=7 +HOMEPAGE=https://github.com/boto/boto3 +IUSE=doc test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 +KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux +LICENSE=Apache-2.0 +RDEPEND=>=dev-python/botocore-1.20.28[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/jmespath-0.7.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/s3transfer-0.3.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] +REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 ) +RESTRICT=!test? ( test ) +SLOT=0 +SRC_URI=https://github.com/boto/boto3/archive/1.17.28.tar.gz -> boto3-1.17.28.tar.gz +_eclasses_=distutils-r1 16579e06f8839831bd5c03455bb87e3f multibuild 6b3d5ee849dafe6cdfd7b859c211fb01 multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 6d099888c5b4dd4868c26508df307e95 python-utils-r1 2dc8e06a3429719b43e9140f7292a425 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 +_md5_=632f3a5a79935d84378ababb9d4c165a diff --git a/metadata/md5-cache/dev-python/botocore-1.20.28 b/metadata/md5-cache/dev-python/botocore-1.20.28 new file mode 100644 index 000000000000..4c10ada3e5a7 --- /dev/null +++ b/metadata/md5-cache/dev-python/botocore-1.20.28 @@ -0,0 +1,15 @@ +BDEPEND=test? ( dev-python/mock[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/jsonschema[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),-python_single_target_python3_9(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) ) test? ( dev-python/six[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/jmespath[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/python-dateutil[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/urllib3-1.25.4[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/nose-1.3.7-r4[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] +DEFINED_PHASES=compile configure install prepare test +DESCRIPTION=Low-level, data-driven core of boto 3 +EAPI=7 +HOMEPAGE=https://github.com/boto/botocore +IUSE=doc test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 +KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux +LICENSE=Apache-2.0 +RDEPEND=dev-python/six[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/jmespath[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/python-dateutil[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/urllib3-1.25.4[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] +REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 ) +RESTRICT=!test? ( test ) +SLOT=0 +SRC_URI=mirror://pypi/b/botocore/botocore-1.20.28.tar.gz +_eclasses_=distutils-r1 16579e06f8839831bd5c03455bb87e3f multibuild 6b3d5ee849dafe6cdfd7b859c211fb01 multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 6d099888c5b4dd4868c26508df307e95 python-utils-r1 2dc8e06a3429719b43e9140f7292a425 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 +_md5_=0cb391ae0ef3fed1bf28148d755b5f6f diff --git a/metadata/md5-cache/dev-python/httpx-0.17.1 b/metadata/md5-cache/dev-python/httpx-0.17.1 new file mode 100644 index 000000000000..4a8aa7c0dea4 --- /dev/null +++ b/metadata/md5-cache/dev-python/httpx-0.17.1 @@ -0,0 +1,15 @@ +BDEPEND=test? ( dev-python/brotlipy[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/cryptography[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/hyper-h2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pytest-asyncio[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/trustme[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/uvicorn[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( dev-python/certifi[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/sniffio[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] =dev-python/httpcore-0.12.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/rfc3986-1.3[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] =dev-python/pytest-4.5.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] +DEFINED_PHASES=compile configure install prepare test +DESCRIPTION=Fully-featured HTTP client which provides sync and async APIs +EAPI=7 +HOMEPAGE=https://www.python-httpx.org/ +IUSE=test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 +KEYWORDS=~amd64 ~x86 +LICENSE=BSD +RDEPEND=dev-python/certifi[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/sniffio[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] =dev-python/httpcore-0.12.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/rfc3986-1.3[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] =dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] +REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 ) +RESTRICT=!test? ( test ) +SLOT=0 +SRC_URI=https://github.com/encode/httpx/archive/0.17.1.tar.gz -> httpx-0.17.1.tar.gz +_eclasses_=distutils-r1 16579e06f8839831bd5c03455bb87e3f multibuild 6b3d5ee849dafe6cdfd7b859c211fb01 multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 6d099888c5b4dd4868c26508df307e95 python-utils-r1 2dc8e06a3429719b43e9140f7292a425 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 +_md5_=0c8a757735c4bdb9b2541f7d19c7cb09 diff --git a/metadata/md5-cache/dev-python/josepy-1.8.0 b/metadata/md5-cache/dev-python/josepy-1.8.0 new file mode 100644 index 000000000000..f9f5d326b3e0 --- /dev/null +++ b/metadata/md5-cache/dev-python/josepy-1.8.0 @@ -0,0 +1,15 @@ +BDEPEND=test? ( dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( >=dev-python/cryptography-0.8[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pyopenssl-0.13[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] +DEFINED_PHASES=compile configure install prepare test +DESCRIPTION=JOSE protocol implementation in Python +EAPI=7 +HOMEPAGE=https://github.com/certbot/josepy +IUSE=test python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 +KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 +LICENSE=Apache-2.0 +RDEPEND=>=dev-python/cryptography-0.8[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pyopenssl-0.13[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] +REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 ) +RESTRICT=!test? ( test ) +SLOT=0 +SRC_URI=mirror://pypi/j/josepy/josepy-1.8.0.tar.gz +_eclasses_=distutils-r1 16579e06f8839831bd5c03455bb87e3f multibuild 6b3d5ee849dafe6cdfd7b859c211fb01 multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 6d099888c5b4dd4868c26508df307e95 python-utils-r1 2dc8e06a3429719b43e9140f7292a425 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 +_md5_=23125cc26c792997c530adcf458baddb diff --git a/metadata/md5-cache/dev-python/pikepdf-2.9.0 b/metadata/md5-cache/dev-python/pikepdf-2.9.0 new file mode 100644 index 000000000000..948d98c69963 --- /dev/null +++ b/metadata/md5-cache/dev-python/pikepdf-2.9.0 @@ -0,0 +1,16 @@ +BDEPEND=>=dev-python/pybind11-2.6.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools_scm-4.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/toml[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/setuptools_scm_git_archive[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] test? ( >=dev-python/attrs-20.2.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/hypothesis-5[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pillow-5.0.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),jpeg,lcms,tiff] >=dev-python/psutil-5[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-6[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-timeout-1.4.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/python-dateutil-2.8.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/python-xmp-toolkit-2.0.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( app-text/qpdf:0= dev-python/pillow[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/lxml[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pybind11[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] +DEFINED_PHASES=compile configure install prepare test +DEPEND=app-text/qpdf:0= +DESCRIPTION=Python library to work with pdf files based on qpdf +EAPI=7 +HOMEPAGE=https://pypi.org/project/pikepdf/ https://github.com/pikepdf/pikepdf +IUSE=test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 +KEYWORDS=~amd64 ~x86 +LICENSE=MPL-2.0 +RDEPEND=app-text/qpdf:0= dev-python/pillow[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/lxml[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pybind11[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] +REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 ) +RESTRICT=!test? ( test ) +SLOT=0 +SRC_URI=https://github.com/pikepdf/pikepdf/archive/v2.9.0.tar.gz -> pikepdf-2.9.0.tar.gz +_eclasses_=distutils-r1 16579e06f8839831bd5c03455bb87e3f multibuild 6b3d5ee849dafe6cdfd7b859c211fb01 multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 6d099888c5b4dd4868c26508df307e95 python-utils-r1 2dc8e06a3429719b43e9140f7292a425 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 +_md5_=87655fb474ef10260f86f42ff90617ee diff --git a/metadata/md5-cache/dev-python/sqlalchemy-1.4.0 b/metadata/md5-cache/dev-python/sqlalchemy-1.4.0 new file mode 100644 index 000000000000..9c63c9ff4777 --- /dev/null +++ b/metadata/md5-cache/dev-python/sqlalchemy-1.4.0 @@ -0,0 +1,15 @@ +BDEPEND=test? ( python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[sqlite] ) python_targets_python3_7? ( dev-lang/python:3.7[sqlite] ) python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) python_targets_python3_9? ( dev-lang/python:3.9[sqlite] ) dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( python_targets_pypy3? ( dev-python/importlib_metadata[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_7? ( dev-python/importlib_metadata[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[sqlite?] ) python_targets_python3_7? ( dev-lang/python:3.7[sqlite?] ) python_targets_python3_8? ( dev-lang/python:3.8[sqlite?] ) python_targets_python3_9? ( dev-lang/python:3.9[sqlite?] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] +DEFINED_PHASES=compile configure install postinst prepare test +DESCRIPTION=Python SQL toolkit and Object Relational Mapper +EAPI=7 +HOMEPAGE=https://www.sqlalchemy.org/ https://pypi.org/project/sqlalchemy/ +IUSE=examples +sqlite test test python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 +KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris +LICENSE=MIT +RDEPEND=python_targets_pypy3? ( dev-python/importlib_metadata[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_7? ( dev-python/importlib_metadata[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[sqlite?] ) python_targets_python3_7? ( dev-lang/python:3.7[sqlite?] ) python_targets_python3_8? ( dev-lang/python:3.8[sqlite?] ) python_targets_python3_9? ( dev-lang/python:3.9[sqlite?] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] +REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 ) +RESTRICT=!test? ( test ) +SLOT=0 +SRC_URI=mirror://pypi/S/SQLAlchemy/SQLAlchemy-1.4.0.tar.gz +_eclasses_=distutils-r1 16579e06f8839831bd5c03455bb87e3f multibuild 6b3d5ee849dafe6cdfd7b859c211fb01 multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 optfeature 6a2add34e06e5a05d88471a33ccdd73e python-r1 6d099888c5b4dd4868c26508df307e95 python-utils-r1 2dc8e06a3429719b43e9140f7292a425 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 +_md5_=e809b9b4b9bfd3ed3aef7fd0c76d800f diff --git a/metadata/md5-cache/dev-python/transitions-0.8.6 b/metadata/md5-cache/dev-python/transitions-0.8.6 deleted file mode 100644 index 262c1b81e6bb..000000000000 --- a/metadata/md5-cache/dev-python/transitions-0.8.6 +++ /dev/null @@ -1,16 +0,0 @@ -BDEPEND=test? ( || ( dev-python/pygraphviz[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/graphviz[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) dev-python/six[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] -DEFINED_PHASES=compile configure install prepare test -DEPEND=test? ( dev-python/dill[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/mock[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pycodestyle[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) -DESCRIPTION=A lightweight, object-oriented state machine implementation in Python -EAPI=7 -HOMEPAGE=https://github.com/pytransitions/transitions -IUSE=examples test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 -KEYWORDS=amd64 x86 -LICENSE=MIT -RDEPEND=|| ( dev-python/pygraphviz[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/graphviz[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) dev-python/six[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] -REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 ) -RESTRICT=!test? ( test ) -SLOT=0 -SRC_URI=https://github.com/pytransitions/transitions/archive/0.8.6.tar.gz -> transitions-0.8.6.tar.gz -_eclasses_=distutils-r1 16579e06f8839831bd5c03455bb87e3f multibuild 6b3d5ee849dafe6cdfd7b859c211fb01 multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 6d099888c5b4dd4868c26508df307e95 python-utils-r1 2dc8e06a3429719b43e9140f7292a425 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 -_md5_=a9ce3b727517c712f0cf26818dec1db1 diff --git a/metadata/md5-cache/dev-python/transitions-0.8.7 b/metadata/md5-cache/dev-python/transitions-0.8.7 index 78bd63614598..5baafd30f8f0 100644 --- a/metadata/md5-cache/dev-python/transitions-0.8.7 +++ b/metadata/md5-cache/dev-python/transitions-0.8.7 @@ -5,7 +5,7 @@ DESCRIPTION=A lightweight, object-oriented state machine implementation in Pytho EAPI=7 HOMEPAGE=https://github.com/pytransitions/transitions IUSE=examples test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 -KEYWORDS=~amd64 ~x86 +KEYWORDS=amd64 x86 LICENSE=MIT RDEPEND=|| ( dev-python/pygraphviz[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/graphviz[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) dev-python/six[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 ) @@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) SLOT=0 SRC_URI=https://github.com/pytransitions/transitions/archive/0.8.7.tar.gz -> transitions-0.8.7.tar.gz _eclasses_=distutils-r1 16579e06f8839831bd5c03455bb87e3f multibuild 6b3d5ee849dafe6cdfd7b859c211fb01 multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 6d099888c5b4dd4868c26508df307e95 python-utils-r1 2dc8e06a3429719b43e9140f7292a425 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 -_md5_=70e370b54f7d83c833259b8769b42874 +_md5_=a9ce3b727517c712f0cf26818dec1db1 diff --git a/metadata/md5-cache/dev-python/twine-3.4.0 b/metadata/md5-cache/dev-python/twine-3.4.0 new file mode 100644 index 000000000000..c58bfeb787d7 --- /dev/null +++ b/metadata/md5-cache/dev-python/twine-3.4.0 @@ -0,0 +1,15 @@ +BDEPEND=dev-python/setuptools_scm[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] test? ( dev-python/jaraco-envs[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/jaraco-functools[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/munch[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/portend[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pretend[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pypiserver[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( >=dev-python/colorama-0.4.3[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/importlib_metadata-3.6[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/keyring-15.1[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/packaging[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pkginfo-1.4.2[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/readme_renderer-21.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/requests-2.20.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/requests-toolbelt-0.8.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/rfc3986-1.4.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/tqdm-4.14[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] +DEFINED_PHASES=compile configure install prepare test +DESCRIPTION=Collection of utilities for publishing packages on PyPI +EAPI=7 +HOMEPAGE=https://twine.readthedocs.io/ https://github.com/pypa/twine https://pypi.org/project/twine/ +IUSE=test python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 +KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos +LICENSE=Apache-2.0 +RDEPEND=>=dev-python/colorama-0.4.3[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/importlib_metadata-3.6[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/keyring-15.1[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/packaging[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pkginfo-1.4.2[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/readme_renderer-21.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/requests-2.20.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/requests-toolbelt-0.8.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/rfc3986-1.4.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/tqdm-4.14[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] +REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 ) +RESTRICT=!test? ( test ) +SLOT=0 +SRC_URI=https://github.com/pypa/twine/archive/3.4.0.tar.gz -> twine-3.4.0.tar.gz +_eclasses_=distutils-r1 16579e06f8839831bd5c03455bb87e3f multibuild 6b3d5ee849dafe6cdfd7b859c211fb01 multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 6d099888c5b4dd4868c26508df307e95 python-utils-r1 2dc8e06a3429719b43e9140f7292a425 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 +_md5_=3204d7f876a8b729bcc074222922bbd0 diff --git a/metadata/md5-cache/dev-python/urllib3-1.26.4 b/metadata/md5-cache/dev-python/urllib3-1.26.4 new file mode 100644 index 000000000000..4759a122e566 --- /dev/null +++ b/metadata/md5-cache/dev-python/urllib3-1.26.4 @@ -0,0 +1,15 @@ +BDEPEND=test? ( python_targets_python3_7? ( >=dev-python/PySocks-1.5.8[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] =dev-python/trustme-0.5.3[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] >=www-servers/tornado-4.2.1[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) python_targets_python3_8? ( >=dev-python/PySocks-1.5.8[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] =dev-python/trustme-0.5.3[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] >=www-servers/tornado-4.2.1[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) python_targets_python3_9? ( >=dev-python/PySocks-1.5.8[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] =dev-python/trustme-0.5.3[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] >=www-servers/tornado-4.2.1[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[ssl(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[ssl(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[ssl(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[ssl(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] +DEFINED_PHASES=compile configure install prepare test +DESCRIPTION=HTTP library with thread-safe connection pooling, file post, and more +EAPI=7 +HOMEPAGE=https://github.com/urllib3/urllib3 +IUSE=brotli test python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 +KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris +LICENSE=MIT +RDEPEND=>=dev-python/PySocks-1.5.8[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] =dev-python/pypy3-7.3.0:0=[ssl(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[ssl(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[ssl(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[ssl(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] +REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 ) +RESTRICT=!test? ( test ) +SLOT=0 +SRC_URI=mirror://pypi/u/urllib3/urllib3-1.26.4.tar.gz +_eclasses_=distutils-r1 16579e06f8839831bd5c03455bb87e3f multibuild 6b3d5ee849dafe6cdfd7b859c211fb01 multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 6d099888c5b4dd4868c26508df307e95 python-utils-r1 2dc8e06a3429719b43e9140f7292a425 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 +_md5_=b561bc059bd5ee7a4732c6f0d28b5c72 diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz index 58706d74d94f..9562123aafb5 100644 Binary files a/metadata/md5-cache/dev-util/Manifest.gz and b/metadata/md5-cache/dev-util/Manifest.gz differ diff --git a/metadata/md5-cache/dev-util/cmake-3.19.5 b/metadata/md5-cache/dev-util/cmake-3.19.7 similarity index 97% rename from metadata/md5-cache/dev-util/cmake-3.19.5 rename to metadata/md5-cache/dev-util/cmake-3.19.7 index 1f48c7fb399c..aeaa4ddd9d14 100644 --- a/metadata/md5-cache/dev-util/cmake-3.19.5 +++ b/metadata/md5-cache/dev-util/cmake-3.19.7 @@ -10,6 +10,6 @@ LICENSE=CMake RDEPEND=>=app-arch/libarchive-3.3.3:= app-crypt/rhash >=dev-libs/expat-2.0.1 >=dev-libs/jsoncpp-1.9.2-r2:0= >=dev-libs/libuv-1.10.0:= >=net-misc/curl-7.21.5[ssl] sys-libs/zlib virtual/pkgconfig emacs? ( >=app-editors/emacs-23.1:* ) ncurses? ( sys-libs/ncurses:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) RESTRICT=!test? ( test ) SLOT=0 -SRC_URI=https://cmake.org/files/v3.19/cmake-3.19.5.tar.gz +SRC_URI=https://cmake.org/files/v3.19/cmake-3.19.7.tar.gz _eclasses_=bash-completion-r1 be99724bde4274de21e581204e9d164a cmake 314a813be2f09820e8978cdee941e501 edos2unix 33e347e171066657f91f8b0c72ec8773 elisp-common d4b53ec63c580b993ed19445f411e1d2 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic 09a8beb8e6a8e02dc1e1bd83ac353741 l10n 8cdd85e169b835d518bc2fd59f780d8e multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 24921b57d6561d87cbef4916a296ada4 virtualx 7e60d3b10c791ab996f717bc1f30072f wrapper 4251d4c84c25f59094fd557e0063a974 xdg-utils ff2ff954e6b17929574eee4efc5152ba _md5_=2b05dc93551f629b5e16ba64d73aac39 diff --git a/metadata/md5-cache/dev-util/howdoi-2.0.10 b/metadata/md5-cache/dev-util/howdoi-2.0.14 similarity index 97% rename from metadata/md5-cache/dev-util/howdoi-2.0.10 rename to metadata/md5-cache/dev-util/howdoi-2.0.14 index 32168050c90b..84832ae7f8b9 100644 --- a/metadata/md5-cache/dev-util/howdoi-2.0.10 +++ b/metadata/md5-cache/dev-util/howdoi-2.0.14 @@ -9,6 +9,6 @@ LICENSE=MIT RDEPEND=dev-python/appdirs[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/cachelib[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/keep[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pygments[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pyquery-1.4.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/requests-2.24.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 ) SLOT=0 -SRC_URI=mirror://pypi/h/howdoi/howdoi-2.0.10.tar.gz +SRC_URI=mirror://pypi/h/howdoi/howdoi-2.0.14.tar.gz _eclasses_=distutils-r1 16579e06f8839831bd5c03455bb87e3f multibuild 6b3d5ee849dafe6cdfd7b859c211fb01 multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 6d099888c5b4dd4868c26508df307e95 python-utils-r1 2dc8e06a3429719b43e9140f7292a425 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 _md5_=b8aece26017a992a5d4c0e78e19e856b diff --git a/metadata/md5-cache/dev-util/howdoi-2.0.8 b/metadata/md5-cache/dev-util/howdoi-2.0.8 deleted file mode 100644 index dab7dbcc21ab..000000000000 --- a/metadata/md5-cache/dev-util/howdoi-2.0.8 +++ /dev/null @@ -1,14 +0,0 @@ -BDEPEND=dev-python/setuptools[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] -DEFINED_PHASES=compile configure install prepare test -DESCRIPTION=A code search tool -EAPI=7 -HOMEPAGE=https://pypi.org/project/howdoi/ -IUSE=python_targets_python3_7 python_targets_python3_8 -KEYWORDS=~amd64 ~x86 -LICENSE=MIT -RDEPEND=dev-python/appdirs[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/cachelib[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/keep[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pygments[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pyquery-1.4.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/requests-2.24.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] -REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 ) -SLOT=0 -SRC_URI=mirror://pypi/h/howdoi/howdoi-2.0.8.tar.gz -_eclasses_=distutils-r1 16579e06f8839831bd5c03455bb87e3f multibuild 6b3d5ee849dafe6cdfd7b859c211fb01 multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 6d099888c5b4dd4868c26508df307e95 python-utils-r1 2dc8e06a3429719b43e9140f7292a425 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 -_md5_=670a5c058020fd716ba652a0bae14086 diff --git a/metadata/md5-cache/dev-vcs/Manifest.gz b/metadata/md5-cache/dev-vcs/Manifest.gz index 817fdcf133c0..f3d64d5e2dc4 100644 Binary files a/metadata/md5-cache/dev-vcs/Manifest.gz and b/metadata/md5-cache/dev-vcs/Manifest.gz differ diff --git a/metadata/md5-cache/dev-vcs/git-2.28.0 b/metadata/md5-cache/dev-vcs/git-2.28.0 deleted file mode 100644 index 819620abee6e..000000000000 --- a/metadata/md5-cache/dev-vcs/git-2.28.0 +++ /dev/null @@ -1,16 +0,0 @@ -BDEPEND=doc? ( app-text/asciidoc app-text/docbook2X app-text/xmlto sys-apps/texinfo ) nls? ( sys-devel/gettext ) test? ( app-crypt/gnupg ) virtual/pkgconfig -DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack -DEPEND=gnome-keyring? ( app-crypt/libsecret ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) sys-libs/zlib pcre? ( pcre-jit? ( dev-libs/libpcre2[jit(+)] ) !pcre-jit? ( dev-libs/libpcre ) ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( >=app-editors/emacs-23.1:* ) iconv? ( virtual/libiconv ) -DESCRIPTION=stupid content tracker: distributed VCS designed for speed and efficiency -EAPI=7 -HOMEPAGE=https://www.git-scm.com/ -IUSE=+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit perforce +perl +ppcsha1 tk +threads +webdav xinetd cvs subversion test python_single_target_python3_7 python_single_target_python3_8 -KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris -LICENSE=GPL-2 -RDEPEND=gnome-keyring? ( app-crypt/libsecret ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) sys-libs/zlib pcre? ( pcre-jit? ( dev-libs/libpcre2[jit(+)] ) !pcre-jit? ( dev-libs/libpcre ) ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( >=app-editors/emacs-23.1:* ) iconv? ( virtual/libiconv ) gpg? ( app-crypt/gnupg ) perl? ( dev-perl/Error dev-perl/MailTools dev-perl/Authen-SASL cgi? ( dev-perl/CGI highlight? ( app-text/highlight ) ) cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite ) mediawiki? ( dev-perl/DateTime-Format-ISO8601 dev-perl/HTML-Tree dev-perl/MediaWiki-API ) subversion? ( dev-vcs/subversion[-dso(-),perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) perforce? ( python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) ) -REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimental? ( mediawiki ) subversion? ( perl ) webdav? ( curl ) pcre-jit? ( pcre ) perforce? ( ^^ ( python_single_target_python3_7 python_single_target_python3_8 ) ) -RESTRICT=!test? ( test ) -SLOT=0 -SRC_URI=https://www.kernel.org/pub/software/scm/git/git-2.28.0.tar.xz https://www.kernel.org/pub/software/scm/git/git-manpages-2.28.0.tar.xz doc? ( https://www.kernel.org/pub/software/scm/git/git-htmldocs-2.28.0.tar.xz ) -_eclasses_=bash-completion-r1 be99724bde4274de21e581204e9d164a elisp-common d4b53ec63c580b993ed19445f411e1d2 l10n 8cdd85e169b835d518bc2fd59f780d8e multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 perl-functions 6ec4c4d8fc8324200f1c14e8d158c59b perl-module 97206c028d9bdc9f248e022ac5c9fc83 python-single-r1 d3100de905f978df912135806cf27188 python-utils-r1 2dc8e06a3429719b43e9140f7292a425 systemd 74b223e42834adf09a2d21fe5fe13741 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 -_md5_=2eb35883e5e726f90b971f00998b314c diff --git a/metadata/md5-cache/dev-vcs/git-2.29.2 b/metadata/md5-cache/dev-vcs/git-2.29.2 deleted file mode 100644 index b3d3841d78e7..000000000000 --- a/metadata/md5-cache/dev-vcs/git-2.29.2 +++ /dev/null @@ -1,16 +0,0 @@ -BDEPEND=doc? ( app-text/asciidoc app-text/docbook2X app-text/xmlto sys-apps/texinfo ) nls? ( sys-devel/gettext ) test? ( app-crypt/gnupg ) virtual/pkgconfig -DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack -DEPEND=gnome-keyring? ( app-crypt/libsecret ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) sys-libs/zlib pcre? ( pcre-jit? ( dev-libs/libpcre2[jit(+)] ) !pcre-jit? ( dev-libs/libpcre ) ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( >=app-editors/emacs-23.1:* ) iconv? ( virtual/libiconv ) -DESCRIPTION=stupid content tracker: distributed VCS designed for speed and efficiency -EAPI=7 -HOMEPAGE=https://www.git-scm.com/ -IUSE=+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit perforce +perl +ppcsha1 subversion tk +threads +webdav xinetd cvs test python_single_target_python3_7 python_single_target_python3_8 -KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris -LICENSE=GPL-2 -RDEPEND=gnome-keyring? ( app-crypt/libsecret ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) sys-libs/zlib pcre? ( pcre-jit? ( dev-libs/libpcre2[jit(+)] ) !pcre-jit? ( dev-libs/libpcre ) ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( >=app-editors/emacs-23.1:* ) iconv? ( virtual/libiconv ) gpg? ( app-crypt/gnupg ) perl? ( dev-perl/Error dev-perl/MailTools dev-perl/Authen-SASL >=virtual/perl-libnet-3.110.0-r4[ssl] cgi? ( dev-perl/CGI highlight? ( app-text/highlight ) ) cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite ) mediawiki? ( dev-perl/DateTime-Format-ISO8601 dev-perl/HTML-Tree dev-perl/MediaWiki-API ) subversion? ( dev-vcs/subversion[-dso(-),perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) perforce? ( python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) ) -REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimental? ( mediawiki ) pcre-jit? ( pcre ) perforce? ( ^^ ( python_single_target_python3_7 python_single_target_python3_8 ) ) subversion? ( perl ) webdav? ( curl ) -RESTRICT=!test? ( test ) -SLOT=0 -SRC_URI=https://www.kernel.org/pub/software/scm/git/git-2.29.2.tar.xz https://www.kernel.org/pub/software/scm/git/git-manpages-2.29.2.tar.xz doc? ( https://www.kernel.org/pub/software/scm/git/git-htmldocs-2.29.2.tar.xz ) -_eclasses_=bash-completion-r1 be99724bde4274de21e581204e9d164a elisp-common d4b53ec63c580b993ed19445f411e1d2 l10n 8cdd85e169b835d518bc2fd59f780d8e multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 perl-functions 6ec4c4d8fc8324200f1c14e8d158c59b perl-module 97206c028d9bdc9f248e022ac5c9fc83 python-single-r1 d3100de905f978df912135806cf27188 python-utils-r1 2dc8e06a3429719b43e9140f7292a425 systemd 74b223e42834adf09a2d21fe5fe13741 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 -_md5_=85d5d9f598e4022ca024d310dabaae29 diff --git a/metadata/md5-cache/dev-vcs/git-2.30.0 b/metadata/md5-cache/dev-vcs/git-2.30.0 deleted file mode 100644 index fb2b8d859f45..000000000000 --- a/metadata/md5-cache/dev-vcs/git-2.30.0 +++ /dev/null @@ -1,16 +0,0 @@ -BDEPEND=doc? ( app-text/asciidoc app-text/docbook2X app-text/xmlto sys-apps/texinfo ) nls? ( sys-devel/gettext ) test? ( app-crypt/gnupg ) virtual/pkgconfig -DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack -DEPEND=gnome-keyring? ( app-crypt/libsecret ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) sys-libs/zlib pcre? ( pcre-jit? ( dev-libs/libpcre2[jit(+)] ) !pcre-jit? ( dev-libs/libpcre ) ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( >=app-editors/emacs-23.1:* ) iconv? ( virtual/libiconv ) -DESCRIPTION=stupid content tracker: distributed VCS designed for speed and efficiency -EAPI=7 -HOMEPAGE=https://www.git-scm.com/ -IUSE=+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit perforce +perl +ppcsha1 subversion tk +threads +webdav xinetd cvs test python_single_target_python3_7 python_single_target_python3_8 -KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris -LICENSE=GPL-2 -RDEPEND=gnome-keyring? ( app-crypt/libsecret ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) sys-libs/zlib pcre? ( pcre-jit? ( dev-libs/libpcre2[jit(+)] ) !pcre-jit? ( dev-libs/libpcre ) ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( >=app-editors/emacs-23.1:* ) iconv? ( virtual/libiconv ) gpg? ( app-crypt/gnupg ) perl? ( dev-perl/Error dev-perl/MailTools dev-perl/Authen-SASL >=virtual/perl-libnet-3.110.0-r4[ssl] cgi? ( dev-perl/CGI highlight? ( app-text/highlight ) ) cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite ) mediawiki? ( dev-perl/DateTime-Format-ISO8601 dev-perl/HTML-Tree dev-perl/MediaWiki-API ) subversion? ( dev-vcs/subversion[-dso(-),perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) perforce? ( python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) ) -REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimental? ( mediawiki ) pcre-jit? ( pcre ) perforce? ( ^^ ( python_single_target_python3_7 python_single_target_python3_8 ) ) subversion? ( perl ) webdav? ( curl ) -RESTRICT=!test? ( test ) -SLOT=0 -SRC_URI=https://www.kernel.org/pub/software/scm/git/git-2.30.0.tar.xz https://www.kernel.org/pub/software/scm/git/git-manpages-2.30.0.tar.xz doc? ( https://www.kernel.org/pub/software/scm/git/git-htmldocs-2.30.0.tar.xz ) -_eclasses_=bash-completion-r1 be99724bde4274de21e581204e9d164a elisp-common d4b53ec63c580b993ed19445f411e1d2 l10n 8cdd85e169b835d518bc2fd59f780d8e multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 perl-functions 6ec4c4d8fc8324200f1c14e8d158c59b perl-module 97206c028d9bdc9f248e022ac5c9fc83 python-single-r1 d3100de905f978df912135806cf27188 python-utils-r1 2dc8e06a3429719b43e9140f7292a425 systemd 74b223e42834adf09a2d21fe5fe13741 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 -_md5_=85d5d9f598e4022ca024d310dabaae29 diff --git a/metadata/md5-cache/dev-vcs/git-2.30.1 b/metadata/md5-cache/dev-vcs/git-2.31.0 similarity index 94% rename from metadata/md5-cache/dev-vcs/git-2.30.1 rename to metadata/md5-cache/dev-vcs/git-2.31.0 index bb3aa2ff41e8..d66c380d3039 100644 --- a/metadata/md5-cache/dev-vcs/git-2.30.1 +++ b/metadata/md5-cache/dev-vcs/git-2.31.0 @@ -11,6 +11,6 @@ RDEPEND=gnome-keyring? ( app-crypt/libsecret ) !libressl? ( dev-libs/openssl:0= REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimental? ( mediawiki ) pcre-jit? ( pcre ) perforce? ( ^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 ) ) subversion? ( perl ) webdav? ( curl ) RESTRICT=!test? ( test ) SLOT=0 -SRC_URI=https://www.kernel.org/pub/software/scm/git/git-2.30.1.tar.xz https://www.kernel.org/pub/software/scm/git/git-manpages-2.30.1.tar.xz doc? ( https://www.kernel.org/pub/software/scm/git/git-htmldocs-2.30.1.tar.xz ) +SRC_URI=https://www.kernel.org/pub/software/scm/git/git-2.31.0.tar.xz https://www.kernel.org/pub/software/scm/git/git-manpages-2.31.0.tar.xz doc? ( https://www.kernel.org/pub/software/scm/git/git-htmldocs-2.31.0.tar.xz ) _eclasses_=bash-completion-r1 be99724bde4274de21e581204e9d164a elisp-common d4b53ec63c580b993ed19445f411e1d2 l10n 8cdd85e169b835d518bc2fd59f780d8e multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 perl-functions 6ec4c4d8fc8324200f1c14e8d158c59b perl-module 97206c028d9bdc9f248e022ac5c9fc83 python-single-r1 d3100de905f978df912135806cf27188 python-utils-r1 2dc8e06a3429719b43e9140f7292a425 systemd 74b223e42834adf09a2d21fe5fe13741 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 -_md5_=7dc9fcc1e8e90c29fe09619ed1056a75 +_md5_=cd06fd5fa2c5c9c50f6330a167094d65 diff --git a/metadata/md5-cache/dev-vcs/git-2.31.0_rc2 b/metadata/md5-cache/dev-vcs/git-2.31.0_rc2 deleted file mode 100644 index 07e2370e62d9..000000000000 --- a/metadata/md5-cache/dev-vcs/git-2.31.0_rc2 +++ /dev/null @@ -1,15 +0,0 @@ -BDEPEND=doc? ( app-text/asciidoc app-text/docbook2X app-text/xmlto sys-apps/texinfo ) nls? ( sys-devel/gettext ) test? ( app-crypt/gnupg ) virtual/pkgconfig -DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack -DEPEND=gnome-keyring? ( app-crypt/libsecret ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) sys-libs/zlib pcre? ( pcre-jit? ( dev-libs/libpcre2[jit(+)] ) !pcre-jit? ( dev-libs/libpcre ) ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( >=app-editors/emacs-23.1:* ) iconv? ( virtual/libiconv ) -DESCRIPTION=stupid content tracker: distributed VCS designed for speed and efficiency -EAPI=7 -HOMEPAGE=https://www.git-scm.com/ -IUSE=+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit perforce +perl +ppcsha1 subversion tk +threads +webdav xinetd cvs test python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 -LICENSE=GPL-2 -RDEPEND=gnome-keyring? ( app-crypt/libsecret ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) sys-libs/zlib pcre? ( pcre-jit? ( dev-libs/libpcre2[jit(+)] ) !pcre-jit? ( dev-libs/libpcre ) ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( >=app-editors/emacs-23.1:* ) iconv? ( virtual/libiconv ) gpg? ( app-crypt/gnupg ) perl? ( dev-perl/Error dev-perl/MailTools dev-perl/Authen-SASL >=virtual/perl-libnet-3.110.0-r4[ssl] cgi? ( dev-perl/CGI highlight? ( app-text/highlight ) ) cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite ) mediawiki? ( dev-perl/DateTime-Format-ISO8601 dev-perl/HTML-Tree dev-perl/MediaWiki-API ) subversion? ( dev-vcs/subversion[-dso(-),perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) perforce? ( python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) -REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimental? ( mediawiki ) pcre-jit? ( pcre ) perforce? ( ^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 ) ) subversion? ( perl ) webdav? ( curl ) -RESTRICT=!test? ( test ) -SLOT=0 -SRC_URI=https://www.kernel.org/pub/software/scm/git/testing/git-2.31.0.rc2.tar.xz https://www.kernel.org/pub/software/scm/git/testing/git-manpages-2.31.0.rc2.tar.xz doc? ( https://www.kernel.org/pub/software/scm/git/testing/git-htmldocs-2.31.0.rc2.tar.xz ) -_eclasses_=bash-completion-r1 be99724bde4274de21e581204e9d164a elisp-common d4b53ec63c580b993ed19445f411e1d2 l10n 8cdd85e169b835d518bc2fd59f780d8e multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 perl-functions 6ec4c4d8fc8324200f1c14e8d158c59b perl-module 97206c028d9bdc9f248e022ac5c9fc83 python-single-r1 d3100de905f978df912135806cf27188 python-utils-r1 2dc8e06a3429719b43e9140f7292a425 systemd 74b223e42834adf09a2d21fe5fe13741 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 -_md5_=cd06fd5fa2c5c9c50f6330a167094d65 diff --git a/metadata/md5-cache/games-board/Manifest.gz b/metadata/md5-cache/games-board/Manifest.gz index b813da2bfe42..170faafbb9a4 100644 Binary files a/metadata/md5-cache/games-board/Manifest.gz and b/metadata/md5-cache/games-board/Manifest.gz differ diff --git a/metadata/md5-cache/games-board/goatee-gtk-0.4.0 b/metadata/md5-cache/games-board/goatee-gtk-0.4.0 new file mode 100644 index 000000000000..cc68c4b7df82 --- /dev/null +++ b/metadata/md5-cache/games-board/goatee-gtk-0.4.0 @@ -0,0 +1,14 @@ +DEFINED_PHASES=compile configure install postinst postrm setup test +DEPEND=>=dev-games/goatee-0.4:=[profile?] =dev-haskell/cairo-0.13:=[profile?] =dev-haskell/glib-0.13:=[profile?] =dev-haskell/gtk-0.13:=[profile?] =dev-haskell/mtl-2.1:=[profile?] =dev-haskell/parsec-3.1:=[profile?] =dev-lang/ghc-8.4.3:= >=dev-haskell/cabal-2.2.0.1 test? ( >=dev-haskell/hunit-1.2 =dev-games/goatee-0.4:=[profile?] =dev-haskell/cairo-0.13:=[profile?] =dev-haskell/glib-0.13:=[profile?] =dev-haskell/gtk-0.13:=[profile?] =dev-haskell/mtl-2.1:=[profile?] =dev-haskell/parsec-3.1:=[profile?] =dev-lang/ghc-8.4.3:= +RESTRICT=!test? ( test ) +SLOT=0/0.4.0 +SRC_URI=https://hackage.haskell.org/package/goatee-gtk-0.4.0/goatee-gtk-0.4.0.tar.gz +_eclasses_=edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 2d5b3f4b315094768576b6799e4f926e ghc-package e3a4a688accbd5f1226e46b379cc1c3e haskell-cabal 9d756e2e026abb59bf29f5b777bb34b2 l10n 8cdd85e169b835d518bc2fd59f780d8e multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 wrapper 4251d4c84c25f59094fd557e0063a974 +_md5_=7c76a6d468d98dc22e251301e43fb7da diff --git a/metadata/md5-cache/media-gfx/Manifest.gz b/metadata/md5-cache/media-gfx/Manifest.gz index 9c6785fb38c2..621fc2b3ce4f 100644 Binary files a/metadata/md5-cache/media-gfx/Manifest.gz and b/metadata/md5-cache/media-gfx/Manifest.gz differ diff --git a/metadata/md5-cache/media-gfx/engauge-10.6 b/metadata/md5-cache/media-gfx/engauge-10.6 index ca013bd2ca6e..4e3abda24470 100644 --- a/metadata/md5-cache/media-gfx/engauge-10.6 +++ b/metadata/md5-cache/media-gfx/engauge-10.6 @@ -4,10 +4,10 @@ DESCRIPTION=Convert an image file showing a graph or map into numbers EAPI=7 HOMEPAGE=https://markummitchell.github.io/engauge-digitizer/ IUSE=doc examples jpeg2k pdf -KEYWORDS=~amd64 ~x86 +KEYWORDS=amd64 ~x86 LICENSE=GPL-2 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qthelp:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-libs/log4cpp sci-libs/fftw:3.0 jpeg2k? ( media-libs/openjpeg:2 ) pdf? ( app-text/poppler[qt5] ) SLOT=0 SRC_URI=https://github.com/markummitchell/engauge-digitizer/archive/v10.6.tar.gz -> engauge-digitizer-10.6.tar.gz _eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba -_md5_=e0ef94f1bb3669f31b2afcca096bc18b +_md5_=71c400b1de54b0cf8611a8620de2d9de diff --git a/metadata/md5-cache/media-gfx/gnofract4d-4.0.1_p1-r1 b/metadata/md5-cache/media-gfx/gnofract4d-4.0.1_p1-r1 deleted file mode 100644 index 9175313b57c0..000000000000 --- a/metadata/md5-cache/media-gfx/gnofract4d-4.0.1_p1-r1 +++ /dev/null @@ -1,16 +0,0 @@ -BDEPEND=virtual/pkgconfig test? ( media-libs/libpng:0= virtual/jpeg:0 python_single_target_python3_7? ( dev-python/pycairo[python_targets_python3_7(-)] dev-python/pygobject:3[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pycairo[python_targets_python3_8(-)] dev-python/pygobject:3[python_targets_python3_8(-)] ) x11-libs/gtk+:3[introspection] python_single_target_python3_7? ( >=dev-python/pytest-4.5.0[python_targets_python3_7(-)] ) python_single_target_python3_8? ( >=dev-python/pytest-4.5.0[python_targets_python3_8(-)] ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) -DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test -DEPEND=media-libs/libpng:0= virtual/jpeg:0 doc? ( app-text/docbook-xsl-stylesheets python_single_target_python3_7? ( dev-python/pygobject[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pygobject[python_targets_python3_8(-)] ) dev-libs/libxslt x11-libs/gtk+:3[introspection] ) dev-util/desktop-file-utils x11-misc/shared-mime-info -DESCRIPTION=A program for drawing beautiful mathematically-based images known as fractals -EAPI=7 -HOMEPAGE=https://github.com/fract4d/gnofract4d -IUSE=+doc test python_single_target_python3_7 python_single_target_python3_8 test -KEYWORDS=amd64 x86 -LICENSE=BSD -RDEPEND=media-libs/libpng:0= virtual/jpeg:0 python_single_target_python3_7? ( dev-python/pycairo[python_targets_python3_7(-)] dev-python/pygobject:3[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pycairo[python_targets_python3_8(-)] dev-python/pygobject:3[python_targets_python3_8(-)] ) x11-libs/gtk+:3[introspection] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) -REQUIRED_USE=test? ( doc ) ^^ ( python_single_target_python3_7 python_single_target_python3_8 ) -RESTRICT=!test? ( test ) !test? ( test ) -SLOT=0 -SRC_URI=https://github.com/fract4d/gnofract4d/archive/bd600c20921afff7b02fc0a76ab79242ebd0896d.tar.gz -> gnofract4d-4.0.1_p1.tar.gz -_eclasses_=distutils-r1 16579e06f8839831bd5c03455bb87e3f multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 optfeature 6a2add34e06e5a05d88471a33ccdd73e python-single-r1 d3100de905f978df912135806cf27188 python-utils-r1 2dc8e06a3429719b43e9140f7292a425 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 virtualx 7e60d3b10c791ab996f717bc1f30072f xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba -_md5_=6490310a37136952b807efdcd01c4db3 diff --git a/metadata/md5-cache/media-sound/Manifest.gz b/metadata/md5-cache/media-sound/Manifest.gz index 5a7eb5aac7db..10fa9e16728c 100644 Binary files a/metadata/md5-cache/media-sound/Manifest.gz and b/metadata/md5-cache/media-sound/Manifest.gz differ diff --git a/metadata/md5-cache/media-sound/gmusicbrowser-1.1.16 b/metadata/md5-cache/media-sound/gmusicbrowser-1.1.16 new file mode 100644 index 000000000000..efac947c32eb --- /dev/null +++ b/metadata/md5-cache/media-sound/gmusicbrowser-1.1.16 @@ -0,0 +1,13 @@ +DEFINED_PHASES=install postinst postrm preinst prepare +DEPEND=dev-lang/perl dev-perl/Gtk2 virtual/perl-MIME-Base64 || ( net-misc/wget dev-perl/AnyEvent-HTTP ) dbus? ( dev-perl/Net-DBus ) gstreamer? ( dev-perl/Glib-Object-Introspection ) mplayer? ( || ( media-video/mplayer media-video/mpv ) ) !gstreamer? ( !mplayer? ( media-sound/alsa-utils media-sound/flac123 || ( media-sound/mpg123 media-sound/mpg321 ) media-sound/vorbis-tools ) ) extras? ( dev-perl/gnome2-wnck ) libnotify? ( dev-perl/Gtk2-Notify ) dev-util/desktop-file-utils x11-misc/shared-mime-info +DESCRIPTION=An open-source jukebox for large collections of mp3/ogg/flac files +EAPI=7 +HOMEPAGE=https://gmusicbrowser.org/ +IUSE=dbus doc extras gstreamer libnotify mplayer +KEYWORDS=~amd64 ~x86 +LICENSE=GPL-3 +RDEPEND=dev-lang/perl dev-perl/Gtk2 virtual/perl-MIME-Base64 || ( net-misc/wget dev-perl/AnyEvent-HTTP ) dbus? ( dev-perl/Net-DBus ) gstreamer? ( dev-perl/Glib-Object-Introspection ) mplayer? ( || ( media-video/mplayer media-video/mpv ) ) !gstreamer? ( !mplayer? ( media-sound/alsa-utils media-sound/flac123 || ( media-sound/mpg123 media-sound/mpg321 ) media-sound/vorbis-tools ) ) extras? ( dev-perl/gnome2-wnck ) libnotify? ( dev-perl/Gtk2-Notify ) +SLOT=0 +SRC_URI=https://gmusicbrowser.org/download/gmusicbrowser-1.1.16.tar.gz +_eclasses_=edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 2d5b3f4b315094768576b6799e4f926e gnome2-utils c8e3fff820d850c0e003e22208d2eea3 l10n 8cdd85e169b835d518bc2fd59f780d8e multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 wrapper 4251d4c84c25f59094fd557e0063a974 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +_md5_=3d047a4b8dcfeac101e5c49a195d9586 diff --git a/metadata/md5-cache/media-sound/gmusicbrowser-9999 b/metadata/md5-cache/media-sound/gmusicbrowser-9999 index 4f5e2bc13618..7b427fa738fc 100644 --- a/metadata/md5-cache/media-sound/gmusicbrowser-9999 +++ b/metadata/md5-cache/media-sound/gmusicbrowser-9999 @@ -1,13 +1,13 @@ -BDEPEND=>=dev-vcs/git-1.8.2.1[curl] +BDEPEND=sys-devel/gettext doc? ( dev-perl/Text-Markdown ) >=dev-vcs/git-1.8.2.1[curl] DEFINED_PHASES=compile install postinst postrm preinst prepare unpack -DEPEND=sys-devel/gettext doc? ( dev-perl/Text-Markdown ) dev-util/desktop-file-utils x11-misc/shared-mime-info +DEPEND=dev-lang/perl dev-perl/Gtk3 virtual/perl-MIME-Base64 || ( net-misc/wget dev-perl/AnyEvent-HTTP ) dbus? ( dev-perl/Net-DBus ) gstreamer? ( dev-perl/Glib-Object-Introspection ) mplayer? ( || ( media-video/mplayer media-video/mpv ) ) !gstreamer? ( !mplayer? ( media-sound/alsa-utils media-sound/flac123 || ( media-sound/mpg123 media-sound/mpg321 ) media-sound/vorbis-tools ) ) extras? ( dev-perl/gnome2-wnck ) libnotify? ( dev-perl/Gtk2-Notify ) dev-util/desktop-file-utils x11-misc/shared-mime-info DESCRIPTION=An open-source jukebox for large collections of mp3/ogg/flac files EAPI=7 HOMEPAGE=https://gmusicbrowser.org/ IUSE=dbus doc extras gstreamer libnotify mplayer LICENSE=GPL-3 PROPERTIES=live -RDEPEND=dev-lang/perl dev-perl/Gtk2 virtual/perl-MIME-Base64 || ( net-misc/wget dev-perl/AnyEvent-HTTP ) dbus? ( dev-perl/Net-DBus ) gstreamer? ( dev-perl/Glib-Object-Introspection ) mplayer? ( || ( media-video/mplayer media-video/mpv ) ) !gstreamer? ( !mplayer? ( media-sound/alsa-utils media-sound/flac123 || ( media-sound/mpg123 media-sound/mpg321 ) media-sound/vorbis-tools ) ) extras? ( dev-perl/gnome2-wnck ) libnotify? ( dev-perl/Gtk2-Notify ) +RDEPEND=dev-lang/perl dev-perl/Gtk3 virtual/perl-MIME-Base64 || ( net-misc/wget dev-perl/AnyEvent-HTTP ) dbus? ( dev-perl/Net-DBus ) gstreamer? ( dev-perl/Glib-Object-Introspection ) mplayer? ( || ( media-video/mplayer media-video/mpv ) ) !gstreamer? ( !mplayer? ( media-sound/alsa-utils media-sound/flac123 || ( media-sound/mpg123 media-sound/mpg321 ) media-sound/vorbis-tools ) ) extras? ( dev-perl/gnome2-wnck ) libnotify? ( dev-perl/Gtk2-Notify ) SLOT=0 _eclasses_=edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 2d5b3f4b315094768576b6799e4f926e git-r3 3e7ec3d6619213460c85e2aa48398441 gnome2-utils c8e3fff820d850c0e003e22208d2eea3 l10n 8cdd85e169b835d518bc2fd59f780d8e multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 wrapper 4251d4c84c25f59094fd557e0063a974 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba -_md5_=bbc0b7d01191bdb6ad7cb9db1db1b827 +_md5_=1fd382f2f5eb8fef056785e054879416 diff --git a/metadata/md5-cache/media-sound/qjackctl-0.9.2 b/metadata/md5-cache/media-sound/qjackctl-0.9.2 new file mode 100644 index 000000000000..59e564b4337e --- /dev/null +++ b/metadata/md5-cache/media-sound/qjackctl-0.9.2 @@ -0,0 +1,14 @@ +BDEPEND=dev-qt/linguist-tools:5 dev-util/ninja dev-util/cmake +DEFINED_PHASES=compile configure install postinst postrm preinst prepare test +DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 virtual/jack alsa? ( media-libs/alsa-lib ) dbus? ( dev-qt/qtdbus:5 ) portaudio? ( media-libs/portaudio ) dev-util/desktop-file-utils x11-misc/shared-mime-info +DESCRIPTION=Qt GUI to control the JACK Audio Connection Kit and ALSA sequencer connections +EAPI=7 +HOMEPAGE=https://qjackctl.sourceforge.io/ +IUSE=alsa dbus debug portaudio +KEYWORDS=~amd64 ~x86 +LICENSE=GPL-2 +RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 virtual/jack alsa? ( media-libs/alsa-lib ) dbus? ( dev-qt/qtdbus:5 ) portaudio? ( media-libs/portaudio ) dev-qt/qtsvg:5 +SLOT=0 +SRC_URI=mirror://sourceforge/qjackctl/qjackctl-0.9.2.tar.gz +_eclasses_=cmake 314a813be2f09820e8978cdee941e501 edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic 09a8beb8e6a8e02dc1e1bd83ac353741 l10n 8cdd85e169b835d518bc2fd59f780d8e multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 24921b57d6561d87cbef4916a296ada4 wrapper 4251d4c84c25f59094fd557e0063a974 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +_md5_=60191d27e3e51dd5d847b4ec584b9a95 diff --git a/metadata/md5-cache/media-sound/qtractor-0.9.19 b/metadata/md5-cache/media-sound/qtractor-0.9.19 deleted file mode 100644 index 540f0e84e77a..000000000000 --- a/metadata/md5-cache/media-sound/qtractor-0.9.19 +++ /dev/null @@ -1,14 +0,0 @@ -BDEPEND=dev-qt/linguist-tools:5 virtual/pkgconfig -DEFINED_PHASES=configure postinst postrm preinst prepare -DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-qt/qtx11extras:5 media-libs/alsa-lib media-libs/ladspa-sdk media-libs/libsndfile media-libs/lilv media-libs/lv2 media-libs/suil virtual/jack aubio? ( media-libs/aubio ) dssi? ( media-libs/dssi ) libsamplerate? ( media-libs/libsamplerate ) mad? ( media-libs/libmad ) osc? ( media-libs/liblo ) rubberband? ( media-libs/rubberband ) vorbis? ( media-libs/libvorbis ) zlib? ( sys-libs/zlib ) dev-util/desktop-file-utils x11-misc/shared-mime-info -DESCRIPTION=Audio/MIDI multi-track sequencer written in C++ with the Qt framework -EAPI=7 -HOMEPAGE=https://qtractor.sourceforge.io -IUSE=aubio cpu_flags_x86_sse debug dssi libsamplerate mad osc rubberband vorbis zlib -KEYWORDS=amd64 x86 -LICENSE=GPL-2 -RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-qt/qtx11extras:5 media-libs/alsa-lib media-libs/ladspa-sdk media-libs/libsndfile media-libs/lilv media-libs/lv2 media-libs/suil virtual/jack aubio? ( media-libs/aubio ) dssi? ( media-libs/dssi ) libsamplerate? ( media-libs/libsamplerate ) mad? ( media-libs/libmad ) osc? ( media-libs/liblo ) rubberband? ( media-libs/rubberband ) vorbis? ( media-libs/libvorbis ) zlib? ( sys-libs/zlib ) -SLOT=0 -SRC_URI=mirror://sourceforge/qtractor/qtractor-0.9.19.tar.gz -_eclasses_=edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic 09a8beb8e6a8e02dc1e1bd83ac353741 l10n 8cdd85e169b835d518bc2fd59f780d8e multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 wrapper 4251d4c84c25f59094fd557e0063a974 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba -_md5_=55f5a73675e7ac9c745ed207f7e00c97 diff --git a/metadata/md5-cache/net-analyzer/Manifest.gz b/metadata/md5-cache/net-analyzer/Manifest.gz index 1bd5e47dd6f9..366bb1c0ecea 100644 Binary files a/metadata/md5-cache/net-analyzer/Manifest.gz and b/metadata/md5-cache/net-analyzer/Manifest.gz differ diff --git a/metadata/md5-cache/net-analyzer/amap-5.4 b/metadata/md5-cache/net-analyzer/amap-5.4 deleted file mode 100644 index 0254abc5825e..000000000000 --- a/metadata/md5-cache/net-analyzer/amap-5.4 +++ /dev/null @@ -1,13 +0,0 @@ -DEFINED_PHASES=compile configure install prepare -DEPEND=dev-libs/libpcre ssl? ( >=dev-libs/openssl-0.9.6j ) -DESCRIPTION=A network scanning tool for pentesters -EAPI=5 -HOMEPAGE=https://www.thc.org/thc-amap/ -IUSE=ssl -KEYWORDS=amd64 ppc ppc64 x86 -LICENSE=GPL-2 -RDEPEND=dev-libs/libpcre ssl? ( >=dev-libs/openssl-0.9.6j ) !sci-biology/amap -SLOT=0 -SRC_URI=https://www.thc.org/releases/amap-5.4.tar.gz -_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 epatch e8f1ec13660dc2f44b32775765d85e42 estack 055c42df72f76a4f45ec92b35e83cd56 eutils 2d5b3f4b315094768576b6799e4f926e l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa multilib d410501a125f99ffb560b0c523cd3d1e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 -_md5_=ea1c8358dd849a4d630c530bc1266634 diff --git a/metadata/md5-cache/net-analyzer/amap-5.4-r1 b/metadata/md5-cache/net-analyzer/amap-5.4-r1 index 94777c6bbd2b..8e3f321aed98 100644 --- a/metadata/md5-cache/net-analyzer/amap-5.4-r1 +++ b/metadata/md5-cache/net-analyzer/amap-5.4-r1 @@ -1,13 +1,13 @@ DEFINED_PHASES=compile configure install prepare DEPEND=dev-libs/libpcre ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) DESCRIPTION=A network scanning tool for pentesters -EAPI=5 +EAPI=7 HOMEPAGE=https://www.thc.org/thc-amap/ IUSE=libressl ssl -KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 +KEYWORDS=amd64 ppc ppc64 x86 LICENSE=GPL-2 RDEPEND=dev-libs/libpcre ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) !sci-biology/amap SLOT=0 SRC_URI=https://www.thc.org/releases/amap-5.4.tar.gz -_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 epatch e8f1ec13660dc2f44b32775765d85e42 estack 055c42df72f76a4f45ec92b35e83cd56 eutils 2d5b3f4b315094768576b6799e4f926e l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa multilib d410501a125f99ffb560b0c523cd3d1e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 -_md5_=59821b0128c41503d2b1ddddd93a81d5 +_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 +_md5_=d174741e1775cc29ebb107b3ac16019e diff --git a/metadata/md5-cache/net-analyzer/argus-3.0.8.2-r3 b/metadata/md5-cache/net-analyzer/argus-3.0.8.2-r3 deleted file mode 100644 index c7cedc3522d3..000000000000 --- a/metadata/md5-cache/net-analyzer/argus-3.0.8.2-r3 +++ /dev/null @@ -1,13 +0,0 @@ -DEFINED_PHASES=compile configure install postinst prepare -DEPEND=acct-group/argus acct-user/argus net-libs/libnsl:= net-libs/libpcap sys-libs/zlib !libtirpc? ( sys-libs/glibc[rpc(-)] ) libtirpc? ( net-libs/libtirpc ) sasl? ( dev-libs/cyrus-sasl ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) >=sys-devel/bison-1.28 >=sys-devel/flex-2.4.6 >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 -DESCRIPTION=network Audit Record Generation and Utilization System -EAPI=5 -HOMEPAGE=https://www.qosient.com/argus/ -IUSE=debug +libtirpc sasl tcpd -KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos -LICENSE=GPL-3 -RDEPEND=acct-group/argus acct-user/argus net-libs/libnsl:= net-libs/libpcap sys-libs/zlib !libtirpc? ( sys-libs/glibc[rpc(-)] ) libtirpc? ( net-libs/libtirpc ) sasl? ( dev-libs/cyrus-sasl ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) -SLOT=0 -SRC_URI=https://www.qosient.com/argus/dev/argus-3.0.8.2.tar.gz -_eclasses_=autotools 9988ecbe04129214297a7bbf3d253710 epatch e8f1ec13660dc2f44b32775765d85e42 estack 055c42df72f76a4f45ec92b35e83cd56 libtool f143db5a74ccd9ca28c1234deffede96 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 -_md5_=9856d7ea6f17c1a49f89cceaa8b77b0f diff --git a/metadata/md5-cache/net-analyzer/argus-3.0.8.2-r4 b/metadata/md5-cache/net-analyzer/argus-3.0.8.2-r4 deleted file mode 100644 index 47eae4c23a25..000000000000 --- a/metadata/md5-cache/net-analyzer/argus-3.0.8.2-r4 +++ /dev/null @@ -1,14 +0,0 @@ -BDEPEND=>=sys-devel/bison-1.28 >=sys-devel/flex-2.4.6 >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 -DEFINED_PHASES=compile configure install postinst prepare -DEPEND=acct-group/argus acct-user/argus net-libs/libnsl:= net-libs/libpcap sys-libs/zlib !libtirpc? ( sys-libs/glibc[rpc(-)] ) libtirpc? ( net-libs/libtirpc ) sasl? ( dev-libs/cyrus-sasl ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) -DESCRIPTION=network Audit Record Generation and Utilization System -EAPI=7 -HOMEPAGE=https://openargus.org/ -IUSE=debug +libtirpc sasl tcpd -KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos -LICENSE=GPL-3 -RDEPEND=acct-group/argus acct-user/argus net-libs/libnsl:= net-libs/libpcap sys-libs/zlib !libtirpc? ( sys-libs/glibc[rpc(-)] ) libtirpc? ( net-libs/libtirpc ) sasl? ( dev-libs/cyrus-sasl ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) -SLOT=0 -SRC_URI=https://www.qosient.com/argus/dev/argus-3.0.8.2.tar.gz -_eclasses_=autotools 9988ecbe04129214297a7bbf3d253710 libtool f143db5a74ccd9ca28c1234deffede96 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 -_md5_=0146d8b8cd1fd1f6edeca546291d92a3 diff --git a/metadata/md5-cache/net-analyzer/argus-3.0.8.3-r1 b/metadata/md5-cache/net-analyzer/argus-3.0.8.3-r1 index 78bf0b43fbef..69466d945fc5 100644 --- a/metadata/md5-cache/net-analyzer/argus-3.0.8.3-r1 +++ b/metadata/md5-cache/net-analyzer/argus-3.0.8.3-r1 @@ -5,10 +5,10 @@ DESCRIPTION=network Audit Record Generation and Utilization System EAPI=7 HOMEPAGE=https://openargus.org/ IUSE=debug sasl tcpd -KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos +KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos LICENSE=GPL-3 RDEPEND=acct-group/argus acct-user/argus net-libs/libnsl:= net-libs/libpcap net-libs/libtirpc sys-libs/zlib sasl? ( dev-libs/cyrus-sasl ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) SLOT=0 SRC_URI=https://www.qosient.com/argus/dev/argus-3.0.8.3.tar.gz _eclasses_=autotools 9988ecbe04129214297a7bbf3d253710 libtool f143db5a74ccd9ca28c1234deffede96 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 -_md5_=4c1d14bd7c0e1e1d35945eee509ad56d +_md5_=9eb47322446c6d7cef073c20103a6c53 diff --git a/metadata/md5-cache/net-analyzer/argus-clients-3.0.8 b/metadata/md5-cache/net-analyzer/argus-clients-3.0.8 deleted file mode 100644 index 47b37be8eea1..000000000000 --- a/metadata/md5-cache/net-analyzer/argus-clients-3.0.8 +++ /dev/null @@ -1,13 +0,0 @@ -DEFINED_PHASES=compile configure install prepare -DEPEND=net-analyzer/rrdtool[perl] net-libs/libpcap sys-libs/ncurses sys-libs/readline sys-libs/zlib ft? ( net-analyzer/flow-tools ) geoip? ( dev-libs/geoip ) mysql? ( virtual/mysql ) sasl? ( dev-libs/cyrus-sasl ) sys-devel/bison sys-devel/flex virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 -DESCRIPTION=Clients for net-analyzer/argus -EAPI=5 -HOMEPAGE=https://www.qosient.com/argus/ -IUSE=debug ft geoip mysql sasl tcpd -KEYWORDS=amd64 ppc x86 -LICENSE=GPL-3 -RDEPEND=net-analyzer/rrdtool[perl] net-libs/libpcap sys-libs/ncurses sys-libs/readline sys-libs/zlib ft? ( net-analyzer/flow-tools ) geoip? ( dev-libs/geoip ) mysql? ( virtual/mysql ) sasl? ( dev-libs/cyrus-sasl ) -SLOT=0 -SRC_URI=https://qosient.com/argus/dev/argus-clients-3.0.8.tar.gz -_eclasses_=autotools 9988ecbe04129214297a7bbf3d253710 desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 epatch e8f1ec13660dc2f44b32775765d85e42 estack 055c42df72f76a4f45ec92b35e83cd56 eutils 2d5b3f4b315094768576b6799e4f926e l10n 8cdd85e169b835d518bc2fd59f780d8e libtool f143db5a74ccd9ca28c1234deffede96 ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa multilib d410501a125f99ffb560b0c523cd3d1e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 -_md5_=ccbd05be2c3319934f643312278554ec diff --git a/metadata/md5-cache/net-analyzer/argus-clients-3.0.8.2 b/metadata/md5-cache/net-analyzer/argus-clients-3.0.8.2 deleted file mode 100644 index c7be15bfe6dc..000000000000 --- a/metadata/md5-cache/net-analyzer/argus-clients-3.0.8.2 +++ /dev/null @@ -1,13 +0,0 @@ -DEFINED_PHASES=compile configure install prepare -DEPEND=net-analyzer/rrdtool[perl] net-libs/libpcap sys-libs/ncurses:= sys-libs/readline:= sys-libs/zlib ft? ( net-analyzer/flow-tools ) geoip? ( dev-libs/geoip ) mysql? ( virtual/mysql ) sasl? ( dev-libs/cyrus-sasl ) sys-devel/bison sys-devel/flex virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 -DESCRIPTION=Clients for net-analyzer/argus -EAPI=5 -HOMEPAGE=https://www.qosient.com/argus/ -IUSE=debug ft geoip mysql sasl tcpd -KEYWORDS=~amd64 ~ppc ~x86 -LICENSE=GPL-3 -RDEPEND=net-analyzer/rrdtool[perl] net-libs/libpcap sys-libs/ncurses:= sys-libs/readline:= sys-libs/zlib ft? ( net-analyzer/flow-tools ) geoip? ( dev-libs/geoip ) mysql? ( virtual/mysql ) sasl? ( dev-libs/cyrus-sasl ) -SLOT=0 -SRC_URI=https://qosient.com/argus/dev/argus-clients-3.0.8.2.tar.gz -_eclasses_=autotools 9988ecbe04129214297a7bbf3d253710 desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 epatch e8f1ec13660dc2f44b32775765d85e42 estack 055c42df72f76a4f45ec92b35e83cd56 eutils 2d5b3f4b315094768576b6799e4f926e l10n 8cdd85e169b835d518bc2fd59f780d8e libtool f143db5a74ccd9ca28c1234deffede96 ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa multilib d410501a125f99ffb560b0c523cd3d1e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 -_md5_=287c5c2f6cdf810dcdd5ea6a5b8bac13 diff --git a/metadata/md5-cache/net-analyzer/argus-clients-3.0.8.2-r2 b/metadata/md5-cache/net-analyzer/argus-clients-3.0.8.2-r2 deleted file mode 100644 index 823e4f650be9..000000000000 --- a/metadata/md5-cache/net-analyzer/argus-clients-3.0.8.2-r2 +++ /dev/null @@ -1,13 +0,0 @@ -DEFINED_PHASES=compile configure install prepare -DEPEND=net-analyzer/rrdtool[perl] net-libs/libpcap net-libs/libtirpc:= sys-libs/ncurses:= sys-libs/readline:= sys-libs/zlib ft? ( net-analyzer/flow-tools ) geoip? ( dev-libs/geoip ) mysql? ( dev-db/mysql-connector-c:0= ) sasl? ( dev-libs/cyrus-sasl ) sys-devel/bison sys-devel/flex virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 -DESCRIPTION=Clients for net-analyzer/argus -EAPI=6 -HOMEPAGE=https://www.qosient.com/argus/ -IUSE=debug ft geoip mysql sasl tcpd -KEYWORDS=~amd64 ~ppc ~x86 -LICENSE=GPL-3 -RDEPEND=net-analyzer/rrdtool[perl] net-libs/libpcap net-libs/libtirpc:= sys-libs/ncurses:= sys-libs/readline:= sys-libs/zlib ft? ( net-analyzer/flow-tools ) geoip? ( dev-libs/geoip ) mysql? ( dev-db/mysql-connector-c:0= ) sasl? ( dev-libs/cyrus-sasl ) -SLOT=0 -SRC_URI=https://qosient.com/argus/dev/argus-clients-3.0.8.2.tar.gz -_eclasses_=autotools 9988ecbe04129214297a7bbf3d253710 libtool f143db5a74ccd9ca28c1234deffede96 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 -_md5_=fc1c5699722632a34790abdaf61a4651 diff --git a/metadata/md5-cache/net-analyzer/argus-clients-3.0.8.2-r3 b/metadata/md5-cache/net-analyzer/argus-clients-3.0.8.2-r3 deleted file mode 100644 index 283e8bf65c30..000000000000 --- a/metadata/md5-cache/net-analyzer/argus-clients-3.0.8.2-r3 +++ /dev/null @@ -1,14 +0,0 @@ -BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 -DEFINED_PHASES=compile configure install prepare -DEPEND=net-analyzer/rrdtool[perl] net-libs/libpcap net-libs/libtirpc:= sys-libs/ncurses:= sys-libs/readline:= sys-libs/zlib ft? ( net-analyzer/flow-tools ) geoip? ( dev-libs/geoip ) mysql? ( dev-db/mysql-connector-c:0= ) sasl? ( dev-libs/cyrus-sasl ) sys-devel/bison sys-devel/flex virtual/pkgconfig -DESCRIPTION=Clients for net-analyzer/argus -EAPI=7 -HOMEPAGE=https://www.qosient.com/argus/ -IUSE=debug ft geoip mysql sasl tcpd -KEYWORDS=~amd64 ~ppc ~x86 -LICENSE=GPL-3 -RDEPEND=net-analyzer/rrdtool[perl] net-libs/libpcap net-libs/libtirpc:= sys-libs/ncurses:= sys-libs/readline:= sys-libs/zlib ft? ( net-analyzer/flow-tools ) geoip? ( dev-libs/geoip ) mysql? ( dev-db/mysql-connector-c:0= ) sasl? ( dev-libs/cyrus-sasl ) -SLOT=0 -SRC_URI=https://qosient.com/argus/dev/argus-clients-3.0.8.2.tar.gz -_eclasses_=autotools 9988ecbe04129214297a7bbf3d253710 libtool f143db5a74ccd9ca28c1234deffede96 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 -_md5_=44430f6a55aaa79025639bafb8920e5b diff --git a/metadata/md5-cache/net-analyzer/argus-clients-3.0.8.3 b/metadata/md5-cache/net-analyzer/argus-clients-3.0.8.3 index a912ce22c49f..4e499a874d35 100644 --- a/metadata/md5-cache/net-analyzer/argus-clients-3.0.8.3 +++ b/metadata/md5-cache/net-analyzer/argus-clients-3.0.8.3 @@ -5,10 +5,10 @@ DESCRIPTION=Clients for net-analyzer/argus EAPI=7 HOMEPAGE=https://openargus.org/ IUSE=debug ft geoip mysql sasl tcpd -KEYWORDS=~amd64 ~ppc ~x86 +KEYWORDS=amd64 ppc x86 LICENSE=GPL-3 RDEPEND=net-analyzer/rrdtool[perl] net-libs/libpcap net-libs/libtirpc:= sys-libs/ncurses:= sys-libs/readline:= sys-libs/zlib ft? ( net-analyzer/flow-tools ) geoip? ( dev-libs/geoip ) mysql? ( dev-db/mysql-connector-c:0= ) sasl? ( dev-libs/cyrus-sasl ) SLOT=0 SRC_URI=https://qosient.com/argus/dev/argus-clients-3.0.8.3.tar.gz _eclasses_=autotools 9988ecbe04129214297a7bbf3d253710 libtool f143db5a74ccd9ca28c1234deffede96 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 -_md5_=420ac97e4e09023951bb7443a2447f0d +_md5_=aa6649abf3c3d219852a6c6e97424811 diff --git a/metadata/md5-cache/net-analyzer/arpwatch-3.1 b/metadata/md5-cache/net-analyzer/arpwatch-3.1-r1 similarity index 59% rename from metadata/md5-cache/net-analyzer/arpwatch-3.1 rename to metadata/md5-cache/net-analyzer/arpwatch-3.1-r1 index 9d947f9fcd4e..7dbb679f1ade 100644 --- a/metadata/md5-cache/net-analyzer/arpwatch-3.1 +++ b/metadata/md5-cache/net-analyzer/arpwatch-3.1-r1 @@ -1,13 +1,14 @@ +BDEPEND=virtual/pkgconfig DEFINED_PHASES=configure install postinst setup DEPEND=net-libs/libpcap sys-libs/ncurses:* DESCRIPTION=An ethernet monitor program that keeps track of ethernet/IP address pairings EAPI=7 HOMEPAGE=https://ee.lbl.gov/ IUSE=selinux -KEYWORDS=~amd64 ~hppa ~ppc ~sparc ~x86 +KEYWORDS=amd64 ~hppa ~ppc ~sparc x86 LICENSE=BSD GPL-2 RDEPEND=net-libs/libpcap sys-libs/ncurses:* selinux? ( sec-policy/selinux-arpwatch ) virtual/mta SLOT=0 SRC_URI=https://ee.lbl.gov/downloads/arpwatch/arpwatch-3.1.tar.gz https://dev.gentoo.org/~jer/ethercodes.dat-20200628.xz -_eclasses_=user b0a0d4ca9e3f79c38f8f4143b8d5a2d8 user-info a2abd4e2f4c3b9b06d64bf1329359a02 -_md5_=86823fdf557beb9e2fb40fa5caa0a85c +_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e systemd 74b223e42834adf09a2d21fe5fe13741 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 user b0a0d4ca9e3f79c38f8f4143b8d5a2d8 user-info a2abd4e2f4c3b9b06d64bf1329359a02 +_md5_=cd25ae2a0f7434a19a3f93696184d6f2 diff --git a/metadata/md5-cache/net-analyzer/bwm-ng-0.6.1-r1 b/metadata/md5-cache/net-analyzer/bwm-ng-0.6.1-r1 deleted file mode 100644 index 91f428fd1a17..000000000000 --- a/metadata/md5-cache/net-analyzer/bwm-ng-0.6.1-r1 +++ /dev/null @@ -1,13 +0,0 @@ -DEFINED_PHASES=configure prepare -DEPEND=sys-libs/ncurses:0= >=sys-apps/net-tools-1.60-r1 >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 -DESCRIPTION=Bandwidth Monitor NG is a small and simple console-based bandwidth monitor -EAPI=6 -HOMEPAGE=http://www.gropp.org/ -IUSE=csv html -KEYWORDS=amd64 ~arm ppc x86 -LICENSE=GPL-2 -RDEPEND=sys-libs/ncurses:0= >=sys-apps/net-tools-1.60-r1 -SLOT=0 -SRC_URI=http://www.gropp.org/bwm-ng/bwm-ng-0.6.1.tar.gz -_eclasses_=autotools 9988ecbe04129214297a7bbf3d253710 libtool f143db5a74ccd9ca28c1234deffede96 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 -_md5_=ed92e7557feeb187f075379457d1d6c3 diff --git a/metadata/md5-cache/net-analyzer/bwm-ng-0.6.2 b/metadata/md5-cache/net-analyzer/bwm-ng-0.6.2 index cb7208a385e2..baeb9c6c99ba 100644 --- a/metadata/md5-cache/net-analyzer/bwm-ng-0.6.2 +++ b/metadata/md5-cache/net-analyzer/bwm-ng-0.6.2 @@ -5,10 +5,10 @@ DESCRIPTION=Bandwidth Monitor NG is a small and simple console-based bandwidth m EAPI=7 HOMEPAGE=http://www.gropp.org/ IUSE=+csv +html -KEYWORDS=~amd64 ~arm ~ppc ~x86 +KEYWORDS=amd64 ~arm ppc x86 LICENSE=GPL-2 RDEPEND=>=sys-apps/net-tools-1.60-r1 sys-libs/ncurses:0= SLOT=0 SRC_URI=https://github.com/vgropp/bwm-ng/archive/v0.6.2.tar.gz -> bwm-ng-0.6.2.tar.gz _eclasses_=autotools 9988ecbe04129214297a7bbf3d253710 libtool f143db5a74ccd9ca28c1234deffede96 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 -_md5_=9e04340d0e5fd33cb3f13ad2eed35ee4 +_md5_=42edc87bcec219e10a6e2ed9be2667be diff --git a/metadata/md5-cache/net-analyzer/bwm-ng-0.6.3 b/metadata/md5-cache/net-analyzer/bwm-ng-0.6.3 new file mode 100644 index 000000000000..18d5ed95489f --- /dev/null +++ b/metadata/md5-cache/net-analyzer/bwm-ng-0.6.3 @@ -0,0 +1,14 @@ +BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 +DEFINED_PHASES=configure prepare +DEPEND=>=sys-apps/net-tools-1.60-r1 sys-libs/ncurses:0= +DESCRIPTION=Bandwidth Monitor NG is a small and simple console-based bandwidth monitor +EAPI=7 +HOMEPAGE=http://www.gropp.org/ +IUSE=+csv +html +KEYWORDS=~amd64 ~arm ~ppc ~x86 +LICENSE=GPL-2 +RDEPEND=>=sys-apps/net-tools-1.60-r1 sys-libs/ncurses:0= +SLOT=0 +SRC_URI=https://github.com/vgropp/bwm-ng/archive/v0.6.3.tar.gz -> bwm-ng-0.6.3.tar.gz +_eclasses_=autotools 9988ecbe04129214297a7bbf3d253710 libtool f143db5a74ccd9ca28c1234deffede96 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 +_md5_=564490235625e2dcda82b990cb972017 diff --git a/metadata/md5-cache/net-analyzer/cutter-1.03-r1 b/metadata/md5-cache/net-analyzer/cutter-1.03-r1 deleted file mode 100644 index 94ad3110d2cb..000000000000 --- a/metadata/md5-cache/net-analyzer/cutter-1.03-r1 +++ /dev/null @@ -1,10 +0,0 @@ -DEFINED_PHASES=compile install prepare -DESCRIPTION=TCP/IP Connection cutting on Linux Firewalls and Routers -EAPI=5 -HOMEPAGE=http://www.digitage.co.uk/digitage/software/linux-security/cutter -KEYWORDS=amd64 ~ppc x86 -LICENSE=GPL-2 -SLOT=0 -SRC_URI=http://www.digitage.co.uk/digitage/files/cutter/cutter-1.03.tgz -_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 epatch e8f1ec13660dc2f44b32775765d85e42 estack 055c42df72f76a4f45ec92b35e83cd56 eutils 2d5b3f4b315094768576b6799e4f926e l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa multilib d410501a125f99ffb560b0c523cd3d1e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 -_md5_=e064b594c521ac16ad27af04c9760a75 diff --git a/metadata/md5-cache/net-analyzer/cutter-1.04 b/metadata/md5-cache/net-analyzer/cutter-1.04 index 2e061281ab37..e5ab37b5b8ee 100644 --- a/metadata/md5-cache/net-analyzer/cutter-1.04 +++ b/metadata/md5-cache/net-analyzer/cutter-1.04 @@ -1,10 +1,10 @@ DEFINED_PHASES=compile install prepare DESCRIPTION=TCP/IP Connection cutting on Linux Firewalls and Routers -EAPI=5 +EAPI=7 HOMEPAGE=http://www.digitage.co.uk/digitage/software/linux-security/cutter -KEYWORDS=~amd64 ~ppc ~x86 +KEYWORDS=amd64 ~ppc x86 LICENSE=GPL-2 SLOT=0 SRC_URI=http://www.digitage.co.uk/digitage/files/cutter/cutter-1.04.tgz -_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 epatch e8f1ec13660dc2f44b32775765d85e42 estack 055c42df72f76a4f45ec92b35e83cd56 eutils 2d5b3f4b315094768576b6799e4f926e l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa multilib d410501a125f99ffb560b0c523cd3d1e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 -_md5_=c85464935874febc81984bf2a003182a +_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 +_md5_=dce0f7ee171a26428a8e6abc9147e121 diff --git a/metadata/md5-cache/net-analyzer/darkstat-3.0.719-r2 b/metadata/md5-cache/net-analyzer/darkstat-3.0.719-r2 deleted file mode 100644 index 81150dde9894..000000000000 --- a/metadata/md5-cache/net-analyzer/darkstat-3.0.719-r2 +++ /dev/null @@ -1,12 +0,0 @@ -DEFINED_PHASES=configure install postinst prepare -DEPEND=acct-user/darkstat dev-libs/libbsd net-libs/libpcap sys-libs/zlib >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 -DESCRIPTION=Network traffic analyzer with cute web interface -EAPI=6 -HOMEPAGE=https://unix4lyfe.org/darkstat/ -KEYWORDS=amd64 ppc x86 -LICENSE=GPL-2 -RDEPEND=acct-user/darkstat dev-libs/libbsd net-libs/libpcap sys-libs/zlib -SLOT=0 -SRC_URI=https://unix4lyfe.org/darkstat/darkstat-3.0.719.tar.bz2 -_eclasses_=autotools 9988ecbe04129214297a7bbf3d253710 libtool f143db5a74ccd9ca28c1234deffede96 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 -_md5_=1db48ad9841f64ba573964aba45b0da3 diff --git a/metadata/md5-cache/net-analyzer/darkstat-3.0.719-r3 b/metadata/md5-cache/net-analyzer/darkstat-3.0.719-r3 index aaec0b661fb6..5fcdce036a6f 100644 --- a/metadata/md5-cache/net-analyzer/darkstat-3.0.719-r3 +++ b/metadata/md5-cache/net-analyzer/darkstat-3.0.719-r3 @@ -4,10 +4,10 @@ DEPEND=acct-user/darkstat dev-libs/libbsd net-libs/libpcap sys-libs/zlib DESCRIPTION=Network traffic analyzer with cute web interface EAPI=7 HOMEPAGE=https://unix4lyfe.org/darkstat/ -KEYWORDS=~amd64 ~ppc ~x86 +KEYWORDS=amd64 ppc x86 LICENSE=GPL-2 RDEPEND=acct-user/darkstat dev-libs/libbsd net-libs/libpcap sys-libs/zlib SLOT=0 SRC_URI=https://unix4lyfe.org/darkstat/darkstat-3.0.719.tar.bz2 _eclasses_=autotools 9988ecbe04129214297a7bbf3d253710 libtool f143db5a74ccd9ca28c1234deffede96 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 -_md5_=5a9896f8828ae3caa1d815fceb9424f5 +_md5_=df05e5b0b844a1c947842d9909643fb8 diff --git a/metadata/md5-cache/net-analyzer/dnstracer-1.10 b/metadata/md5-cache/net-analyzer/dnstracer-1.10 index d65ce8d2c01e..0ac528124233 100644 --- a/metadata/md5-cache/net-analyzer/dnstracer-1.10 +++ b/metadata/md5-cache/net-analyzer/dnstracer-1.10 @@ -3,9 +3,9 @@ DEFINED_PHASES=compile install DESCRIPTION=Determines where a given nameserver gets its information from EAPI=7 HOMEPAGE=https://www.mavetju.org/unix/general.php -KEYWORDS=~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux +KEYWORDS=amd64 ~arm ~hppa ~ia64 ~ppc ppc64 ~s390 ~sparc x86 ~amd64-linux LICENSE=BSD-2 SLOT=0 SRC_URI=https://www.mavetju.org/download/dnstracer-1.10.tar.bz2 -> dnstracer-1.10.tar.gz _eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 -_md5_=2766dca52f8df9ea0e7701acf087f298 +_md5_=942b870e07a1b321ef30e1550e5c3640 diff --git a/metadata/md5-cache/net-analyzer/flow-tools-0.68.5.1-r11 b/metadata/md5-cache/net-analyzer/flow-tools-0.68.5.1-r11 deleted file mode 100644 index fdbcbcb25b27..000000000000 --- a/metadata/md5-cache/net-analyzer/flow-tools-0.68.5.1-r11 +++ /dev/null @@ -1,13 +0,0 @@ -BDEPEND=sys-devel/flex sys-devel/bison -DEFINED_PHASES=configure install -DEPEND=acct-group/flows acct-user/flows sys-apps/tcp-wrappers sys-libs/zlib mysql? ( dev-db/mysql-connector-c:0= ) postgres? ( dev-db/postgresql:* ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) -DESCRIPTION=library and programs to process reports from NetFlow data -EAPI=7 -HOMEPAGE=https://code.google.com/p/flow-tools/ -IUSE=debug libressl mysql postgres ssl static-libs -KEYWORDS=amd64 ppc x86 -LICENSE=BSD GPL-2 -RDEPEND=acct-group/flows acct-user/flows sys-apps/tcp-wrappers sys-libs/zlib mysql? ( dev-db/mysql-connector-c:0= ) postgres? ( dev-db/postgresql:* ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) -SLOT=0 -SRC_URI=https://flow-tools.googlecode.com/files/flow-tools-0.68.5.1.tar.bz2 -_md5_=a407d324d01f0e0207b713d5a2ddc5a2 diff --git a/metadata/md5-cache/net-analyzer/flow-tools-0.68.6-r1 b/metadata/md5-cache/net-analyzer/flow-tools-0.68.6-r1 index 3120486d700b..fd84f392932d 100644 --- a/metadata/md5-cache/net-analyzer/flow-tools-0.68.6-r1 +++ b/metadata/md5-cache/net-analyzer/flow-tools-0.68.6-r1 @@ -5,10 +5,10 @@ DESCRIPTION=library and programs to process reports from NetFlow data EAPI=7 HOMEPAGE=https://github.com/5u623l20/flow-tools/ IUSE=debug libressl mysql postgres ssl static-libs -KEYWORDS=~amd64 ~ppc ~x86 +KEYWORDS=amd64 ppc x86 LICENSE=BSD GPL-3 RDEPEND=acct-group/flows acct-user/flows sys-apps/tcp-wrappers sys-libs/zlib mysql? ( dev-db/mysql-connector-c:0= ) postgres? ( dev-db/postgresql:* ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) SLOT=0 SRC_URI=https://github.com/5u623l20/flow-tools/archive/v0.68.6.tar.gz -> flow-tools-0.68.6.tar.gz _eclasses_=autotools 9988ecbe04129214297a7bbf3d253710 libtool f143db5a74ccd9ca28c1234deffede96 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 -_md5_=c0f417208f78ab6cb36832f3a41169ec +_md5_=65e7718dc1a0da0b2371b64653025620 diff --git a/metadata/md5-cache/net-analyzer/fwlogwatch-1.5 b/metadata/md5-cache/net-analyzer/fwlogwatch-1.5 index 5e0226588c87..0571a87360b5 100644 --- a/metadata/md5-cache/net-analyzer/fwlogwatch-1.5 +++ b/metadata/md5-cache/net-analyzer/fwlogwatch-1.5 @@ -1,13 +1,14 @@ +BDEPEND=sys-devel/flex nls? ( sys-devel/gettext ) DEFINED_PHASES=compile configure install prepare -DEPEND=geoip? ( dev-libs/geoip ) zlib? ( sys-libs/zlib ) sys-devel/flex nls? ( sys-devel/gettext ) +DEPEND=geoip? ( dev-libs/geoip ) zlib? ( sys-libs/zlib ) DESCRIPTION=A packet filter and firewall log analyzer -EAPI=5 +EAPI=7 HOMEPAGE=http://fwlogwatch.inside-security.de/ IUSE=geoip nls zlib -KEYWORDS=~amd64 ~ppc ~sparc ~x86 +KEYWORDS=amd64 ~ppc ~sparc x86 LICENSE=GPL-1 RDEPEND=geoip? ( dev-libs/geoip ) zlib? ( sys-libs/zlib ) SLOT=0 SRC_URI=http://fwlogwatch.inside-security.de/sw/fwlogwatch-1.5.tar.bz2 -_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 epatch e8f1ec13660dc2f44b32775765d85e42 estack 055c42df72f76a4f45ec92b35e83cd56 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic 09a8beb8e6a8e02dc1e1bd83ac353741 l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa multilib d410501a125f99ffb560b0c523cd3d1e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 -_md5_=cf29cb67d38a7419ae8ac32c3551700a +_eclasses_=edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic 09a8beb8e6a8e02dc1e1bd83ac353741 l10n 8cdd85e169b835d518bc2fd59f780d8e multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 wrapper 4251d4c84c25f59094fd557e0063a974 +_md5_=f6f2875699683f3b44c473d0e24e6baf diff --git a/metadata/md5-cache/net-analyzer/hydra-9.0 b/metadata/md5-cache/net-analyzer/hydra-9.0 index 78f262cb78ef..b145fa6bfb61 100644 --- a/metadata/md5-cache/net-analyzer/hydra-9.0 +++ b/metadata/md5-cache/net-analyzer/hydra-9.0 @@ -1,13 +1,13 @@ DEFINED_PHASES=compile configure install prepare -DEPEND=gtk? ( dev-libs/atk dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 ) firebird? ( dev-db/firebird ) gcrypt? ( dev-libs/libgcrypt ) idn? ( net-dns/libidn:0= ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) memcached? ( dev-libs/libmemcached[sasl] ) mongodb? ( dev-libs/mongo-c-driver ) mysql? ( dev-db/mysql-connector-c:0= ) ncp? ( net-fs/ncpfs ) ncurses? ( sys-libs/ncurses:= ) oracle? ( dev-db/oracle-instantclient-basic ) pcre? ( dev-libs/libpcre ) postgres? ( dev-db/postgresql:* ) rdp? ( net-misc/freerdp ) libssh? ( >=net-libs/libssh-0.4.0 ) subversion? ( dev-vcs/subversion ) zlib? ( sys-libs/zlib ) virtual/pkgconfig +DEPEND=gtk? ( dev-libs/atk dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 ) firebird? ( dev-db/firebird ) gcrypt? ( dev-libs/libgcrypt ) idn? ( net-dns/libidn:0= ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) memcached? ( dev-libs/libmemcached[sasl] ) mongodb? ( dev-libs/mongo-c-driver ) mysql? ( dev-db/mysql-connector-c:0= ) ncurses? ( sys-libs/ncurses:= ) oracle? ( dev-db/oracle-instantclient-basic ) pcre? ( dev-libs/libpcre ) postgres? ( dev-db/postgresql:* ) rdp? ( net-misc/freerdp ) libssh? ( >=net-libs/libssh-0.4.0 ) subversion? ( dev-vcs/subversion ) zlib? ( sys-libs/zlib ) virtual/pkgconfig DESCRIPTION=Parallelized network login hacker EAPI=7 HOMEPAGE=https://github.com/vanhauser-thc/thc-hydra -IUSE=debug firebird gcrypt gtk idn libressl memcached mongodb mysql ncp ncurses oracle pcre postgres rdp libssh subversion zlib +IUSE=debug firebird gcrypt gtk idn libressl memcached mongodb mysql ncurses oracle pcre postgres rdp libssh subversion zlib KEYWORDS=amd64 ~ppc x86 LICENSE=GPL-3 -RDEPEND=gtk? ( dev-libs/atk dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 ) firebird? ( dev-db/firebird ) gcrypt? ( dev-libs/libgcrypt ) idn? ( net-dns/libidn:0= ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) memcached? ( dev-libs/libmemcached[sasl] ) mongodb? ( dev-libs/mongo-c-driver ) mysql? ( dev-db/mysql-connector-c:0= ) ncp? ( net-fs/ncpfs ) ncurses? ( sys-libs/ncurses:= ) oracle? ( dev-db/oracle-instantclient-basic ) pcre? ( dev-libs/libpcre ) postgres? ( dev-db/postgresql:* ) rdp? ( net-misc/freerdp ) libssh? ( >=net-libs/libssh-0.4.0 ) subversion? ( dev-vcs/subversion ) zlib? ( sys-libs/zlib ) +RDEPEND=gtk? ( dev-libs/atk dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 ) firebird? ( dev-db/firebird ) gcrypt? ( dev-libs/libgcrypt ) idn? ( net-dns/libidn:0= ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) memcached? ( dev-libs/libmemcached[sasl] ) mongodb? ( dev-libs/mongo-c-driver ) mysql? ( dev-db/mysql-connector-c:0= ) ncurses? ( sys-libs/ncurses:= ) oracle? ( dev-db/oracle-instantclient-basic ) pcre? ( dev-libs/libpcre ) postgres? ( dev-db/postgresql:* ) rdp? ( net-misc/freerdp ) libssh? ( >=net-libs/libssh-0.4.0 ) subversion? ( dev-vcs/subversion ) zlib? ( sys-libs/zlib ) SLOT=0 SRC_URI=https://github.com/vanhauser-thc/thc-hydra/archive/v9.0.tar.gz -> hydra-9.0.tar.gz _eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 -_md5_=c78990fac271c15a2add731181e47f91 +_md5_=696799f79ea092adbb020c45d1b8d3e0 diff --git a/metadata/md5-cache/net-analyzer/hydra-9.0-r1 b/metadata/md5-cache/net-analyzer/hydra-9.0-r1 index 0d4a5a972402..f49ed62cff6c 100644 --- a/metadata/md5-cache/net-analyzer/hydra-9.0-r1 +++ b/metadata/md5-cache/net-analyzer/hydra-9.0-r1 @@ -1,13 +1,13 @@ DEFINED_PHASES=compile configure install prepare -DEPEND=gtk? ( dev-libs/atk dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 ) firebird? ( dev-db/firebird ) gcrypt? ( dev-libs/libgcrypt ) idn? ( net-dns/libidn:0= ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) memcached? ( dev-libs/libmemcached[sasl] ) mongodb? ( dev-libs/mongo-c-driver ) mysql? ( dev-db/mysql-connector-c:0= ) ncp? ( net-fs/ncpfs ) ncurses? ( sys-libs/ncurses:= ) oracle? ( dev-db/oracle-instantclient-basic ) pcre? ( dev-libs/libpcre ) postgres? ( dev-db/postgresql:* ) rdp? ( net-misc/freerdp ) libssh? ( >=net-libs/libssh-0.4.0 ) subversion? ( dev-vcs/subversion ) zlib? ( sys-libs/zlib ) virtual/pkgconfig +DEPEND=gtk? ( dev-libs/atk dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 ) firebird? ( dev-db/firebird ) gcrypt? ( dev-libs/libgcrypt ) idn? ( net-dns/libidn:0= ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) memcached? ( dev-libs/libmemcached[sasl] ) mongodb? ( dev-libs/mongo-c-driver ) mysql? ( dev-db/mysql-connector-c:0= ) ncurses? ( sys-libs/ncurses:= ) oracle? ( dev-db/oracle-instantclient-basic ) pcre? ( dev-libs/libpcre ) postgres? ( dev-db/postgresql:* ) rdp? ( net-misc/freerdp ) libssh? ( >=net-libs/libssh-0.4.0 ) subversion? ( dev-vcs/subversion ) zlib? ( sys-libs/zlib ) virtual/pkgconfig DESCRIPTION=Parallelized network login hacker EAPI=7 HOMEPAGE=https://github.com/vanhauser-thc/thc-hydra -IUSE=debug firebird gcrypt gtk idn libressl memcached mongodb mysql ncp ncurses oracle pcre postgres rdp libssh subversion zlib +IUSE=debug firebird gcrypt gtk idn libressl memcached mongodb mysql ncurses oracle pcre postgres rdp libssh subversion zlib KEYWORDS=~amd64 ~ppc ~x86 LICENSE=GPL-3 -RDEPEND=gtk? ( dev-libs/atk dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 ) firebird? ( dev-db/firebird ) gcrypt? ( dev-libs/libgcrypt ) idn? ( net-dns/libidn:0= ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) memcached? ( dev-libs/libmemcached[sasl] ) mongodb? ( dev-libs/mongo-c-driver ) mysql? ( dev-db/mysql-connector-c:0= ) ncp? ( net-fs/ncpfs ) ncurses? ( sys-libs/ncurses:= ) oracle? ( dev-db/oracle-instantclient-basic ) pcre? ( dev-libs/libpcre ) postgres? ( dev-db/postgresql:* ) rdp? ( net-misc/freerdp ) libssh? ( >=net-libs/libssh-0.4.0 ) subversion? ( dev-vcs/subversion ) zlib? ( sys-libs/zlib ) +RDEPEND=gtk? ( dev-libs/atk dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 ) firebird? ( dev-db/firebird ) gcrypt? ( dev-libs/libgcrypt ) idn? ( net-dns/libidn:0= ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) memcached? ( dev-libs/libmemcached[sasl] ) mongodb? ( dev-libs/mongo-c-driver ) mysql? ( dev-db/mysql-connector-c:0= ) ncurses? ( sys-libs/ncurses:= ) oracle? ( dev-db/oracle-instantclient-basic ) pcre? ( dev-libs/libpcre ) postgres? ( dev-db/postgresql:* ) rdp? ( net-misc/freerdp ) libssh? ( >=net-libs/libssh-0.4.0 ) subversion? ( dev-vcs/subversion ) zlib? ( sys-libs/zlib ) SLOT=0 SRC_URI=https://github.com/vanhauser-thc/thc-hydra/archive/v9.0.tar.gz -> hydra-9.0.tar.gz _eclasses_=edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic 09a8beb8e6a8e02dc1e1bd83ac353741 l10n 8cdd85e169b835d518bc2fd59f780d8e multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 wrapper 4251d4c84c25f59094fd557e0063a974 -_md5_=4447a34c9103ec8181efee00300bc578 +_md5_=5fe1c307448069d2826551adb8107e26 diff --git a/metadata/md5-cache/net-analyzer/hydra-9.1 b/metadata/md5-cache/net-analyzer/hydra-9.1 index f5b0b6ea332d..add81d2e38ee 100644 --- a/metadata/md5-cache/net-analyzer/hydra-9.1 +++ b/metadata/md5-cache/net-analyzer/hydra-9.1 @@ -1,13 +1,13 @@ DEFINED_PHASES=compile configure install prepare -DEPEND=gtk? ( dev-libs/atk dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 ) firebird? ( dev-db/firebird ) gcrypt? ( dev-libs/libgcrypt ) idn? ( net-dns/libidn:0= ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) memcached? ( dev-libs/libmemcached[sasl] ) mongodb? ( dev-libs/mongo-c-driver ) mysql? ( dev-db/mysql-connector-c:0= ) ncp? ( net-fs/ncpfs ) ncurses? ( sys-libs/ncurses:= ) oracle? ( dev-db/oracle-instantclient-basic ) pcre? ( dev-libs/libpcre ) postgres? ( dev-db/postgresql:* ) rdp? ( net-misc/freerdp ) libssh? ( >=net-libs/libssh-0.4.0 ) subversion? ( dev-vcs/subversion ) zlib? ( sys-libs/zlib ) virtual/pkgconfig +DEPEND=gtk? ( dev-libs/atk dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 ) firebird? ( dev-db/firebird ) gcrypt? ( dev-libs/libgcrypt ) idn? ( net-dns/libidn:0= ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) memcached? ( dev-libs/libmemcached[sasl] ) mongodb? ( dev-libs/mongo-c-driver ) mysql? ( dev-db/mysql-connector-c:0= ) ncurses? ( sys-libs/ncurses:= ) oracle? ( dev-db/oracle-instantclient-basic ) pcre? ( dev-libs/libpcre ) postgres? ( dev-db/postgresql:* ) rdp? ( net-misc/freerdp ) libssh? ( >=net-libs/libssh-0.4.0 ) subversion? ( dev-vcs/subversion ) zlib? ( sys-libs/zlib ) virtual/pkgconfig DESCRIPTION=Parallelized network login hacker EAPI=7 HOMEPAGE=https://github.com/vanhauser-thc/thc-hydra -IUSE=debug firebird gcrypt gtk idn libressl memcached mongodb mysql ncp ncurses oracle pcre postgres rdp libssh subversion zlib -KEYWORDS=~amd64 ~ppc ~x86 +IUSE=debug firebird gcrypt gtk idn libressl memcached mongodb mysql ncurses oracle pcre postgres rdp libssh subversion zlib +KEYWORDS=~amd64 ~ppc x86 LICENSE=GPL-3 -RDEPEND=gtk? ( dev-libs/atk dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 ) firebird? ( dev-db/firebird ) gcrypt? ( dev-libs/libgcrypt ) idn? ( net-dns/libidn:0= ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) memcached? ( dev-libs/libmemcached[sasl] ) mongodb? ( dev-libs/mongo-c-driver ) mysql? ( dev-db/mysql-connector-c:0= ) ncp? ( net-fs/ncpfs ) ncurses? ( sys-libs/ncurses:= ) oracle? ( dev-db/oracle-instantclient-basic ) pcre? ( dev-libs/libpcre ) postgres? ( dev-db/postgresql:* ) rdp? ( net-misc/freerdp ) libssh? ( >=net-libs/libssh-0.4.0 ) subversion? ( dev-vcs/subversion ) zlib? ( sys-libs/zlib ) +RDEPEND=gtk? ( dev-libs/atk dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 ) firebird? ( dev-db/firebird ) gcrypt? ( dev-libs/libgcrypt ) idn? ( net-dns/libidn:0= ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) memcached? ( dev-libs/libmemcached[sasl] ) mongodb? ( dev-libs/mongo-c-driver ) mysql? ( dev-db/mysql-connector-c:0= ) ncurses? ( sys-libs/ncurses:= ) oracle? ( dev-db/oracle-instantclient-basic ) pcre? ( dev-libs/libpcre ) postgres? ( dev-db/postgresql:* ) rdp? ( net-misc/freerdp ) libssh? ( >=net-libs/libssh-0.4.0 ) subversion? ( dev-vcs/subversion ) zlib? ( sys-libs/zlib ) SLOT=0 SRC_URI=https://github.com/vanhauser-thc/thc-hydra/archive/v9.1.tar.gz -> hydra-9.1.tar.gz _eclasses_=edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic 09a8beb8e6a8e02dc1e1bd83ac353741 l10n 8cdd85e169b835d518bc2fd59f780d8e multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 wrapper 4251d4c84c25f59094fd557e0063a974 -_md5_=0608b76a1f1d1c3e9be222f1d68e9d1f +_md5_=c2b048618f5b2b35cc55d12eaa1fcc53 diff --git a/metadata/md5-cache/net-analyzer/hydra-9.2 b/metadata/md5-cache/net-analyzer/hydra-9.2 new file mode 100644 index 000000000000..afaf3ef76383 --- /dev/null +++ b/metadata/md5-cache/net-analyzer/hydra-9.2 @@ -0,0 +1,14 @@ +BDEPEND=virtual/pkgconfig +DEFINED_PHASES=compile configure install prepare +DEPEND=gtk? ( dev-libs/atk dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 ) firebird? ( dev-db/firebird ) gcrypt? ( dev-libs/libgcrypt ) idn? ( net-dns/libidn:0= ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) memcached? ( dev-libs/libmemcached[sasl] ) mongodb? ( dev-libs/mongo-c-driver ) mysql? ( dev-db/mysql-connector-c:0= ) ncurses? ( sys-libs/ncurses:= ) oracle? ( dev-db/oracle-instantclient-basic ) pcre? ( dev-libs/libpcre ) postgres? ( dev-db/postgresql:* ) rdp? ( net-misc/freerdp ) libssh? ( >=net-libs/libssh-0.4.0 ) subversion? ( dev-vcs/subversion ) zlib? ( sys-libs/zlib ) +DESCRIPTION=Parallelized network login hacker +EAPI=7 +HOMEPAGE=https://github.com/vanhauser-thc/thc-hydra +IUSE=debug firebird gcrypt gtk idn libressl memcached mongodb mysql ncurses oracle pcre postgres rdp libssh subversion zlib +KEYWORDS=~amd64 ~ppc ~x86 +LICENSE=GPL-3 +RDEPEND=gtk? ( dev-libs/atk dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 ) firebird? ( dev-db/firebird ) gcrypt? ( dev-libs/libgcrypt ) idn? ( net-dns/libidn:0= ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) memcached? ( dev-libs/libmemcached[sasl] ) mongodb? ( dev-libs/mongo-c-driver ) mysql? ( dev-db/mysql-connector-c:0= ) ncurses? ( sys-libs/ncurses:= ) oracle? ( dev-db/oracle-instantclient-basic ) pcre? ( dev-libs/libpcre ) postgres? ( dev-db/postgresql:* ) rdp? ( net-misc/freerdp ) libssh? ( >=net-libs/libssh-0.4.0 ) subversion? ( dev-vcs/subversion ) zlib? ( sys-libs/zlib ) +SLOT=0 +SRC_URI=https://github.com/vanhauser-thc/thc-hydra/archive/v9.2.tar.gz -> hydra-9.2.tar.gz +_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 +_md5_=8393228f2380561eb10a17a4ce8af57c diff --git a/metadata/md5-cache/net-analyzer/hydra-9999999 b/metadata/md5-cache/net-analyzer/hydra-9999999 index f8801e2baeb4..063d6cde678b 100644 --- a/metadata/md5-cache/net-analyzer/hydra-9999999 +++ b/metadata/md5-cache/net-analyzer/hydra-9999999 @@ -1,13 +1,13 @@ -BDEPEND=>=dev-vcs/git-1.8.2.1[curl] +BDEPEND=virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl] DEFINED_PHASES=compile configure install prepare unpack -DEPEND=gtk? ( dev-libs/atk dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 ) firebird? ( dev-db/firebird ) gcrypt? ( dev-libs/libgcrypt ) idn? ( net-dns/libidn:0= ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) memcached? ( dev-libs/libmemcached[sasl] ) mongodb? ( dev-libs/mongo-c-driver ) mysql? ( dev-db/mysql-connector-c:0= ) ncp? ( net-fs/ncpfs ) ncurses? ( sys-libs/ncurses:= ) oracle? ( dev-db/oracle-instantclient-basic ) pcre? ( dev-libs/libpcre ) postgres? ( dev-db/postgresql:* ) rdp? ( net-misc/freerdp ) libssh? ( >=net-libs/libssh-0.4.0 ) subversion? ( dev-vcs/subversion ) zlib? ( sys-libs/zlib ) virtual/pkgconfig +DEPEND=gtk? ( dev-libs/atk dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 ) firebird? ( dev-db/firebird ) gcrypt? ( dev-libs/libgcrypt ) idn? ( net-dns/libidn:0= ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) memcached? ( dev-libs/libmemcached[sasl] ) mongodb? ( dev-libs/mongo-c-driver ) mysql? ( dev-db/mysql-connector-c:0= ) ncurses? ( sys-libs/ncurses:= ) oracle? ( dev-db/oracle-instantclient-basic ) pcre? ( dev-libs/libpcre ) postgres? ( dev-db/postgresql:* ) rdp? ( net-misc/freerdp ) libssh? ( >=net-libs/libssh-0.4.0 ) subversion? ( dev-vcs/subversion ) zlib? ( sys-libs/zlib ) DESCRIPTION=Parallelized network login hacker EAPI=7 HOMEPAGE=https://github.com/vanhauser-thc/thc-hydra -IUSE=debug firebird gcrypt gtk idn libressl memcached mongodb mysql ncp ncurses oracle pcre postgres rdp libssh subversion zlib +IUSE=debug firebird gcrypt gtk idn libressl memcached mongodb mysql ncurses oracle pcre postgres rdp libssh subversion zlib LICENSE=GPL-3 PROPERTIES=live -RDEPEND=gtk? ( dev-libs/atk dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 ) firebird? ( dev-db/firebird ) gcrypt? ( dev-libs/libgcrypt ) idn? ( net-dns/libidn:0= ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) memcached? ( dev-libs/libmemcached[sasl] ) mongodb? ( dev-libs/mongo-c-driver ) mysql? ( dev-db/mysql-connector-c:0= ) ncp? ( net-fs/ncpfs ) ncurses? ( sys-libs/ncurses:= ) oracle? ( dev-db/oracle-instantclient-basic ) pcre? ( dev-libs/libpcre ) postgres? ( dev-db/postgresql:* ) rdp? ( net-misc/freerdp ) libssh? ( >=net-libs/libssh-0.4.0 ) subversion? ( dev-vcs/subversion ) zlib? ( sys-libs/zlib ) +RDEPEND=gtk? ( dev-libs/atk dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 ) firebird? ( dev-db/firebird ) gcrypt? ( dev-libs/libgcrypt ) idn? ( net-dns/libidn:0= ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) memcached? ( dev-libs/libmemcached[sasl] ) mongodb? ( dev-libs/mongo-c-driver ) mysql? ( dev-db/mysql-connector-c:0= ) ncurses? ( sys-libs/ncurses:= ) oracle? ( dev-db/oracle-instantclient-basic ) pcre? ( dev-libs/libpcre ) postgres? ( dev-db/postgresql:* ) rdp? ( net-misc/freerdp ) libssh? ( >=net-libs/libssh-0.4.0 ) subversion? ( dev-vcs/subversion ) zlib? ( sys-libs/zlib ) SLOT=0 -_eclasses_=edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic 09a8beb8e6a8e02dc1e1bd83ac353741 git-r3 3e7ec3d6619213460c85e2aa48398441 l10n 8cdd85e169b835d518bc2fd59f780d8e multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 wrapper 4251d4c84c25f59094fd557e0063a974 -_md5_=a0c4caea2d6d5bd0dce366ce0ebdb38d +_eclasses_=git-r3 3e7ec3d6619213460c85e2aa48398441 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 +_md5_=a830f5044ee19fa04e6556e25791113a diff --git a/metadata/md5-cache/net-analyzer/ifstatus-2.0.0 b/metadata/md5-cache/net-analyzer/ifstatus-2.0.0 index 110aefb61fcf..9cdb98bc0d1d 100644 --- a/metadata/md5-cache/net-analyzer/ifstatus-2.0.0 +++ b/metadata/md5-cache/net-analyzer/ifstatus-2.0.0 @@ -3,10 +3,10 @@ DEPEND=>=sys-libs/ncurses-4.2:0= virtual/pkgconfig DESCRIPTION=A simple CLI program for displaying network statistics in real time EAPI=7 HOMEPAGE=http://ifstatus.sourceforge.net/ -KEYWORDS=~amd64 ~arm ~ppc ~x86 +KEYWORDS=amd64 ~arm ~ppc x86 LICENSE=GPL-2 RDEPEND=>=sys-libs/ncurses-4.2:0= SLOT=0 SRC_URI=mirror://sourceforge/ifstatus/ifstatus-v2.0.0.tar.gz _eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 -_md5_=9efd4f0708896c124269fa85e05cb6eb +_md5_=d031f3ab4b7e51b29ad867ba922c6fc3 diff --git a/metadata/md5-cache/net-analyzer/labrea-2.5_p1 b/metadata/md5-cache/net-analyzer/labrea-2.5_p1 index 6d4ec805a2f1..b2c38bf96ed8 100644 --- a/metadata/md5-cache/net-analyzer/labrea-2.5_p1 +++ b/metadata/md5-cache/net-analyzer/labrea-2.5_p1 @@ -10,4 +10,4 @@ RDEPEND=net-libs/libpcap >=dev-libs/libdnet-1.7 SLOT=0 SRC_URI=mirror://sourceforge/labrea/labrea-2.5-stable-1.tar.gz _eclasses_=autotools 9988ecbe04129214297a7bbf3d253710 libtool f143db5a74ccd9ca28c1234deffede96 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 -_md5_=919fe7763401a749c07212ad801bf5be +_md5_=0b7e4f76e892d0724f66878f50e89074 diff --git a/metadata/md5-cache/net-analyzer/lft-3.77 b/metadata/md5-cache/net-analyzer/lft-3.77 deleted file mode 100644 index 78639fb92022..000000000000 --- a/metadata/md5-cache/net-analyzer/lft-3.77 +++ /dev/null @@ -1,11 +0,0 @@ -DEFINED_PHASES=prepare -DEPEND=net-libs/libpcap -DESCRIPTION=Layer Four Traceroute (LFT) and WhoB -EAPI=6 -HOMEPAGE=http://pwhois.org/lft/ -KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos -LICENSE=VOSTROM -RDEPEND=net-libs/libpcap -SLOT=0 -SRC_URI=http://pwhois.org/get/lft-3.77.tar.gz -_md5_=85142ed1d6f8eda9d248d8eceba11652 diff --git a/metadata/md5-cache/net-analyzer/lft-3.79 b/metadata/md5-cache/net-analyzer/lft-3.79 deleted file mode 100644 index 76a32f4251c9..000000000000 --- a/metadata/md5-cache/net-analyzer/lft-3.79 +++ /dev/null @@ -1,11 +0,0 @@ -DEFINED_PHASES=prepare -DEPEND=net-libs/libpcap -DESCRIPTION=Layer Four Traceroute (LFT) and WhoB -EAPI=6 -HOMEPAGE=http://pwhois.org/lft/ -KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos -LICENSE=VOSTROM -RDEPEND=net-libs/libpcap -SLOT=0 -SRC_URI=http://pwhois.org/get/lft-3.79.tar.gz -_md5_=08903f8e6029f11fa2d80073f6fd18a6 diff --git a/metadata/md5-cache/net-analyzer/lft-3.80 b/metadata/md5-cache/net-analyzer/lft-3.80 deleted file mode 100644 index 03bd64467cc2..000000000000 --- a/metadata/md5-cache/net-analyzer/lft-3.80 +++ /dev/null @@ -1,11 +0,0 @@ -DEFINED_PHASES=prepare -DEPEND=net-libs/libpcap -DESCRIPTION=Layer Four Traceroute (LFT) and WhoB -EAPI=6 -HOMEPAGE=http://pwhois.org/lft/ -KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos -LICENSE=VOSTROM -RDEPEND=net-libs/libpcap -SLOT=0 -SRC_URI=http://pwhois.org/get/lft-3.8.tar.gz -_md5_=fb1a26defe042348edc17d4af3bcb410 diff --git a/metadata/md5-cache/net-analyzer/lft-3.90 b/metadata/md5-cache/net-analyzer/lft-3.90 deleted file mode 100644 index 1312746af729..000000000000 --- a/metadata/md5-cache/net-analyzer/lft-3.90 +++ /dev/null @@ -1,11 +0,0 @@ -DEFINED_PHASES=prepare -DEPEND=net-libs/libpcap -DESCRIPTION=Layer Four Traceroute (LFT) and WhoB -EAPI=7 -HOMEPAGE=http://pwhois.org/lft/ -KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos -LICENSE=VOSTROM -RDEPEND=net-libs/libpcap -SLOT=0 -SRC_URI=http://pwhois.org/get/lft-3.9.tar.gz -_md5_=7f29e66e0eaa27a77825497e90adfe32 diff --git a/metadata/md5-cache/net-analyzer/lft-3.91-r1 b/metadata/md5-cache/net-analyzer/lft-3.91-r1 index 8d0ac7e44d53..823b9a1e3a2f 100644 --- a/metadata/md5-cache/net-analyzer/lft-3.91-r1 +++ b/metadata/md5-cache/net-analyzer/lft-3.91-r1 @@ -3,9 +3,9 @@ DEPEND=net-libs/libpcap DESCRIPTION=Layer Four Traceroute (LFT) and WhoB EAPI=7 HOMEPAGE=http://pwhois.org/lft/ -KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos +KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos LICENSE=VOSTROM RDEPEND=net-libs/libpcap SLOT=0 SRC_URI=http://pwhois.org/get/lft-3.91.tar.gz -_md5_=bec576cec5e8d59c4f9a1236bbe9be19 +_md5_=4db5a41ed21b7ac315e0d010ca47d75f diff --git a/metadata/md5-cache/net-analyzer/nbwmon-0.5.2 b/metadata/md5-cache/net-analyzer/nbwmon-0.5.2 index dc7535c23eb6..9c52d468c2f5 100644 --- a/metadata/md5-cache/net-analyzer/nbwmon-0.5.2 +++ b/metadata/md5-cache/net-analyzer/nbwmon-0.5.2 @@ -1,12 +1,13 @@ +BDEPEND=virtual/pkgconfig DEFINED_PHASES=install prepare -DEPEND=sys-libs/ncurses virtual/pkgconfig +DEPEND=sys-libs/ncurses DESCRIPTION=ncurses bandwidth monitor -EAPI=5 -HOMEPAGE=http://causes.host.funtoo.org/?p=nbwmon https://github.com/causes-/nbwmon +EAPI=7 +HOMEPAGE=https://github.com/causes-/nbwmon KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 LICENSE=MIT RDEPEND=sys-libs/ncurses SLOT=0 SRC_URI=https://github.com/causes-/nbwmon/archive/0.5.2.tar.gz -> nbwmon-0.5.2.tar.gz -_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 epatch e8f1ec13660dc2f44b32775765d85e42 estack 055c42df72f76a4f45ec92b35e83cd56 eutils 2d5b3f4b315094768576b6799e4f926e l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa multilib d410501a125f99ffb560b0c523cd3d1e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 -_md5_=0c18a052aa3381487896e19b659423b3 +_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 +_md5_=f9985a49198ce31293bdd42e598133c5 diff --git a/metadata/md5-cache/net-analyzer/nethogs-0.8.6 b/metadata/md5-cache/net-analyzer/nethogs-0.8.6 deleted file mode 100644 index a7d7a29a5f6c..000000000000 --- a/metadata/md5-cache/net-analyzer/nethogs-0.8.6 +++ /dev/null @@ -1,12 +0,0 @@ -DEFINED_PHASES=compile install -DEPEND=net-libs/libpcap sys-libs/ncurses:0= virtual/pkgconfig -DESCRIPTION=A small 'net top' tool, grouping bandwidth by process -EAPI=6 -HOMEPAGE=https://github.com/raboof/nethogs -KEYWORDS=amd64 ~arm ~ia64 x86 -LICENSE=GPL-2 -RDEPEND=net-libs/libpcap sys-libs/ncurses:0= -SLOT=0 -SRC_URI=https://github.com/raboof/nethogs/archive/v0.8.6.tar.gz -> nethogs-0.8.6.tar.gz -_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 -_md5_=8c91db48faf626dca895434e368740ca diff --git a/metadata/md5-cache/net-analyzer/nethogs-0.8.6-r1 b/metadata/md5-cache/net-analyzer/nethogs-0.8.6-r1 new file mode 100644 index 000000000000..71d105a63e41 --- /dev/null +++ b/metadata/md5-cache/net-analyzer/nethogs-0.8.6-r1 @@ -0,0 +1,14 @@ +BDEPEND=virtual/pkgconfig filecaps? ( sys-libs/libcap ) +DEFINED_PHASES=compile install postinst +DEPEND=net-libs/libpcap sys-libs/ncurses:0= +DESCRIPTION=A small 'net top' tool, grouping bandwidth by process +EAPI=7 +HOMEPAGE=https://github.com/raboof/nethogs +IUSE=+filecaps +KEYWORDS=amd64 ~arm ~ia64 x86 +LICENSE=GPL-2 +RDEPEND=net-libs/libpcap sys-libs/ncurses:0= filecaps? ( sys-libs/libcap ) +SLOT=0 +SRC_URI=https://github.com/raboof/nethogs/archive/v0.8.6.tar.gz -> nethogs-0.8.6.tar.gz +_eclasses_=fcaps da689a8e04bbbb3518888ff668fee45b multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 +_md5_=18653837cb056849c452092aa9fb5576 diff --git a/metadata/md5-cache/net-analyzer/netselect-0.4-r2 b/metadata/md5-cache/net-analyzer/netselect-0.4-r2 new file mode 100644 index 000000000000..fbd41f0a15db --- /dev/null +++ b/metadata/md5-cache/net-analyzer/netselect-0.4-r2 @@ -0,0 +1,13 @@ +BDEPEND=filecaps? ( sys-libs/libcap ) +DEFINED_PHASES=compile install postinst prepare +DESCRIPTION=Ultrafast implementation of ping +EAPI=7 +HOMEPAGE=http://apenwarr.ca/netselect/ +IUSE=ipv6 +filecaps +KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos +LICENSE=BSD +RDEPEND=filecaps? ( sys-libs/libcap ) +SLOT=0 +SRC_URI=https://github.com/apenwarr/netselect/archive/netselect-0.4.tar.gz ipv6? ( https://dev.gentoo.org/~jer/netselect-0.4-ipv6.patch.xz ) +_eclasses_=fcaps da689a8e04bbbb3518888ff668fee45b multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 +_md5_=372313c97e62b44f0cc6fca34e6beaa0 diff --git a/metadata/md5-cache/net-analyzer/nfdump-1.6.20 b/metadata/md5-cache/net-analyzer/nfdump-1.6.20 deleted file mode 100644 index 5a244f28ec3a..000000000000 --- a/metadata/md5-cache/net-analyzer/nfdump-1.6.20 +++ /dev/null @@ -1,14 +0,0 @@ -BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 -DEFINED_PHASES=configure install prepare -DEPEND=app-arch/bzip2 sys-libs/zlib ftconv? ( sys-libs/zlib net-analyzer/flow-tools ) nfprofile? ( net-analyzer/rrdtool ) nftrack? ( net-analyzer/rrdtool ) readpcap? ( net-libs/libpcap ) app-doc/doxygen sys-devel/flex virtual/yacc -DESCRIPTION=A set of tools to collect and process netflow data -EAPI=7 -HOMEPAGE=https://github.com/phaag/nfdump -IUSE=debug ftconv nfprofile nftrack readpcap sflow static-libs -KEYWORDS=~amd64 ~x86 -LICENSE=BSD -RDEPEND=app-arch/bzip2 sys-libs/zlib ftconv? ( sys-libs/zlib net-analyzer/flow-tools ) nfprofile? ( net-analyzer/rrdtool ) nftrack? ( net-analyzer/rrdtool ) readpcap? ( net-libs/libpcap ) dev-lang/perl -SLOT=0/1.6.15 -SRC_URI=https://github.com/phaag/nfdump/archive/v1.6.20.tar.gz -> nfdump-1.6.20.tar.gz -_eclasses_=autotools 9988ecbe04129214297a7bbf3d253710 libtool f143db5a74ccd9ca28c1234deffede96 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 -_md5_=57b01e6d924d7f70d3530d88990e7414 diff --git a/metadata/md5-cache/net-analyzer/nfdump-1.6.21 b/metadata/md5-cache/net-analyzer/nfdump-1.6.21-r1 similarity index 96% rename from metadata/md5-cache/net-analyzer/nfdump-1.6.21 rename to metadata/md5-cache/net-analyzer/nfdump-1.6.21-r1 index 5dacfac11251..2d640e2b7d3f 100644 --- a/metadata/md5-cache/net-analyzer/nfdump-1.6.21 +++ b/metadata/md5-cache/net-analyzer/nfdump-1.6.21-r1 @@ -11,4 +11,4 @@ RDEPEND=app-arch/bzip2 sys-libs/zlib ftconv? ( sys-libs/zlib net-analyzer/flow-t SLOT=0/1.6.15 SRC_URI=https://github.com/phaag/nfdump/archive/v1.6.21.tar.gz -> nfdump-1.6.21.tar.gz _eclasses_=autotools 9988ecbe04129214297a7bbf3d253710 libtool f143db5a74ccd9ca28c1234deffede96 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 -_md5_=ec61c709e09081edf5a2312fbca63488 +_md5_=16ba665049aca8713a99816dbde71728 diff --git a/metadata/md5-cache/net-analyzer/nfdump-1.6.22-r1 b/metadata/md5-cache/net-analyzer/nfdump-1.6.22-r1 new file mode 100644 index 000000000000..ff8396bf4b24 --- /dev/null +++ b/metadata/md5-cache/net-analyzer/nfdump-1.6.22-r1 @@ -0,0 +1,15 @@ +BDEPEND=sys-devel/flex virtual/yacc doc? ( app-doc/doxygen media-gfx/graphviz ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 +DEFINED_PHASES=configure install prepare +DEPEND=app-arch/bzip2 sys-libs/zlib ftconv? ( net-analyzer/flow-tools ) nfpcapd? ( net-libs/libpcap ) nfprofile? ( net-analyzer/rrdtool ) nftrack? ( net-analyzer/rrdtool ) readpcap? ( net-libs/libpcap ) +DESCRIPTION=A set of tools to collect and process netflow data +EAPI=7 +HOMEPAGE=https://github.com/phaag/nfdump +IUSE=debug doc jnat ftconv nfpcapd nfprofile nftrack nsel readpcap sflow static-libs +KEYWORDS=~amd64 ~x86 +LICENSE=BSD +RDEPEND=app-arch/bzip2 sys-libs/zlib ftconv? ( net-analyzer/flow-tools ) nfpcapd? ( net-libs/libpcap ) nfprofile? ( net-analyzer/rrdtool ) nftrack? ( net-analyzer/rrdtool ) readpcap? ( net-libs/libpcap ) +REQUIRED_USE=?? ( jnat nsel ) +SLOT=0/1.6.22 +SRC_URI=https://github.com/phaag/nfdump/archive/v1.6.22.tar.gz -> nfdump-1.6.22.tar.gz +_eclasses_=autotools 9988ecbe04129214297a7bbf3d253710 libtool f143db5a74ccd9ca28c1234deffede96 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 +_md5_=205cc176146c042f62de7c9025538d8d diff --git a/metadata/md5-cache/net-analyzer/packit-1.6.1 b/metadata/md5-cache/net-analyzer/packit-1.6.1 deleted file mode 100644 index 0214a597152e..000000000000 --- a/metadata/md5-cache/net-analyzer/packit-1.6.1 +++ /dev/null @@ -1,13 +0,0 @@ -BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 -DEFINED_PHASES=install prepare -DEPEND=net-libs/libnet:1.1 net-libs/libpcap -DESCRIPTION=network packet generator and capture tool -EAPI=7 -HOMEPAGE=https://github.com/resurrecting-open-source-projects/packit -KEYWORDS=amd64 ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos -LICENSE=GPL-2 -RDEPEND=net-libs/libnet:1.1 net-libs/libpcap -SLOT=0 -SRC_URI=https://github.com/resurrecting-open-source-projects/packit/archive/1.6.1.tar.gz -> packit-1.6.1.tar.gz -_eclasses_=autotools 9988ecbe04129214297a7bbf3d253710 libtool f143db5a74ccd9ca28c1234deffede96 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 -_md5_=6bf18000a94c71be10cef9961f6711be diff --git a/metadata/md5-cache/net-analyzer/packit-1.7 b/metadata/md5-cache/net-analyzer/packit-1.7 index 39a0d740aec6..b764cceadf52 100644 --- a/metadata/md5-cache/net-analyzer/packit-1.7 +++ b/metadata/md5-cache/net-analyzer/packit-1.7 @@ -4,10 +4,10 @@ DEPEND=net-libs/libnet:1.1 net-libs/libpcap DESCRIPTION=network packet generator and capture tool EAPI=7 HOMEPAGE=https://github.com/resurrecting-open-source-projects/packit -KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos +KEYWORDS=amd64 ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos LICENSE=GPL-2 RDEPEND=net-libs/libnet:1.1 net-libs/libpcap SLOT=0 SRC_URI=https://github.com/resurrecting-open-source-projects/packit/archive/1.7.tar.gz -> packit-1.7.tar.gz _eclasses_=autotools 9988ecbe04129214297a7bbf3d253710 libtool f143db5a74ccd9ca28c1234deffede96 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 -_md5_=f75e49dfb999ae52e42ae52c70be951b +_md5_=4f1ec69618fae6b35d00eb1ef9f88295 diff --git a/metadata/md5-cache/net-analyzer/rrdtool-1.7.2 b/metadata/md5-cache/net-analyzer/rrdtool-1.7.2 deleted file mode 100644 index 7ffe3c8d0fc3..000000000000 --- a/metadata/md5-cache/net-analyzer/rrdtool-1.7.2 +++ /dev/null @@ -1,16 +0,0 @@ -DEFINED_PHASES=compile configure install prepare setup test -DEPEND=>=dev-libs/glib-2.28.7:2[static-libs(+)?] >=dev-libs/libxml2-2.7.8:2[static-libs(+)?] dbi? ( dev-db/libdbi[static-libs(+)?] ) graph? ( >=media-libs/libpng-1.5.10:0=[static-libs(+)?] >=x11-libs/cairo-1.10.2[svg,static-libs(+)?] >=x11-libs/pango-1.28 ) lua? ( dev-lang/lua:0=[deprecated] ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) ) rados? ( sys-cluster/ceph ) tcl? ( dev-lang/tcl:0= ) tcpd? ( sys-apps/tcp-wrappers ) sys-apps/groff virtual/pkgconfig virtual/awk test? ( sys-devel/bc ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 -DESCRIPTION=A system to store and display time-series data -EAPI=6 -HOMEPAGE=https://oss.oetiker.ch/rrdtool/ -IUSE=dbi doc graph lua perl python rados rrdcgi ruby static-libs tcl tcpd test python_single_target_python3_7 python_single_target_python3_8 -KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris -LICENSE=GPL-2 -PDEPEND=ruby? ( ~dev-ruby/rrdtool-bindings-1.7.2 ) -RDEPEND=>=dev-libs/glib-2.28.7:2[static-libs(+)?] >=dev-libs/libxml2-2.7.8:2[static-libs(+)?] dbi? ( dev-db/libdbi[static-libs(+)?] ) graph? ( >=media-libs/libpng-1.5.10:0=[static-libs(+)?] >=x11-libs/cairo-1.10.2[svg,static-libs(+)?] >=x11-libs/pango-1.28 ) lua? ( dev-lang/lua:0=[deprecated] ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) ) rados? ( sys-cluster/ceph ) tcl? ( dev-lang/tcl:0= ) tcpd? ( sys-apps/tcp-wrappers ) -REQUIRED_USE=python? ( ^^ ( python_single_target_python3_7 python_single_target_python3_8 ) ) -RESTRICT=!test? ( test ) -SLOT=0/8.0.0 -SRC_URI=https://oss.oetiker.ch/rrdtool/pub/rrdtool-1.7.2.tar.gz -_eclasses_=autotools 9988ecbe04129214297a7bbf3d253710 desktop c0d27bf73aa08ca05b663dbd31fbef28 distutils-r1 16579e06f8839831bd5c03455bb87e3f edos2unix 33e347e171066657f91f8b0c72ec8773 epatch e8f1ec13660dc2f44b32775765d85e42 estack 055c42df72f76a4f45ec92b35e83cd56 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic 09a8beb8e6a8e02dc1e1bd83ac353741 l10n 8cdd85e169b835d518bc2fd59f780d8e libtool f143db5a74ccd9ca28c1234deffede96 ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 perl-functions 6ec4c4d8fc8324200f1c14e8d158c59b perl-module 97206c028d9bdc9f248e022ac5c9fc83 preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 d3100de905f978df912135806cf27188 python-utils-r1 2dc8e06a3429719b43e9140f7292a425 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 xdg-utils ff2ff954e6b17929574eee4efc5152ba -_md5_=56abd2a99518d774ab61fd573459aa30 diff --git a/metadata/md5-cache/net-analyzer/rrdtool-1.7.2-r1 b/metadata/md5-cache/net-analyzer/rrdtool-1.7.2-r1 deleted file mode 100644 index 2170959423e1..000000000000 --- a/metadata/md5-cache/net-analyzer/rrdtool-1.7.2-r1 +++ /dev/null @@ -1,16 +0,0 @@ -DEFINED_PHASES=compile configure install prepare setup test -DEPEND=>=dev-libs/glib-2.28.7:2[static-libs(+)?] >=dev-libs/libxml2-2.7.8:2[static-libs(+)?] dbi? ( dev-db/libdbi[static-libs(+)?] ) graph? ( >=media-libs/libpng-1.5.10:0=[static-libs(+)?] >=x11-libs/cairo-1.10.2[svg,static-libs(+)?] >=x11-libs/pango-1.28 ) lua? ( dev-lang/lua:0= ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) ) rados? ( sys-cluster/ceph ) tcl? ( dev-lang/tcl:0= ) tcpd? ( sys-apps/tcp-wrappers ) sys-apps/groff virtual/pkgconfig virtual/awk test? ( sys-devel/bc ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 -DESCRIPTION=A system to store and display time-series data -EAPI=6 -HOMEPAGE=https://oss.oetiker.ch/rrdtool/ -IUSE=dbi doc graph lua perl python rados rrdcgi ruby static-libs tcl tcpd test python_single_target_python3_7 python_single_target_python3_8 -KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris -LICENSE=GPL-2 -PDEPEND=ruby? ( ~dev-ruby/rrdtool-bindings-1.7.2 ) -RDEPEND=>=dev-libs/glib-2.28.7:2[static-libs(+)?] >=dev-libs/libxml2-2.7.8:2[static-libs(+)?] dbi? ( dev-db/libdbi[static-libs(+)?] ) graph? ( >=media-libs/libpng-1.5.10:0=[static-libs(+)?] >=x11-libs/cairo-1.10.2[svg,static-libs(+)?] >=x11-libs/pango-1.28 ) lua? ( dev-lang/lua:0= ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) ) rados? ( sys-cluster/ceph ) tcl? ( dev-lang/tcl:0= ) tcpd? ( sys-apps/tcp-wrappers ) -REQUIRED_USE=python? ( ^^ ( python_single_target_python3_7 python_single_target_python3_8 ) ) -RESTRICT=!test? ( test ) -SLOT=0/8.0.0 -SRC_URI=https://oss.oetiker.ch/rrdtool/pub/rrdtool-1.7.2.tar.gz -_eclasses_=autotools 9988ecbe04129214297a7bbf3d253710 desktop c0d27bf73aa08ca05b663dbd31fbef28 distutils-r1 16579e06f8839831bd5c03455bb87e3f edos2unix 33e347e171066657f91f8b0c72ec8773 epatch e8f1ec13660dc2f44b32775765d85e42 estack 055c42df72f76a4f45ec92b35e83cd56 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic 09a8beb8e6a8e02dc1e1bd83ac353741 l10n 8cdd85e169b835d518bc2fd59f780d8e libtool f143db5a74ccd9ca28c1234deffede96 ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 perl-functions 6ec4c4d8fc8324200f1c14e8d158c59b perl-module 97206c028d9bdc9f248e022ac5c9fc83 preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 d3100de905f978df912135806cf27188 python-utils-r1 2dc8e06a3429719b43e9140f7292a425 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 xdg-utils ff2ff954e6b17929574eee4efc5152ba -_md5_=17ca7c4a653e64f9e78f8216fd650147 diff --git a/metadata/md5-cache/net-analyzer/rrdtool-1.7.2-r100 b/metadata/md5-cache/net-analyzer/rrdtool-1.7.2-r100 index cf2975ee25e1..c05199f7cab7 100644 --- a/metadata/md5-cache/net-analyzer/rrdtool-1.7.2-r100 +++ b/metadata/md5-cache/net-analyzer/rrdtool-1.7.2-r100 @@ -1,6 +1,6 @@ -BDEPEND=test? ( lua? ( lua_targets_luajit? ( dev-lang/luajit:= ) lua_targets_lua5-1? ( dev-lang/lua:5.1 ) lua_targets_lua5-2? ( dev-lang/lua:5.2 ) lua_targets_lua5-3? ( dev-lang/lua:5.3 ) lua_targets_lua5-4? ( dev-lang/lua:5.4 ) ) ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 +BDEPEND=sys-apps/groff virtual/pkgconfig virtual/awk python? ( python_single_target_python3_7? ( dev-python/setuptools[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/setuptools[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/setuptools[python_targets_python3_9(-)] ) ) test? ( sys-devel/bc lua? ( lua_targets_luajit? ( dev-lang/luajit:= ) lua_targets_lua5-1? ( dev-lang/lua:5.1 ) lua_targets_lua5-2? ( dev-lang/lua:5.2 ) lua_targets_lua5-3? ( dev-lang/lua:5.3 ) lua_targets_lua5-4? ( dev-lang/lua:5.4 ) ) ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 DEFINED_PHASES=compile configure install prepare setup test -DEPEND=>=dev-libs/glib-2.28.7:2[static-libs(+)?] >=dev-libs/libxml2-2.7.8:2[static-libs(+)?] dbi? ( dev-db/libdbi[static-libs(+)?] ) graph? ( >=media-libs/libpng-1.5.10:0=[static-libs(+)?] >=x11-libs/cairo-1.10.2[svg,static-libs(+)?] >=x11-libs/pango-1.28 ) lua? ( lua_targets_luajit? ( dev-lang/luajit:= ) lua_targets_lua5-1? ( dev-lang/lua:5.1 ) lua_targets_lua5-2? ( dev-lang/lua:5.2 ) lua_targets_lua5-3? ( dev-lang/lua:5.3 ) lua_targets_lua5-4? ( dev-lang/lua:5.4 ) ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) rados? ( sys-cluster/ceph ) tcl? ( dev-lang/tcl:0= ) tcpd? ( sys-apps/tcp-wrappers ) sys-apps/groff virtual/pkgconfig virtual/awk test? ( sys-devel/bc ) +DEPEND=>=dev-libs/glib-2.28.7:2[static-libs(+)?] >=dev-libs/libxml2-2.7.8:2[static-libs(+)?] dbi? ( dev-db/libdbi[static-libs(+)?] ) graph? ( >=media-libs/libpng-1.5.10:0=[static-libs(+)?] >=x11-libs/cairo-1.10.2[svg,static-libs(+)?] >=x11-libs/pango-1.28 ) lua? ( lua_targets_luajit? ( dev-lang/luajit:= ) lua_targets_lua5-1? ( dev-lang/lua:5.1 ) lua_targets_lua5-2? ( dev-lang/lua:5.2 ) lua_targets_lua5-3? ( dev-lang/lua:5.3 ) lua_targets_lua5-4? ( dev-lang/lua:5.4 ) ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) rados? ( sys-cluster/ceph ) tcl? ( dev-lang/tcl:0= ) tcpd? ( sys-apps/tcp-wrappers ) DESCRIPTION=A system to store and display time-series data EAPI=7 HOMEPAGE=https://oss.oetiker.ch/rrdtool/ @@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) SLOT=0/8.0.0 SRC_URI=https://oss.oetiker.ch/rrdtool/pub/rrdtool-1.7.2.tar.gz _eclasses_=autotools 9988ecbe04129214297a7bbf3d253710 distutils-r1 16579e06f8839831bd5c03455bb87e3f edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic 09a8beb8e6a8e02dc1e1bd83ac353741 l10n 8cdd85e169b835d518bc2fd59f780d8e libtool f143db5a74ccd9ca28c1234deffede96 lua 117840f7c4855d27ccde1c6cca990331 lua-utils 736947973cfbc9de01fdb8548f942f82 multibuild 6b3d5ee849dafe6cdfd7b859c211fb01 multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 perl-functions 6ec4c4d8fc8324200f1c14e8d158c59b perl-module 97206c028d9bdc9f248e022ac5c9fc83 python-single-r1 d3100de905f978df912135806cf27188 python-utils-r1 2dc8e06a3429719b43e9140f7292a425 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 wrapper 4251d4c84c25f59094fd557e0063a974 -_md5_=d1ccda56ab0b5ab7d38db4bd76fbf359 +_md5_=2bca8fa56622c31a667f8d715ff2fc4a diff --git a/metadata/md5-cache/net-analyzer/sbd-1.37-r1 b/metadata/md5-cache/net-analyzer/sbd-1.37-r1 index f724eb7afc09..569c621e05a2 100644 --- a/metadata/md5-cache/net-analyzer/sbd-1.37-r1 +++ b/metadata/md5-cache/net-analyzer/sbd-1.37-r1 @@ -1,10 +1,10 @@ DEFINED_PHASES=compile install prepare DESCRIPTION=Netcat-clone, designed to be portable and offer strong encryption -EAPI=5 +EAPI=7 HOMEPAGE=http://tigerteam.se/dl/sbd/ -KEYWORDS=amd64 ~hppa ~ppc x86 -LICENSE=GPL-2 +KEYWORDS=~amd64 ~hppa ~ppc ~x86 +LICENSE=GPL-2+ SLOT=0 SRC_URI=http://tigerteam.se/dl/sbd/sbd-1.37.tar.gz _eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 -_md5_=59c9ec2d54ff2b339d8931d9eb114284 +_md5_=6a822ec81b3c49974400aab0e69ec0cc diff --git a/metadata/md5-cache/net-analyzer/sguil-sensor-1.0.0 b/metadata/md5-cache/net-analyzer/sguil-sensor-1.0.0-r1 similarity index 63% rename from metadata/md5-cache/net-analyzer/sguil-sensor-1.0.0 rename to metadata/md5-cache/net-analyzer/sguil-sensor-1.0.0-r1 index 613232fb5375..d04f37f70b26 100644 --- a/metadata/md5-cache/net-analyzer/sguil-sensor-1.0.0 +++ b/metadata/md5-cache/net-analyzer/sguil-sensor-1.0.0-r1 @@ -4,8 +4,8 @@ EAPI=7 HOMEPAGE=https://github.com/bammv/sguil KEYWORDS=~amd64 ~x86 LICENSE=GPL-2 QPL -RDEPEND=>=dev-lang/tcl-8.3:0=[-threads] >=dev-tcltk/tclx-8.3 >=net-analyzer/barnyard-0.2.0-r1 >=net-analyzer/snort-2.4.1-r1 dev-ml/pcre-ocaml net-analyzer/sancp +RDEPEND=>=dev-lang/tcl-8.3:0=[-threads] >=dev-tcltk/tclx-8.3 dev-tcltk/tls >=net-analyzer/barnyard-0.2.0-r1 >=net-analyzer/snort-2.4.1-r1 dev-ml/pcre-ocaml net-analyzer/sancp SLOT=0 SRC_URI=https://github.com/bammv/sguil/archive/v1.0.0.tar.gz -> sguil-1.0.0.tar.gz _eclasses_=user b0a0d4ca9e3f79c38f8f4143b8d5a2d8 user-info a2abd4e2f4c3b9b06d64bf1329359a02 -_md5_=f9385c31a7dd33722bb5a4824a89d212 +_md5_=cc96d57190774f3c79aaf35abbba4e07 diff --git a/metadata/md5-cache/net-analyzer/ssldump-1.3 b/metadata/md5-cache/net-analyzer/ssldump-1.3 new file mode 100644 index 000000000000..51fa65c2f537 --- /dev/null +++ b/metadata/md5-cache/net-analyzer/ssldump-1.3 @@ -0,0 +1,14 @@ +BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 +DEFINED_PHASES=install prepare +DEPEND=net-libs/libnet:1.1 net-libs/libpcap ssl? ( >=dev-libs/openssl-1:0= ) +DESCRIPTION=An SSLv3/TLS network protocol analyzer +EAPI=7 +HOMEPAGE=https://github.com/adulau/ssldump/ +IUSE=ssl +KEYWORDS=~amd64 ~arm ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos +LICENSE=openssl +RDEPEND=net-libs/libnet:1.1 net-libs/libpcap ssl? ( >=dev-libs/openssl-1:0= ) +SLOT=0 +SRC_URI=https://github.com/adulau/ssldump/archive/v1.3.tar.gz -> ssldump-1.3.tar.gz +_eclasses_=autotools 9988ecbe04129214297a7bbf3d253710 libtool f143db5a74ccd9ca28c1234deffede96 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 +_md5_=80d901d0f67ec74c658666e82e393006 diff --git a/metadata/md5-cache/net-analyzer/tcpstat-1.5_p8 b/metadata/md5-cache/net-analyzer/tcpstat-1.5_p8 index 4125c9ccd311..5dc8bc07e2ad 100644 --- a/metadata/md5-cache/net-analyzer/tcpstat-1.5_p8 +++ b/metadata/md5-cache/net-analyzer/tcpstat-1.5_p8 @@ -5,10 +5,10 @@ DESCRIPTION=Reports network interface statistics EAPI=7 HOMEPAGE=https://www.frenchfries.net/paul/tcpstat/ IUSE=ipv6 -KEYWORDS=~amd64 ~ppc ~ppc64 ~sparc ~x86 +KEYWORDS=amd64 ~ppc ppc64 ~sparc ~x86 LICENSE=BSD-2 RDEPEND=net-libs/libpcap sys-libs/db:* SLOT=0 SRC_URI=https://www.frenchfries.net/paul/tcpstat/tcpstat-1.5.tar.gz mirror://debian/pool/main/t/tcpstat/tcpstat_1.5-8.debian.tar.xz _eclasses_=autotools 9988ecbe04129214297a7bbf3d253710 edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic 09a8beb8e6a8e02dc1e1bd83ac353741 l10n 8cdd85e169b835d518bc2fd59f780d8e libtool f143db5a74ccd9ca28c1234deffede96 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 wrapper 4251d4c84c25f59094fd557e0063a974 -_md5_=10ff4908f181b54d46ef30dce69e783a +_md5_=69d783c747253656b3bc1114c6757fb0 diff --git a/metadata/md5-cache/net-analyzer/tcptrace-6.6.7_p6 b/metadata/md5-cache/net-analyzer/tcptrace-6.6.7_p6 index a53d8347695d..7eeaf03ac607 100644 --- a/metadata/md5-cache/net-analyzer/tcptrace-6.6.7_p6 +++ b/metadata/md5-cache/net-analyzer/tcptrace-6.6.7_p6 @@ -4,10 +4,10 @@ DEPEND=net-libs/libpcap DESCRIPTION=A Tool for analyzing network packet dumps EAPI=7 HOMEPAGE=http://www.tcptrace.org/ -KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 +KEYWORDS=amd64 ~ppc ppc64 ~x86 LICENSE=GPL-2 RDEPEND=net-libs/libpcap SLOT=0 SRC_URI=http://www.tcptrace.org/download/tcptrace-6.6.7.tar.gz http://www.tcptrace.org/download/old/6.6/tcptrace-6.6.7.tar.gz mirror://debian/pool/main/t/tcptrace/tcptrace_6.6.7-6.debian.tar.xz _eclasses_=autotools 9988ecbe04129214297a7bbf3d253710 libtool f143db5a74ccd9ca28c1234deffede96 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 -_md5_=5dd7f0f50843e2b95b919b7af6efb13a +_md5_=73758a05f69031496a3408bf62981c2a diff --git a/metadata/md5-cache/net-analyzer/xnetload-1.11.3-r1 b/metadata/md5-cache/net-analyzer/xnetload-1.11.3-r1 index 536b5142456c..3bdd15d0ba3e 100644 --- a/metadata/md5-cache/net-analyzer/xnetload-1.11.3-r1 +++ b/metadata/md5-cache/net-analyzer/xnetload-1.11.3-r1 @@ -1,12 +1,12 @@ DEFINED_PHASES=compile install prepare DEPEND=x11-libs/libX11 x11-libs/libXt x11-libs/libXaw -DESCRIPTION=displays a count and a graph of the traffic over a specified network connection -EAPI=5 -HOMEPAGE=http://www.xs4all.nl/~rsmith/software/ +DESCRIPTION=Displays a count and a graph of the traffic over a specified network connection +EAPI=7 +HOMEPAGE=https://www.xs4all.nl/~rsmith/software/ KEYWORDS=amd64 ppc ppc64 sparc x86 LICENSE=GPL-2 RDEPEND=x11-libs/libX11 x11-libs/libXt x11-libs/libXaw SLOT=0 -SRC_URI=http://www.xs4all.nl/~rsmith/software/xnetload-1.11.3.tar.gz +SRC_URI=https://www.xs4all.nl/~rsmith/software/xnetload-1.11.3.tar.gz _eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 -_md5_=8368154252831890ff6c5b8e6e983179 +_md5_=dad4fab5efef07375879629f3186fdee diff --git a/metadata/md5-cache/net-fs/Manifest.gz b/metadata/md5-cache/net-fs/Manifest.gz index bd7c68e22d1e..599a7e2fc316 100644 Binary files a/metadata/md5-cache/net-fs/Manifest.gz and b/metadata/md5-cache/net-fs/Manifest.gz differ diff --git a/metadata/md5-cache/net-fs/samba-4.14.0 b/metadata/md5-cache/net-fs/samba-4.14.0 index 9583ccecdb90..9c20c6950926 100644 --- a/metadata/md5-cache/net-fs/samba-4.14.0 +++ b/metadata/md5-cache/net-fs/samba-4.14.0 @@ -1,16 +1,16 @@ BDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7[threads(+),xml(+)] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[threads(+),xml(+)] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[threads(+),xml(+)] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) app-text/docbook-xsl-stylesheets dev-libs/libxslt virtual/pkgconfig virtual/pkgconfig DEFINED_PHASES=compile configure install postinst prepare setup test -DEPEND=>=app-arch/libarchive-3.1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-lang/perl:= dev-libs/icu:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libtasn1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/popt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-perl/Parse-Yapp >=net-libs/gnutls-3.4.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-libs/libnsl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/e2fsprogs-libs[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/ldb-2.2.0[ldap(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] =sys-libs/talloc-2.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.4.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tevent-0.10.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libiconv acl? ( virtual/acl ) python_single_target_python3_7? ( dev-python/subunit[python_targets_python3_7(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] addc? ( dev-python/markdown[python_targets_python3_7(-)] ) addns? ( dev-python/dnspython:=[python_targets_python3_7(-)] net-dns/bind-tools[gssapi] ) ) python_single_target_python3_8? ( dev-python/subunit[python_targets_python3_8(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] addc? ( dev-python/markdown[python_targets_python3_8(-)] ) addns? ( dev-python/dnspython:=[python_targets_python3_8(-)] net-dns/bind-tools[gssapi] ) ) python_single_target_python3_9? ( dev-python/subunit[python_targets_python3_9(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] addc? ( dev-python/markdown[python_targets_python3_9(-)] ) addns? ( dev-python/dnspython:=[python_targets_python3_9(-)] net-dns/bind-tools[gssapi] ) ) ceph? ( sys-cluster/ceph ) cluster? ( net-libs/rpcsvc-proto ) cups? ( net-print/cups ) debug? ( dev-util/lttng-ust ) dmapi? ( sys-apps/dmapi ) fam? ( virtual/fam ) gpg? ( app-crypt/gpgme ) json? ( dev-libs/jansson ) ldap? ( net-nds/openldap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pam? ( sys-libs/pam ) python? ( sys-libs/ldb[python,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] sys-libs/talloc[python,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] sys-libs/tdb[python,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] sys-libs/tevent[python,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) snapper? ( sys-apps/dbus ) system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) system-mitkrb5? ( >=app-crypt/mit-krb5-1.15.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) systemd? ( sys-apps/systemd:0= ) zeroconf? ( net-dns/avahi[dbus] ) >=dev-util/cmocka-1.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-libs/libtirpc[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] || ( net-libs/rpcsvc-proto =net-dns/resolv_wrapper-1.1.4 >=net-libs/socket_wrapper-1.1.9 >=sys-libs/nss_wrapper-1.1.3 >=sys-libs/uid_wrapper-1.2.1 ) ) +DEPEND=>=app-arch/libarchive-3.1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-lang/perl:= dev-libs/icu:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libtasn1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/popt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-perl/Parse-Yapp >=net-libs/gnutls-3.4.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-libs/libnsl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/e2fsprogs-libs[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/ldb-2.2.0[ldap(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] =sys-libs/talloc-2.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.4.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tevent-0.10.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libiconv acl? ( virtual/acl ) python_single_target_python3_7? ( dev-python/subunit[python_targets_python3_7(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] addc? ( dev-python/dnspython:=[python_targets_python3_7(-)] dev-python/markdown[python_targets_python3_7(-)] ) addns? ( dev-python/dnspython:=[python_targets_python3_7(-)] net-dns/bind-tools[gssapi] ) ) python_single_target_python3_8? ( dev-python/subunit[python_targets_python3_8(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] addc? ( dev-python/dnspython:=[python_targets_python3_8(-)] dev-python/markdown[python_targets_python3_8(-)] ) addns? ( dev-python/dnspython:=[python_targets_python3_8(-)] net-dns/bind-tools[gssapi] ) ) python_single_target_python3_9? ( dev-python/subunit[python_targets_python3_9(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] addc? ( dev-python/dnspython:=[python_targets_python3_9(-)] dev-python/markdown[python_targets_python3_9(-)] ) addns? ( dev-python/dnspython:=[python_targets_python3_9(-)] net-dns/bind-tools[gssapi] ) ) ceph? ( sys-cluster/ceph ) cluster? ( net-libs/rpcsvc-proto ) cups? ( net-print/cups ) debug? ( dev-util/lttng-ust ) dmapi? ( sys-apps/dmapi ) fam? ( virtual/fam ) gpg? ( app-crypt/gpgme ) json? ( dev-libs/jansson ) ldap? ( net-nds/openldap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pam? ( sys-libs/pam ) python? ( sys-libs/ldb[python,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] sys-libs/talloc[python,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] sys-libs/tdb[python,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] sys-libs/tevent[python,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) snapper? ( sys-apps/dbus ) system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) system-mitkrb5? ( >=app-crypt/mit-krb5-1.15.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) systemd? ( sys-apps/systemd:0= ) zeroconf? ( net-dns/avahi[dbus] ) >=dev-util/cmocka-1.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-libs/libtirpc[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] || ( net-libs/rpcsvc-proto =net-dns/resolv_wrapper-1.1.4 >=net-libs/socket_wrapper-1.1.9 >=sys-libs/nss_wrapper-1.1.3 >=sys-libs/uid_wrapper-1.2.1 ) ) DESCRIPTION=Samba Suite Version 4 EAPI=7 HOMEPAGE=https://samba.org/ IUSE=acl addc addns ads ceph client cluster cups debug dmapi fam glusterfs gpg iprint json ldap ntvfs pam profiling-data python quota +regedit selinux snapper spotlight syslog system-heimdal +system-mitkrb5 systemd test winbind zeroconf python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 kernel_linux KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 LICENSE=GPL-3 -RDEPEND=>=app-arch/libarchive-3.1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-lang/perl:= dev-libs/icu:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libtasn1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/popt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-perl/Parse-Yapp >=net-libs/gnutls-3.4.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-libs/libnsl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/e2fsprogs-libs[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/ldb-2.2.0[ldap(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] =sys-libs/talloc-2.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.4.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tevent-0.10.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libiconv acl? ( virtual/acl ) python_single_target_python3_7? ( dev-python/subunit[python_targets_python3_7(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] addc? ( dev-python/markdown[python_targets_python3_7(-)] ) addns? ( dev-python/dnspython:=[python_targets_python3_7(-)] net-dns/bind-tools[gssapi] ) ) python_single_target_python3_8? ( dev-python/subunit[python_targets_python3_8(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] addc? ( dev-python/markdown[python_targets_python3_8(-)] ) addns? ( dev-python/dnspython:=[python_targets_python3_8(-)] net-dns/bind-tools[gssapi] ) ) python_single_target_python3_9? ( dev-python/subunit[python_targets_python3_9(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] addc? ( dev-python/markdown[python_targets_python3_9(-)] ) addns? ( dev-python/dnspython:=[python_targets_python3_9(-)] net-dns/bind-tools[gssapi] ) ) ceph? ( sys-cluster/ceph ) cluster? ( net-libs/rpcsvc-proto ) cups? ( net-print/cups ) debug? ( dev-util/lttng-ust ) dmapi? ( sys-apps/dmapi ) fam? ( virtual/fam ) gpg? ( app-crypt/gpgme ) json? ( dev-libs/jansson ) ldap? ( net-nds/openldap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pam? ( sys-libs/pam ) python? ( sys-libs/ldb[python,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] sys-libs/talloc[python,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] sys-libs/tdb[python,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] sys-libs/tevent[python,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) snapper? ( sys-apps/dbus ) system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) system-mitkrb5? ( >=app-crypt/mit-krb5-1.15.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) systemd? ( sys-apps/systemd:0= ) zeroconf? ( net-dns/avahi[dbus] ) client? ( net-fs/cifs-utils[ads?] ) python? ( python_single_target_python3_7? ( dev-lang/python:3.7[threads(+),xml(+)] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[threads(+),xml(+)] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[threads(+),xml(+)] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) selinux? ( sec-policy/selinux-samba ) virtual/tmpfiles +RDEPEND=>=app-arch/libarchive-3.1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-lang/perl:= dev-libs/icu:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libtasn1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/popt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-perl/Parse-Yapp >=net-libs/gnutls-3.4.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-libs/libnsl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/e2fsprogs-libs[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/ldb-2.2.0[ldap(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] =sys-libs/talloc-2.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.4.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tevent-0.10.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libiconv acl? ( virtual/acl ) python_single_target_python3_7? ( dev-python/subunit[python_targets_python3_7(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] addc? ( dev-python/dnspython:=[python_targets_python3_7(-)] dev-python/markdown[python_targets_python3_7(-)] ) addns? ( dev-python/dnspython:=[python_targets_python3_7(-)] net-dns/bind-tools[gssapi] ) ) python_single_target_python3_8? ( dev-python/subunit[python_targets_python3_8(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] addc? ( dev-python/dnspython:=[python_targets_python3_8(-)] dev-python/markdown[python_targets_python3_8(-)] ) addns? ( dev-python/dnspython:=[python_targets_python3_8(-)] net-dns/bind-tools[gssapi] ) ) python_single_target_python3_9? ( dev-python/subunit[python_targets_python3_9(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] addc? ( dev-python/dnspython:=[python_targets_python3_9(-)] dev-python/markdown[python_targets_python3_9(-)] ) addns? ( dev-python/dnspython:=[python_targets_python3_9(-)] net-dns/bind-tools[gssapi] ) ) ceph? ( sys-cluster/ceph ) cluster? ( net-libs/rpcsvc-proto ) cups? ( net-print/cups ) debug? ( dev-util/lttng-ust ) dmapi? ( sys-apps/dmapi ) fam? ( virtual/fam ) gpg? ( app-crypt/gpgme ) json? ( dev-libs/jansson ) ldap? ( net-nds/openldap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pam? ( sys-libs/pam ) python? ( sys-libs/ldb[python,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] sys-libs/talloc[python,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] sys-libs/tdb[python,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] sys-libs/tevent[python,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) snapper? ( sys-apps/dbus ) system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) system-mitkrb5? ( >=app-crypt/mit-krb5-1.15.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) systemd? ( sys-apps/systemd:0= ) zeroconf? ( net-dns/avahi[dbus] ) client? ( net-fs/cifs-utils[ads?] ) python? ( python_single_target_python3_7? ( dev-lang/python:3.7[threads(+),xml(+)] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[threads(+),xml(+)] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[threads(+),xml(+)] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) selinux? ( sec-policy/selinux-samba ) virtual/tmpfiles REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 ) addc? ( python json winbind ) addns? ( python ) ads? ( acl ldap winbind ) cluster? ( ads ) gpg? ( addc ) ntvfs? ( addc ) spotlight? ( json ) test? ( python ) !ads? ( !addc ) ?? ( system-heimdal system-mitkrb5 ) RESTRICT=test SLOT=0 SRC_URI=mirror://samba/stable/samba-4.14.0.tar.gz _eclasses_=edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic 09a8beb8e6a8e02dc1e1bd83ac353741 l10n 8cdd85e169b835d518bc2fd59f780d8e linux-info c90a203b1c14cfa77bd3e37a0e96c955 multibuild 6b3d5ee849dafe6cdfd7b859c211fb01 multilib d410501a125f99ffb560b0c523cd3d1e multilib-build 9a65133006c608964888346a412cc454 multilib-minimal 8bddda43703ba94d8341f4e247f97566 multiprocessing cac3169468f893670dac3e7cb940e045 pam b097695df28f3974e3af860d6704d4f2 python-single-r1 d3100de905f978df912135806cf27188 python-utils-r1 2dc8e06a3429719b43e9140f7292a425 systemd 74b223e42834adf09a2d21fe5fe13741 tmpfiles dc8e4917d734a019caa04ad3b8db560b toolchain-funcs 24921b57d6561d87cbef4916a296ada4 waf-utils 0a6e492cdcbd52b1304cfcd9eba5abc6 wrapper 4251d4c84c25f59094fd557e0063a974 -_md5_=a3137a85a10ba801209fe653108248a7 +_md5_=2b7fe2a346a2936b896a5e155b8acf9b diff --git a/metadata/md5-cache/net-ftp/Manifest.gz b/metadata/md5-cache/net-ftp/Manifest.gz index fc92966c9b08..2ec4a8a7e192 100644 Binary files a/metadata/md5-cache/net-ftp/Manifest.gz and b/metadata/md5-cache/net-ftp/Manifest.gz differ diff --git a/metadata/md5-cache/net-ftp/filezilla-3.53.0 b/metadata/md5-cache/net-ftp/filezilla-3.53.0 new file mode 100644 index 000000000000..176d2bdfd432 --- /dev/null +++ b/metadata/md5-cache/net-ftp/filezilla-3.53.0 @@ -0,0 +1,14 @@ +DEFINED_PHASES=configure postinst postrm preinst prepare pretend +DEPEND=>=app-eselect/eselect-wxwidgets-0.7-r1 >=dev-libs/nettle-3.1:= >=dev-db/sqlite-3.7 >=dev-libs/libfilezilla-0.26.0:= >=dev-libs/pugixml-1.7 >=net-libs/gnutls-3.5.7 >=x11-libs/wxGTK-3.0.4:3.0-gtk3[X] x11-misc/xdg-utils dbus? ( sys-apps/dbus ) virtual/pkgconfig >=sys-devel/libtool-1.4 nls? ( >=sys-devel/gettext-0.11 ) test? ( >=dev-util/cppunit-1.13.0 ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 dev-util/desktop-file-utils x11-misc/shared-mime-info +DESCRIPTION=FTP client with lots of useful features and an intuitive interface +EAPI=6 +HOMEPAGE=https://filezilla-project.org/ +IUSE=dbus nls test +KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86 +LICENSE=GPL-2 +RDEPEND=>=app-eselect/eselect-wxwidgets-0.7-r1 >=dev-libs/nettle-3.1:= >=dev-db/sqlite-3.7 >=dev-libs/libfilezilla-0.26.0:= >=dev-libs/pugixml-1.7 >=net-libs/gnutls-3.5.7 >=x11-libs/wxGTK-3.0.4:3.0-gtk3[X] x11-misc/xdg-utils dbus? ( sys-apps/dbus ) +RESTRICT=!test? ( test ) +SLOT=0 +SRC_URI=https://download.filezilla-project.org/client/FileZilla_3.53.0_src.tar.bz2 +_eclasses_=autotools 9988ecbe04129214297a7bbf3d253710 desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 epatch e8f1ec13660dc2f44b32775765d85e42 estack 055c42df72f76a4f45ec92b35e83cd56 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic 09a8beb8e6a8e02dc1e1bd83ac353741 l10n 8cdd85e169b835d518bc2fd59f780d8e libtool f143db5a74ccd9ca28c1234deffede96 ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa multilib d410501a125f99ffb560b0c523cd3d1e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 wxwidgets e1e6e1eb5b3d911b3abd712f611e2312 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +_md5_=fab135a66da7e1f8406ff705e42f0783 diff --git a/metadata/md5-cache/net-libs/Manifest.gz b/metadata/md5-cache/net-libs/Manifest.gz index f87c5a02aa24..d36ebd75372e 100644 Binary files a/metadata/md5-cache/net-libs/Manifest.gz and b/metadata/md5-cache/net-libs/Manifest.gz differ diff --git a/metadata/md5-cache/net-libs/libnet-1.2 b/metadata/md5-cache/net-libs/libnet-1.2 index d7ccabda8111..90577602628a 100644 --- a/metadata/md5-cache/net-libs/libnet-1.2 +++ b/metadata/md5-cache/net-libs/libnet-1.2 @@ -7,4 +7,4 @@ KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x LICENSE=BSD BSD-2 HPND SLOT=1.1 SRC_URI=https://github.com/libnet/libnet/releases/download/v1.2/libnet-1.2.tar.gz -_md5_=9c68cccc2b060519eb97d4b042463d6f +_md5_=f48f85e595287e089c904d855ec3e924 diff --git a/metadata/md5-cache/net-misc/Manifest.gz b/metadata/md5-cache/net-misc/Manifest.gz index 62dc0c0f1f39..9e3abc4a52ac 100644 Binary files a/metadata/md5-cache/net-misc/Manifest.gz and b/metadata/md5-cache/net-misc/Manifest.gz differ diff --git a/metadata/md5-cache/net-misc/modemmanager-1.14.8-r1 b/metadata/md5-cache/net-misc/modemmanager-1.14.8-r1 new file mode 100644 index 000000000000..e928ed399c8d --- /dev/null +++ b/metadata/md5-cache/net-misc/modemmanager-1.14.8-r1 @@ -0,0 +1,15 @@ +BDEPEND=dev-util/gdbus-codegen dev-util/glib-utils >=dev-util/gtk-doc-am-1 >=sys-devel/gettext-0.19.8 virtual/pkgconfig vala? ( || ( dev-lang/vala:0.50[vapigen(+)] dev-lang/vala:0.48[vapigen(+)] dev-lang/vala:0.46[vapigen(+)] dev-lang/vala:0.44[vapigen(+)] dev-lang/vala:0.40[vapigen(+)] dev-lang/vala:0.36[vapigen(+)] ) ) >=app-portage/elt-patches-20170815 app-arch/xz-utils virtual/pkgconfig virtual/pkgconfig +DEFINED_PHASES=compile configure install postinst postrm preinst prepare +DEPEND=>=dev-libs/glib-2.48.0:2 udev? ( >=dev-libs/libgudev-230:= ) introspection? ( >=dev-libs/gobject-introspection-0.9.6:= ) mbim? ( >=net-libs/libmbim-1.24.0 ) policykit? ( >=sys-auth/polkit-0.106[introspection] ) qmi? ( >=net-libs/libqmi-1.26.0:= ) elogind? ( sys-auth/elogind ) systemd? ( >=sys-apps/systemd-209 ) dev-util/desktop-file-utils x11-misc/shared-mime-info +DESCRIPTION=Modem and mobile broadband management libraries +EAPI=7 +HOMEPAGE=https://www.freedesktop.org/wiki/Software/ModemManager/ +IUSE=elogind +introspection mbim policykit +qmi systemd +udev vala +KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 +LICENSE=GPL-2+ +RDEPEND=>=dev-libs/glib-2.48.0:2 udev? ( >=dev-libs/libgudev-230:= ) introspection? ( >=dev-libs/gobject-introspection-0.9.6:= ) mbim? ( >=net-libs/libmbim-1.24.0 ) policykit? ( >=sys-auth/polkit-0.106[introspection] ) qmi? ( >=net-libs/libqmi-1.26.0:= ) elogind? ( sys-auth/elogind ) systemd? ( >=sys-apps/systemd-209 ) policykit? ( acct-group/plugdev ) +REQUIRED_USE=?? ( elogind systemd ) vala? ( introspection ) +SLOT=0/1 +SRC_URI=https://www.freedesktop.org/software/ModemManager/ModemManager-1.14.8.tar.xz +_eclasses_=edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 2d5b3f4b315094768576b6799e4f926e gnome.org 532d56d07b9eace4831aaa817d2b756a gnome2 c156bb2ac81c822dd861424ce19bc168 gnome2-utils c8e3fff820d850c0e003e22208d2eea3 l10n 8cdd85e169b835d518bc2fd59f780d8e libtool f143db5a74ccd9ca28c1234deffede96 multilib d410501a125f99ffb560b0c523cd3d1e readme.gentoo-r1 22ae82e140bdd95d17a34fd5fd733190 systemd 74b223e42834adf09a2d21fe5fe13741 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 udev 452708c3f55cf6e918b045adb949a9e6 vala 5fab64090cefe75c5df431cefa0b653d wrapper 4251d4c84c25f59094fd557e0063a974 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba +_md5_=3a35d87a2ede6e3bfdb3bfba10bd9435 diff --git a/metadata/md5-cache/sci-mathematics/Manifest.gz b/metadata/md5-cache/sci-mathematics/Manifest.gz index cbb5eb82d28b..4da317deadb5 100644 Binary files a/metadata/md5-cache/sci-mathematics/Manifest.gz and b/metadata/md5-cache/sci-mathematics/Manifest.gz differ diff --git a/metadata/md5-cache/sci-mathematics/agda-2.6.1.2 b/metadata/md5-cache/sci-mathematics/agda-2.6.1.2 index 11dad89ed743..e0e138de0407 100644 --- a/metadata/md5-cache/sci-mathematics/agda-2.6.1.2 +++ b/metadata/md5-cache/sci-mathematics/agda-2.6.1.2 @@ -11,4 +11,4 @@ RDEPEND=>=dev-haskell/aeson-1.1.2.0:=[profile?] AusweisApp2-1.22.1.tar.gz +_eclasses_=cmake 314a813be2f09820e8978cdee941e501 edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic 09a8beb8e6a8e02dc1e1bd83ac353741 l10n 8cdd85e169b835d518bc2fd59f780d8e multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 24921b57d6561d87cbef4916a296ada4 wrapper 4251d4c84c25f59094fd557e0063a974 xdg-utils ff2ff954e6b17929574eee4efc5152ba +_md5_=5350c05a00480efdac493e0de08e554c diff --git a/metadata/md5-cache/sys-auth/Manifest.gz b/metadata/md5-cache/sys-auth/Manifest.gz index 580de311883b..1a979961eca9 100644 Binary files a/metadata/md5-cache/sys-auth/Manifest.gz and b/metadata/md5-cache/sys-auth/Manifest.gz differ diff --git a/metadata/md5-cache/sys-cluster/Manifest.gz b/metadata/md5-cache/sys-cluster/Manifest.gz index f999f20784c1..9ae483cd9d9c 100644 Binary files a/metadata/md5-cache/sys-cluster/Manifest.gz and b/metadata/md5-cache/sys-cluster/Manifest.gz differ diff --git a/metadata/md5-cache/sys-cluster/ceph-14.2.17 b/metadata/md5-cache/sys-cluster/ceph-14.2.18 similarity index 99% rename from metadata/md5-cache/sys-cluster/ceph-14.2.17 rename to metadata/md5-cache/sys-cluster/ceph-14.2.18 index 3ee9289c9068..591f58ac643b 100644 --- a/metadata/md5-cache/sys-cluster/ceph-14.2.17 +++ b/metadata/md5-cache/sys-cluster/ceph-14.2.18 @@ -11,6 +11,6 @@ RDEPEND=acct-group/ceph acct-user/ceph virtual/libudev:= app-arch/bzip2:= app-ar REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 ) ?? ( jemalloc tcmalloc ) diskprediction? ( mgr !python_targets_python3_8 ) kafka? ( radosgw ) mgr? ( cephfs ) rabbitmq? ( radosgw ) RESTRICT=test? ( userpriv ) test SLOT=0 -SRC_URI=https://download.ceph.com/tarballs/ceph-14.2.17.tar.gz +SRC_URI=https://download.ceph.com/tarballs/ceph-14.2.18.tar.gz _eclasses_=bash-completion-r1 be99724bde4274de21e581204e9d164a check-reqs 7e3fd1855a5e1b50bb9e80827b3f672d cmake 314a813be2f09820e8978cdee941e501 distutils-r1 16579e06f8839831bd5c03455bb87e3f edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic 09a8beb8e6a8e02dc1e1bd83ac353741 l10n 8cdd85e169b835d518bc2fd59f780d8e multibuild 6b3d5ee849dafe6cdfd7b859c211fb01 multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-r1 6d099888c5b4dd4868c26508df307e95 python-utils-r1 2dc8e06a3429719b43e9140f7292a425 readme.gentoo-r1 22ae82e140bdd95d17a34fd5fd733190 systemd 74b223e42834adf09a2d21fe5fe13741 tmpfiles dc8e4917d734a019caa04ad3b8db560b toolchain-funcs 24921b57d6561d87cbef4916a296ada4 udev 452708c3f55cf6e918b045adb949a9e6 wrapper 4251d4c84c25f59094fd557e0063a974 xdg-utils ff2ff954e6b17929574eee4efc5152ba _md5_=7cea868eb4c1124302a6fade97eb7b85 diff --git a/metadata/md5-cache/x11-libs/Manifest.gz b/metadata/md5-cache/x11-libs/Manifest.gz index 2fa66f078a68..5c9debc151ff 100644 Binary files a/metadata/md5-cache/x11-libs/Manifest.gz and b/metadata/md5-cache/x11-libs/Manifest.gz differ diff --git a/metadata/md5-cache/x11-libs/c++-gtk-utils-2.2.20 b/metadata/md5-cache/x11-libs/c++-gtk-utils-2.2.20 new file mode 100644 index 000000000000..9e7c9e383951 --- /dev/null +++ b/metadata/md5-cache/x11-libs/c++-gtk-utils-2.2.20 @@ -0,0 +1,15 @@ +BDEPEND=virtual/pkgconfig nls? ( sys-devel/gettext ) test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) +DEFINED_PHASES=configure install test +DEPEND=dev-libs/glib:2 gtk? ( x11-libs/gtk+:3 ) +DESCRIPTION=A number of classes and functions for programming GTK+ programs using C++ +EAPI=7 +HOMEPAGE=http://cxx-gtk-utils.sourceforge.net/ +IUSE=+gtk nls test +KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 +LICENSE=LGPL-2.1 +RDEPEND=dev-libs/glib:2 gtk? ( x11-libs/gtk+:3 ) +RESTRICT=!test? ( test ) +SLOT=0 +SRC_URI=mirror://sourceforge/cxx-gtk-utils/c++-gtk-utils-2.2.20.tar.gz +_eclasses_=virtualx 7e60d3b10c791ab996f717bc1f30072f +_md5_=d9a8729f351f239d1fec909532994a2c diff --git a/metadata/md5-cache/x11-misc/3ddesktop-0.2.9-r1 b/metadata/md5-cache/x11-misc/3ddesktop-0.2.9-r1 deleted file mode 100644 index 793313dea630..000000000000 --- a/metadata/md5-cache/x11-misc/3ddesktop-0.2.9-r1 +++ /dev/null @@ -1,12 +0,0 @@ -DEFINED_PHASES=postinst prepare -DEPEND=>=media-libs/freetype-2 media-libs/freeglut media-libs/imlib2[X] x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXmu x11-libs/libXt x11-libs/libXxf86vm x11-base/xorg-proto >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 -DESCRIPTION=OpenGL virtual desktop switching -EAPI=5 -HOMEPAGE=http://desk3d.sourceforge.net/ -KEYWORDS=amd64 ppc x86 -LICENSE=GPL-2 -RDEPEND=>=media-libs/freetype-2 media-libs/freeglut media-libs/imlib2[X] x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXmu x11-libs/libXt x11-libs/libXxf86vm -SLOT=0 -SRC_URI=mirror://sourceforge/desk3d/3ddesktop-0.2.9.tar.gz -_eclasses_=autotools 9988ecbe04129214297a7bbf3d253710 desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 epatch e8f1ec13660dc2f44b32775765d85e42 estack 055c42df72f76a4f45ec92b35e83cd56 eutils 2d5b3f4b315094768576b6799e4f926e l10n 8cdd85e169b835d518bc2fd59f780d8e libtool f143db5a74ccd9ca28c1234deffede96 ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa multilib d410501a125f99ffb560b0c523cd3d1e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 -_md5_=2e6bb019725b360202dacc2d130337c1 diff --git a/metadata/md5-cache/x11-misc/3ddesktop-0.2.9-r2 b/metadata/md5-cache/x11-misc/3ddesktop-0.2.9-r2 index 19d1a423c063..2c9ff9ad221a 100644 --- a/metadata/md5-cache/x11-misc/3ddesktop-0.2.9-r2 +++ b/metadata/md5-cache/x11-misc/3ddesktop-0.2.9-r2 @@ -4,10 +4,10 @@ DEPEND=>=media-libs/freetype-2 media-libs/freeglut media-libs/imlib2[X] x11-libs DESCRIPTION=OpenGL virtual desktop switching EAPI=7 HOMEPAGE=https://sourceforge.net/projects/desk3d/ -KEYWORDS=~amd64 ~ppc ~x86 +KEYWORDS=amd64 ppc x86 LICENSE=GPL-2 RDEPEND=>=media-libs/freetype-2 media-libs/freeglut media-libs/imlib2[X] x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXmu x11-libs/libXt x11-libs/libXxf86vm SLOT=0 SRC_URI=mirror://sourceforge/desk3d/3ddesktop-0.2.9.tar.gz _eclasses_=autotools 9988ecbe04129214297a7bbf3d253710 libtool f143db5a74ccd9ca28c1234deffede96 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 -_md5_=0fb9d82ec614fdd3b444c244910bf6b0 +_md5_=1747249f259ae3d15de0c6412f8812f0 diff --git a/metadata/md5-cache/x11-misc/Manifest.gz b/metadata/md5-cache/x11-misc/Manifest.gz index 367f7c6e5e28..4d8d623abae4 100644 Binary files a/metadata/md5-cache/x11-misc/Manifest.gz and b/metadata/md5-cache/x11-misc/Manifest.gz differ diff --git a/metadata/md5-cache/x11-misc/cairo-clock-0.3.4-r1 b/metadata/md5-cache/x11-misc/cairo-clock-0.3.4-r1 deleted file mode 100644 index 082975b6e00c..000000000000 --- a/metadata/md5-cache/x11-misc/cairo-clock-0.3.4-r1 +++ /dev/null @@ -1,12 +0,0 @@ -DEFINED_PHASES=prepare -DEPEND=>=dev-libs/glib-2.8 >=gnome-base/libglade-2.6 >=gnome-base/librsvg-2.14 >=x11-libs/cairo-1.2 >=x11-libs/gtk+-2.10:2 >=x11-libs/pango-1.10 dev-util/intltool virtual/pkgconfig sys-devel/gettext >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 -DESCRIPTION=An analog clock displaying the system-time -EAPI=6 -HOMEPAGE=https://launchpad.net/cairo-clock -KEYWORDS=amd64 ~x86 -LICENSE=GPL-2 -RDEPEND=>=dev-libs/glib-2.8 >=gnome-base/libglade-2.6 >=gnome-base/librsvg-2.14 >=x11-libs/cairo-1.2 >=x11-libs/gtk+-2.10:2 >=x11-libs/pango-1.10 -SLOT=0 -SRC_URI=http://macslow.thepimp.net/projects/cairo-clock/cairo-clock-0.3.4.tar.gz -_eclasses_=autotools 9988ecbe04129214297a7bbf3d253710 libtool f143db5a74ccd9ca28c1234deffede96 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 -_md5_=dd80ae326a31bc23dda6947052988815 diff --git a/metadata/md5-cache/x11-misc/cairo-clock-0.3.4-r2 b/metadata/md5-cache/x11-misc/cairo-clock-0.3.4-r2 index d52a8dd186c2..d611eb4abb80 100644 --- a/metadata/md5-cache/x11-misc/cairo-clock-0.3.4-r2 +++ b/metadata/md5-cache/x11-misc/cairo-clock-0.3.4-r2 @@ -4,10 +4,10 @@ DEPEND=>=dev-libs/glib-2.8 >=gnome-base/libglade-2.6 >=gnome-base/librsvg-2.14 > DESCRIPTION=An analog clock displaying the system-time EAPI=7 HOMEPAGE=https://launchpad.net/cairo-clock -KEYWORDS=~amd64 ~x86 +KEYWORDS=amd64 ~x86 LICENSE=GPL-2 RDEPEND=>=dev-libs/glib-2.8 >=gnome-base/libglade-2.6 >=gnome-base/librsvg-2.14 >=x11-libs/cairo-1.2 >=x11-libs/gtk+-2.10:2 >=x11-libs/pango-1.10 SLOT=0 SRC_URI=http://macslow.thepimp.net/projects/cairo-clock/cairo-clock-0.3.4.tar.gz _eclasses_=autotools 9988ecbe04129214297a7bbf3d253710 libtool f143db5a74ccd9ca28c1234deffede96 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 -_md5_=9bf33e7a5eb6c3a3fedd752327b9b7e1 +_md5_=243c0171669a9496e0e00a94e604d03a diff --git a/metadata/md5-cache/x11-misc/dclock-2.2.2_p12 b/metadata/md5-cache/x11-misc/dclock-2.2.2_p12 index e0bf65f1e219..42e8f0df8984 100644 --- a/metadata/md5-cache/x11-misc/dclock-2.2.2_p12 +++ b/metadata/md5-cache/x11-misc/dclock-2.2.2_p12 @@ -5,10 +5,10 @@ DESCRIPTION=Digital clock for the X window system EAPI=7 HOMEPAGE=https://packages.qa.debian.org/d/dclock.html IUSE=xft -KEYWORDS=~amd64 ~ppc ~x86 +KEYWORDS=amd64 ppc x86 LICENSE=GPL-2 RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXt xft? ( media-libs/freetype x11-libs/libXft ) SLOT=0 SRC_URI=mirror://debian/pool/main/d/dclock/dclock_2.2.2.orig.tar.gz mirror://debian/pool/main/d/dclock/dclock_2.2.2-12.debian.tar.xz _eclasses_=edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic 09a8beb8e6a8e02dc1e1bd83ac353741 l10n 8cdd85e169b835d518bc2fd59f780d8e multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 wrapper 4251d4c84c25f59094fd557e0063a974 -_md5_=77f9cb7f895b7834644e161fe454c3e2 +_md5_=32faad548c8b14fe2385b097fe37d1d2 diff --git a/metadata/md5-cache/x11-misc/dclock-2.2.2_p9 b/metadata/md5-cache/x11-misc/dclock-2.2.2_p9 deleted file mode 100644 index a0980f58bef5..000000000000 --- a/metadata/md5-cache/x11-misc/dclock-2.2.2_p9 +++ /dev/null @@ -1,13 +0,0 @@ -DEFINED_PHASES=compile configure install -DEPEND=xft? ( media-libs/freetype x11-libs/libXft ) x11-libs/libX11 x11-libs/libXext x11-libs/libXt app-text/rman x11-misc/imake xft? ( virtual/pkgconfig ) -DESCRIPTION=Digital clock for the X window system -EAPI=6 -HOMEPAGE=https://packages.qa.debian.org/d/dclock.html -IUSE=xft -KEYWORDS=amd64 ppc x86 -LICENSE=GPL-2 -RDEPEND=xft? ( media-libs/freetype x11-libs/libXft ) x11-libs/libX11 x11-libs/libXext x11-libs/libXt -SLOT=0 -SRC_URI=mirror://debian/pool/main/d/dclock/dclock_2.2.2.orig.tar.gz mirror://debian/pool/main/d/dclock/dclock_2.2.2-9.debian.tar.xz -_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 epatch e8f1ec13660dc2f44b32775765d85e42 estack 055c42df72f76a4f45ec92b35e83cd56 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic 09a8beb8e6a8e02dc1e1bd83ac353741 l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa multilib d410501a125f99ffb560b0c523cd3d1e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 -_md5_=f2709bc81e3914a3a219a6d823559998 diff --git a/metadata/md5-cache/x11-misc/efax-gtk-3.2.14 b/metadata/md5-cache/x11-misc/efax-gtk-3.2.14 deleted file mode 100644 index d0293e2bd7c0..000000000000 --- a/metadata/md5-cache/x11-misc/efax-gtk-3.2.14 +++ /dev/null @@ -1,11 +0,0 @@ -DEFINED_PHASES=configure install postinst prepare -DEPEND=>=dev-libs/glib-2.10 media-libs/tiff:0= x11-libs/libX11 x11-libs/c++-gtk-utils:0[gtk] x11-libs/gtk+:3 virtual/pkgconfig sys-devel/gettext -DESCRIPTION=A graphical frontend for the 'efax' application -EAPI=7 -HOMEPAGE=http://efax-gtk.sourceforge.net/ -KEYWORDS=amd64 ~ppc ~ppc64 x86 -LICENSE=GPL-2 LGPL-2.1 -RDEPEND=>=dev-libs/glib-2.10 media-libs/tiff:0= x11-libs/libX11 x11-libs/c++-gtk-utils:0[gtk] x11-libs/gtk+:3 -SLOT=0 -SRC_URI=mirror://sourceforge/efax-gtk/efax-gtk-3.2.14.src.tgz -_md5_=1dc78a3d494bf310cfd1a16cb7e9014f diff --git a/metadata/md5-cache/x11-misc/efax-gtk-3.2.15 b/metadata/md5-cache/x11-misc/efax-gtk-3.2.15 index de03e0967ff1..472a9a4dc522 100644 --- a/metadata/md5-cache/x11-misc/efax-gtk-3.2.15 +++ b/metadata/md5-cache/x11-misc/efax-gtk-3.2.15 @@ -3,9 +3,9 @@ DEPEND=>=dev-libs/glib-2.10 media-libs/tiff:0= x11-libs/libX11 x11-libs/c++-gtk- DESCRIPTION=A graphical frontend for the 'efax' application EAPI=7 HOMEPAGE=http://efax-gtk.sourceforge.net/ -KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 +KEYWORDS=amd64 ~ppc ~ppc64 x86 LICENSE=GPL-2 LGPL-2.1 RDEPEND=>=dev-libs/glib-2.10 media-libs/tiff:0= x11-libs/libX11 x11-libs/c++-gtk-utils:0[gtk] x11-libs/gtk+:3 SLOT=0 SRC_URI=mirror://sourceforge/efax-gtk/efax-gtk-3.2.15.src.tgz -_md5_=eb609bfe40e39769d0709ba01df3b8e8 +_md5_=698ae1ac047ffe2afcd18368034dea6c diff --git a/metadata/md5-cache/x11-misc/lineak-defaultplugin-0.9.0-r2 b/metadata/md5-cache/x11-misc/lineak-defaultplugin-0.9.0-r2 index 162f75ef7ace..e896fd6387d4 100644 --- a/metadata/md5-cache/x11-misc/lineak-defaultplugin-0.9.0-r2 +++ b/metadata/md5-cache/x11-misc/lineak-defaultplugin-0.9.0-r2 @@ -4,10 +4,10 @@ DESCRIPTION=Mute/unmute and other macros for LINEAK EAPI=7 HOMEPAGE=http://lineak.sourceforge.net IUSE=debug -KEYWORDS=~amd64 ~ppc ~x86 +KEYWORDS=amd64 ppc x86 LICENSE=GPL-2 RDEPEND==x11-misc/lineakd-0.9.0* SLOT=0 SRC_URI=mirror://sourceforge/lineak/lineak-defaultplugin-0.9.tar.gz _eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 -_md5_=ca6f8f4c52749c98eebadc77aa9bd695 +_md5_=197cf4df42b4ece9ccbadc2fa78e19c8 diff --git a/metadata/md5-cache/x11-misc/lineak-xosdplugin-0.9.0-r2 b/metadata/md5-cache/x11-misc/lineak-xosdplugin-0.9.0-r2 index 9a82de00757b..20789c00bd56 100644 --- a/metadata/md5-cache/x11-misc/lineak-xosdplugin-0.9.0-r2 +++ b/metadata/md5-cache/x11-misc/lineak-xosdplugin-0.9.0-r2 @@ -9,5 +9,4 @@ LICENSE=GPL-2 RDEPEND==x11-misc/lineakd-0.9.0* x11-libs/xosd SLOT=0 SRC_URI=mirror://sourceforge/lineak/lineak-xosdplugin-0.9.tar.gz -_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 -_md5_=c868853ba95000a74defa163f9b71d15 +_md5_=6b75b638e48cebb8210ce570ee36ec82 diff --git a/metadata/md5-cache/x11-misc/nitrogen-1.6.1-r1 b/metadata/md5-cache/x11-misc/nitrogen-1.6.1-r1 index 03f763d85655..f35bc8797bc4 100644 --- a/metadata/md5-cache/x11-misc/nitrogen-1.6.1-r1 +++ b/metadata/md5-cache/x11-misc/nitrogen-1.6.1-r1 @@ -4,10 +4,10 @@ DESCRIPTION=A background browser and setter for X EAPI=6 HOMEPAGE=https://github.com/l3ib/nitrogen IUSE=nls xinerama -KEYWORDS=~amd64 ~ppc ~x86 +KEYWORDS=amd64 ~ppc ~x86 LICENSE=GPL-2 RDEPEND=>=dev-cpp/gtkmm-2.10:2.4 >=gnome-base/librsvg-2.20:2 >=x11-libs/gtk+-2.10:2 xinerama? ( x11-libs/libXinerama ) SLOT=0 SRC_URI=https://github.com/l3ib/nitrogen/releases/download/1.6.1/nitrogen-1.6.1.tar.gz _eclasses_=autotools 9988ecbe04129214297a7bbf3d253710 desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 epatch e8f1ec13660dc2f44b32775765d85e42 estack 055c42df72f76a4f45ec92b35e83cd56 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic 09a8beb8e6a8e02dc1e1bd83ac353741 gnome2-utils c8e3fff820d850c0e003e22208d2eea3 l10n 8cdd85e169b835d518bc2fd59f780d8e libtool f143db5a74ccd9ca28c1234deffede96 ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa multilib d410501a125f99ffb560b0c523cd3d1e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 xdg-utils ff2ff954e6b17929574eee4efc5152ba -_md5_=74930e8875d386e969c60c5b971e143d +_md5_=0799b25c1cd483575b8fc4fa91df94d3 diff --git a/metadata/md5-cache/x11-misc/rofi-1.5.4-r1 b/metadata/md5-cache/x11-misc/rofi-1.5.4-r1 deleted file mode 100644 index 79e99fc94aa4..000000000000 --- a/metadata/md5-cache/x11-misc/rofi-1.5.4-r1 +++ /dev/null @@ -1,15 +0,0 @@ -BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 -DEFINED_PHASES=configure prepare -DEPEND=dev-libs/glib:2 gnome-base/librsvg:2 media-libs/freetype x11-libs/cairo[X,xcb(+)] x11-libs/libXft x11-libs/libXinerama x11-libs/libxcb x11-libs/libxkbcommon[X] x11-libs/pango[X] x11-libs/startup-notification x11-libs/xcb-util x11-libs/xcb-util-wm x11-libs/xcb-util-xrm virtual/pkgconfig x11-base/xorg-proto test? ( >=dev-libs/check-0.11 ) -DESCRIPTION=A window switcher, run dialog and dmenu replacement -EAPI=7 -HOMEPAGE=https://github.com/davatorium/rofi -IUSE=test windowmode -KEYWORDS=amd64 ~arm64 x86 -LICENSE=MIT -RDEPEND=dev-libs/glib:2 gnome-base/librsvg:2 media-libs/freetype x11-libs/cairo[X,xcb(+)] x11-libs/libXft x11-libs/libXinerama x11-libs/libxcb x11-libs/libxkbcommon[X] x11-libs/pango[X] x11-libs/startup-notification x11-libs/xcb-util x11-libs/xcb-util-wm x11-libs/xcb-util-xrm -RESTRICT=!test? ( test ) -SLOT=0 -SRC_URI=https://github.com/davatorium/rofi/releases/download/1.5.4/rofi-1.5.4.tar.gz -_eclasses_=autotools 9988ecbe04129214297a7bbf3d253710 libtool f143db5a74ccd9ca28c1234deffede96 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 -_md5_=7ff99619acac0f179f63a61abe5b347f diff --git a/metadata/md5-cache/x11-misc/rofi-1.6.0 b/metadata/md5-cache/x11-misc/rofi-1.6.0 deleted file mode 100644 index ac40c88eb2b3..000000000000 --- a/metadata/md5-cache/x11-misc/rofi-1.6.0 +++ /dev/null @@ -1,15 +0,0 @@ -BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 -DEFINED_PHASES=configure prepare -DEPEND=dev-libs/glib:2 gnome-base/librsvg:2 media-libs/freetype virtual/jpeg x11-libs/cairo[X,xcb(+)] x11-libs/libXft x11-libs/libXinerama x11-libs/libxcb x11-libs/libxkbcommon[X] x11-libs/pango[X] x11-libs/startup-notification x11-libs/xcb-util x11-libs/xcb-util-wm x11-libs/xcb-util-xrm virtual/pkgconfig x11-base/xorg-proto test? ( >=dev-libs/check-0.11 ) -DESCRIPTION=A window switcher, run dialog and dmenu replacement -EAPI=7 -HOMEPAGE=https://github.com/davatorium/rofi -IUSE=+drun test +windowmode -KEYWORDS=~amd64 ~arm64 ~x86 -LICENSE=MIT -RDEPEND=dev-libs/glib:2 gnome-base/librsvg:2 media-libs/freetype virtual/jpeg x11-libs/cairo[X,xcb(+)] x11-libs/libXft x11-libs/libXinerama x11-libs/libxcb x11-libs/libxkbcommon[X] x11-libs/pango[X] x11-libs/startup-notification x11-libs/xcb-util x11-libs/xcb-util-wm x11-libs/xcb-util-xrm -RESTRICT=!test? ( test ) -SLOT=0 -SRC_URI=https://github.com/davatorium/rofi/releases/download/1.6.0/rofi-1.6.0.tar.gz -_eclasses_=autotools 9988ecbe04129214297a7bbf3d253710 libtool f143db5a74ccd9ca28c1234deffede96 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 -_md5_=cf9aa28c2234e7677597f7417df24dc8 diff --git a/metadata/md5-cache/x11-misc/rofi-1.6.1 b/metadata/md5-cache/x11-misc/rofi-1.6.1 index ac06af34e19a..38079c200d04 100644 --- a/metadata/md5-cache/x11-misc/rofi-1.6.1 +++ b/metadata/md5-cache/x11-misc/rofi-1.6.1 @@ -5,11 +5,11 @@ DESCRIPTION=A window switcher, run dialog and dmenu replacement EAPI=7 HOMEPAGE=https://github.com/davatorium/rofi IUSE=+drun test +windowmode -KEYWORDS=~amd64 ~arm64 ~x86 +KEYWORDS=amd64 ~arm64 x86 LICENSE=MIT RDEPEND=dev-libs/glib:2 gnome-base/librsvg:2 media-libs/freetype virtual/jpeg x11-libs/cairo[X,xcb(+)] x11-libs/libXft x11-libs/libXinerama x11-libs/libxcb x11-libs/libxkbcommon[X] x11-libs/pango[X] x11-libs/startup-notification x11-libs/xcb-util x11-libs/xcb-util-wm x11-libs/xcb-util-xrm RESTRICT=!test? ( test ) SLOT=0 SRC_URI=https://github.com/davatorium/rofi/releases/download/1.6.1/rofi-1.6.1.tar.gz _eclasses_=autotools 9988ecbe04129214297a7bbf3d253710 libtool f143db5a74ccd9ca28c1234deffede96 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 -_md5_=b7aba5fa3939887a5e841e3e6cac227e +_md5_=355b6cdfd5bfe49aefdc5b1703be2acf diff --git a/metadata/md5-cache/x11-misc/sisctrl-0.0.20051202-r1 b/metadata/md5-cache/x11-misc/sisctrl-0.0.20051202-r1 index d24d7845ba01..49cd6d937405 100644 --- a/metadata/md5-cache/x11-misc/sisctrl-0.0.20051202-r1 +++ b/metadata/md5-cache/x11-misc/sisctrl-0.0.20051202-r1 @@ -1,5 +1,6 @@ +BDEPEND=virtual/pkgconfig DEFINED_PHASES=configure -DEPEND=dev-libs/glib:2 x11-libs/gtk+:2 x11-libs/libXrender x11-libs/libXv x11-libs/libXxf86vm virtual/pkgconfig x11-base/xorg-proto +DEPEND=dev-libs/glib:2 x11-libs/gtk+:2 x11-libs/libXrender x11-libs/libXv x11-libs/libXxf86vm x11-base/xorg-proto DESCRIPTION=tool that allows you to tune SiS drivers from X EAPI=7 HOMEPAGE=http://www.winischhofer.net/linuxsispart1.shtml#sisctrl @@ -9,4 +10,4 @@ RDEPEND=dev-libs/glib:2 x11-libs/gtk+:2 x11-libs/libXrender x11-libs/libXv x11-l SLOT=0 SRC_URI=http://www.winischhofer.net/sis/sisctrl-0.0.20051202.tar.gz _eclasses_=edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic 09a8beb8e6a8e02dc1e1bd83ac353741 l10n 8cdd85e169b835d518bc2fd59f780d8e multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 wrapper 4251d4c84c25f59094fd557e0063a974 -_md5_=23da58f4eea0cd282c1f4ac8c2fdda75 +_md5_=039f9f763dee1b03676d9baca6be8ed2 diff --git a/metadata/md5-cache/x11-misc/sux-1.0.1 b/metadata/md5-cache/x11-misc/sux-1.0.1 index e08df5a410ba..5a29a7e37adc 100644 --- a/metadata/md5-cache/x11-misc/sux-1.0.1 +++ b/metadata/md5-cache/x11-misc/sux-1.0.1 @@ -3,9 +3,9 @@ DEPEND=x11-apps/xauth DESCRIPTION="su" wrapper which transfers X credentials EAPI=7 HOMEPAGE=http://fgouget.free.fr/sux/sux-readme.shtml -KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ppc ~sparc ~x86 +KEYWORDS=~alpha amd64 ~arm ~arm64 ppc ~sparc x86 LICENSE=MIT RDEPEND=x11-apps/xauth SLOT=0 SRC_URI=mirror://sourceforge/sux/1.0.1/sux-1.0.1.tar.gz -_md5_=90dd7f6d02bf7005830285951446744f +_md5_=afcd83fd15583a0f19ae01aea2db25b2 diff --git a/metadata/md5-cache/x11-misc/trayer-1.0-r3 b/metadata/md5-cache/x11-misc/trayer-1.0-r3 deleted file mode 100644 index 795c083b0406..000000000000 --- a/metadata/md5-cache/x11-misc/trayer-1.0-r3 +++ /dev/null @@ -1,12 +0,0 @@ -DEFINED_PHASES=compile install -DEPEND=dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 x11-libs/libX11 virtual/pkgconfig -DESCRIPTION=Lightweight GTK+ based systray for UNIX desktop -EAPI=6 -HOMEPAGE=http://home.gna.org/fvwm-crystal/ -KEYWORDS=amd64 ppc ppc64 x86 -LICENSE=GPL-2 -RDEPEND=dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 x11-libs/libX11 -SLOT=0 -SRC_URI=http://download.gna.org/fvwm-crystal/trayer/trayer-1.0.tar.gz -_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 -_md5_=d145601224c6b7491d6f4c059c702c91 diff --git a/metadata/md5-cache/x11-misc/trayer-1.0-r4 b/metadata/md5-cache/x11-misc/trayer-1.0-r4 index 2ba86d154281..bc8a9e05380d 100644 --- a/metadata/md5-cache/x11-misc/trayer-1.0-r4 +++ b/metadata/md5-cache/x11-misc/trayer-1.0-r4 @@ -3,10 +3,10 @@ DEPEND=dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 x11-libs/libX11 vir DESCRIPTION=Lightweight GTK+ based systray for UNIX desktop EAPI=7 HOMEPAGE=https://sourceforge.net/projects/fvwm-crystal/ -KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 +KEYWORDS=amd64 ppc ppc64 x86 LICENSE=GPL-2 RDEPEND=dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 x11-libs/libX11 SLOT=0 SRC_URI=https://sourceforge.net/projects/fvwm-crystal/files/trayer/1.0/trayer-1.0.tar.gz/download -> trayer-1.0-sourceforge.tar.gz _eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 -_md5_=bbb1ad01f528f8921021f4f8c54e1b61 +_md5_=f9bf14097662a6b94a117d85c9f8837d diff --git a/metadata/md5-cache/x11-misc/trayer-srg-1.1.7 b/metadata/md5-cache/x11-misc/trayer-srg-1.1.7 deleted file mode 100644 index a1335a813c01..000000000000 --- a/metadata/md5-cache/x11-misc/trayer-srg-1.1.7 +++ /dev/null @@ -1,12 +0,0 @@ -DEFINED_PHASES=compile configure install -DEPEND=x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 x11-libs/libX11 virtual/pkgconfig -DESCRIPTION=trayer fork with multi monitor support and cleaned up codebase -EAPI=6 -HOMEPAGE=https://github.com/sargon/trayer-srg -KEYWORDS=amd64 x86 -LICENSE=MIT GPL-2+ -RDEPEND=x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 x11-libs/libX11 -SLOT=0 -SRC_URI=https://github.com/sargon/trayer-srg/archive/trayer-1.1.7.tar.gz -> trayer-srg-1.1.7.tar.gz -_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 -_md5_=1b30e5bc9c3bb69512f1d68a92c3049a diff --git a/metadata/md5-cache/x11-misc/trayer-srg-1.1.8 b/metadata/md5-cache/x11-misc/trayer-srg-1.1.8 index b0a658fd40e4..cb8a1839fd18 100644 --- a/metadata/md5-cache/x11-misc/trayer-srg-1.1.8 +++ b/metadata/md5-cache/x11-misc/trayer-srg-1.1.8 @@ -3,10 +3,10 @@ DEPEND=x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 x11-libs/libX11 virtual/pkgconfig DESCRIPTION=trayer fork with multi monitor support and cleaned up codebase EAPI=6 HOMEPAGE=https://github.com/sargon/trayer-srg -KEYWORDS=~amd64 ~x86 +KEYWORDS=amd64 x86 LICENSE=MIT GPL-2+ RDEPEND=x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 x11-libs/libX11 SLOT=0 SRC_URI=https://github.com/sargon/trayer-srg/archive/trayer-1.1.8.tar.gz -> trayer-srg-1.1.8.tar.gz _eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 -_md5_=caf8906e185661e1f4a2baa7168ba1e1 +_md5_=732d85de6272d15fadd7608ce9306621 diff --git a/metadata/md5-cache/x11-misc/xautolock-2.2_p7 b/metadata/md5-cache/x11-misc/xautolock-2.2_p7 index f64184a1c506..87df69f67153 100644 --- a/metadata/md5-cache/x11-misc/xautolock-2.2_p7 +++ b/metadata/md5-cache/x11-misc/xautolock-2.2_p7 @@ -3,10 +3,10 @@ DEPEND=x11-libs/libXScrnSaver app-text/rman x11-base/xorg-proto x11-misc/imake DESCRIPTION=An automatic X screen-locker/screen-saver EAPI=7 HOMEPAGE=http://www.ibiblio.org/pub/Linux/X11/screensavers/ -KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~sparc ~x86 +KEYWORDS=amd64 ~arm ~arm64 ppc ~sparc x86 LICENSE=GPL-2 RDEPEND=x11-libs/libXScrnSaver SLOT=0 SRC_URI=http://www.ibiblio.org/pub/Linux/X11/screensavers/xautolock-2.2.tgz mirror://debian/pool/main/x/xautolock/xautolock_2.2-7.debian.tar.xz _eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 -_md5_=f890c530049ceae1af7a209fbe6779de +_md5_=2c070a4f033b38ef9c16125b92dc4b4b diff --git a/metadata/md5-cache/x11-misc/xdesktopwaves-1.3-r2 b/metadata/md5-cache/x11-misc/xdesktopwaves-1.3-r2 deleted file mode 100644 index ad7c7d754c3d..000000000000 --- a/metadata/md5-cache/x11-misc/xdesktopwaves-1.3-r2 +++ /dev/null @@ -1,12 +0,0 @@ -DEFINED_PHASES=compile install preinst -DEPEND=x11-libs/libXext x11-base/xorg-proto -DESCRIPTION=A cellular automata setting the background of your X Windows desktop under water -EAPI=6 -HOMEPAGE=http://xdesktopwaves.sourceforge.net/ -KEYWORDS=amd64 ppc x86 -LICENSE=GPL-2 -RDEPEND=x11-libs/libXext -SLOT=0 -SRC_URI=mirror://sourceforge/xdesktopwaves/xdesktopwaves-1.3.tar.gz -_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 epatch e8f1ec13660dc2f44b32775765d85e42 estack 055c42df72f76a4f45ec92b35e83cd56 eutils 2d5b3f4b315094768576b6799e4f926e l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa multilib d410501a125f99ffb560b0c523cd3d1e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 -_md5_=1041e6d2fed91712666035fe33224f1b diff --git a/metadata/md5-cache/x11-misc/xdesktopwaves-1.4 b/metadata/md5-cache/x11-misc/xdesktopwaves-1.4 index 04b06c8a6072..cd619a8e75c1 100644 --- a/metadata/md5-cache/x11-misc/xdesktopwaves-1.4 +++ b/metadata/md5-cache/x11-misc/xdesktopwaves-1.4 @@ -3,10 +3,10 @@ DEPEND=x11-libs/libXext x11-base/xorg-proto DESCRIPTION=A cellular automata setting the background of your X Windows desktop under water EAPI=7 HOMEPAGE=http://xdesktopwaves.sourceforge.net/ -KEYWORDS=~amd64 ~ppc ~x86 +KEYWORDS=amd64 ppc x86 LICENSE=GPL-2 RDEPEND=x11-libs/libXext SLOT=0 SRC_URI=mirror://sourceforge/xdesktopwaves/xdesktopwaves-1.4.tar.gz _eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 -_md5_=a23fa6e750e57846e7fa9711e53ed71a +_md5_=d8c37b5e79c5bc64290f0d2753a5e8fa diff --git a/metadata/md5-cache/x11-misc/xdiskusage-1.51 b/metadata/md5-cache/x11-misc/xdiskusage-1.51 deleted file mode 100644 index ba0024ba29b1..000000000000 --- a/metadata/md5-cache/x11-misc/xdiskusage-1.51 +++ /dev/null @@ -1,11 +0,0 @@ -DEFINED_PHASES=compile install -DEPEND=>=x11-libs/fltk-1.3:1 -DESCRIPTION=user-friendly program to show you what is using up all your disk space -EAPI=6 -HOMEPAGE=http://xdiskusage.sourceforge.net/ -KEYWORDS=amd64 ~ppc x86 -LICENSE=GPL-2 -RDEPEND=>=x11-libs/fltk-1.3:1 -SLOT=0 -SRC_URI=http://xdiskusage.sourceforge.net/xdiskusage-1.51.tgz -_md5_=1369113f0e7f6b91eb39b5737ab3018c diff --git a/metadata/md5-cache/x11-misc/xdiskusage-1.52 b/metadata/md5-cache/x11-misc/xdiskusage-1.52 index a709ef524395..358bee321c55 100644 --- a/metadata/md5-cache/x11-misc/xdiskusage-1.52 +++ b/metadata/md5-cache/x11-misc/xdiskusage-1.52 @@ -4,9 +4,9 @@ DEPEND=>=x11-libs/fltk-1.3:1 DESCRIPTION=user-friendly program to show you what is using up all your disk space EAPI=7 HOMEPAGE=http://xdiskusage.sourceforge.net/ -KEYWORDS=~amd64 ~arm64 ~ppc ~x86 +KEYWORDS=amd64 ~arm64 ~ppc x86 LICENSE=GPL-2 RDEPEND=>=x11-libs/fltk-1.3:1 SLOT=0 SRC_URI=http://xdiskusage.sourceforge.net/xdiskusage-1.52.tgz -_md5_=6d30c8881985cf461342c89033b4cb65 +_md5_=0a0790a6b36adf8efea95364fd67a4ed diff --git a/metadata/md5-cache/x11-misc/xfishtank-2.1-r2 b/metadata/md5-cache/x11-misc/xfishtank-2.1-r2 deleted file mode 100644 index 1e6ba1833e2e..000000000000 --- a/metadata/md5-cache/x11-misc/xfishtank-2.1-r2 +++ /dev/null @@ -1,12 +0,0 @@ -DEFINED_PHASES=compile -DEPEND=x11-libs/libX11 x11-libs/libXt x11-libs/libXext x11-base/xorg-proto x11-misc/imake -DESCRIPTION=Turns your root window into an aquarium -EAPI=6 -HOMEPAGE=http://www.ibiblio.org/pub/Linux/X11/demos/ -KEYWORDS=amd64 ppc ppc64 x86 ~x86-linux -LICENSE=public-domain -RDEPEND=x11-libs/libX11 x11-libs/libXt x11-libs/libXext -SLOT=0 -SRC_URI=http://www.ibiblio.org/pub/Linux/X11/demos/xfishtank-2.1tp.tar.gz -_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 -_md5_=2c75d1f8086760d29c1a2c10747fa691 diff --git a/metadata/md5-cache/x11-misc/xfishtank-2.5 b/metadata/md5-cache/x11-misc/xfishtank-2.5 index 3347a52987e6..787d7240b8ee 100644 --- a/metadata/md5-cache/x11-misc/xfishtank-2.5 +++ b/metadata/md5-cache/x11-misc/xfishtank-2.5 @@ -4,10 +4,10 @@ DEPEND=media-libs/imlib2[X] x11-libs/libX11 x11-libs/libXext x11-libs/libXt x11- DESCRIPTION=Turns your root window into an aquarium EAPI=7 HOMEPAGE=https://jim.rees.org/computers/xfishtank.html -KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~x86-linux +KEYWORDS=amd64 ppc ppc64 x86 ~x86-linux LICENSE=public-domain RDEPEND=media-libs/imlib2[X] x11-libs/libX11 x11-libs/libXext x11-libs/libXt SLOT=0 SRC_URI=https://dev.gentoo.org/~jer/xfishtank-2.5.tar.gz _eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 -_md5_=cff9baa0902f14b70b9b4030f334810c +_md5_=98ceb0f4a4b2e65e00e9d35cf5f6993c diff --git a/metadata/md5-cache/x11-misc/xkbd-0.8.16-r1 b/metadata/md5-cache/x11-misc/xkbd-0.8.16-r1 deleted file mode 100644 index f4fd88256034..000000000000 --- a/metadata/md5-cache/x11-misc/xkbd-0.8.16-r1 +++ /dev/null @@ -1,12 +0,0 @@ -DEFINED_PHASES=configure -DEPEND=x11-libs/libXrender x11-libs/libX11 x11-libs/libXft x11-libs/libXtst x11-libs/libXpm media-libs/freetype dev-libs/expat sys-libs/zlib x11-base/xorg-proto -DESCRIPTION=onscreen soft keyboard for X11 -EAPI=6 -HOMEPAGE=http://trac.hackable1.org/trac/wiki/Xkbd -IUSE=debug -KEYWORDS=amd64 ~arm ~ppc x86 -LICENSE=GPL-2 -RDEPEND=x11-libs/libXrender x11-libs/libX11 x11-libs/libXft x11-libs/libXtst x11-libs/libXpm media-libs/freetype dev-libs/expat sys-libs/zlib -SLOT=0 -SRC_URI=http://trac.hackable1.org/trac/raw-attachment/wiki/Xkbd/xkbd-0.8.16.tar.gz -_md5_=3129d663e5e5851ea08c8bbe1f71a48c diff --git a/metadata/md5-cache/x11-misc/xkbd-0.8.18 b/metadata/md5-cache/x11-misc/xkbd-0.8.18 index d8bfeaf326f4..21735a4d4b6c 100644 --- a/metadata/md5-cache/x11-misc/xkbd-0.8.18 +++ b/metadata/md5-cache/x11-misc/xkbd-0.8.18 @@ -5,10 +5,10 @@ DESCRIPTION=onscreen soft keyboard for X11 EAPI=7 HOMEPAGE=https://github.com/mahatma-kaganovich/xkbd IUSE=debug +xft +xpm -KEYWORDS=~amd64 ~arm ~ppc ~x86 +KEYWORDS=amd64 ~arm ~ppc x86 LICENSE=GPL-2 RDEPEND=x11-libs/libX11 x11-libs/libXtst xft? ( x11-libs/libXft ) xpm? ( x11-libs/libXpm ) SLOT=0 SRC_URI=https://github.com/mahatma-kaganovich/xkbd/archive/xkbd-0.8.18.tar.gz _eclasses_=autotools 9988ecbe04129214297a7bbf3d253710 edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic 09a8beb8e6a8e02dc1e1bd83ac353741 l10n 8cdd85e169b835d518bc2fd59f780d8e libtool f143db5a74ccd9ca28c1234deffede96 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 wrapper 4251d4c84c25f59094fd557e0063a974 -_md5_=f3da6573773f56c67df4503ae94ae594 +_md5_=12f7f803bd677adcbdb23181f206bf36 diff --git a/metadata/md5-cache/x11-misc/xkeycaps-2.47-r2 b/metadata/md5-cache/x11-misc/xkeycaps-2.47-r2 deleted file mode 100644 index 5f1faff95ac8..000000000000 --- a/metadata/md5-cache/x11-misc/xkeycaps-2.47-r2 +++ /dev/null @@ -1,12 +0,0 @@ -DEFINED_PHASES=compile install -DEPEND=x11-misc/xbitmaps x11-libs/libX11 x11-libs/libXmu x11-libs/libXt x11-libs/libXaw x11-libs/libXext x11-base/xorg-proto x11-misc/imake >=sys-apps/sed-4 -DESCRIPTION=GUI frontend to xmodmap -EAPI=6 -HOMEPAGE=https://packages.qa.debian.org/x/xkeycaps.html -KEYWORDS=amd64 ppc ppc64 x86 -LICENSE=HPND -RDEPEND=x11-misc/xbitmaps x11-libs/libX11 x11-libs/libXmu x11-libs/libXt x11-libs/libXaw x11-libs/libXext -SLOT=0 -SRC_URI=mirror://debian/pool/main/x/xkeycaps/xkeycaps_2.47.orig.tar.gz -_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 -_md5_=ab1f9e1eab11b9f5c6096f6f6313a7f9 diff --git a/metadata/md5-cache/x11-misc/xkeycaps-2.47_p7 b/metadata/md5-cache/x11-misc/xkeycaps-2.47_p7 index 51a926f5e2e8..cefdf89b8083 100644 --- a/metadata/md5-cache/x11-misc/xkeycaps-2.47_p7 +++ b/metadata/md5-cache/x11-misc/xkeycaps-2.47_p7 @@ -3,10 +3,10 @@ DEPEND=x11-libs/libX11 x11-libs/libXaw x11-libs/libXext x11-libs/libXmu x11-libs DESCRIPTION=GUI frontend to xmodmap EAPI=7 HOMEPAGE=https://packages.qa.debian.org/x/xkeycaps.html -KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 +KEYWORDS=amd64 ppc ppc64 x86 LICENSE=HPND RDEPEND=x11-libs/libX11 x11-libs/libXaw x11-libs/libXext x11-libs/libXmu x11-libs/libXt x11-misc/xbitmaps SLOT=0 SRC_URI=mirror://debian/pool/main/x/xkeycaps/xkeycaps_2.47.orig.tar.gz mirror://debian/pool/main/x/xkeycaps/xkeycaps_2.47-7.debian.tar.xz _eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 -_md5_=5e102c199cd4fd59dab721f20efb3d7d +_md5_=ec1a490d0cc8d3c0224d7b802f183d0d diff --git a/metadata/md5-cache/x11-misc/xlockmore-5.65-r1 b/metadata/md5-cache/x11-misc/xlockmore-5.65-r1 index 2d3a2c27d355..273e4ff7c8f8 100644 --- a/metadata/md5-cache/x11-misc/xlockmore-5.65-r1 +++ b/metadata/md5-cache/x11-misc/xlockmore-5.65-r1 @@ -5,11 +5,11 @@ DESCRIPTION=Just another screensaver application for X EAPI=7 HOMEPAGE=https://www.sillycycle.com/xlockmore.html IUSE=crypt debug gtk imagemagick motif nas opengl pam truetype xinerama xlockrc vtlock -KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 +KEYWORDS=~alpha amd64 ~arm ~hppa ppc ppc64 ~sparc x86 LICENSE=BSD GPL-2 RDEPEND=gtk? ( x11-libs/gtk+:2 ) imagemagick? ( media-gfx/imagemagick:= ) motif? ( >=x11-libs/motif-2.3:0 ) nas? ( media-libs/nas ) opengl? ( virtual/opengl virtual/glu truetype? ( >=media-libs/ftgl-2.1.3_rc5 ) ) pam? ( sys-libs/pam ) truetype? ( media-libs/freetype:2 ) x11-libs/libX11 x11-libs/libXext x11-libs/libXmu x11-libs/libXpm x11-libs/libXt xinerama? ( x11-libs/libXinerama ) REQUIRED_USE=|| ( crypt pam ) pam? ( !xlockrc ) xlockrc? ( !pam ) SLOT=0 SRC_URI=https://www.sillycycle.com/xlock/xlockmore-5.65.tar.xz https://www.sillycycle.com/xlock/recent-releases/xlockmore-5.65.tar.xz _eclasses_=autotools 9988ecbe04129214297a7bbf3d253710 edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic 09a8beb8e6a8e02dc1e1bd83ac353741 l10n 8cdd85e169b835d518bc2fd59f780d8e libtool f143db5a74ccd9ca28c1234deffede96 multilib d410501a125f99ffb560b0c523cd3d1e pam b097695df28f3974e3af860d6704d4f2 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 wrapper 4251d4c84c25f59094fd557e0063a974 -_md5_=fd816252d336f71139539cc8335b9d53 +_md5_=c69dfea7e0e356127a4860c02ace0202 diff --git a/metadata/md5-cache/x11-misc/xlockmore-5.66 b/metadata/md5-cache/x11-misc/xlockmore-5.66 new file mode 100644 index 000000000000..f9a1bce158e0 --- /dev/null +++ b/metadata/md5-cache/x11-misc/xlockmore-5.66 @@ -0,0 +1,15 @@ +BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 +DEFINED_PHASES=configure install prepare +DEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXmu x11-libs/libXpm x11-libs/libXt gtk? ( x11-libs/gtk+:2 ) imagemagick? ( media-gfx/imagemagick:= ) motif? ( >=x11-libs/motif-2.3:0 ) nas? ( media-libs/nas ) opengl? ( virtual/opengl virtual/glu truetype? ( >=media-libs/ftgl-2.1.3_rc5 ) ) pam? ( sys-libs/pam ) truetype? ( media-libs/freetype:2 ) xinerama? ( x11-libs/libXinerama ) x11-base/xorg-proto +DESCRIPTION=Just another screensaver application for X +EAPI=7 +HOMEPAGE=https://www.sillycycle.com/xlockmore.html +IUSE=crypt debug gtk imagemagick motif nas opengl pam truetype xinerama xlockrc vtlock +KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 +LICENSE=BSD GPL-2 +RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXmu x11-libs/libXpm x11-libs/libXt gtk? ( x11-libs/gtk+:2 ) imagemagick? ( media-gfx/imagemagick:= ) motif? ( >=x11-libs/motif-2.3:0 ) nas? ( media-libs/nas ) opengl? ( virtual/opengl virtual/glu truetype? ( >=media-libs/ftgl-2.1.3_rc5 ) ) pam? ( sys-libs/pam ) truetype? ( media-libs/freetype:2 ) xinerama? ( x11-libs/libXinerama ) +REQUIRED_USE=|| ( crypt pam ) pam? ( !xlockrc ) xlockrc? ( !pam ) +SLOT=0 +SRC_URI=https://www.sillycycle.com/xlock/xlockmore-5.66.tar.xz https://www.sillycycle.com/xlock/recent-releases/xlockmore-5.66.tar.xz +_eclasses_=autotools 9988ecbe04129214297a7bbf3d253710 edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic 09a8beb8e6a8e02dc1e1bd83ac353741 l10n 8cdd85e169b835d518bc2fd59f780d8e libtool f143db5a74ccd9ca28c1234deffede96 multilib d410501a125f99ffb560b0c523cd3d1e pam b097695df28f3974e3af860d6704d4f2 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 wrapper 4251d4c84c25f59094fd557e0063a974 +_md5_=9c6575191df2776d8af423689d8f22ff diff --git a/metadata/md5-cache/x11-misc/xpad-4.2 b/metadata/md5-cache/x11-misc/xpad-4.2 deleted file mode 100644 index dfd847d41b42..000000000000 --- a/metadata/md5-cache/x11-misc/xpad-4.2 +++ /dev/null @@ -1,11 +0,0 @@ -DEFINED_PHASES=- -DEPEND=>=x11-libs/gtk+-2.12:2 >=dev-libs/glib-2.38:2 x11-libs/libICE x11-libs/libSM x11-libs/pango >=dev-util/intltool-0.31 virtual/pkgconfig sys-devel/gettext -DESCRIPTION=a sticky note application for jotting down things to remember -EAPI=5 -HOMEPAGE=https://launchpad.net/xpad -KEYWORDS=amd64 ~arm ppc x86 -LICENSE=GPL-3 -RDEPEND=>=x11-libs/gtk+-2.12:2 >=dev-libs/glib-2.38:2 x11-libs/libICE x11-libs/libSM x11-libs/pango -SLOT=0 -SRC_URI=https://launchpad.net/xpad/trunk/4.2/+download/xpad-4.2.tar.bz2 -_md5_=6e240b90a0fd71000849db7c3f89e535 diff --git a/metadata/md5-cache/x11-misc/xpad-5.3.0 b/metadata/md5-cache/x11-misc/xpad-5.3.0 deleted file mode 100644 index 904f3cdf075d..000000000000 --- a/metadata/md5-cache/x11-misc/xpad-5.3.0 +++ /dev/null @@ -1,13 +0,0 @@ -BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 -DEFINED_PHASES=prepare -DEPEND=>=dev-libs/glib-2.56:2 app-accessibility/at-spi2-atk dev-libs/atk sys-devel/gettext x11-libs/gdk-pixbuf x11-libs/gtk+:3[X] x11-libs/gtksourceview:3.0 x11-libs/libICE x11-libs/libSM x11-libs/pango >=dev-util/intltool-0.31 sys-devel/gettext virtual/pkgconfig -DESCRIPTION=a sticky note application for jotting down things to remember -EAPI=7 -HOMEPAGE=https://launchpad.net/xpad -KEYWORDS=~amd64 ~arm ~ppc ~x86 -LICENSE=GPL-3 -RDEPEND=>=dev-libs/glib-2.56:2 app-accessibility/at-spi2-atk dev-libs/atk sys-devel/gettext x11-libs/gdk-pixbuf x11-libs/gtk+:3[X] x11-libs/gtksourceview:3.0 x11-libs/libICE x11-libs/libSM x11-libs/pango -SLOT=0 -SRC_URI=https://launchpad.net/xpad/trunk/5.3.0/+download/xpad-5.3.0.tar.bz2 -_eclasses_=autotools 9988ecbe04129214297a7bbf3d253710 libtool f143db5a74ccd9ca28c1234deffede96 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 -_md5_=64b1d45b09fb70e22bbb064b69a6dc06 diff --git a/metadata/md5-cache/x11-misc/xpad-5.4.0 b/metadata/md5-cache/x11-misc/xpad-5.4.0 index 96a4f8b65519..30e5a485cfba 100644 --- a/metadata/md5-cache/x11-misc/xpad-5.4.0 +++ b/metadata/md5-cache/x11-misc/xpad-5.4.0 @@ -4,10 +4,10 @@ DEPEND=>=dev-libs/glib-2.56:2 app-accessibility/at-spi2-atk dev-libs/atk sys-dev DESCRIPTION=a sticky note application for jotting down things to remember EAPI=7 HOMEPAGE=https://launchpad.net/xpad -KEYWORDS=~amd64 ~arm ~ppc ~x86 +KEYWORDS=amd64 ~arm ppc x86 LICENSE=GPL-3 RDEPEND=>=dev-libs/glib-2.56:2 app-accessibility/at-spi2-atk dev-libs/atk sys-devel/gettext x11-libs/gdk-pixbuf x11-libs/gtk+:3[X] x11-libs/gtksourceview:3.0 x11-libs/libICE x11-libs/libSM x11-libs/pango SLOT=0 SRC_URI=https://launchpad.net/xpad/trunk/5.4.0/+download/xpad-5.4.0.tar.bz2 _eclasses_=autotools 9988ecbe04129214297a7bbf3d253710 libtool f143db5a74ccd9ca28c1234deffede96 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 -_md5_=f883c84a26f29d527dbbc2977f5375ff +_md5_=ab8196ddae09d93f4814a9546cc13c31 diff --git a/metadata/md5-cache/x11-misc/xscreensaver-5.45 b/metadata/md5-cache/x11-misc/xscreensaver-5.45 index 262868f6d02d..54a7cbf3701f 100644 --- a/metadata/md5-cache/x11-misc/xscreensaver-5.45 +++ b/metadata/md5-cache/x11-misc/xscreensaver-5.45 @@ -12,4 +12,4 @@ REQUIRED_USE=gdk-pixbuf? ( gtk ) SLOT=0 SRC_URI=https://www.jwz.org/xscreensaver/xscreensaver-5.45.tar.gz _eclasses_=autotools 9988ecbe04129214297a7bbf3d253710 desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic 09a8beb8e6a8e02dc1e1bd83ac353741 l10n 8cdd85e169b835d518bc2fd59f780d8e libtool f143db5a74ccd9ca28c1234deffede96 multilib d410501a125f99ffb560b0c523cd3d1e optfeature 6a2add34e06e5a05d88471a33ccdd73e pam b097695df28f3974e3af860d6704d4f2 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 wrapper 4251d4c84c25f59094fd557e0063a974 -_md5_=eba4725b04eea57bf1bdded31ecec6af +_md5_=e274315b6ccc15918e82cf2790b217c5 diff --git a/metadata/md5-cache/x11-misc/xscreensaver-app-2.3-r3 b/metadata/md5-cache/x11-misc/xscreensaver-app-2.3-r3 deleted file mode 100644 index 906d6004b986..000000000000 --- a/metadata/md5-cache/x11-misc/xscreensaver-app-2.3-r3 +++ /dev/null @@ -1,12 +0,0 @@ -DEFINED_PHASES=install prepare -DEPEND=x11-libs/libdockapp x11-libs/libX11 virtual/pkgconfig x11-base/xorg-proto >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 -DESCRIPTION=XScreenSaver dockapp for the Window Maker window manager -EAPI=5 -HOMEPAGE=http://xscreensaverapp.sourceforge.net/ -KEYWORDS=amd64 x86 -LICENSE=GPL-2 -RDEPEND=x11-libs/libdockapp x11-libs/libX11 x11-misc/xscreensaver -SLOT=0 -SRC_URI=mirror://sourceforge/project/xscreensaverapp/XScreenSaver.App/2.3/XScreenSaver.App-2.3.tar.gz -_eclasses_=autotools 9988ecbe04129214297a7bbf3d253710 libtool f143db5a74ccd9ca28c1234deffede96 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 -_md5_=07e529126b1733d2c736bb55c2a0968b diff --git a/metadata/md5-cache/x11-misc/xscreensaver-app-2.3-r4 b/metadata/md5-cache/x11-misc/xscreensaver-app-2.3-r4 index 4748531faf26..477f42016dc5 100644 --- a/metadata/md5-cache/x11-misc/xscreensaver-app-2.3-r4 +++ b/metadata/md5-cache/x11-misc/xscreensaver-app-2.3-r4 @@ -4,10 +4,10 @@ DEPEND=x11-libs/libdockapp x11-libs/libX11 virtual/pkgconfig x11-base/xorg-proto DESCRIPTION=XScreenSaver dockapp for the Window Maker window manager EAPI=7 HOMEPAGE=http://xscreensaverapp.sourceforge.net/ -KEYWORDS=~amd64 ~x86 +KEYWORDS=amd64 x86 LICENSE=GPL-2 RDEPEND=x11-libs/libdockapp x11-libs/libX11 x11-misc/xscreensaver SLOT=0 SRC_URI=mirror://sourceforge/project/xscreensaverapp/XScreenSaver.App/2.3/XScreenSaver.App-2.3.tar.gz _eclasses_=autotools 9988ecbe04129214297a7bbf3d253710 libtool f143db5a74ccd9ca28c1234deffede96 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 -_md5_=b38298e34ea11d5280b714d9784bd3f7 +_md5_=ffca0ec3fdceb3e3cd666e29ad33240c diff --git a/metadata/md5-cache/x11-misc/xsetleds-0.1.3-r2 b/metadata/md5-cache/x11-misc/xsetleds-0.1.3-r2 index 67b3196a6f0a..e8f7c89a18fa 100644 --- a/metadata/md5-cache/x11-misc/xsetleds-0.1.3-r2 +++ b/metadata/md5-cache/x11-misc/xsetleds-0.1.3-r2 @@ -3,10 +3,10 @@ DEPEND=x11-libs/libX11 x11-libs/libXtst x11-base/xorg-proto DESCRIPTION=small tool to report and change the keyboard LED states of an X display EAPI=6 HOMEPAGE=https://github.com/bmeurer/xsetleds -KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~sparc ~x86 +KEYWORDS=~alpha amd64 ~hppa ~ia64 ~mips ppc ~sparc x86 LICENSE=GPL-2 RDEPEND=x11-libs/libX11 x11-libs/libXtst SLOT=0 SRC_URI=ftp://ftp.unix-ag.org/user/bmeurer/xsetleds/src/xsetleds-0.1.3.tar.gz https://dev.gentoo.org/~jer/xsetleds-0.1.3.tar.gz _eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 -_md5_=9ad607f3eb9fd970ec6f7ed9744e4fb2 +_md5_=fc1c09ab036d75e1a0741acded4fb6d9 diff --git a/metadata/md5-cache/x11-misc/xsnap-1.5.15-r1 b/metadata/md5-cache/x11-misc/xsnap-1.5.15-r1 deleted file mode 100644 index 8cb8cc6d4011..000000000000 --- a/metadata/md5-cache/x11-misc/xsnap-1.5.15-r1 +++ /dev/null @@ -1,12 +0,0 @@ -DEFINED_PHASES=compile prepare -DEPEND=media-libs/libpng:0 virtual/jpeg:0 x11-libs/libX11 x11-libs/libXft x11-libs/libXpm app-text/rman dev-lang/perl x11-base/xorg-proto x11-misc/imake -DESCRIPTION=Program to interactively take a 'snapshot' of a region of the screen -EAPI=6 -HOMEPAGE=ftp://ftp.ac-grenoble.fr/ge/Xutils/ -KEYWORDS=amd64 ppc x86 ~amd64-linux -LICENSE=GPL-3+ -RDEPEND=media-libs/libpng:0 virtual/jpeg:0 x11-libs/libX11 x11-libs/libXft x11-libs/libXpm media-fonts/font-misc-misc -SLOT=0 -SRC_URI=ftp://ftp.ac-grenoble.fr/ge/Xutils/xsnap-1.5.15.tar.bz2 -_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 -_md5_=56f937c54246969b6db9a7dc9b333755 diff --git a/metadata/md5-cache/x11-misc/xsnap-1.5.15-r2 b/metadata/md5-cache/x11-misc/xsnap-1.5.15-r2 index 97ca2606589b..6bffff7fcb98 100644 --- a/metadata/md5-cache/x11-misc/xsnap-1.5.15-r2 +++ b/metadata/md5-cache/x11-misc/xsnap-1.5.15-r2 @@ -3,10 +3,10 @@ DEPEND=media-libs/libpng:0 virtual/jpeg:0 x11-libs/libX11 x11-libs/libXft x11-li DESCRIPTION=Program to interactively take a 'snapshot' of a region of the screen EAPI=7 HOMEPAGE=ftp://ftp.ac-grenoble.fr/ge/Xutils/ -KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux +KEYWORDS=amd64 ppc x86 ~amd64-linux LICENSE=GPL-3+ RDEPEND=media-libs/libpng:0 virtual/jpeg:0 x11-libs/libX11 x11-libs/libXft x11-libs/libXpm media-fonts/font-misc-misc SLOT=0 SRC_URI=ftp://ftp.ac-grenoble.fr/ge/Xutils/xsnap-1.5.15.tar.bz2 _eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 -_md5_=3340d0f7e13d2a10171e1cb0c03bade9 +_md5_=ebd680a652358a3f5fba5821ae300004 diff --git a/metadata/md5-cache/x11-misc/xtrlock-2.12 b/metadata/md5-cache/x11-misc/xtrlock-2.12 deleted file mode 100644 index ea0e3ff764e0..000000000000 --- a/metadata/md5-cache/x11-misc/xtrlock-2.12 +++ /dev/null @@ -1,12 +0,0 @@ -DEFINED_PHASES=compile install -DEPEND=x11-libs/libX11 x11-base/xorg-proto x11-misc/imake -DESCRIPTION=A simplistic screen locking program for X -EAPI=7 -HOMEPAGE=http://ftp.debian.org/debian/pool/main/x/xtrlock/ -KEYWORDS=amd64 ppc x86 -LICENSE=GPL-3 -RDEPEND=x11-libs/libX11 -SLOT=0 -SRC_URI=mirror://debian/pool/main/x/xtrlock/xtrlock_2.12.tar.xz -_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 -_md5_=b088ebe432bb1f1aedf62d52e61b9879 diff --git a/metadata/md5-cache/x11-misc/xtrlock-2.13 b/metadata/md5-cache/x11-misc/xtrlock-2.13 index d91e1490b961..cee1a632702d 100644 --- a/metadata/md5-cache/x11-misc/xtrlock-2.13 +++ b/metadata/md5-cache/x11-misc/xtrlock-2.13 @@ -3,10 +3,10 @@ DEPEND=x11-libs/libX11 x11-base/xorg-proto x11-misc/imake DESCRIPTION=A simplistic screen locking program for X EAPI=7 HOMEPAGE=http://ftp.debian.org/debian/pool/main/x/xtrlock/ -KEYWORDS=~amd64 ~ppc ~x86 +KEYWORDS=amd64 ppc x86 LICENSE=GPL-3 RDEPEND=x11-libs/libX11 SLOT=0 SRC_URI=mirror://debian/pool/main/x/xtrlock/xtrlock_2.13.tar.xz _eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 -_md5_=896a59078e0828be410f108628a8baa2 +_md5_=211b253b9e272563eaea710fc0a618f8 diff --git a/metadata/md5-cache/x11-misc/xwit-3.4_p15 b/metadata/md5-cache/x11-misc/xwit-3.4_p15 deleted file mode 100644 index e3cae0ca0402..000000000000 --- a/metadata/md5-cache/x11-misc/xwit-3.4_p15 +++ /dev/null @@ -1,12 +0,0 @@ -DEFINED_PHASES=install prepare -DEPEND=x11-libs/libX11 x11-base/xorg-proto -DESCRIPTION=A collection of simple routines to call some of those X11 functions -EAPI=6 -HOMEPAGE=https://tracker.debian.org/pkg/xwit -KEYWORDS=~amd64 ~ppc x86 -LICENSE=public-domain HPND -RDEPEND=x11-libs/libX11 -SLOT=0 -SRC_URI=mirror://debian/pool/main/x/xwit/xwit_3.4.orig.tar.gz mirror://debian/pool/main/x/xwit/xwit_3.4-15.debian.tar.gz -_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 -_md5_=b1c64af7165fc086ddef0bea10c98501 diff --git a/metadata/md5-cache/x11-misc/xwit-3.4_p16 b/metadata/md5-cache/x11-misc/xwit-3.4_p16 index 827563df4a76..93ce0991062c 100644 --- a/metadata/md5-cache/x11-misc/xwit-3.4_p16 +++ b/metadata/md5-cache/x11-misc/xwit-3.4_p16 @@ -3,10 +3,10 @@ DEPEND=x11-libs/libX11 x11-base/xorg-proto DESCRIPTION=A collection of simple routines to call some of those X11 functions EAPI=7 HOMEPAGE=https://tracker.debian.org/pkg/xwit -KEYWORDS=~amd64 ~ppc ~x86 +KEYWORDS=~amd64 ~ppc x86 LICENSE=public-domain HPND RDEPEND=x11-libs/libX11 SLOT=0 SRC_URI=mirror://debian/pool/main/x/xwit/xwit_3.4.orig.tar.gz mirror://debian/pool/main/x/xwit/xwit_3.4-16.debian.tar.xz _eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 -_md5_=1b35b104bc7fe3a20fe1e14d655b890d +_md5_=f4aa22085560e92bc283075fbc1c79ff diff --git a/metadata/md5-cache/x11-misc/xxkb-1.11.1-r1 b/metadata/md5-cache/x11-misc/xxkb-1.11.1-r1 index 2c5b2eb161f4..7c92c9dc402f 100644 --- a/metadata/md5-cache/x11-misc/xxkb-1.11.1-r1 +++ b/metadata/md5-cache/x11-misc/xxkb-1.11.1-r1 @@ -5,10 +5,10 @@ DESCRIPTION=eXtended XKB - assign different keymaps to different windows EAPI=7 HOMEPAGE=https://sourceforge.net/projects/xxkb/ IUSE=svg -KEYWORDS=~amd64 ~ppc ~x86 +KEYWORDS=amd64 ~ppc x86 LICENSE=Artistic-2 RDEPEND=x11-libs/gdk-pixbuf-xlib x11-libs/libX11 x11-libs/libXpm x11-libs/libXt svg? ( dev-libs/glib:2 gnome-base/librsvg:2 x11-libs/gtk+:2 ) SLOT=0 SRC_URI=mirror://sourceforge/xxkb/xxkb-1.11.1-src.tar.gz svg? ( https://dev.gentoo.org/~jer/xxkb-flags.tar.bz2 ) _eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 -_md5_=c9ba3f5f2c7c95b613abb1c7cf627530 +_md5_=f937db1039c25b902f6d589e014eda7b diff --git a/metadata/md5-cache/x11-themes/Manifest.gz b/metadata/md5-cache/x11-themes/Manifest.gz index 900080cd7233..33bde19bae2d 100644 Binary files a/metadata/md5-cache/x11-themes/Manifest.gz and b/metadata/md5-cache/x11-themes/Manifest.gz differ diff --git a/metadata/md5-cache/x11-themes/silver-xcursors-0.4-r1 b/metadata/md5-cache/x11-themes/silver-xcursors-0.4-r1 index e88c74c0f239..ff2a999a785a 100644 --- a/metadata/md5-cache/x11-themes/silver-xcursors-0.4-r1 +++ b/metadata/md5-cache/x11-themes/silver-xcursors-0.4-r1 @@ -2,8 +2,8 @@ DEFINED_PHASES=install DESCRIPTION=A high quality set of Xfree 4.3.0 animated mouse cursors EAPI=6 HOMEPAGE=http://www.kde-look.org/content/show.php?content=5533 -KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~sparc ~x86 +KEYWORDS=~alpha amd64 ~hppa ~ia64 ~mips ppc ~sparc x86 LICENSE=LGPL-2.1 SLOT=0 SRC_URI=http://www.kde-look.org/CONTENT/content-files/5533-Silver-XCursors-3D-0.4.tar.bz2 -_md5_=7acaed38d624a8169386643ff9882afd +_md5_=9632807d052d590642ae92ad23e8e3cd diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk index e0f0edffbd5c..4612a5b80f28 100644 --- a/metadata/news/timestamp.chk +++ b/metadata/news/timestamp.chk @@ -1 +1 @@ -Mon, 15 Mar 2021 20:08:41 +0000 +Tue, 16 Mar 2021 11:08:38 +0000 diff --git a/metadata/timestamp b/metadata/timestamp index 92df79890275..6ac6e79ce8ad 100644 --- a/metadata/timestamp +++ b/metadata/timestamp @@ -1 +1 @@ -Mon Mar 15 08:08:41 PM UTC 2021 +Tue Mar 16 11:08:37 AM UTC 2021 diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk index 9ae4ac341822..03f4bd92fc67 100644 --- a/metadata/timestamp.chk +++ b/metadata/timestamp.chk @@ -1 +1 @@ -Mon, 15 Mar 2021 20:30:01 +0000 +Tue, 16 Mar 2021 11:30:01 +0000 diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit index 21c3831872bc..d1720a7229e4 100644 --- a/metadata/timestamp.commit +++ b/metadata/timestamp.commit @@ -1 +1 @@ -3f0dfe97ab5a70e7dc07b5f034ada4002afad68f 1615838740 2021-03-15T20:05:40+00:00 +f55d5b3b480f6945846d68a4d077a4e17532440c 1615892454 2021-03-16T11:00:54+00:00 diff --git a/metadata/timestamp.x b/metadata/timestamp.x index 7ed55a13dfb3..4de00b74e07f 100644 --- a/metadata/timestamp.x +++ b/metadata/timestamp.x @@ -1 +1 @@ -1615838701 Mon 15 Mar 2021 08:05:01 PM UTC +1615892701 Tue 16 Mar 2021 11:05:01 AM UTC diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk index e0f0edffbd5c..db53ff6d2000 100644 --- a/metadata/xml-schema/timestamp.chk +++ b/metadata/xml-schema/timestamp.chk @@ -1 +1 @@ -Mon, 15 Mar 2021 20:08:41 +0000 +Tue, 16 Mar 2021 11:08:37 +0000 diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz index ffec2de4159e..e588c62b81c8 100644 Binary files a/net-analyzer/Manifest.gz and b/net-analyzer/Manifest.gz differ diff --git a/net-analyzer/amap/amap-5.4-r1.ebuild b/net-analyzer/amap/amap-5.4-r1.ebuild index 9848a4c18f2d..2703bd6e4bd7 100644 --- a/net-analyzer/amap/amap-5.4-r1.ebuild +++ b/net-analyzer/amap/amap-5.4-r1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 -inherit eutils toolchain-funcs +inherit toolchain-funcs DESCRIPTION="A network scanning tool for pentesters" HOMEPAGE="https://www.thc.org/thc-amap/" @@ -11,7 +11,7 @@ SRC_URI="https://www.thc.org/releases/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" +KEYWORDS="amd64 ppc ppc64 x86" IUSE="libressl ssl" DEPEND=" @@ -26,23 +26,31 @@ RDEPEND=" !sci-biology/amap " +PATCHES=( + "${FILESDIR}"/4.8-system-pcre.patch +) + src_prepare() { rm -r pcre-3.9 || die + sed -i -e "s:etc/:share/amap/:g" amap-lib.c || die + # Above change requires below change. See sources... sed -i '/strlen(AMAP_PREFIX/s: 5 : 12 :' amap-lib.c || die sed -i 's:/usr/local:/usr:' amap.h || die + # Files to be updated are at different location, bug 207839. sed -i '/AMAP_RESOURCE/s:www:freeworld:' amap.h || die sed -i '/DATADIR/s:/etc:/share/amap:' Makefile.am || die - epatch "${FILESDIR}"/4.8-system-pcre.patch + default } src_configure() { # non-autotools configure script ./configure || die + sed -i \ -e '/^XDEFINES=/s:=.*:=:' \ -e '/^XLIBS=/s:=.*:=:' \ @@ -50,12 +58,14 @@ src_configure() { -e '/^XIPATHS=/s:=.*:=:' \ -e "/^CC=/d" \ Makefile || die + if use ssl ; then sed -i \ -e '/^XDEFINES=/s:=:=-DOPENSSL:' \ -e '/^XLIBS=/s:=:=-lcrypto -lssl:' \ Makefile || die fi + sed -i Makefile \ -e '/-o amap/{s|(OPT) |(OPT) $(LDFLAGS) |g}' \ || die diff --git a/net-analyzer/amap/amap-5.4.ebuild b/net-analyzer/amap/amap-5.4.ebuild deleted file mode 100644 index ef97cd2aec15..000000000000 --- a/net-analyzer/amap/amap-5.4.ebuild +++ /dev/null @@ -1,72 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit eutils toolchain-funcs - -DESCRIPTION="A network scanning tool for pentesters" -HOMEPAGE="https://www.thc.org/thc-amap/" -SRC_URI="https://www.thc.org/releases/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ppc ppc64 x86" -IUSE="ssl" - -DEPEND=" - dev-libs/libpcre - ssl? ( >=dev-libs/openssl-0.9.6j ) -" -RDEPEND=" - ${DEPEND} - !sci-biology/amap -" - -src_prepare() { - rm -r pcre-3.9 || die - sed -i -e "s:etc/:share/amap/:g" amap-lib.c || die - # Above change requires below change. See sources... - sed -i '/strlen(AMAP_PREFIX/s: 5 : 12 :' amap-lib.c || die - sed -i 's:/usr/local:/usr:' amap.h || die - # Files to be updated are at different location, bug 207839. - sed -i '/AMAP_RESOURCE/s:www:freeworld:' amap.h || die - - sed -i '/DATADIR/s:/etc:/share/amap:' Makefile.am || die - - epatch "${FILESDIR}"/4.8-system-pcre.patch -} - -src_configure() { - # non-autotools configure script - ./configure || die - sed -i \ - -e '/^XDEFINES=/s:=.*:=:' \ - -e '/^XLIBS=/s:=.*:=:' \ - -e '/^XLIBPATHS/s:=.*:=:' \ - -e '/^XIPATHS=/s:=.*:=:' \ - -e "/^CC=/d" \ - Makefile || die - if use ssl ; then - sed -i \ - -e '/^XDEFINES=/s:=:=-DOPENSSL:' \ - -e '/^XLIBS=/s:=:=-lcrypto -lssl:' \ - Makefile || die - fi - sed -i Makefile \ - -e '/-o amap/{s|(OPT) |(OPT) $(LDFLAGS) |g}' \ - || die -} - -src_compile() { - emake CC=$(tc-getCC) OPT="${CFLAGS}" -} - -src_install() { - dobin amap amapcrap - insinto /usr/share/amap - doins appdefs.* - - doman ${PN}.1 - dodoc README TODO CHANGES -} diff --git a/net-analyzer/argus-clients/Manifest b/net-analyzer/argus-clients/Manifest index 86af1c6d491b..e93bb4e9c8d8 100644 --- a/net-analyzer/argus-clients/Manifest +++ b/net-analyzer/argus-clients/Manifest @@ -1,3 +1 @@ -DIST argus-clients-3.0.8.2.tar.gz 2776072 BLAKE2B 429a12d63f38ce1c5dae343be28543f3c8b6dd746661a893a0108db100762d60dec619cdccfff525b84c0843f0bb61c7e5d96df561a369e6df0d1e6a821d938a SHA512 20aac16bd6474b8f98c8fc86b21ad0b43aca62264c6de2f7f26eea876a90f7276cdaf2241a510a19ae445f40f5d0d05ec6a5869980b6889e6eb5937dbff0f855 DIST argus-clients-3.0.8.3.tar.gz 2753929 BLAKE2B 561b945ce5beb8d8d016579921417f405f421fd2afe2369ff0a4c5b8aaed44eca7591b43e64db00396cf963cc550753207c9b0e8d21d6b99d8c1ea0faaddb0e9 SHA512 ce6f6aaa21452f60c72498b5410cdc650eed6eec6d949daf7226e93f22d193db175e8051073cbfd258c127ed7cb445d6673ae38f386982dc19632ac55539960e -DIST argus-clients-3.0.8.tar.gz 2627515 BLAKE2B e7753ce1a65f24639c0c36d694033b038abb7cf835b89a1020edf72829f9196cad2a1be5958a28a51884c169ff7b4e295381501e61cf1e1eb1ee1557fccb6d8f SHA512 79022b3c3e472ebc526b27c20c25ae97abdb9a363a91ebbe3baf405f2aba9bdd80fbc0250b444d3d7ab4488e3c1325389a4719e92d9aded7598a91c3309369c2 diff --git a/net-analyzer/argus-clients/argus-clients-3.0.8.2-r2.ebuild b/net-analyzer/argus-clients/argus-clients-3.0.8.2-r2.ebuild deleted file mode 100644 index d87060d87bec..000000000000 --- a/net-analyzer/argus-clients/argus-clients-3.0.8.2-r2.ebuild +++ /dev/null @@ -1,74 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit autotools toolchain-funcs - -DESCRIPTION="Clients for net-analyzer/argus" -HOMEPAGE="https://www.qosient.com/argus/" -SRC_URI="https://qosient.com/argus/dev/${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" -IUSE="debug ft geoip mysql sasl tcpd" - -ARGUS_CDEPEND=" - net-analyzer/rrdtool[perl] - net-libs/libpcap - net-libs/libtirpc:= - sys-libs/ncurses:= - sys-libs/readline:= - sys-libs/zlib - ft? ( net-analyzer/flow-tools ) - geoip? ( dev-libs/geoip ) - mysql? ( dev-db/mysql-connector-c:0= ) - sasl? ( dev-libs/cyrus-sasl ) -" -RDEPEND=" - ${ARGUS_CDEPEND} -" -DEPEND=" - ${ARGUS_CDEPEND} - sys-devel/bison - sys-devel/flex - virtual/pkgconfig -" -PATCHES=( - "${FILESDIR}"/${PN}-3.0.4.1-disable-tcp-wrappers-automagic.patch - "${FILESDIR}"/${PN}-3.0.7.21-curses-readline.patch - "${FILESDIR}"/${PN}-3.0.8.2-rpc.patch - "${FILESDIR}"/${PN}-3.0.8.2-ar.patch - "${FILESDIR}"/${PN}-3.0.8.2-curses-readline.patch -) - -src_prepare() { - default - - eautoreconf -} - -src_configure() { - tc-export AR RANLIB - - use debug && touch .debug - econf \ - $(use_with ft libft) \ - $(use_with geoip GeoIP /usr/) \ - $(use_with sasl) \ - $(use_with tcpd wrappers) \ - $(use_with mysql mysql /usr) -} - -src_compile() { - emake \ - CCOPT="${CFLAGS} ${LDFLAGS}" \ - RANLIB=$(tc-getRANLIB) \ - CURSESLIB="$( $(tc-getPKG_CONFIG) --libs ncurses)" -} - -src_install() { - dobin bin/ra* - dodoc ChangeLog CREDITS README CHANGES - doman man/man{1,5}/* -} diff --git a/net-analyzer/argus-clients/argus-clients-3.0.8.2-r3.ebuild b/net-analyzer/argus-clients/argus-clients-3.0.8.2-r3.ebuild deleted file mode 100644 index 637ef50ad05a..000000000000 --- a/net-analyzer/argus-clients/argus-clients-3.0.8.2-r3.ebuild +++ /dev/null @@ -1,75 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit autotools toolchain-funcs - -DESCRIPTION="Clients for net-analyzer/argus" -HOMEPAGE="https://www.qosient.com/argus/" -SRC_URI="https://qosient.com/argus/dev/${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" -IUSE="debug ft geoip mysql sasl tcpd" - -ARGUS_CDEPEND=" - net-analyzer/rrdtool[perl] - net-libs/libpcap - net-libs/libtirpc:= - sys-libs/ncurses:= - sys-libs/readline:= - sys-libs/zlib - ft? ( net-analyzer/flow-tools ) - geoip? ( dev-libs/geoip ) - mysql? ( dev-db/mysql-connector-c:0= ) - sasl? ( dev-libs/cyrus-sasl ) -" -RDEPEND=" - ${ARGUS_CDEPEND} -" -DEPEND=" - ${ARGUS_CDEPEND} - sys-devel/bison - sys-devel/flex - virtual/pkgconfig -" -PATCHES=( - "${FILESDIR}"/${PN}-3.0.4.1-disable-tcp-wrappers-automagic.patch - "${FILESDIR}"/${PN}-3.0.7.21-curses-readline.patch - "${FILESDIR}"/${PN}-3.0.8.2-ar.patch - "${FILESDIR}"/${PN}-3.0.8.2-curses-readline.patch - "${FILESDIR}"/${PN}-3.0.8.2-my_bool.patch - "${FILESDIR}"/${PN}-3.0.8.2-rpc.patch -) - -src_prepare() { - default - - eautoreconf -} - -src_configure() { - tc-export AR RANLIB - - use debug && touch .debug - econf \ - $(use_with ft libft) \ - $(use_with geoip GeoIP /usr/) \ - $(use_with sasl) \ - $(use_with tcpd wrappers) \ - $(use_with mysql mysql /usr) -} - -src_compile() { - emake \ - CCOPT="${CFLAGS} ${LDFLAGS}" \ - RANLIB=$(tc-getRANLIB) \ - CURSESLIB="$( $(tc-getPKG_CONFIG) --libs ncurses)" -} - -src_install() { - dobin bin/ra* - dodoc ChangeLog CREDITS README CHANGES - doman man/man{1,5}/* -} diff --git a/net-analyzer/argus-clients/argus-clients-3.0.8.2.ebuild b/net-analyzer/argus-clients/argus-clients-3.0.8.2.ebuild deleted file mode 100644 index d16c7f6422a6..000000000000 --- a/net-analyzer/argus-clients/argus-clients-3.0.8.2.ebuild +++ /dev/null @@ -1,72 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit autotools eutils toolchain-funcs - -DESCRIPTION="Clients for net-analyzer/argus" -HOMEPAGE="https://www.qosient.com/argus/" -SRC_URI="https://qosient.com/argus/dev/${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" -IUSE="debug ft geoip mysql sasl tcpd" - -MY_CDEPEND=" - net-analyzer/rrdtool[perl] - net-libs/libpcap - sys-libs/ncurses:= - sys-libs/readline:= - sys-libs/zlib - ft? ( net-analyzer/flow-tools ) - geoip? ( dev-libs/geoip ) - mysql? ( virtual/mysql ) - sasl? ( dev-libs/cyrus-sasl ) -" - -RDEPEND=" - ${MY_CDEPEND} -" - -DEPEND=" - ${MY_CDEPEND} - sys-devel/bison - sys-devel/flex - virtual/pkgconfig -" - -src_prepare() { - epatch \ - "${FILESDIR}"/${PN}-3.0.4.1-disable-tcp-wrappers-automagic.patch \ - "${FILESDIR}"/${PN}-3.0.7.21-curses-readline.patch - - sed -i -e 's| ar | $(AR) |g' common/Makefile.in || die - tc-export AR RANLIB - - eautoreconf -} - -src_configure() { - use debug && touch .debug - econf \ - $(use_with ft libft) \ - $(use_with geoip GeoIP /usr/) \ - $(use_with sasl) \ - $(use_with tcpd wrappers) \ - $(use_with mysql) -} - -src_compile() { - # racurses uses both libncurses and libtinfo, if present - emake \ - CCOPT="${CFLAGS} ${LDFLAGS}" \ - RANLIB=$(tc-getRANLIB) \ - CURSESLIB="$( $(tc-getPKG_CONFIG) --libs ncurses)" -} - -src_install() { - dobin bin/ra* - dodoc ChangeLog CREDITS README CHANGES - doman man/man{1,5}/* -} diff --git a/net-analyzer/argus-clients/argus-clients-3.0.8.3.ebuild b/net-analyzer/argus-clients/argus-clients-3.0.8.3.ebuild index da05b0364a68..382122ab0c5d 100644 --- a/net-analyzer/argus-clients/argus-clients-3.0.8.3.ebuild +++ b/net-analyzer/argus-clients/argus-clients-3.0.8.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -10,7 +10,7 @@ SRC_URI="https://qosient.com/argus/dev/${P}.tar.gz" LICENSE="GPL-3" SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" +KEYWORDS="amd64 ppc x86" IUSE="debug ft geoip mysql sasl tcpd" ARGUS_CDEPEND=" diff --git a/net-analyzer/argus-clients/argus-clients-3.0.8.ebuild b/net-analyzer/argus-clients/argus-clients-3.0.8.ebuild deleted file mode 100644 index 742c6cbebee7..000000000000 --- a/net-analyzer/argus-clients/argus-clients-3.0.8.ebuild +++ /dev/null @@ -1,72 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit autotools eutils toolchain-funcs - -DESCRIPTION="Clients for net-analyzer/argus" -HOMEPAGE="https://www.qosient.com/argus/" -SRC_URI="https://qosient.com/argus/dev/${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="amd64 ppc x86" -IUSE="debug ft geoip mysql sasl tcpd" - -MY_CDEPEND=" - net-analyzer/rrdtool[perl] - net-libs/libpcap - sys-libs/ncurses - sys-libs/readline - sys-libs/zlib - ft? ( net-analyzer/flow-tools ) - geoip? ( dev-libs/geoip ) - mysql? ( virtual/mysql ) - sasl? ( dev-libs/cyrus-sasl ) -" - -RDEPEND=" - ${MY_CDEPEND} -" - -DEPEND=" - ${MY_CDEPEND} - sys-devel/bison - sys-devel/flex - virtual/pkgconfig -" - -src_prepare() { - epatch \ - "${FILESDIR}"/${PN}-3.0.4.1-disable-tcp-wrappers-automagic.patch \ - "${FILESDIR}"/${PN}-3.0.7.21-curses-readline.patch - - sed -i -e 's| ar | $(AR) |g' common/Makefile.in || die - tc-export AR RANLIB - - eautoreconf -} - -src_configure() { - use debug && touch .debug - econf \ - $(use_with ft libft) \ - $(use_with geoip GeoIP /usr/) \ - $(use_with sasl) \ - $(use_with tcpd wrappers) \ - $(use_with mysql) -} - -src_compile() { - # racurses uses both libncurses and libtinfo, if present - emake \ - CCOPT="${CFLAGS} ${LDFLAGS}" \ - RANLIB=$(tc-getRANLIB) \ - CURSESLIB="$( $(tc-getPKG_CONFIG) --libs ncurses)" -} - -src_install() { - dobin bin/ra* - dodoc ChangeLog CREDITS README CHANGES - doman man/man{1,5}/* -} diff --git a/net-analyzer/argus-clients/files/argus-clients-3.0.8.2-rpc.patch b/net-analyzer/argus-clients/files/argus-clients-3.0.8.2-rpc.patch deleted file mode 100644 index e140fa96b2a3..000000000000 --- a/net-analyzer/argus-clients/files/argus-clients-3.0.8.2-rpc.patch +++ /dev/null @@ -1,34 +0,0 @@ ---- a/configure.ac -+++ b/configure.ac -@@ -40,6 +40,7 @@ - AC_PROG_INSTALL - AC_PROG_RANLIB - AC_PROG_YACC -+PKG_PROG_PKG_CONFIG - - AC_CHECK_PROGS(V_RANLIB, ranlib, @true) - AC_QOSIENT_LEX_AND_YACC(V_LEX, V_YACC, argus_) -@@ -82,6 +83,12 @@ - AC_CHECK_HEADERS([stdlib.h stddef.h string.h strings.h sys/file.h sys/ioctl.h sys/param.h sys/socket.h]) - AC_CHECK_HEADERS([sys/mount.h sys/time.h sys/vfs.h syslog.h termios.h unistd.h values.h ifaddrs.h]) - -+PKG_CHECK_MODULES(libtirpc, libtirpc, -+ [LIBS="${LIBS} ${libtirpc_LIBS}"], -+[AC_CHECK_HEADER([rpc/types.h],, -+ [AC_MSG_ERROR([Cannot find ])])] -+) -+ - # Checks for typedefs, structures, and compiler characteristics. - AC_C_CONST - AC_C_INLINE ---- a/common/Makefile.in -+++ b/common/Makefile.in -@@ -48,7 +48,7 @@ - - CC = @CC@ - CCOPT = @V_CCOPT@ --INCLS = -I. -I../include @V_INCLS@ @MYSQL_INCLS@ -+INCLS = -I. -I../include @V_INCLS@ @MYSQL_INCLS@ @libtirpc_CFLAGS@ - DEFS = @DEFS@ -DARGUS_SYSLOG - - # Standard CFLAGS diff --git a/net-analyzer/argus/Manifest b/net-analyzer/argus/Manifest index 960cce267b55..196e3c621939 100644 --- a/net-analyzer/argus/Manifest +++ b/net-analyzer/argus/Manifest @@ -1,2 +1 @@ -DIST argus-3.0.8.2.tar.gz 524749 BLAKE2B 4d93fd8acd71b198da712961d75f0e813f5ed3fde841e77b8a10c3a9b89571902b7597969a4be12437c97ffc69ba5ebefaee8b684c5d2d4ce4f1309c1cfd1199 SHA512 146795880d8697e065ed23d2fbab226846d55db0b71945c5a4cab2896e48ceb6e1671ccb4e00dc3b0f984525bac4ced3773f3b9e70c3ea5f7c6972fe9bd94313 DIST argus-3.0.8.3.tar.gz 524549 BLAKE2B f905784c12d28d4440a7a6954441ce4f0865125a87e3d740edd5785e729f8b5b45967d97aef4f72802d2166b76176e15c6f15ec99b87ae1d14849ae92c65ad76 SHA512 f66db5b3bb1305825b76a7eda413d5805d65182aabef647e27716cfd629327b3aab8c299bc8af419199ac655cef4ac3bfcb83c059080e98b042e09f79f01d82a diff --git a/net-analyzer/argus/argus-3.0.8.2-r3.ebuild b/net-analyzer/argus/argus-3.0.8.2-r3.ebuild deleted file mode 100644 index 47656c47be5d..000000000000 --- a/net-analyzer/argus/argus-3.0.8.2-r3.ebuild +++ /dev/null @@ -1,84 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit autotools epatch - -DESCRIPTION="network Audit Record Generation and Utilization System" -HOMEPAGE="https://www.qosient.com/argus/" -SRC_URI="https://www.qosient.com/argus/dev/${P/_rc/.rc.}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos" -IUSE="debug +libtirpc sasl tcpd" - -RDEPEND=" - acct-group/argus - acct-user/argus - net-libs/libnsl:= - net-libs/libpcap - sys-libs/zlib - !libtirpc? ( sys-libs/glibc[rpc(-)] ) - libtirpc? ( net-libs/libtirpc ) - sasl? ( dev-libs/cyrus-sasl ) - tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) -" -DEPEND=" - ${RDEPEND} - >=sys-devel/bison-1.28 - >=sys-devel/flex-2.4.6 -" - -S=${WORKDIR}/${P/_rc/.rc.} - -src_prepare() { - find . -type f -execdir chmod +w {} \; #561360 - sed -e 's:/etc/argus.conf:/etc/argus/argus.conf:' \ - -i argus/argus.c \ - -i support/Config/argus.conf \ - -i man/man8/argus.8 \ - -i man/man5/argus.conf.5 || die - - sed -e 's:#\(ARGUS_SETUSER_ID=\).*:\1argus:' \ - -e 's:#\(ARGUS_SETGROUP_ID=\).*:\1argus:' \ - -e 's:\(#ARGUS_CHROOT_DIR=\).*:\1/var/lib/argus:' \ - -i support/Config/argus.conf || die - epatch \ - "${FILESDIR}"/${PN}-3.0.8.1-disable-tcp-wrappers-automagic.patch \ - "${FILESDIR}"/${PN}-3.0.5-Makefile.patch \ - "${FILESDIR}"/${PN}-3.0.7.3-DLT_IPNET.patch \ - "${FILESDIR}"/${PN}-3.0.8.2-rpc.patch - - epatch_user - eautoreconf -} - -src_configure() { - use debug && touch .debug # enable debugging - econf $(use_with libtirpc) $(use_with tcpd wrappers) $(use_with sasl) -} - -src_compile() { - emake CCOPT="${CFLAGS} ${LDFLAGS}" -} - -src_install() { - doman man/man5/*.5 man/man8/*.8 - - dosbin bin/argus{,bug} - - dodoc ChangeLog CREDITS README - - insinto /etc/argus - doins support/Config/argus.conf - - newinitd "${FILESDIR}/argus.initd" argus - keepdir /var/lib/argus -} - -pkg_postinst() { - elog "Note, if you modify ARGUS_DAEMON value in argus.conf it's quite" - elog "possible that the init script will fail to work." -} diff --git a/net-analyzer/argus/argus-3.0.8.2-r4.ebuild b/net-analyzer/argus/argus-3.0.8.2-r4.ebuild deleted file mode 100644 index dd6e555ef544..000000000000 --- a/net-analyzer/argus/argus-3.0.8.2-r4.ebuild +++ /dev/null @@ -1,85 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools - -DESCRIPTION="network Audit Record Generation and Utilization System" -HOMEPAGE="https://openargus.org/" -SRC_URI="https://www.qosient.com/argus/dev/${P/_rc/.rc.}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" -IUSE="debug +libtirpc sasl tcpd" - -RDEPEND=" - acct-group/argus - acct-user/argus - net-libs/libnsl:= - net-libs/libpcap - sys-libs/zlib - !libtirpc? ( sys-libs/glibc[rpc(-)] ) - libtirpc? ( net-libs/libtirpc ) - sasl? ( dev-libs/cyrus-sasl ) - tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) -" -DEPEND="${RDEPEND}" -BDEPEND=" - >=sys-devel/bison-1.28 - >=sys-devel/flex-2.4.6 -" -PATCHES=( - "${FILESDIR}"/${PN}-3.0.8.1-disable-tcp-wrappers-automagic.patch - "${FILESDIR}"/${PN}-3.0.5-Makefile.patch - "${FILESDIR}"/${PN}-3.0.7.3-DLT_IPNET.patch - "${FILESDIR}"/${PN}-3.0.8.2-rpc.patch - "${FILESDIR}"/${PN}-3.0.8.2-fno-common.patch -) -S=${WORKDIR}/${P/_rc/.rc.} - -src_prepare() { - find . -type f -execdir chmod +w {} \; #561360 - sed -e 's:/etc/argus.conf:/etc/argus/argus.conf:' \ - -i argus/argus.c \ - -i support/Config/argus.conf \ - -i man/man8/argus.8 \ - -i man/man5/argus.conf.5 || die - - sed -e 's:#\(ARGUS_SETUSER_ID=\).*:\1argus:' \ - -e 's:#\(ARGUS_SETGROUP_ID=\).*:\1argus:' \ - -e 's:\(#ARGUS_CHROOT_DIR=\).*:\1/var/lib/argus:' \ - -i support/Config/argus.conf || die - - default - eautoreconf -} - -src_configure() { - use debug && touch .debug # enable debugging - econf $(use_with libtirpc) $(use_with tcpd wrappers) $(use_with sasl) -} - -src_compile() { - emake CCOPT="${CFLAGS} ${LDFLAGS}" -} - -src_install() { - doman man/man5/*.5 man/man8/*.8 - - dosbin bin/argus{,bug} - - dodoc ChangeLog CREDITS README - - insinto /etc/argus - doins support/Config/argus.conf - - newinitd "${FILESDIR}/argus.initd" argus - keepdir /var/lib/argus -} - -pkg_postinst() { - elog "Note, if you modify ARGUS_DAEMON value in argus.conf it's quite" - elog "possible that the init script will fail to work." -} diff --git a/net-analyzer/argus/argus-3.0.8.3-r1.ebuild b/net-analyzer/argus/argus-3.0.8.3-r1.ebuild index 9dc4905b07a7..a4176cf571c4 100644 --- a/net-analyzer/argus/argus-3.0.8.3-r1.ebuild +++ b/net-analyzer/argus/argus-3.0.8.3-r1.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://www.qosient.com/argus/dev/${P/_rc/.rc.}.tar.gz" LICENSE="GPL-3" SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" +KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos" IUSE="debug sasl tcpd" RDEPEND=" diff --git a/net-analyzer/argus/files/argus-3.0.8.2-fno-common.patch b/net-analyzer/argus/files/argus-3.0.8.2-fno-common.patch deleted file mode 100644 index 66f950d0c04d..000000000000 --- a/net-analyzer/argus/files/argus-3.0.8.2-fno-common.patch +++ /dev/null @@ -1,45 +0,0 @@ ---- a/include/argus/bootp.h -+++ b/include/argus/bootp.h -@@ -45,6 +45,8 @@ - unsigned char bp_vend[64]; /* vendor-specific area */ - }; - -+extern struct bootp *bp; -+ - /* - * UDP port numbers, server and client. - */ ---- a/argus/ArgusUdp.c -+++ b/argus/ArgusUdp.c -@@ -40,9 +40,6 @@ - #include - #include - --#include --struct bootp *bp; -- - void ArgusUpdateUDPState (struct ArgusModelerStruct *, struct ArgusFlowStruct *, unsigned char *); - - void ---- a/argus/ArgusUdt.c -+++ b/argus/ArgusUdt.c -@@ -40,9 +40,6 @@ - #include - #include - --#include --struct bootp *bp; -- - struct ArgusSystemFlow * - ArgusCreateUDTFlow (struct ArgusModelerStruct *model, struct udt_header *udt) - { ---- a/argus/ArgusModeler.c -+++ b/argus/ArgusModeler.c -@@ -43,7 +43,6 @@ - - #include - --#include - #include - - #include diff --git a/net-analyzer/argus/files/argus-3.0.8.2-rpc.patch b/net-analyzer/argus/files/argus-3.0.8.2-rpc.patch deleted file mode 100644 index 96af0caf140e..000000000000 --- a/net-analyzer/argus/files/argus-3.0.8.2-rpc.patch +++ /dev/null @@ -1,45 +0,0 @@ ---- a/common/Makefile.in -+++ b/common/Makefile.in -@@ -35,12 +35,12 @@ - - CC = @CC@ - CCOPT = @V_CCOPT@ --INCLS = -I$(srcdir) @V_INCLS@ -I$(srcdir)/../include -I$(srcdir)/../argus -+INCLS = -I$(srcdir) @V_INCLS@ @RPC_CFLAGS@ -I$(srcdir)/../include -I$(srcdir)/../argus - DEFS = @DEFS@ - - # Standard CFLAGS - CFLAGS = $(CCOPT) $(INCLS) $(DEFS) --LDFLAGS = @LDFLAGS@ -+LDFLAGS = @LDFLAGS@ @RPC_LIBS@ - - INSTALL = @INSTALL@ - RANLIB = @V_RANLIB@ ---- a/configure.ac -+++ b/configure.ac -@@ -120,6 +120,25 @@ - AC_CHECK_FUNCS(floorf remainderf) - AC_CHECK_FUNCS(timegm) - -+AC_ARG_WITH([libtirpc], -+ AS_HELP_STRING([--with-libtirpc], [Use libtirpc as RPC implementation (instead of sunrpc)]), -+ [], [ with_libtirpc=no ]) -+ -+AS_IF([test "x$with_libtirpc" != xno], -+ [PKG_CHECK_MODULES([TIRPC], -+ [libtirpc], -+ [RPC_CFLAGS=$TIRPC_CFLAGS; RPC_LIBS=$TIRPC_LIBS;], -+ [AC_MSG_ERROR([libtirpc requested, but library not found.])] -+ )], -+ [AC_CHECK_HEADER(rpc/rpc.h, -+ [RPC_CFLAGS=""; RPC_LIBS="";], -+ [AC_MSG_ERROR([sunrpc requested, but headers are not present.])] -+ )] -+) -+ -+AC_SUBST(RPC_CFLAGS) -+AC_SUBST(RPC_LIBS) -+ - AC_CHECK_FUNCS(xdrmem_create) - if test "$ac_cv_func_xdrmem_create" = yes ; then - AC_DEFINE([HAVE_XDR], [], [Using system XDR library]) diff --git a/net-analyzer/argus/metadata.xml b/net-analyzer/argus/metadata.xml index 025cfc82ece2..74c2baebb4ec 100644 --- a/net-analyzer/argus/metadata.xml +++ b/net-analyzer/argus/metadata.xml @@ -5,7 +5,4 @@ netmon@gentoo.org Gentoo network monitoring and analysis project - - Build against net-libs/libtirpc for RPC support - diff --git a/net-analyzer/arpwatch/arpwatch-3.1.ebuild b/net-analyzer/arpwatch/arpwatch-3.1-r1.ebuild similarity index 90% rename from net-analyzer/arpwatch/arpwatch-3.1.ebuild rename to net-analyzer/arpwatch/arpwatch-3.1-r1.ebuild index 64ae0f6ef45b..88148ee795c6 100644 --- a/net-analyzer/arpwatch/arpwatch-3.1.ebuild +++ b/net-analyzer/arpwatch/arpwatch-3.1-r1.ebuild @@ -1,8 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit user + +inherit systemd user DESCRIPTION="An ethernet monitor program that keeps track of ethernet/IP address pairings" HOMEPAGE="https://ee.lbl.gov/" @@ -15,7 +16,7 @@ SRC_URI=" https://dev.gentoo.org/~jer/ethercodes.dat-${ETHERCODES_DATE}.xz " -KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86" +KEYWORDS="amd64 ~hppa ~ppc ~sparc x86" IUSE="selinux" DEPEND=" @@ -60,6 +61,9 @@ src_install() { newconfd "${FILESDIR}"/arpwatch.confd-r2 arpwatch newinitd "${FILESDIR}"/arpwatch.initd-r2 arpwatch + + systemd_dounit "${FILESDIR}/arpwatch.service" + systemd_install_serviced "${FILESDIR}/arpwatch.conf" } pkg_postinst() { diff --git a/net-analyzer/arpwatch/files/arpwatch.conf b/net-analyzer/arpwatch/files/arpwatch.conf new file mode 100644 index 000000000000..070f0edad80b --- /dev/null +++ b/net-analyzer/arpwatch/files/arpwatch.conf @@ -0,0 +1,16 @@ +# Config file for /etc/systemd/system/arpwatch +# see arpwatch.8 for more information + +IFACES=-i eno1 + +# Location of the PID file +PIDFILE=-P /run/arpwatch.pid + +# Additional options to pass to arpwatch. +OPTIONS=-N -p -Q -D + +# Where to store the data (default is /usr/share/arpwatch) +DATA=-f /var/log/arpwatch/eno1.dat + +# Comment this line if you wish arpwatch to run as root user (not recommended) +RUNUSER=-u arpwatch diff --git a/net-analyzer/arpwatch/files/arpwatch.service b/net-analyzer/arpwatch/files/arpwatch.service new file mode 100644 index 000000000000..943e3146f8df --- /dev/null +++ b/net-analyzer/arpwatch/files/arpwatch.service @@ -0,0 +1,16 @@ +[Unit] +Description=Ethernet monitoring program that tracks net/IP pairings +Documentation=man:arpwatch(8) +Conflicts= +After=systemd-networkd.service + +PIDFILE=/run/arpwatch.pid + +[Service] +Type=forking +ExecStartPre=/bin/rm -f /run/arpwatch.pid +ExecStart=/usr/sbin/arpwatch $IFACES $PIDFILE $RUNUSER $OPTIONS $DATA +Restart=on-abort + +[Install] +Alias=arpwatchd.service diff --git a/net-analyzer/bwm-ng/Manifest b/net-analyzer/bwm-ng/Manifest index 44c35c9cce13..82ed4d73eacd 100644 --- a/net-analyzer/bwm-ng/Manifest +++ b/net-analyzer/bwm-ng/Manifest @@ -1,2 +1,2 @@ -DIST bwm-ng-0.6.1.tar.gz 162620 BLAKE2B 28e201ac681fcb1d79afead8a7d2c31d52bfa9ee1ebc132d3cd1080a7edd8ddcc8c0cd6df1897d23a1c79a4a5d9157214a8f3224bd5f8f2c1a12cad96ec188bd SHA512 3f8d4a10f5cbf743d6aee9c6170f334c4274224a2f1886f04338c9a1bf0cf13af5be4aaea0445c9e5b5d361915cc3a93bbfe7c4abf69a0d24e42bc414d8056cd DIST bwm-ng-0.6.2.tar.gz 70079 BLAKE2B 4e0c5dd73bdcaabf5138ce842e5ce50709ba3bc0792f11ebee2640b6246f5bd740fcf8ad79b7dcffabdbc8f44c5ec2d925b20cf28609f8735e537f6920f92aba SHA512 4a7f141692f96dfab0c1729a7df36f5213a75ddb891b967b2cf951419daea7b84354c276705a0ee7c09f4ed26948ca068f65a04b8f9d18b2b8ed2df97b5e3b0a +DIST bwm-ng-0.6.3.tar.gz 70094 BLAKE2B bfc5007470a2e4d7f50dc43dc33898f5bcb34a0eaeeb0f53ed74029299ac2b732d343eaf725144a05b778ad8a204c5d546f0ea0b6aaf997995e2e7a6bc3c6cf6 SHA512 85ce29e6ffa9643b4e7c1d731f4e928ddca8cfdc71c86b65ec4e55058b951eb8da9ab80139145300518223589d5fece5bdc11ede91a1ea394d569993ccdb0ab8 diff --git a/net-analyzer/bwm-ng/bwm-ng-0.6.2.ebuild b/net-analyzer/bwm-ng/bwm-ng-0.6.2.ebuild index 23c71582d272..2b7bf683dc9e 100644 --- a/net-analyzer/bwm-ng/bwm-ng-0.6.2.ebuild +++ b/net-analyzer/bwm-ng/bwm-ng-0.6.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -8,7 +8,7 @@ DESCRIPTION="Bandwidth Monitor NG is a small and simple console-based bandwidth HOMEPAGE="http://www.gropp.org/" SRC_URI="https://github.com/vgropp/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" -KEYWORDS="~amd64 ~arm ~ppc ~x86" +KEYWORDS="amd64 ~arm ppc x86" LICENSE="GPL-2" SLOT="0" IUSE="+csv +html" diff --git a/net-analyzer/bwm-ng/bwm-ng-0.6.1-r1.ebuild b/net-analyzer/bwm-ng/bwm-ng-0.6.3.ebuild similarity index 54% rename from net-analyzer/bwm-ng/bwm-ng-0.6.1-r1.ebuild rename to net-analyzer/bwm-ng/bwm-ng-0.6.3.ebuild index 51311ad80550..d7770f571f23 100644 --- a/net-analyzer/bwm-ng/bwm-ng-0.6.1-r1.ebuild +++ b/net-analyzer/bwm-ng/bwm-ng-0.6.3.ebuild @@ -1,31 +1,31 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 inherit autotools DESCRIPTION="Bandwidth Monitor NG is a small and simple console-based bandwidth monitor" -SRC_URI="http://www.gropp.org/bwm-ng/${P}.tar.gz" HOMEPAGE="http://www.gropp.org/" +SRC_URI="https://github.com/vgropp/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" -KEYWORDS="amd64 ~arm ppc x86" +KEYWORDS="~amd64 ~arm ~ppc ~x86" LICENSE="GPL-2" SLOT="0" -IUSE="csv html" +IUSE="+csv +html" -RDEPEND="sys-libs/ncurses:0= - >=sys-apps/net-tools-1.60-r1" +RDEPEND=" + >=sys-apps/net-tools-1.60-r1 + sys-libs/ncurses:0= +" DEPEND="${RDEPEND}" PATCHES=( - "${FILESDIR}"/${P}-fix-buildsystem.patch - "${FILESDIR}"/${P}-static-inline.patch + "${FILESDIR}"/${PN}-0.6.2-tinfo.patch ) src_prepare() { default - mv configure.{in,ac} || die eautoreconf } @@ -33,6 +33,6 @@ src_configure() { econf \ $(use_enable csv) \ $(use_enable html) \ - --enable-ncurses \ + --with-ncurses \ --with-procnetdev } diff --git a/net-analyzer/bwm-ng/files/bwm-ng-0.6.1-fix-buildsystem.patch b/net-analyzer/bwm-ng/files/bwm-ng-0.6.1-fix-buildsystem.patch deleted file mode 100644 index 04c14392d66a..000000000000 --- a/net-analyzer/bwm-ng/files/bwm-ng-0.6.1-fix-buildsystem.patch +++ /dev/null @@ -1,93 +0,0 @@ -* Fix broken buildsystem -* Fix ncurses underlinking caused by missing "-ltinfo" in $LIBS -https://bugs.gentoo.org/show_bug.cgi?id=561718 - ---- a/configure.in -+++ b/configure.in -@@ -3,7 +3,7 @@ - - AC_INIT([bwm-ng],[0.6.1],[bwmng@gropp.org],[bwm-ng]) - AC_CONFIG_SRCDIR(src/bwm-ng.c) --AM_INIT_AUTOMAKE([gnu]) -+AM_INIT_AUTOMAKE([gnu subdir-objects]) - AC_CONFIG_HEADERS(config.h) - AC_CONFIG_MACRO_DIR(./) - AC_LANG([C]) -@@ -28,44 +28,12 @@ - AC_CHECK_TYPES(unsigned long long) - - # Checks for libraries. --CURSES_CHECKED="0" -+AC_ARG_ENABLE([ncurses], -+ AS_HELP_STRING([--enable-ncurses], [Enable feature ncurses])) - --AC_ARG_WITH([curses],AS_HELP_STRING([--with-curses],[with curses (ARG=PATH)]),[ --if [ test $withval != "no" ]; then -- OLD_CPPFLAGS=$CPPFLAGS -- if [ test $withval != "yes" ]; then -- CPPFLAGS="$CPPFLAGS -I$withval" -- fi -- AC_CHECK_LIB([curses],[newterm,timeout],,[ CPPFLAGS=$OLD_CPPFLAGS ]) -- CURSES_CHECKED="1" --else -- CURSES_CHECKED="1" --fi --]) -- -- --if [ test $CURSES_CHECKED != "1" ]; then --AC_ARG_WITH([ncurses],AS_HELP_STRING([--with-ncurses],[prefer ncurses over curses (ARG=PATH)]),[ --if [ test $withval != "no" ]; then -- OLD_CPPFLAGS=$CPPFLAGS -- if [ test $withval != "yes" ]; then -- CPPFLAGS="$CPPFLAGS -I$withval" -- fi -- AC_CHECK_LIB([ncurses],[newterm,timeout],,[ CPPFLAGS=$OLD_CPPFLAGS ]) -- CURSES_CHECKED="1" --else -- CURSES_CHECKED="1" --fi -+AS_IF([test "x$enable_ncurses" != "xno"], [ -+ PKG_CHECK_MODULES([NCURSES], [ncurses], [AC_DEFINE([HAVE_LIBNCURSES], [1], [Define to 1 if you have the `ncurses' library (-lncurses).])]) - ]) --fi -- -- -- --if [ test $CURSES_CHECKED != "1" ]; then --AC_CHECK_LIB([curses],[initscr,timeout],,[ -- AC_CHECK_LIB([ncurses],[newterm,timeout]) --]) --fi - - AC_CHECK_FUNCS([wattron]) - AC_CHECK_FUNCS([curs_set]) ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -2,12 +2,10 @@ - - bin_PROGRAMS = bwm-ng - --bwm_ng_SOURCES = bwm-ng.c process.c output.c options.c help.c curses_tools.c -+bwm_ng_SOURCES = bwm-ng.c process.c output.c options.c help.c curses_tools.c input/retrieve.c input/devstat.c input/libkstat.c input/netstat.c input/proc_net_dev.c input/sysctl.c input/ioservice.c input/libstatgrab.c input/proc_diskstats.c input/win32.c input/getifaddrs.c - --EXTRA_bwm_ng_SOURCES = input/retrieve.c input/devstat.c input/libkstat.c input/netstat.c input/proc_net_dev.c input/sysctl.c input/ioservice.c input/libstatgrab.c input/proc_diskstats.c input/win32.c input/getifaddrs.c -- --bwm_ng_LDADD = retrieve.$(OBJEXT) $(INPUT_SYSTEM) --bwm_ng_DEPENDENCIES = retrieve.$(OBJEXT) $(INPUT_SYSTEM) -+bwm_ng_CPPFLAGS = @NCURSES_CFLAGS@ -+bwm_ng_LDADD = @NCURSES_LIBS@ - - noinst_HEADERS = bwm-ng.h process.h output.h options.h help.h curses_tools.h types.h defines.h global_vars.h input/devstat.h input/libkstat.h input/netstat.h input/proc_net_dev.h input/sysctl.h input/ioservice.h input/libstatgrab.h input/proc_diskstats.h input/retrieve.h input/win32.h input/getifaddrs.h - ---- a/src/defines.h -+++ b/src/defines.h -@@ -48,7 +48,7 @@ - #define LIBSTATGRAB - #endif - --#if HAVE_LIBCURSES || HAVE_LIBNCURSES -+#if defined(HAVE_LIBCURSES) || defined(HAVE_LIBNCURSES) - #define HAVE_CURSES - #endif - diff --git a/net-analyzer/bwm-ng/files/bwm-ng-0.6.1-static-inline.patch b/net-analyzer/bwm-ng/files/bwm-ng-0.6.1-static-inline.patch deleted file mode 100644 index 88e15ecefe3f..000000000000 --- a/net-analyzer/bwm-ng/files/bwm-ng-0.6.1-static-inline.patch +++ /dev/null @@ -1,256 +0,0 @@ -Make all 'inline' functions 'static inline' such that -the compiler can emit definitions when needed. -http://www.greenend.org.uk/rjk/tech/inline.html - ---- a/src/bwm-ng.c -+++ b/src/bwm-ng.c -@@ -26,7 +26,7 @@ - - /* handle interrupt signal */ - void sigint(int sig) FUNCATTR_NORETURN; --inline void init(void); -+static inline void init(void); - - /* clear stuff and exit */ - #ifdef __STDC__ -@@ -98,7 +98,7 @@ - deinit(0, NULL); - } - --inline void init(void) { -+static inline void init(void) { - if_count=0; - delay=500; - #if EXTENDED_STATS ---- a/src/help.c -+++ b/src/help.c -@@ -24,9 +24,9 @@ - #include "global_vars.h" - #include "help.h" - --inline void print_help_line(const char *short_c,const char * long_c,const char *descr); -+static inline void print_help_line(const char *short_c,const char * long_c,const char *descr); - --inline void print_help_line(const char *short_c,const char * long_c,const char *descr) { -+static inline void print_help_line(const char *short_c,const char * long_c,const char *descr) { - #ifdef LONG_OPTIONS - printf(" %-23s",long_c); - #else ---- a/src/options.c -+++ b/src/options.c -@@ -30,12 +30,12 @@ - char *trim_whitespace(char *str); - int read_config(const char *config_file); - #endif --inline int str2output_unit(char *optarg); -+static inline int str2output_unit(char *optarg); - #if EXTENDED_STATS --inline int str2output_type(char *optarg); -+static inline int str2output_type(char *optarg); - #endif --inline int str2out_method(char *optarg); --inline int str2in_method(char *optarg); -+static inline int str2out_method(char *optarg); -+static inline int str2in_method(char *optarg); - - #ifdef CONFIG_FILE - /****************************************************************************** -@@ -65,7 +65,7 @@ - /******************************************************************************/ - #endif - --inline int str2output_unit(char *optarg) { -+static inline int str2output_unit(char *optarg) { - if (optarg) { - if (!strcasecmp(optarg,"bytes")) return BYTES_OUT; - if (!strcasecmp(optarg,"bits")) return BITS_OUT; -@@ -76,7 +76,7 @@ - } - - #if EXTENDED_STATS --inline int str2output_type(char *optarg) { -+static inline int str2output_type(char *optarg) { - if (optarg) { - if (!strcasecmp(optarg,"rate")) return RATE_OUT; - if (!strcasecmp(optarg,"max")) return MAX_OUT; -@@ -87,7 +87,7 @@ - } - #endif - --inline int str2out_method(char *optarg) { -+static inline int str2out_method(char *optarg) { - if (optarg) { - if (!strcasecmp(optarg,"plain")) return PLAIN_OUT; - #ifdef HAVE_CURSES -@@ -109,7 +109,7 @@ - } - - --inline int str2in_method(char *optarg) { -+static inline int str2in_method(char *optarg) { - if (optarg) { - #ifdef PROC_NET_DEV - if (!strcasecmp(optarg,"proc")) return PROC_IN; ---- a/src/output.c -+++ b/src/output.c -@@ -25,13 +25,13 @@ - #include "output.h" - - inline static const char *output_type2str(void); --inline const char *input2str(void); --inline const char *show_all_if2str(void); --inline ullong direction2value(char mode,struct inout_long stats); -+static inline const char *input2str(void); -+static inline const char *show_all_if2str(void); -+static inline ullong direction2value(char mode,struct inout_long stats); - #if EXTENDED_STATS --inline double direction_max2value(char mode,struct inouttotal_double stats,int items); -+static inline double direction_max2value(char mode,struct inouttotal_double stats,int items); - #endif --inline char *dyn_byte_value2str(double value,char *str,int buf_size); -+static inline char *dyn_byte_value2str(double value,char *str,int buf_size); - char *values2str(char mode,t_iface_speed_stats stats,t_iface_stats full_stats,float multiplier,char *str,int buf_size); - - inline static const char *output_type2str(void) { -@@ -59,7 +59,7 @@ - } - - --inline const char *input2str(void) { -+static inline const char *input2str(void) { - switch (input_method) { - #ifdef SYSCTL - case SYSCTL_IN: -@@ -121,7 +121,7 @@ - return ""; - } - --inline const char *show_all_if2str(void) { -+static inline const char *show_all_if2str(void) { - switch (show_all_if) { - case 1: - return " (all)"; -@@ -262,7 +262,7 @@ - } - - --inline ullong direction2value(char mode,struct inout_long stats) { -+static inline ullong direction2value(char mode,struct inout_long stats) { - switch (mode) { - case 0: - return stats.in; -@@ -275,7 +275,7 @@ - } - - #if EXTENDED_STATS --inline double direction_max2value(char mode,struct inouttotal_double stats,int items) { -+static inline double direction_max2value(char mode,struct inouttotal_double stats,int items) { - switch (mode) { - case 0: - return (double)(stats.in/items); -@@ -288,7 +288,7 @@ - } - #endif - --inline char *dyn_byte_value2str(double value,char *str,int buf_size) { -+static inline char *dyn_byte_value2str(double value,char *str,int buf_size) { - if (dynamic) { - if (value<1024) - snprintf(str,buf_size,"%15.2f ",value); -@@ -306,7 +306,7 @@ - return str; - } - --inline char *dyn_bit_value2str(double value,char *str,int buf_size) { -+static inline char *dyn_bit_value2str(double value,char *str,int buf_size) { - if (dynamic) { - if (value<1000) - snprintf(str,buf_size,"%15.2f ",value); ---- a/src/process.c -+++ b/src/process.c -@@ -26,19 +26,19 @@ - - short show_iface(char *instr, char *searchstr,char iface_is_up); - #if HAVE_GETTIMEOFDAY --inline long tvdiff(struct timeval newer, struct timeval older); -+static inline long tvdiff(struct timeval newer, struct timeval older); - float get_time_delay(int iface_num); - #endif --inline ullong calc_new_values(ullong new, ullong old); -+static inline ullong calc_new_values(ullong new, ullong old); - t_iface_speed_stats convert2calced_values(t_iface_speed_stats new, t_iface_speed_stats old); - t_iface_speed_stats convert2calced_disk_values(t_iface_speed_stats new, t_iface_speed_stats old); - #if EXTENDED_STATS --inline void sub_avg_values(struct inouttotal_double *values,struct inouttotal_double data); --inline void add_avg_values(struct inouttotal_double *values,struct inouttotal_double data); --inline void save_avg_values(struct inouttotal_double *values,struct inouttotal_double *data,struct inout_long calced_stats,float multiplier); -+static inline void sub_avg_values(struct inouttotal_double *values,struct inouttotal_double data); -+static inline void add_avg_values(struct inouttotal_double *values,struct inouttotal_double data); -+static inline void save_avg_values(struct inouttotal_double *values,struct inouttotal_double *data,struct inout_long calced_stats,float multiplier); - void save_avg(struct t_avg *avg,struct iface_speed_stats calced_stats,float multiplier); --inline void save_sum(struct inout_long *stats,struct inout_long new_stats_values); --inline void save_max(struct inouttotal_double *stats,struct inout_long calced_stats,float multiplier); -+static inline void save_sum(struct inout_long *stats,struct inout_long new_stats_values); -+static inline void save_max(struct inouttotal_double *stats,struct inout_long calced_stats,float multiplier); - #endif - - /* returns the whether to show the iface or not -@@ -74,7 +74,7 @@ - - #if HAVE_GETTIMEOFDAY - /* Returns: the time difference in milliseconds. */ --inline long tvdiff(struct timeval newer, struct timeval older) { -+static inline long tvdiff(struct timeval newer, struct timeval older) { - return labs((newer.tv_sec-older.tv_sec)*1000+ - (newer.tv_usec-older.tv_usec)/1000); - } -@@ -92,7 +92,7 @@ - #endif - - /* basically new-old, but handles "overflow" of source aswell */ --inline ullong calc_new_values(ullong new, ullong old) { -+static inline ullong calc_new_values(ullong new, ullong old) { - /* FIXME: WRAP_AROUND _might_ be wrong for libstatgrab, where the type is always long long */ - return (new>=old) ? (ullong)(new-old) : (ullong)(( - #ifdef HAVE_LIBKSTAT -@@ -133,13 +133,13 @@ - - #if EXTENDED_STATS - /* sub old values from cached for avg stats */ --inline void sub_avg_values(struct inouttotal_double *values,struct inouttotal_double data) { -+static inline void sub_avg_values(struct inouttotal_double *values,struct inouttotal_double data) { - values->in-=data.in; - values->out-=data.out; - values->total-=data.total; - } - --inline void add_avg_values(struct inouttotal_double *values,struct inouttotal_double data) { -+static inline void add_avg_values(struct inouttotal_double *values,struct inouttotal_double data) { - values->in+=data.in; - values->out+=data.out; - values->total+=data.total; -@@ -148,7 +148,7 @@ - - /* put new-old bytes in inout_long struct into a inouttotal_double struct - * and add values to cached .value struct */ --inline void save_avg_values(struct inouttotal_double *values,struct inouttotal_double *data,struct inout_long calced_stats,float multiplier) { -+static inline void save_avg_values(struct inouttotal_double *values,struct inouttotal_double *data,struct inout_long calced_stats,float multiplier) { - data->in=calced_stats.in*multiplier; - data->out=calced_stats.out*multiplier; - data->total=(calced_stats.in+calced_stats.out)*multiplier; -@@ -198,13 +198,13 @@ - } - - /* add current in and out bytes to totals struct */ --inline void save_sum(struct inout_long *stats,struct inout_long new_stats_values) { -+static inline void save_sum(struct inout_long *stats,struct inout_long new_stats_values) { - stats->in+=new_stats_values.in; - stats->out+=new_stats_values.out; - } - - /* lookup old max values and save new if higher */ --inline void save_max(struct inouttotal_double *stats,struct inout_long calced_stats,float multiplier) { -+static inline void save_max(struct inouttotal_double *stats,struct inout_long calced_stats,float multiplier) { - if (multiplier*calced_stats.in > stats->in) - stats->in=multiplier*calced_stats.in; - if (multiplier*calced_stats.out>stats->out) diff --git a/net-analyzer/bwm-ng/metadata.xml b/net-analyzer/bwm-ng/metadata.xml index 7d30b17df0f1..95c98a2c1a89 100644 --- a/net-analyzer/bwm-ng/metadata.xml +++ b/net-analyzer/bwm-ng/metadata.xml @@ -1,12 +1,15 @@ - -netmon@gentoo.org -Gentoo network monitoring and analysis project - - -Enable csv output -Enable html output - + + netmon@gentoo.org + Gentoo network monitoring and analysis project + + + Enable csv output + Enable html output + + + vgropp/bwm-ng + diff --git a/net-analyzer/cutter/Manifest b/net-analyzer/cutter/Manifest index cc59c2538cd9..9cd1ba973c97 100644 --- a/net-analyzer/cutter/Manifest +++ b/net-analyzer/cutter/Manifest @@ -1,2 +1 @@ -DIST cutter-1.03.tgz 13176 BLAKE2B d879d849be77c34d3e1882cbe500be71e631a5047116828ab07f8ab07b5bbb853e19b6e8b7dd5c42a73ce7b5c2825228cbeae07ec875e83da7bd1bd1c6f34a7a SHA512 821e8abf496e22b86bdd855fb1c9c51648a276ebb572edd2ccb172ae7025a38794df37dfe153c1807785ecec279c34b9df5e2bcc2de582b3a88ee3776cf46eea DIST cutter-1.04.tgz 13680 BLAKE2B 373e5e0c0fb14224974ff399c7db0a69dc5568394a881be2c285437050a1ec4cfb26acbcdd593d22519f34a32760bdbe342a96c2a4d55547f7c06bc49806e228 SHA512 79c17ec8c17e696a79aa8b11fda347f2e6929eb35f9a37da450acf6aff7ab9471e13eaef24708f90f3f0c2791fade2eb944443b98df3d3ae4eef0c408abc7b3a diff --git a/net-analyzer/cutter/cutter-1.03-r1.ebuild b/net-analyzer/cutter/cutter-1.03-r1.ebuild deleted file mode 100644 index 7e3806ff08d3..000000000000 --- a/net-analyzer/cutter/cutter-1.03-r1.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit eutils toolchain-funcs - -DESCRIPTION="TCP/IP Connection cutting on Linux Firewalls and Routers" -HOMEPAGE="http://www.digitage.co.uk/digitage/software/linux-security/cutter" -SRC_URI="http://www.digitage.co.uk/digitage/files/${PN}/${P}.tgz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ~ppc x86" - -src_prepare() { - epatch "${FILESDIR}"/${P}-debian.patch - rm -f Makefile # implicit rules are better ;x -} - -src_compile() { - emake cutter CC="$(tc-getCC)" -} - -src_install() { - dosbin cutter - dodoc README - doman debian/cutter.8 -} diff --git a/net-analyzer/cutter/cutter-1.04.ebuild b/net-analyzer/cutter/cutter-1.04.ebuild index f11002ca418e..46cc52cc6f2c 100644 --- a/net-analyzer/cutter/cutter-1.04.ebuild +++ b/net-analyzer/cutter/cutter-1.04.ebuild @@ -1,8 +1,9 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit eutils toolchain-funcs +EAPI=7 + +inherit toolchain-funcs DESCRIPTION="TCP/IP Connection cutting on Linux Firewalls and Routers" HOMEPAGE="http://www.digitage.co.uk/digitage/software/linux-security/cutter" @@ -10,11 +11,17 @@ SRC_URI="http://www.digitage.co.uk/digitage/files/${PN}/${P}.tgz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" +KEYWORDS="amd64 ~ppc x86" + +PATCHES=( + "${FILESDIR}"/${PN}-1.03-debian.patch +) src_prepare() { - epatch "${FILESDIR}"/${PN}-1.03-debian.patch - rm -f Makefile # implicit rules are better ;x + default + + # implicit rules are better ;x + rm -f Makefile || die } src_compile() { diff --git a/net-analyzer/darkstat/darkstat-3.0.719-r2.ebuild b/net-analyzer/darkstat/darkstat-3.0.719-r2.ebuild deleted file mode 100644 index 041df6e159de..000000000000 --- a/net-analyzer/darkstat/darkstat-3.0.719-r2.ebuild +++ /dev/null @@ -1,67 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit autotools - -DESCRIPTION="Network traffic analyzer with cute web interface" -HOMEPAGE="https://unix4lyfe.org/darkstat/" -SRC_URI="https://unix4lyfe.org/${PN}/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ppc x86" - -DEPEND=" - acct-user/darkstat - dev-libs/libbsd - net-libs/libpcap - sys-libs/zlib -" -RDEPEND=" - ${DEPEND} -" - -DARKSTAT_CHROOT_DIR=${DARKSTAT_CHROOT_DIR:-/var/lib/darkstat} - -DOCS=( AUTHORS ChangeLog README NEWS ) - -src_prepare() { - default - - sed -i -e 's|-flto||g' configure.ac || die - - eautoreconf -} - -src_configure() { - econf --disable-debug --with-privdrop-user=darkstat -} - -src_install() { - default - - newinitd "${FILESDIR}"/darkstat-initd darkstat - newconfd "${FILESDIR}"/darkstat-confd darkstat - - sed -i -e "s:__CHROOT__:${DARKSTAT_CHROOT_DIR}:g" "${D}"/etc/conf.d/darkstat || die - sed -i -e "s:__CHROOT__:${DARKSTAT_CHROOT_DIR}:g" "${D}"/etc/init.d/darkstat || die - - keepdir "${DARKSTAT_CHROOT_DIR}" - chown darkstat:0 "${D}${DARKSTAT_CHROOT_DIR}" -} - -pkg_postinst() { - # Workaround bug #141619 - DARKSTAT_CHROOT_DIR=`sed -n 's/^#CHROOT=\(.*\)/\1/p' "${ROOT}"etc/conf.d/darkstat` - chown darkstat:0 "${ROOT}${DARKSTAT_CHROOT_DIR}" - - elog "To start different darkstat instances which will listen on a different" - elog "interfaces create in /etc/init.d directory the 'darkstat.if' symlink to" - elog "darkstat script where 'if' is the name of the interface." - elog "Also in /etc/conf.d directory copy darkstat to darkstat.if" - elog "and edit it to change default values." - elog - elog "darkstat's default chroot directory is: \"${ROOT}${DARKSTAT_CHROOT_DIR}\"" -} diff --git a/net-analyzer/darkstat/darkstat-3.0.719-r3.ebuild b/net-analyzer/darkstat/darkstat-3.0.719-r3.ebuild index d67ebb1e93f5..f14539d204ea 100644 --- a/net-analyzer/darkstat/darkstat-3.0.719-r3.ebuild +++ b/net-analyzer/darkstat/darkstat-3.0.719-r3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,7 +11,7 @@ SRC_URI="https://unix4lyfe.org/${PN}/${P}.tar.bz2" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" +KEYWORDS="amd64 ppc x86" DEPEND=" acct-user/darkstat diff --git a/net-analyzer/dnstracer/dnstracer-1.10.ebuild b/net-analyzer/dnstracer/dnstracer-1.10.ebuild index 733c4c9cc2d7..c989ddeffa15 100644 --- a/net-analyzer/dnstracer/dnstracer-1.10.ebuild +++ b/net-analyzer/dnstracer/dnstracer-1.10.ebuild @@ -1,24 +1,24 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 + inherit toolchain-funcs DESCRIPTION="Determines where a given nameserver gets its information from" HOMEPAGE="https://www.mavetju.org/unix/general.php" SRC_URI="https://www.mavetju.org/download/${P}.tar.bz2 -> ${P}.tar.gz" -LICENSE="BSD-2" +S="${WORKDIR}/${PN}" +LICENSE="BSD-2" SLOT="0" -KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux" +KEYWORDS="amd64 ~arm ~hppa ~ia64 ~ppc ppc64 ~s390 ~sparc x86 ~amd64-linux" + +BDEPEND="dev-lang/perl" -BDEPEND=" - dev-lang/perl -" PATCHES=( "${FILESDIR}"/${PN}-1.9-argv0.patch ) -S=${WORKDIR}/${PN} src_compile() { emake CC="$(tc-getCC) ${CFLAGS} ${LDFLAGS}" diff --git a/net-analyzer/flow-tools/Manifest b/net-analyzer/flow-tools/Manifest index 11214dc160a7..958d870d3dc3 100644 --- a/net-analyzer/flow-tools/Manifest +++ b/net-analyzer/flow-tools/Manifest @@ -1,2 +1 @@ -DIST flow-tools-0.68.5.1.tar.bz2 914062 BLAKE2B 8a987c1aac53a1370045ab118888c51ce2de7b8db4074432e86e701153469163870cf1cf9da9e2267ed934d240de4b4bf2391b4681012b82db7e4205207b7fa4 SHA512 ae17ba39854daa8ef3deecd3a554bb6d1fa47648cb791d8225a40bec13f65bf0692871660b2c3490d133b1251875c323d066bb0c0483eceb0707cec9b7714c57 DIST flow-tools-0.68.6.tar.gz 1078778 BLAKE2B 8a6179e44f2efa90bb2c3ace73bfbb8a928c1d7aabc8f47a778ca7361a92c13f2df168194bdd9c489c175079c1bd977f6ad9852711a62d99649d1f44609d746b SHA512 fc3d0650ace93ec2180340624648b5967fd7f094900f8409e751b439eb659c9623e2ee55effeb74164ec6b15f0a1edd8ed7735ccfacfd72af08e9c5c0d65b740 diff --git a/net-analyzer/flow-tools/files/flow-tools-0.68.5.1-syslog.patch b/net-analyzer/flow-tools/files/flow-tools-0.68.5.1-syslog.patch deleted file mode 100644 index cb17471072bc..000000000000 --- a/net-analyzer/flow-tools/files/flow-tools-0.68.5.1-syslog.patch +++ /dev/null @@ -1,47 +0,0 @@ ---- a/lib/fterr.c -+++ b/lib/fterr.c -@@ -112,7 +112,7 @@ - fprintf(((fterr_file) ? fterr_file : stderr), "%s\n", buf2); - - if (fterr_flags & FTERR_SYSLOG) -- syslog(LOG_INFO, buf); -+ syslog(LOG_INFO, "%s", buf); - - } /* fterr_info */ - -@@ -134,7 +134,7 @@ - - if (fterr_flags & FTERR_SYSLOG) { - snprintf(buf2, 1024, "%s: %s", buf, strerror(errno)); -- syslog(LOG_INFO, buf2); -+ syslog(LOG_INFO, "%s", buf2); - } - - if (fterr_exit) -@@ -159,7 +159,7 @@ - } - - if (fterr_flags & FTERR_SYSLOG) -- syslog(LOG_INFO, buf); -+ syslog(LOG_INFO, "%s", buf); - - if (fterr_exit) - fterr_exit(code); -@@ -183,7 +183,7 @@ - } - - if (fterr_flags & FTERR_SYSLOG) -- syslog(LOG_INFO, buf); -+ syslog(LOG_INFO, "%s", buf); - - } /* fterr_warnx */ - -@@ -205,7 +205,7 @@ - - if (fterr_flags & FTERR_SYSLOG) { - snprintf(buf2, 1024, "%s: %s", buf, strerror(errno)); -- syslog(LOG_INFO, buf2); -+ syslog(LOG_INFO, "%s", buf2); - } - - } /* fterr_warn */ diff --git a/net-analyzer/flow-tools/flow-tools-0.68.5.1-r11.ebuild b/net-analyzer/flow-tools/flow-tools-0.68.5.1-r11.ebuild deleted file mode 100644 index d1f4fc95e62a..000000000000 --- a/net-analyzer/flow-tools/flow-tools-0.68.5.1-r11.ebuild +++ /dev/null @@ -1,68 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="library and programs to process reports from NetFlow data" -HOMEPAGE="https://code.google.com/p/flow-tools/" -SRC_URI="https://${PN}.googlecode.com/files/${P}.tar.bz2" - -LICENSE="BSD GPL-2" -SLOT="0" -KEYWORDS="amd64 ppc x86" -IUSE="debug libressl mysql postgres ssl static-libs" - -RDEPEND=" - acct-group/flows - acct-user/flows - sys-apps/tcp-wrappers - sys-libs/zlib - mysql? ( dev-db/mysql-connector-c:0= ) - postgres? ( dev-db/postgresql:* ) - ssl? ( - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) - )" -DEPEND="${RDEPEND}" -BDEPEND=" - sys-devel/flex - sys-devel/bison" - -DOCS=( ChangeLog README SECURITY TODO ) - -PATCHES=( - "${FILESDIR}"/${P}-run.patch - "${FILESDIR}"/${P}-syslog.patch - "${FILESDIR}"/${P}-openssl11.patch - "${FILESDIR}"/${P}-fno-common.patch -) - -src_configure() { - econf \ - $(use_enable static-libs static) \ - $(usex mysql --with-mysql '') \ - $(usex postgres --with-postgresql=yes --with-postgresql=no) \ - $(usex ssl --with-openssl '') \ - --sysconfdir=/etc/flow-tools -} - -src_install() { - default - - find "${D}" -name '*.la' -delete || die - - exeinto /var/lib/flows/bin - doexe "${FILESDIR}"/linkme - - keepdir /var/lib/flows/ft - - newinitd "${FILESDIR}/flowcapture.initd" flowcapture - newconfd "${FILESDIR}/flowcapture.confd" flowcapture - - fowners flows:flows /var/lib/flows - fowners flows:flows /var/lib/flows/bin - fowners flows:flows /var/lib/flows/ft - - fperms 0755 /var/lib/flows - fperms 0755 /var/lib/flows/bin -} diff --git a/net-analyzer/flow-tools/flow-tools-0.68.6-r1.ebuild b/net-analyzer/flow-tools/flow-tools-0.68.6-r1.ebuild index d8ee002d2ccf..0f7a1e00b1eb 100644 --- a/net-analyzer/flow-tools/flow-tools-0.68.6-r1.ebuild +++ b/net-analyzer/flow-tools/flow-tools-0.68.6-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,7 +11,7 @@ SRC_URI="https://github.com/5u623l20/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="BSD GPL-3" SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" +KEYWORDS="amd64 ppc x86" IUSE="debug libressl mysql postgres ssl static-libs" RDEPEND=" diff --git a/net-analyzer/fwlogwatch/fwlogwatch-1.5.ebuild b/net-analyzer/fwlogwatch/fwlogwatch-1.5.ebuild index 93b1e6a2a352..76955ecc5654 100644 --- a/net-analyzer/fwlogwatch/fwlogwatch-1.5.ebuild +++ b/net-analyzer/fwlogwatch/fwlogwatch-1.5.ebuild @@ -1,15 +1,15 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 -inherit eutils flag-o-matic toolchain-funcs +inherit flag-o-matic toolchain-funcs DESCRIPTION="A packet filter and firewall log analyzer" HOMEPAGE="http://fwlogwatch.inside-security.de/" SRC_URI="http://fwlogwatch.inside-security.de/sw/${P}.tar.bz2" -KEYWORDS="~amd64 ~ppc ~sparc ~x86" +KEYWORDS="amd64 ~ppc ~sparc x86" LICENSE="GPL-1" SLOT="0" IUSE="geoip nls zlib" @@ -18,13 +18,15 @@ RDEPEND=" geoip? ( dev-libs/geoip ) zlib? ( sys-libs/zlib ) " -DEPEND=" - ${RDEPEND} +DEPEND="${RDEPEND}" +BDEPEND=" sys-devel/flex nls? ( sys-devel/gettext ) " src_prepare() { + default + if use nls; then strip-linguas -i po/ local lingua pofile @@ -62,7 +64,7 @@ src_configure() { src_compile() { emake \ - CC=$(tc-getCC) \ + CC="$(tc-getCC)" \ CFLAGS="${CFLAGS}" \ LDFLAGS="${LDFLAGS}" use nls && emake -C po @@ -72,6 +74,7 @@ src_install() { emake \ LOCALE_DIR="${D}/usr" INSTALL_DIR="${D}/usr" \ install + use nls && emake \ LOCALE_DIR="${D}/usr" INSTALL_DIR="${D}/usr" \ install-i18n diff --git a/net-analyzer/hydra/Manifest b/net-analyzer/hydra/Manifest index fb6dd8eb4936..8d6ee303deb2 100644 --- a/net-analyzer/hydra/Manifest +++ b/net-analyzer/hydra/Manifest @@ -1,2 +1,3 @@ DIST hydra-9.0.tar.gz 1168498 BLAKE2B b4834c66fb1bebcd19151784b75d4c9220cbf7045b289a063a1cbc48a793abfa2edcb466d43234bd4c8e14074a2e2a39ccd697698392f24f39c84da54ee07165 SHA512 58067bd2696e82645bb959fe5537f2876e1d8c170a15fe6a9ac65bbdc33cfb75b47fd1a969c314a6c6d91b2b6c0ce4ba087680bbd67a5a38925a2a8b5c5ad338 DIST hydra-9.1.tar.gz 611846 BLAKE2B 9a5b6dc52b5f4069bf326e86728ebaf8c1fe018536f3943b83493de934703bff6770ae3f7a9a223ee00b5f52f7bd10ee4ddc272e1bbad00c399aa19cc0c083ba SHA512 863176375fe1aae4c0a2b74c11aba297682d66e522c98c926c539348309b0af4e407e460b4cb803d2c83c008787c73f7f1e56ac6aca9791351e1b596c2e4fbb2 +DIST hydra-9.2.tar.gz 614176 BLAKE2B 102c744fbdd3702c624b1c8339178883b689db093d9f1c66d8e04816327eb8095f3e3133f889b2a6ee6dcabb9e5af0c71ec8470731b4b174021fbd79741d05e7 SHA512 ee8ecd854b61ac9d708098c8a0d9a128d8b80b38db1a2ba8eb06de6fbbc6865135d994620ade8e3742fb993899274ed9d8fd0e95bed7a9fbeb1ca9e182540322 diff --git a/net-analyzer/hydra/hydra-9.0-r1.ebuild b/net-analyzer/hydra/hydra-9.0-r1.ebuild index 402929ea2301..f1397694c8ad 100644 --- a/net-analyzer/hydra/hydra-9.0-r1.ebuild +++ b/net-analyzer/hydra/hydra-9.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -12,7 +12,7 @@ LICENSE="GPL-3" SLOT="0" KEYWORDS="~amd64 ~ppc ~x86" IUSE=" - debug firebird gcrypt gtk idn libressl memcached mongodb mysql ncp ncurses + debug firebird gcrypt gtk idn libressl memcached mongodb mysql ncurses oracle pcre postgres rdp libssh subversion zlib " @@ -31,7 +31,6 @@ RDEPEND=" memcached? ( dev-libs/libmemcached[sasl] ) mongodb? ( dev-libs/mongo-c-driver ) mysql? ( dev-db/mysql-connector-c:0= ) - ncp? ( net-fs/ncpfs ) ncurses? ( sys-libs/ncurses:= ) oracle? ( dev-db/oracle-instantclient-basic ) pcre? ( dev-libs/libpcre ) @@ -93,7 +92,6 @@ src_configure() { hydra_sed memcached '-lmemcached' '$( "${PKG_CONFIG}" --libs libmemcached )' '-DLIBMCACHED' hydra_sed mongodb '-lmongoc-1.0' '$( "${PKG_CONFIG}" --libs libmongoc-1.0 )' '-DLIBMONGODB\|-DLIBBSON' hydra_sed mysql '-lmysqlclient' '$( ${CTARGET:-${CHOST}}-mysql_config --libs )' '-DLIBMYSQLCLIENT' - hydra_sed ncp '-lncp' '' '-DLIBNCP' hydra_sed ncurses '-lcurses' '$( "${PKG_CONFIG}" --libs ncurses )' '-DLIBNCURSES' hydra_sed pcre '-lpcre' '$( "${PKG_CONFIG}" --libs libpcre )' '-DHAVE_PCRE' hydra_sed postgres '-lpq' '$( "${PKG_CONFIG}" --libs libpq )' '-DLIBPOSTGRES' diff --git a/net-analyzer/hydra/hydra-9.0.ebuild b/net-analyzer/hydra/hydra-9.0.ebuild index 3a812ec881b5..190b5ed145c3 100644 --- a/net-analyzer/hydra/hydra-9.0.ebuild +++ b/net-analyzer/hydra/hydra-9.0.ebuild @@ -12,7 +12,7 @@ LICENSE="GPL-3" SLOT="0" KEYWORDS="amd64 ~ppc x86" IUSE=" - debug firebird gcrypt gtk idn libressl memcached mongodb mysql ncp ncurses + debug firebird gcrypt gtk idn libressl memcached mongodb mysql ncurses oracle pcre postgres rdp libssh subversion zlib " @@ -31,7 +31,6 @@ RDEPEND=" memcached? ( dev-libs/libmemcached[sasl] ) mongodb? ( dev-libs/mongo-c-driver ) mysql? ( dev-db/mysql-connector-c:0= ) - ncp? ( net-fs/ncpfs ) ncurses? ( sys-libs/ncurses:= ) oracle? ( dev-db/oracle-instantclient-basic ) pcre? ( dev-libs/libpcre ) @@ -89,7 +88,6 @@ src_configure() { hydra_sed memcached '-lmemcached' '$( "${PKG_CONFIG}" --libs libmemcached )' '-DLIBMCACHED' hydra_sed mongodb '-lmongoc-1.0' '$( "${PKG_CONFIG}" --libs libmongoc-1.0 )' '-DLIBMONGODB\|-DLIBBSON' hydra_sed mysql '-lmysqlclient' '$( ${CTARGET:-${CHOST}}-mysql_config --libs )' '-DLIBMYSQLCLIENT' - hydra_sed ncp '-lncp' '' '-DLIBNCP' hydra_sed ncurses '-lcurses' '$( "${PKG_CONFIG}" --libs ncurses )' '-DLIBNCURSES' hydra_sed pcre '-lpcre' '$( "${PKG_CONFIG}" --libs libpcre )' '-DHAVE_PCRE' hydra_sed postgres '-lpq' '$( "${PKG_CONFIG}" --libs libpq )' '-DLIBPOSTGRES' diff --git a/net-analyzer/hydra/hydra-9.1.ebuild b/net-analyzer/hydra/hydra-9.1.ebuild index 0b2eb5c879d1..edfc864a713f 100644 --- a/net-analyzer/hydra/hydra-9.1.ebuild +++ b/net-analyzer/hydra/hydra-9.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -10,9 +10,9 @@ SRC_URI="https://github.com/vanhauser-thc/thc-hydra/archive/v${PV}.tar.gz -> ${P LICENSE="GPL-3" SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" +KEYWORDS="~amd64 ~ppc x86" IUSE=" - debug firebird gcrypt gtk idn libressl memcached mongodb mysql ncp ncurses + debug firebird gcrypt gtk idn libressl memcached mongodb mysql ncurses oracle pcre postgres rdp libssh subversion zlib " @@ -31,7 +31,6 @@ RDEPEND=" memcached? ( dev-libs/libmemcached[sasl] ) mongodb? ( dev-libs/mongo-c-driver ) mysql? ( dev-db/mysql-connector-c:0= ) - ncp? ( net-fs/ncpfs ) ncurses? ( sys-libs/ncurses:= ) oracle? ( dev-db/oracle-instantclient-basic ) pcre? ( dev-libs/libpcre ) @@ -89,7 +88,6 @@ src_configure() { hydra_sed memcached '-lmemcached' '$( "${PKG_CONFIG}" --libs libmemcached )' '-DLIBMCACHED' hydra_sed mongodb '-lmongoc-1.0' '$( "${PKG_CONFIG}" --libs libmongoc-1.0 )' '-DLIBMONGODB\|-DLIBBSON' hydra_sed mysql '-lmysqlclient' '$( ${CTARGET:-${CHOST}}-mysql_config --libs )' '-DLIBMYSQLCLIENT' - hydra_sed ncp '-lncp' '' '-DLIBNCP' hydra_sed ncurses '-lcurses' '$( "${PKG_CONFIG}" --libs ncurses )' '-DLIBNCURSES' hydra_sed pcre '-lpcre' '$( "${PKG_CONFIG}" --libs libpcre )' '-DHAVE_PCRE' hydra_sed postgres '-lpq' '$( "${PKG_CONFIG}" --libs libpq )' '-DLIBPOSTGRES' diff --git a/net-analyzer/hydra/hydra-9.2.ebuild b/net-analyzer/hydra/hydra-9.2.ebuild new file mode 100644 index 000000000000..5ce7e4c52418 --- /dev/null +++ b/net-analyzer/hydra/hydra-9.2.ebuild @@ -0,0 +1,120 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit toolchain-funcs + +DESCRIPTION="Parallelized network login hacker" +HOMEPAGE="https://github.com/vanhauser-thc/thc-hydra" +SRC_URI="https://github.com/vanhauser-thc/thc-hydra/archive/v${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/thc-${P}" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86" +IUSE=" + debug firebird gcrypt gtk idn libressl memcached mongodb mysql ncurses + oracle pcre postgres rdp libssh subversion zlib +" + +RDEPEND=" + gtk? ( + dev-libs/atk + dev-libs/glib:2 + x11-libs/gdk-pixbuf:2 + x11-libs/gtk+:2 + ) + firebird? ( dev-db/firebird ) + gcrypt? ( dev-libs/libgcrypt ) + idn? ( net-dns/libidn:0= ) + !libressl? ( dev-libs/openssl:0= ) + libressl? ( dev-libs/libressl:0= ) + memcached? ( dev-libs/libmemcached[sasl] ) + mongodb? ( dev-libs/mongo-c-driver ) + mysql? ( dev-db/mysql-connector-c:0= ) + ncurses? ( sys-libs/ncurses:= ) + oracle? ( dev-db/oracle-instantclient-basic ) + pcre? ( dev-libs/libpcre ) + postgres? ( dev-db/postgresql:* ) + rdp? ( net-misc/freerdp ) + libssh? ( >=net-libs/libssh-0.4.0 ) + subversion? ( dev-vcs/subversion ) + zlib? ( sys-libs/zlib ) +" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +src_prepare() { + default + + # None of the settings in Makefile.unix are useful to us + mv Makefile.unix{,.gentoo_unused} || die + touch Makefile.unix || die + + sed -i \ + -e 's:|| echo.*$::' \ + -e '/\t-$(CC)/s:-::' \ + -e '/^OPTS/{s|=|+=|;s| -O3||}' \ + -e '/ -o /s:$(OPTS):& $(LDFLAGS):g' \ + Makefile.am || die +} + +src_configure() { + # Note: the top level configure script is not autoconf-based + tc-export CC PKG_CONFIG + + export OPTS="${CFLAGS}" + + hydra_sed() { + if use ${1}; then + einfo "Enabling ${1}" + if [[ -n "${3}" ]]; then + sed -i 's#'"${2}"'#'"${3}"'#' configure || die + fi + else + einfo "Disabling ${1}" + sed -i 's#'"${2}"'##; s#'"${4}"'##' configure || die + fi + } + + hydra_sed firebird '-lfbclient' '' '-DLIBFIREBIRD' + hydra_sed gcrypt '-lgcrypt' '$( ${CTARGET:-${CHOST}}-libgcrypt-config --libs )' '-DHAVE_GCRYPT' + hydra_sed idn '-lidn' '$( "${PKG_CONFIG}" --libs libidn )' '-DLIBIDN -DHAVE_PR29_H' + hydra_sed libssh '-lssh' '$( "${PKG_CONFIG}" --libs libssh )' '-DLIBSSH' + hydra_sed memcached '-lmemcached' '$( "${PKG_CONFIG}" --libs libmemcached )' '-DLIBMCACHED' + hydra_sed mongodb '-lmongoc-1.0' '$( "${PKG_CONFIG}" --libs libmongoc-1.0 )' '-DLIBMONGODB\|-DLIBBSON' + hydra_sed mysql '-lmysqlclient' '$( ${CTARGET:-${CHOST}}-mysql_config --libs )' '-DLIBMYSQLCLIENT' + hydra_sed ncurses '-lcurses' '$( "${PKG_CONFIG}" --libs ncurses )' '-DLIBNCURSES' + hydra_sed pcre '-lpcre' '$( "${PKG_CONFIG}" --libs libpcre )' '-DHAVE_PCRE' + hydra_sed postgres '-lpq' '$( "${PKG_CONFIG}" --libs libpq )' '-DLIBPOSTGRES' + hydra_sed oracle '-locci -lclntsh' '' '-DLIBORACLE' + hydra_sed rdp '-lfreerdp2' '$( "${PKG_CONFIG}" --libs freerdp2 )' '-DLIBFREERDP2' + # TODO: https://bugs.gentoo.org/686148 + #hydra_sed subversion '-lsvn_client-1 -lapr-1 -laprutil-1 -lsvn_subr-1' '$( "${PKG_CONFIG}" --libs libsvn_client )' '-DLIBSVN' + hydra_sed subversion '-lsvn_client-1 -lapr-1 -laprutil-1 -lsvn_subr-1' '' '-DLIBSVN' + hydra_sed zlib '-lz' '$( "${PKG_CONFIG}" --libs zlib )' '-DHAVE_ZLIB' + + sh configure \ + $(use gtk || echo --disable-xhydra) \ + $(usex debug '--debug' '') \ + --nostrip \ + --prefix=/usr \ + || die + + if use gtk ; then + pushd hydra-gtk || die + econf + fi +} + +src_compile() { + emake XLIBPATHS='' + use gtk && emake -C hydra-gtk +} + +src_install() { + dobin hydra pw-inspector + use gtk && dobin hydra-gtk/src/xhydra + dodoc CHANGES README.md +} diff --git a/net-analyzer/hydra/hydra-9999999.ebuild b/net-analyzer/hydra/hydra-9999999.ebuild index 3ff5496cc9b3..8745aff71916 100644 --- a/net-analyzer/hydra/hydra-9999999.ebuild +++ b/net-analyzer/hydra/hydra-9999999.ebuild @@ -1,18 +1,19 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit flag-o-matic git-r3 toolchain-funcs + +inherit git-r3 toolchain-funcs DESCRIPTION="Parallelized network login hacker" HOMEPAGE="https://github.com/vanhauser-thc/thc-hydra" EGIT_REPO_URI="https://github.com/vanhauser-thc/thc-hydra" +S="${WORKDIR}/thc-${P}" LICENSE="GPL-3" SLOT="0" -KEYWORDS="" IUSE=" - debug firebird gcrypt gtk idn libressl memcached mongodb mysql ncp ncurses + debug firebird gcrypt gtk idn libressl memcached mongodb mysql ncurses oracle pcre postgres rdp libssh subversion zlib " @@ -31,7 +32,6 @@ RDEPEND=" memcached? ( dev-libs/libmemcached[sasl] ) mongodb? ( dev-libs/mongo-c-driver ) mysql? ( dev-db/mysql-connector-c:0= ) - ncp? ( net-fs/ncpfs ) ncurses? ( sys-libs/ncurses:= ) oracle? ( dev-db/oracle-instantclient-basic ) pcre? ( dev-libs/libpcre ) @@ -41,10 +41,8 @@ RDEPEND=" subversion? ( dev-vcs/subversion ) zlib? ( sys-libs/zlib ) " -DEPEND=" - ${RDEPEND} - virtual/pkgconfig -" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" src_prepare() { default @@ -64,7 +62,6 @@ src_prepare() { src_configure() { # Note: the top level configure script is not autoconf-based tc-export CC PKG_CONFIG - append-cflags -fcommon export OPTS="${CFLAGS}" @@ -87,12 +84,11 @@ src_configure() { hydra_sed memcached '-lmemcached' '$( "${PKG_CONFIG}" --libs libmemcached )' '-DLIBMCACHED' hydra_sed mongodb '-lmongoc-1.0' '$( "${PKG_CONFIG}" --libs libmongoc-1.0 )' '-DLIBMONGODB\|-DLIBBSON' hydra_sed mysql '-lmysqlclient' '$( ${CTARGET:-${CHOST}}-mysql_config --libs )' '-DLIBMYSQLCLIENT' - hydra_sed ncp '-lncp' '' '-DLIBNCP' hydra_sed ncurses '-lcurses' '$( "${PKG_CONFIG}" --libs ncurses )' '-DLIBNCURSES' hydra_sed pcre '-lpcre' '$( "${PKG_CONFIG}" --libs libpcre )' '-DHAVE_PCRE' hydra_sed postgres '-lpq' '$( "${PKG_CONFIG}" --libs libpq )' '-DLIBPOSTGRES' hydra_sed oracle '-locci -lclntsh' '' '-DLIBORACLE' - hydra_sed rdp '-lfreerdp2' '$( "${PKG_CONFIG}" --libs freerdp2 )' '-DLIBFREERDP2' + hydra_sed rdp '-lfreerdp2' '$( "${PKG_CONFIG}" --libs freerdp2 )' '-DLIBFREERDP' # TODO: https://bugs.gentoo.org/686148 #hydra_sed subversion '-lsvn_client-1 -lapr-1 -laprutil-1 -lsvn_subr-1' '$( "${PKG_CONFIG}" --libs libsvn_client )' '-DLIBSVN' hydra_sed subversion '-lsvn_client-1 -lapr-1 -laprutil-1 -lsvn_subr-1' '' '-DLIBSVN' diff --git a/net-analyzer/hydra/metadata.xml b/net-analyzer/hydra/metadata.xml index 0c88bc63e93a..edfd01784ed1 100644 --- a/net-analyzer/hydra/metadata.xml +++ b/net-analyzer/hydra/metadata.xml @@ -1,13 +1,15 @@ - -netmon@gentoo.org - - -Enable radmin2 support through dev-libs/libgcrypt -Enable SSH support through net-libs/libssh -MongoDB support through dev-libs/mongo-c-driver -NCP protocol (NetWare) support through ncpfs - + + netmon@gentoo.org + + + Enable radmin2 support through dev-libs/libgcrypt + Enable SSH support through net-libs/libssh + MongoDB support through dev-libs/mongo-c-driver + + + vanhauser-thc/thc-hydra + diff --git a/net-analyzer/ifstatus/ifstatus-2.0.0.ebuild b/net-analyzer/ifstatus/ifstatus-2.0.0.ebuild index 7b2612d29fee..0b58e01792d6 100644 --- a/net-analyzer/ifstatus/ifstatus-2.0.0.ebuild +++ b/net-analyzer/ifstatus/ifstatus-2.0.0.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 inherit toolchain-funcs -KEYWORDS="~amd64 ~arm ~ppc ~x86" +KEYWORDS="amd64 ~arm ~ppc x86" DESCRIPTION="A simple CLI program for displaying network statistics in real time" HOMEPAGE="http://ifstatus.sourceforge.net/" diff --git a/net-analyzer/labrea/files/labrea-2.5-libdir.patch b/net-analyzer/labrea/files/labrea-2.5-libdir.patch new file mode 100644 index 000000000000..039745205c3c --- /dev/null +++ b/net-analyzer/labrea/files/labrea-2.5-libdir.patch @@ -0,0 +1,26 @@ +--- a/configure.in ++++ b/configure.in +@@ -82,9 +82,9 @@ AC_ARG_WITH(libpcap, + if cd $withval; then withval=`pwd`; cd $owd; fi + PCAPINC="-I$withval/include" + if test -f $withval/lib/libwpcap.a; then +- PCAPLIB="-L$withval/lib -lwpcap" ++ PCAPLIB="-L$withval/${libdir} -lwpcap" + else +- PCAPLIB="-L$withval/lib -lpcap" ++ PCAPLIB="-L$withval/${libdir} -lpcap" + fi + else + AC_ERROR(pcap.h, net/bpf.h, or libpcap.a not found in $withval) +@@ -94,9 +94,9 @@ AC_ARG_WITH(libpcap, + [ if test -f ${prefix}/include/pcap.h; then + PCAPINC="-I${prefix}/include" + if test -f ${prefix}/lib/libwpcap.a; then +- PCAPLIB="-L${prefix}/lib -lwpcap" ++ PCAPLIB="-L${libdir} -lwpcap" + else +- PCAPLIB="-L${prefix}/lib -lpcap" ++ PCAPLIB="-L${libdir} -lpcap" + fi + elif test -f /usr/include/pcap/pcap.h; then + PCAPINC="-I/usr/include/pcap" diff --git a/net-analyzer/labrea/labrea-2.5_p1.ebuild b/net-analyzer/labrea/labrea-2.5_p1.ebuild index 5fc9881601f9..a47abfc9e1a0 100644 --- a/net-analyzer/labrea/labrea-2.5_p1.ebuild +++ b/net-analyzer/labrea/labrea-2.5_p1.ebuild @@ -1,12 +1,14 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 + inherit autotools DESCRIPTION="'Sticky' Honeypot and IDS" HOMEPAGE="http://labrea.sourceforge.net/" SRC_URI="mirror://sourceforge/${PN}/${P/_p*}-stable-${PV/*_p}.tar.gz" +S="${WORKDIR}/${P/_p/-stable-}" LICENSE="GPL-2" SLOT="0" @@ -16,15 +18,15 @@ DEPEND=" net-libs/libpcap >=dev-libs/libdnet-1.7 " -RDEPEND=" - ${DEPEND} -" +RDEPEND="${DEPEND}" + DOCS=( AUTHORS ChangeLog README{,.first} TODO NEWS ) + PATCHES=( "${FILESDIR}"/${P/_p/-stable-}-incdir.patch "${FILESDIR}"/${P/_p*}-pcap_open.patch + "${FILESDIR}"/${PN}-2.5-libdir.patch ) -S=${WORKDIR}/${P/_p/-stable-} src_prepare() { default @@ -32,6 +34,8 @@ src_prepare() { # autotools will overwrite this with the generic version mv INSTALL README.first || die + mv configure.{in,ac} || die + eautoreconf } diff --git a/net-analyzer/lft/Manifest b/net-analyzer/lft/Manifest index c110350415b4..9b6cb4681d0e 100644 --- a/net-analyzer/lft/Manifest +++ b/net-analyzer/lft/Manifest @@ -1,5 +1 @@ -DIST lft-3.77.tar.gz 376369 BLAKE2B be518167608896a43b7e2ef1ca478f3fa9a9ced58737e607af348bd8929a2890356dc6041ce3ea9fa3273a954d4df151a4c6ff5fc5a0e26e25b3849bf83aac5d SHA512 b06fa50cbccb40d275ac604b86c6aed4ee00700cde38fd579de06bb577280f154d0173c4788920410a5c2e0c8ed20d7adf07f15d0b98cf5ad4ea422651df60f1 -DIST lft-3.79.tar.gz 376655 BLAKE2B 4c3affe00a09befc00029029a1da5d530d08bce317e616e7d996a8e31d22632cf43adbe519f4789313b59dc01f4c36d19860effd561b4f691eadcac05c935d6e SHA512 83f35cb24966467a7da180ca8ac9d642e7ca6267a14e752a813f172956554c3d4b278a450d230535c15db1b14d415dca752ad05ed1cec8c1c7cf4953b90a646d -DIST lft-3.8.tar.gz 376731 BLAKE2B e78e6d32cdaff8864e13477522dac92953d7ba44cb7d64e327eeb126411d6f6c022fe1e2011377df28bc948ae75193d1de2801ee12edc42a5cf70e2b56f5e8e5 SHA512 13ea176362096cc8c20500d61969483642f5d003263b529ec8d601786f621341107859510f9cafa5d365417beafce897bcc9cd631171e291ca3dc07fec1bd483 -DIST lft-3.9.tar.gz 377008 BLAKE2B ee56fde8ea25eddc9d7b7860c55f5f9d90a867fd54b5169fdfffd9c7276e38ed9f3855480472c0ed51e53db608e16a0f462f315c0e4b10794b69daab00aeb8b8 SHA512 9d95644eaa61a295d15381c35a8130642e3299a6e90a73bf4a1f369a3b9d8eee648497638f36f0ed5ae970d0307420ba30dbe4ac865767923fd618fbccddc806 DIST lft-3.91.tar.gz 377135 BLAKE2B 6b67438738ebab46e5c6c79c17f074042535e9eecb80827562fb6ca6550118ecb3e70118379c4cd0b99611189554fe117ebb3d76580130627b2a21d72c9b5253 SHA512 1d030e2def14330426eef4c81245c4cce5f09c560b65b319199b20d82e967b77a5d4e323e2e64a8c1bcf80d1f87ae871e3f24a7d9cbc19cd7a5be2d3204845e7 diff --git a/net-analyzer/lft/lft-3.77.ebuild b/net-analyzer/lft/lft-3.77.ebuild deleted file mode 100644 index b79c445424c0..000000000000 --- a/net-analyzer/lft/lft-3.77.ebuild +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -DESCRIPTION="Layer Four Traceroute (LFT) and WhoB" -HOMEPAGE="http://pwhois.org/lft/" -SRC_URI="http://pwhois.org/get/${P}.tar.gz" - -LICENSE="VOSTROM" -SLOT="0" -KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos" - -DEPEND=" - net-libs/libpcap -" -RDEPEND=" - ${DEPEND} -" - -DOCS=( CHANGELOG README TODO ) - -src_prepare() { - default - sed -i Makefile.in -e 's:strip:true:g' || die -} diff --git a/net-analyzer/lft/lft-3.79.ebuild b/net-analyzer/lft/lft-3.79.ebuild deleted file mode 100644 index 58a145bd7256..000000000000 --- a/net-analyzer/lft/lft-3.79.ebuild +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -DESCRIPTION="Layer Four Traceroute (LFT) and WhoB" -HOMEPAGE="http://pwhois.org/lft/" -SRC_URI="http://pwhois.org/get/${P}.tar.gz" - -LICENSE="VOSTROM" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" - -DEPEND=" - net-libs/libpcap -" -RDEPEND=" - ${DEPEND} -" - -DOCS=( CHANGELOG README TODO ) - -src_prepare() { - default - sed -i Makefile.in -e 's:strip:true:g' || die -} diff --git a/net-analyzer/lft/lft-3.80.ebuild b/net-analyzer/lft/lft-3.80.ebuild deleted file mode 100644 index bc7acaa2b658..000000000000 --- a/net-analyzer/lft/lft-3.80.ebuild +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -DESCRIPTION="Layer Four Traceroute (LFT) and WhoB" -HOMEPAGE="http://pwhois.org/lft/" -SRC_URI="http://pwhois.org/get/${P/0}.tar.gz" - -LICENSE="VOSTROM" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" - -DEPEND=" - net-libs/libpcap -" -RDEPEND=" - ${DEPEND} -" -S=${WORKDIR}/${P/0} - -DOCS=( CHANGELOG README TODO ) - -src_prepare() { - default - sed -i Makefile.in -e 's:strip:true:g' || die -} diff --git a/net-analyzer/lft/lft-3.90.ebuild b/net-analyzer/lft/lft-3.90.ebuild deleted file mode 100644 index d874cf1a0c8c..000000000000 --- a/net-analyzer/lft/lft-3.90.ebuild +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="Layer Four Traceroute (LFT) and WhoB" -HOMEPAGE="http://pwhois.org/lft/" -SRC_URI="http://pwhois.org/get/${P/0}.tar.gz" - -LICENSE="VOSTROM" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" - -DEPEND=" - net-libs/libpcap -" -RDEPEND=" - ${DEPEND} -" -S=${WORKDIR}/${P/0} - -DOCS=( CHANGELOG README TODO ) - -src_prepare() { - sed -i -e 's:strip:true:g' Makefile.in || die - sed -i \ - -e 's|_BSD_SOURCE|_DEFAULT_SOURCE|g' \ - configure config/acconfig.h.in || die - default -} diff --git a/net-analyzer/lft/lft-3.91-r1.ebuild b/net-analyzer/lft/lft-3.91-r1.ebuild index 576eb0a3cc0b..3e57965afb2b 100644 --- a/net-analyzer/lft/lft-3.91-r1.ebuild +++ b/net-analyzer/lft/lft-3.91-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -9,7 +9,7 @@ SRC_URI="http://pwhois.org/get/${P}.tar.gz" LICENSE="VOSTROM" SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" +KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos" DEPEND=" net-libs/libpcap diff --git a/net-analyzer/nbwmon/nbwmon-0.5.2.ebuild b/net-analyzer/nbwmon/nbwmon-0.5.2.ebuild index f2c7742f396c..613256373c42 100644 --- a/net-analyzer/nbwmon/nbwmon-0.5.2.ebuild +++ b/net-analyzer/nbwmon/nbwmon-0.5.2.ebuild @@ -1,27 +1,26 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit eutils toolchain-funcs +EAPI=7 + +inherit toolchain-funcs DESCRIPTION="ncurses bandwidth monitor" -HOMEPAGE="http://causes.host.funtoo.org/?p=nbwmon https://github.com/causes-/nbwmon" +HOMEPAGE="https://github.com/causes-/nbwmon" SRC_URI="https://github.com/causes-/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="MIT" SLOT="0" KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" -RDEPEND=" - sys-libs/ncurses -" -DEPEND=" - ${RDEPEND} - virtual/pkgconfig -" +RDEPEND="sys-libs/ncurses" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +PATCHES=( "${FILESDIR}"/${PN}-0.5.2-tinfo.patch ) src_prepare() { - epatch "${FILESDIR}"/${PN}-0.5.2-tinfo.patch + default tc-export CC PKG_CONFIG } diff --git a/net-analyzer/nethogs/nethogs-0.8.6.ebuild b/net-analyzer/nethogs/nethogs-0.8.6-r1.ebuild similarity index 67% rename from net-analyzer/nethogs/nethogs-0.8.6.ebuild rename to net-analyzer/nethogs/nethogs-0.8.6-r1.ebuild index bef9dec145fd..e0f115871a58 100644 --- a/net-analyzer/nethogs/nethogs-0.8.6.ebuild +++ b/net-analyzer/nethogs/nethogs-0.8.6-r1.ebuild @@ -1,9 +1,9 @@ # Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 -inherit toolchain-funcs +inherit fcaps toolchain-funcs DESCRIPTION="A small 'net top' tool, grouping bandwidth by process" HOMEPAGE="https://github.com/raboof/nethogs" @@ -13,21 +13,27 @@ LICENSE="GPL-2" SLOT="0" KEYWORDS="amd64 ~arm ~ia64 x86" +DOCS=( DESIGN README.decpcap.txt README.md ) + RDEPEND=" net-libs/libpcap sys-libs/ncurses:0= " -DEPEND=" - ${RDEPEND} +DEPEND="${RDEPEND}" +BDEPEND=" virtual/pkgconfig " +FILECAPS=( + cap_net_admin,cap_net_raw usr/sbin/nethogs +) + src_compile() { tc-export CC CXX - emake NCURSES_LIBS="$( $(tc-getPKG_CONFIG) --libs ncurses )" ${PN} + emake NCURSES_LIBS="$( $(tc-getPKG_CONFIG) --libs ncurses )" "${PN}" } src_install() { emake DESTDIR="${ED}" PREFIX="/usr" install - dodoc DESIGN README.decpcap.txt README.md + einstalldocs } diff --git a/net-analyzer/netselect/netselect-0.4-r2.ebuild b/net-analyzer/netselect/netselect-0.4-r2.ebuild new file mode 100644 index 000000000000..decda5e572d5 --- /dev/null +++ b/net-analyzer/netselect/netselect-0.4-r2.ebuild @@ -0,0 +1,56 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit fcaps toolchain-funcs + +DESCRIPTION="Ultrafast implementation of ping" +HOMEPAGE="http://apenwarr.ca/netselect/" +SRC_URI=" + https://github.com/apenwarr/${PN}/archive/${P}.tar.gz + ipv6? ( https://dev.gentoo.org/~jer/${P}-ipv6.patch.xz ) +" +S="${WORKDIR}/${PN}-${P}" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" +IUSE="ipv6" + +PATCHES=( + "${FILESDIR}"/${PN}-0.4-bsd.patch + "${FILESDIR}"/${PN}-0.4-flags.patch +) + +DOCS=( HISTORY README ) + +FILECAPS=( -g wheel cap_net_raw /usr/bin/netselect ) + +src_prepare() { + use ipv6 && eapply "${WORKDIR}"/${PN}-0.4-ipv6.patch + + default + + # Don't warn about "root privileges required" when running as + # an unprivileged user with filecaps + if ! use prefix && use filecaps; then + sed -i -e '/if (geteuid () != 0)/,+2d' "${S}"/netselect.c || die + fi +} + +src_compile() { + emake CC="$(tc-getCC)" LDFLAGS="${CFLAGS} ${LDFLAGS}" +} + +src_install() { + dobin netselect + + einstalldocs + + doman netselect.1 +} + +pkg_postinst() { + ! use prefix && fcaps_pkg_postinst +} diff --git a/net-analyzer/nfdump/Manifest b/net-analyzer/nfdump/Manifest index 8e6ae49f88b8..78d77f893a28 100644 --- a/net-analyzer/nfdump/Manifest +++ b/net-analyzer/nfdump/Manifest @@ -1,3 +1,3 @@ DIST nfdump-1.6.19.tar.gz 561923 BLAKE2B 458cf0e23f433c7c1c27450712a2f9f8f75a990eeaf079bac9a74bf5abf4bc22c930294494424fd8e7f7d03ffc1e5f1e35ba50e29ba4f3528f63e1739524c9ed SHA512 577c23ca3aae8ab035c734c137d3a338e09f46b5f8551946fd84b9a03fae1ef2aa80e2ab9657eb226defcd753bb63503eeb85316ca1df18d95b85270df8f379e -DIST nfdump-1.6.20.tar.gz 561053 BLAKE2B 20c8db09386a4aa6174d3c2919c33409a4b2d9b295908ae61e8ce12107c08ba7742fb7ec80bcb7bcdb15e036e6d2320c83f0446a479185cb18717720eca87c88 SHA512 8396241fa24d532540135762a81ce035586c405d4ab1e01d6e2b8226b7cc9b6784170ca1fa4c1581fb60f324473cca5ce2d3de82282313d3877f9584e449d137 DIST nfdump-1.6.21.tar.gz 561617 BLAKE2B 61a52cb7ee724c47f93e0ce8dd0515306c16b94d8b351f9543deecc2b28c813f09f0e4ba621f2561760924af683ffd527d00936fbc5f91f83d6f727d6cf9e5d9 SHA512 c9162b7a6653267cd4d66a2d75bb2c3d65c431bb29ee549bac2a208fe7f2bc871bb91dfa6d89d6f18cd69f1d435dd25ba1c5dfe6e10b0efc4a582f2e67913a34 +DIST nfdump-1.6.22.tar.gz 563266 BLAKE2B f985a8f8bcbb7ff3ab98d4f01449b121e92914bc47ec7fa07c1a7a068f6722447228b0166d0f2e966c0bab2c93e34133743e8dff7d8dc41a1c70ffac64fbbf6e SHA512 3508e54b4c4785a79118147779300eebd9485532e157b37ed6487255dacaa49959d425c8fc489caa98ff559a4859b9e456e97a6c8a06a1029eb904aa1f9efb61 diff --git a/net-analyzer/nfdump/files/nfcapd.confd b/net-analyzer/nfdump/files/nfcapd.confd new file mode 100644 index 000000000000..28ea35fd0741 --- /dev/null +++ b/net-analyzer/nfdump/files/nfcapd.confd @@ -0,0 +1,11 @@ +#shellcheck shell=sh +#shellcheck disable=SC2034 + +#port number to listen on +#PORT="2055" + +#maximum size of collected files +#MAX_SIZE="1G" + +#enable sending of all received packets to specified address +#REPEAT_TO="192.168.1.1/60062" diff --git a/net-analyzer/nfdump/files/nfcapd.initd b/net-analyzer/nfdump/files/nfcapd.initd new file mode 100644 index 000000000000..98d388cb710f --- /dev/null +++ b/net-analyzer/nfdump/files/nfcapd.initd @@ -0,0 +1,60 @@ +#!/sbin/openrc-run +#shellcheck shell=sh + +IDENT="${RC_SVCNAME#*.}" +PIDFILE="/run/nfcapd/${IDENT}.pid" +USER="nfcapd" +GROUP="nfcapd" + +ssd_start(){ + if [ -n "${MAX_SIZE}" ]; then + set -- "$@" -e + fi + if [ -n "${PORT}" ]; then + set -- "$@" -p "${PORT}" + fi + if [ -n "${REPEAT_TO}" ]; then + set -- "$@" -R "${REPEAT_TO}" + fi + start-stop-daemon "$@" +} + +checkconfig() { + if [ "${IDENT}" = "${RC_SVCNAME}" ]; then + eerror "You have to create an init script for each ident:" + eerror " cd /etc/init.d/; ln -s nfcapd nfcapd.ident" + return 1 + fi +} + +depend() { + need net +} + +start() { + checkconfig || return 1 + + checkpath -d -m 0750 -o nfcapd:nfcapd /run/nfcapd + checkpath -d -m 0750 -o nfcapd:nfcapd /var/tmp/nfcapd/"${IDENT}" + + if [ -n "${MAX_SIZE}" ]; then + nfexpire -u /var/tmp/nfcapd/"${IDENT}" -s "${MAX_SIZE}" \ + > /dev/null 2>&1 + chown -R ${USER}:${GROUP} /var/tmp/nfcapd/"${IDENT}" + fi + + ebegin "Starting ${RC_SVCNAME}" + ssd_start --start --quiet --exec /usr/bin/nfcapd \ + --pidfile "${PIDFILE}" -- -D -P "${PIDFILE}" -u ${USER} \ + -g ${GROUP} -I "${IDENT}" -l /var/tmp/nfcapd/"${IDENT}" + eend $? +} + +stop() { + checkconfig || return 1 + + ebegin "Stopping ${RC_SVCNAME}" + start-stop-daemon --stop --exec /usr/bin/nfcapd \ + --pidfile "${PIDFILE}" + eend $? +} diff --git a/net-analyzer/nfdump/files/nfdump-1.6.21-remove-strict-rfc-7011-handling.patch b/net-analyzer/nfdump/files/nfdump-1.6.21-remove-strict-rfc-7011-handling.patch new file mode 100644 index 000000000000..a36af2242d42 --- /dev/null +++ b/net-analyzer/nfdump/files/nfdump-1.6.21-remove-strict-rfc-7011-handling.patch @@ -0,0 +1,49 @@ +From f5ae2b821c22ebe0c96f3516d4e90f4255633828 Mon Sep 17 00:00:00 2001 +From: Peter Haag +Date: Sat, 8 Aug 2020 16:46:04 +0200 +Subject: [PATCH] Re-address issue #231 - remove strict rule rfc 7011 + +--- + ChangeLog | 3 +++ + bin/ipfix.c | 3 --- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/ChangeLog b/ChangeLog +index a0b2b67..8b92e58 100755 +--- a/ChangeLog ++++ b/ChangeLog +@@ -1,3 +1,6 @@ ++2020-08-02 ++- Re-address issue #231 - remove strict rule rfc 7011 ++ + 2020-08-02 + - Release 1.6.21 + - Address issue #159. Implement rfc 7011 and include sender UDP port into unique template identification +diff --git a/bin/ipfix.c b/bin/ipfix.c +index a730a8b..19c9d63 100644 +--- a/bin/ipfix.c ++++ b/bin/ipfix.c +@@ -158,7 +158,6 @@ typedef struct exporterDomain_s { + + // exporter information + exporter_info_record_t info; +- in_port_t port; // follow rfc 7011 - matching src port + + uint64_t packets; // number of packets sent by this exporter + uint64_t flows; // number of flow records sent by this exporter +@@ -383,7 +382,6 @@ uint32_t ObservationDomain = ntohl(ipfix_header->ObservationDomain); + + while ( *e ) { + if ( (*e)->info.id == ObservationDomain && (*e)->info.version == 10 && +- (*e)->port == fs->port && + (*e)->info.ip.V6[0] == fs->ip.V6[0] && (*e)->info.ip.V6[1] == fs->ip.V6[1]) + return *e; + e = &((*e)->next); +@@ -412,7 +410,6 @@ uint32_t ObservationDomain = ntohl(ipfix_header->ObservationDomain); + (*e)->info.header.size = sizeof(exporter_info_record_t); + (*e)->info.id = ObservationDomain; + (*e)->info.ip = fs->ip; +- (*e)->port = fs->port; + (*e)->info.sa_family = fs->sa_family; + (*e)->info.version = 10; + (*e)->info.sysid = 0; diff --git a/net-analyzer/nfdump/metadata.xml b/net-analyzer/nfdump/metadata.xml index f785b8973856..f9f3c305c35a 100644 --- a/net-analyzer/nfdump/metadata.xml +++ b/net-analyzer/nfdump/metadata.xml @@ -6,12 +6,18 @@ Gentoo network monitoring and analysis project - Build nfcapd collector to read from pcap file instead ofnetwork data Build the flow-tools to nfdump converter + Build nfudmp to support JunOS NAT event logging + Build nfpcapd collector to create netflow data from precollected pcap traffic Build nfprofile used by NfSen Build nfprofile used by PortTracker + Build nfudmp to support NSEL/NEL event data + Build nfcapd collector to read from pcap file instead ofnetwork data Build sflow collector sfcpad + nfdump is a toolset to collect and process netflow and sflow + data, sent from netflow/sflow compatible devices. The toolset supports + netflow v1, v5/v7,v9,IPFIX and SFLOW. nfdump phaag/nfdump diff --git a/net-analyzer/nfdump/nfdump-1.6.21.ebuild b/net-analyzer/nfdump/nfdump-1.6.21-r1.ebuild similarity index 93% rename from net-analyzer/nfdump/nfdump-1.6.21.ebuild rename to net-analyzer/nfdump/nfdump-1.6.21-r1.ebuild index 4c59fb92baec..f6000c763cbd 100644 --- a/net-analyzer/nfdump/nfdump-1.6.21.ebuild +++ b/net-analyzer/nfdump/nfdump-1.6.21-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -35,7 +35,9 @@ RDEPEND=" PATCHES=( "${FILESDIR}"/${PN}-1.6.19-compiler.patch "${FILESDIR}"/${PN}-1.6.19-libft.patch + "${FILESDIR}"/${PN}-1.6.21-remove-strict-rfc-7011-handling.patch ) + DOCS=( AUTHORS ChangeLog README.md ) src_prepare() { diff --git a/net-analyzer/nfdump/nfdump-1.6.20.ebuild b/net-analyzer/nfdump/nfdump-1.6.22-r1.ebuild similarity index 62% rename from net-analyzer/nfdump/nfdump-1.6.20.ebuild rename to net-analyzer/nfdump/nfdump-1.6.22-r1.ebuild index d866f89da5b1..67db70201342 100644 --- a/net-analyzer/nfdump/nfdump-1.6.20.ebuild +++ b/net-analyzer/nfdump/nfdump-1.6.22-r1.ebuild @@ -1,7 +1,8 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 + inherit autotools DESCRIPTION="A set of tools to collect and process netflow data" @@ -9,32 +10,36 @@ HOMEPAGE="https://github.com/phaag/nfdump" SRC_URI="https://github.com/phaag/nfdump/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="BSD" -SLOT="0/1.6.15" +SLOT="0/1.6.22" KEYWORDS="~amd64 ~x86" -IUSE="debug ftconv nfprofile nftrack readpcap sflow static-libs" +IUSE="debug doc jnat ftconv nfpcapd nfprofile nftrack nsel readpcap sflow + static-libs" +REQUIRED_USE="?? ( jnat nsel )" -COMMON_DEPEND=" +RDEPEND=" app-arch/bzip2 sys-libs/zlib - ftconv? ( sys-libs/zlib net-analyzer/flow-tools ) + ftconv? ( net-analyzer/flow-tools ) + nfpcapd? ( net-libs/libpcap ) nfprofile? ( net-analyzer/rrdtool ) nftrack? ( net-analyzer/rrdtool ) readpcap? ( net-libs/libpcap ) " -DEPEND=" - ${COMMON_DEPEND} - app-doc/doxygen +DEPEND="${RDEPEND}" +BDEPEND=" sys-devel/flex virtual/yacc + doc? ( + app-doc/doxygen + media-gfx/graphviz + ) " -RDEPEND=" - ${COMMON_DEPEND} - dev-lang/perl -" + PATCHES=( "${FILESDIR}"/${PN}-1.6.19-compiler.patch "${FILESDIR}"/${PN}-1.6.19-libft.patch ) + DOCS=( AUTHORS ChangeLog README.md ) src_prepare() { @@ -42,22 +47,35 @@ src_prepare() { eautoreconf - doxygen -u doc/Doxyfile.in || die + if use doc; then + doxygen -u doc/Doxyfile.in || die + fi } src_configure() { # --without-ftconf is not handled well #322201 econf \ $(use ftconv && echo "--enable-ftconv --with-ftpath=/usr") \ + $(use nfpcapd && echo --enable-nfpcapd) \ $(use nfprofile && echo --enable-nfprofile) \ $(use nftrack && echo --enable-nftrack) \ $(use_enable debug devel) \ + $(use_enable jnat) \ + $(use_enable nsel) \ $(use_enable readpcap) \ $(use_enable sflow) \ - $(use_enable static-libs static) + --disable-static } src_install() { default + find "${ED}" -name '*.la' -delete || die + + newinitd "${FILESDIR}"/nfcapd.initd nfcapd + newconfd "${FILESDIR}"/nfcapd.confd nfcapd + + if use doc; then + dodoc -r doc/html + fi } diff --git a/net-analyzer/packit/Manifest b/net-analyzer/packit/Manifest index 69e82515e9d3..df96e38d0b67 100644 --- a/net-analyzer/packit/Manifest +++ b/net-analyzer/packit/Manifest @@ -1,2 +1 @@ -DIST packit-1.6.1.tar.gz 52643 BLAKE2B 4b67c179140a21ec3dc8b5ae2e116a771fdbd860c3a880588a29346f04c956a80a59fcaf84f42ae6c505554e5b942964ed3f2d3a06d408e5b36850276832994a SHA512 462470bfc755dc33418ae0a65237d0dcbbe04609de710883134bcb1e13cff9212cd9a28e888b2e839a06a566fa080ecd6c6668414f1cac2bde337c81d1ac58a2 DIST packit-1.7.tar.gz 53192 BLAKE2B f5a7fcd0790e05be593be47c2339c3ecb14b2fd45308a273ecc9d5398087698605c2174a8440e870ccf35fd9d560bea11ca720e44045115c15757f6f98d00ac4 SHA512 4e7d13ef5387dc446e718792562dbf84f9e0b611196a3590ea8e8b4411ae30694b48f28ab632a0b692935adffb44757e65a4eb5ab942b5d625acbdc08d34aefd diff --git a/net-analyzer/packit/files/packit-1.6.1-fno-common.patch b/net-analyzer/packit/files/packit-1.6.1-fno-common.patch deleted file mode 100644 index f4813d868ab1..000000000000 --- a/net-analyzer/packit/files/packit-1.6.1-fno-common.patch +++ /dev/null @@ -1,251 +0,0 @@ ---- a/src/capture_defs.h -+++ b/src/capture_defs.h -@@ -30,12 +30,12 @@ - #define READ_TIMEOUT 500 - #define SNAPLEN_DEFAULT 68 - --u_int16_t g_display; --u_int16_t g_link_layer; --u_int16_t g_dump_pkt; --u_int16_t g_time_gmt; --u_int16_t g_t_rst; --u_int16_t g_snap_len; --u_int32_t g_pkt_rst; -+extern u_int16_t g_display; -+extern u_int16_t g_link_layer; -+extern u_int16_t g_dump_pkt; -+extern u_int16_t g_time_gmt; -+extern u_int16_t g_t_rst; -+extern u_int16_t g_snap_len; -+extern u_int32_t g_pkt_rst; - - #endif /* __CAPTURE_DEFS_H */ ---- a/src/error.c -+++ b/src/error.c -@@ -26,6 +26,8 @@ - - #include "error.h" - -+char error_buf[ERRBUF_MAXLEN]; -+ - void - fatal_error(char *err,...) - { ---- a/src/error.h -+++ b/src/error.h -@@ -33,7 +33,7 @@ - #define SUCCESS 1 - #define FAILURE -1 - --char error_buf[ERRBUF_MAXLEN]; -+extern char error_buf[ERRBUF_MAXLEN]; - - void fatal_error(char *,...); - ---- a/src/globals.h -+++ b/src/globals.h -@@ -138,20 +138,20 @@ - #define P_INT64 0x7FFFFFFFFFFFFFFF - #define P_UINT64 0xFFFFFFFFFFFFFFFF - --char g_w_file[OPT_MAXLEN]; --char g_r_file[OPT_MAXLEN]; -+extern char g_w_file[OPT_MAXLEN]; -+extern char g_r_file[OPT_MAXLEN]; - --pcap_t *g_pkt; --u_int8_t g_tr_fin; --char *g_filter; --char *g_device; --u_int16_t g_hdr_len; --u_int16_t g_pkt_len; --u_int16_t g_verbose; --u_int16_t g_resolve; --u_int16_t g_p_mode; --u_int64_t g_cnt; --u_int64_t g_inj_cnt; --u_int64_t g_cap_cnt; -+extern pcap_t *g_pkt; -+extern u_int8_t g_tr_fin; -+extern char *g_filter; -+extern char *g_device; -+extern u_int16_t g_hdr_len; -+extern u_int16_t g_pkt_len; -+extern u_int16_t g_verbose; -+extern u_int16_t g_resolve; -+extern u_int16_t g_p_mode; -+extern u_int64_t g_cnt; -+extern u_int64_t g_inj_cnt; -+extern u_int64_t g_cap_cnt; - - #endif /* __GLOBALS_H */ ---- a/src/inject_defs.h -+++ b/src/inject_defs.h -@@ -30,7 +30,7 @@ - #ifndef __INJECTION_STRUCTS_H - #define __INJECTION_STRUCTS_H - --struct ip4hdr_opts -+extern struct ip4hdr_opts - { - u_int16_t p; /* protocol type */ - u_int16_t rand_p; -@@ -59,7 +59,7 @@ - u_int16_t rand_d_addr; - } g_ip4hdr_o; - --struct tcphdr_opts -+extern struct tcphdr_opts - { - u_int16_t s_port; /* tcp source port */ - u_int16_t d_port; /* tcp destination port */ -@@ -82,7 +82,7 @@ - - } g_thdr_o; - --struct udphdr_opts -+extern struct udphdr_opts - { - u_int16_t s_port; /* udp source port */ - u_int16_t d_port; /* udp destination port */ -@@ -90,7 +90,7 @@ - u_int16_t sum; /* udp checksum */ - } g_uhdr_o; - --struct icmp4hdr_opts -+extern struct icmp4hdr_opts - { - u_int16_t type; /* icmp4 type */ - u_int16_t code; /* icmp4 code */ -@@ -132,7 +132,7 @@ - u_int32_t ttime; /* transmit timestamp */ - } g_i4hdr_o; - --struct enethdr_opts -+extern struct enethdr_opts - { - u_int16_t rand_s_addr; - u_int16_t rand_d_addr; -@@ -143,7 +143,7 @@ - u_int8_t dhw_addr[18]; - } g_ehdr_o; - --struct arphdr_opts -+extern struct arphdr_opts - { - u_int16_t op_type; /* arp operation */ - -@@ -163,28 +163,28 @@ - u_int8_t rhw_addr[18]; - } g_ahdr_o; - --libnet_t *g_pkt_d; -+extern libnet_t *g_pkt_d; - --u_int16_t g_init_type; --u_int16_t g_rand_d_port; --u_int16_t g_rand_s_port; --u_int16_t g_s_port; --u_int16_t g_d_port; --u_int16_t g_port_range; --u_int16_t g_interval_sec; --u_int16_t g_interval_usec; --u_int16_t g_injection_type; --u_int16_t g_r_timeout; --u_int16_t g_burst_rate; --u_int16_t g_payload_len; --u_int8_t *g_payload; --u_int8_t g_hex_payload; --u_int8_t *g_s_d_port; --u_int8_t g_hwaddr_p[18]; --u_int8_t g_rawip; -+extern u_int16_t g_init_type; -+extern u_int16_t g_rand_d_port; -+extern u_int16_t g_rand_s_port; -+extern u_int16_t g_s_port; -+extern u_int16_t g_d_port; -+extern u_int16_t g_port_range; -+extern u_int16_t g_interval_sec; -+extern u_int16_t g_interval_usec; -+extern u_int16_t g_injection_type; -+extern u_int16_t g_r_timeout; -+extern u_int16_t g_burst_rate; -+extern u_int16_t g_payload_len; -+extern u_int8_t *g_payload; -+extern u_int8_t g_hex_payload; -+extern u_int8_t *g_s_d_port; -+extern u_int8_t g_hwaddr_p[18]; -+extern u_int8_t g_rawip; - --struct timeval g_bf_pcap; --struct timeval g_af_pcap; -+extern struct timeval g_bf_pcap; -+extern struct timeval g_af_pcap; - - - #endif /* __INJECTION_STRUCTS_H */ ---- a/src/main.c -+++ b/src/main.c -@@ -30,6 +30,62 @@ - - #include "main.h" - -+char g_w_file[OPT_MAXLEN]; -+char g_r_file[OPT_MAXLEN]; -+ -+pcap_t *g_pkt; -+u_int8_t g_tr_fin; -+char *g_filter; -+char *g_device; -+u_int16_t g_hdr_len; -+u_int16_t g_pkt_len; -+u_int16_t g_verbose; -+u_int16_t g_resolve; -+u_int16_t g_p_mode; -+u_int64_t g_cnt; -+u_int64_t g_inj_cnt; -+u_int64_t g_cap_cnt; -+ -+/* capture_defs.h */ -+u_int16_t g_display; -+u_int16_t g_link_layer; -+u_int16_t g_dump_pkt; -+u_int16_t g_time_gmt; -+u_int16_t g_t_rst; -+u_int16_t g_snap_len; -+u_int32_t g_pkt_rst; -+ -+/* inject_defs.h */ -+u_int16_t g_init_type; -+u_int16_t g_rand_d_port; -+u_int16_t g_rand_s_port; -+u_int16_t g_s_port; -+u_int16_t g_d_port; -+u_int16_t g_port_range; -+u_int16_t g_interval_sec; -+u_int16_t g_interval_usec; -+u_int16_t g_injection_type; -+u_int16_t g_r_timeout; -+u_int16_t g_burst_rate; -+u_int16_t g_payload_len; -+u_int8_t *g_payload; -+u_int8_t g_hex_payload; -+u_int8_t *g_s_d_port; -+u_int8_t g_hwaddr_p[18]; -+u_int8_t g_rawip; -+ -+struct timeval g_bf_pcap; -+struct timeval g_af_pcap; -+ -+struct arphdr_opts g_ahdr_o; -+struct enethdr_opts g_ehdr_o; -+struct icmp4hdr_opts g_i4hdr_o; -+struct ip4hdr_opts g_ip4hdr_o; -+struct tcphdr_opts g_thdr_o; -+struct udphdr_opts g_uhdr_o; -+ -+libnet_t *g_pkt_d; -+ - void - parse_capture_options(int argc, char *argv[]) - { diff --git a/net-analyzer/packit/packit-1.6.1.ebuild b/net-analyzer/packit/packit-1.6.1.ebuild deleted file mode 100644 index 48ba4aeab1c9..000000000000 --- a/net-analyzer/packit/packit-1.6.1.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit autotools - -DESCRIPTION="network packet generator and capture tool" -HOMEPAGE="https://github.com/resurrecting-open-source-projects/packit" -SRC_URI="https://github.com/resurrecting-open-source-projects/packit/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos" - -DEPEND=" - net-libs/libnet:1.1 - net-libs/libpcap -" -RDEPEND="${DEPEND}" -PATCHES=( - "${FILESDIR}"/${PN}-1.0-noopt.patch - "${FILESDIR}"/${PN}-1.6.1-fno-common.patch -) - -src_prepare() { - default - eautoreconf -} - -src_install() { - default - dodoc docs/* -} diff --git a/net-analyzer/packit/packit-1.7.ebuild b/net-analyzer/packit/packit-1.7.ebuild index 5059d8e159a0..6f454fbc9ba2 100644 --- a/net-analyzer/packit/packit-1.7.ebuild +++ b/net-analyzer/packit/packit-1.7.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -10,7 +10,7 @@ SRC_URI="https://github.com/resurrecting-open-source-projects/packit/archive/${P LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" +KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos" DEPEND=" net-libs/libnet:1.1 diff --git a/net-analyzer/rrdtool/metadata.xml b/net-analyzer/rrdtool/metadata.xml index a6a291c9723d..d2dbe95efd3c 100644 --- a/net-analyzer/rrdtool/metadata.xml +++ b/net-analyzer/rrdtool/metadata.xml @@ -1,13 +1,16 @@ - -netmon@gentoo.org -Gentoo network monitoring and analysis project - - -Enable support for graphing functions -Enable support for librados from sys-cluster/ceph -Build rrdcgi support - + + netmon@gentoo.org + Gentoo network monitoring and analysis project + + + Enable support for graphing functions + Enable support for librados from sys-cluster/ceph + Build rrdcgi support + + + oetiker/rrdtool-1.x + diff --git a/net-analyzer/rrdtool/rrdtool-1.7.2-r1.ebuild b/net-analyzer/rrdtool/rrdtool-1.7.2-r1.ebuild deleted file mode 100644 index ba8b9c45ce93..000000000000 --- a/net-analyzer/rrdtool/rrdtool-1.7.2-r1.ebuild +++ /dev/null @@ -1,189 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -DISTUTILS_OPTIONAL=true -DISTUTILS_SINGLE_IMPL=true -GENTOO_DEPEND_ON_PERL=no -PYTHON_COMPAT=( python3_{7,8} ) -inherit autotools perl-module distutils-r1 flag-o-matic multilib - -MY_P=${P/_/-} - -DESCRIPTION="A system to store and display time-series data" -HOMEPAGE="https://oss.oetiker.ch/rrdtool/" -SRC_URI="https://oss.oetiker.ch/rrdtool/pub/${MY_P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0/8.0.0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris" -IUSE="dbi doc graph lua perl python rados rrdcgi ruby static-libs tcl tcpd test" -RESTRICT="!test? ( test )" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -CDEPEND=" - >=dev-libs/glib-2.28.7:2[static-libs(+)?] - >=dev-libs/libxml2-2.7.8:2[static-libs(+)?] - dbi? ( dev-db/libdbi[static-libs(+)?] ) - graph? ( - >=media-libs/libpng-1.5.10:0=[static-libs(+)?] - >=x11-libs/cairo-1.10.2[svg,static-libs(+)?] - >=x11-libs/pango-1.28 - ) - lua? ( dev-lang/lua:0= ) - perl? ( dev-lang/perl:= ) - python? ( ${PYTHON_DEPS} ) - rados? ( sys-cluster/ceph ) - tcl? ( dev-lang/tcl:0= ) - tcpd? ( sys-apps/tcp-wrappers ) -" - -DEPEND=" - ${CDEPEND} - sys-apps/groff - virtual/pkgconfig - virtual/awk - test? ( sys-devel/bc ) -" -RDEPEND=" - ${CDEPEND} -" -PDEPEND=" - ruby? ( ~dev-ruby/rrdtool-bindings-${PV} ) -" -PATCHES=( - "${FILESDIR}"/${PN}-1.4.9-disable-rrd_graph-perl.patch - "${FILESDIR}"/${PN}-1.7.0-disable-rrd_graph-cgi.patch - "${FILESDIR}"/${PN}-1.7.1-configure.ac.patch -) -S=${WORKDIR}/${MY_P} - -python_compile() { - cd bindings/python || die - distutils-r1_python_compile -} - -python_install() { - cd bindings/python || die - distutils-r1_python_install -} - -pkg_setup() { - use python && python-single-r1_pkg_setup -} - -src_prepare() { - default - # At the next version bump, please see if you actually still need this - # before adding versions - if ! [ -f doc/rrdrados.pod ]; then - cp "${FILESDIR}"/${PN}-1.5.5-rrdrados.pod doc/rrdrados.pod - else - die "File already exists: doc/rrdrados.pod. Remove this code!" - fi - - # bug 456810 - # no time to sleep - sed -i \ - -e 's|$LUA_CFLAGS|IGNORE_THIS_BAD_TEST|g' \ - -e 's|^sleep 1$||g' \ - -e '/^dnl.*png/s|^dnl||g' \ - configure.ac || die - - # Python bindings are built/installed manually - sed -i \ - -e '/^all-local:/s| @COMP_PYTHON@||' \ - bindings/Makefile.am || die - - if ! use graph; then - sed -i \ - -e '2s:rpn1::; 2s:rpn2::; 6s:create-with-source-4::;' \ - -e '7s:xport1::; 7s:dcounter1::; 7s:vformatter1::' \ - -e 's|graph1||g' \ - tests/Makefile.am || die - fi - - eautoreconf -} - -src_configure() { - export rd_cv_gcc_flag__Werror=no - export rd_cv_ms_async=ok - - filter-flags -ffast-math - - export RRDDOCDIR=${EPREFIX}/usr/share/doc/${PF} - - # to solve bug #260380 - [[ ${CHOST} == *-solaris* ]] && append-flags -D__EXTENSIONS__ - - # Stub configure.ac - local myconf=() - if ! use tcpd; then - myconf+=( "--disable-libwrap" ) - fi - if ! use dbi; then - myconf+=( "--disable-libdbi" ) - fi - if ! use rados; then - myconf+=( "--disable-librados" ) - fi - - econf \ - $(use_enable graph rrd_graph) \ - $(use_enable lua lua-site-install) \ - $(use_enable lua) \ - $(use_enable perl perl-site-install) \ - $(use_enable perl) \ - $(use_enable python) \ - $(use_enable rrdcgi) \ - $(use_enable static-libs static) \ - $(use_enable tcl) \ - $(use_with tcl tcllib "${EPREFIX}"/usr/$(get_libdir)) \ - --with-perl-options=INSTALLDIRS=vendor \ - --disable-ruby-site-install \ - --disable-ruby \ - ${myconf[@]} -} - -src_compile() { - default - - use python && distutils-r1_src_compile -} - -src_test() { - export LC_ALL=C - default -} - -src_install() { - default - - if ! use doc ; then - rm -rf "${ED}"usr/share/doc/${PF}/{html,txt} - fi - - if use !rrdcgi ; then - # uses rrdcgi, causes invalid shebang error in Prefix, useless - # without rrdcgi installed - rm -f "${ED}"usr/share/${PN}/examples/cgi-demo.cgi - fi - - if use perl ; then - perl_delete_localpod - perl_delete_packlist - fi - - dodoc CHANGES CONTRIBUTORS NEWS THREADS TODO - - find "${ED}"usr -name '*.la' -exec rm -f {} + - - keepdir /var/lib/rrdcached/journal/ - keepdir /var/lib/rrdcached/db/ - - newconfd "${FILESDIR}"/rrdcached.confd rrdcached - newinitd "${FILESDIR}"/rrdcached.init rrdcached - - use python && distutils-r1_src_install -} diff --git a/net-analyzer/rrdtool/rrdtool-1.7.2-r100.ebuild b/net-analyzer/rrdtool/rrdtool-1.7.2-r100.ebuild index 8e87060d737d..6dbe3765730f 100644 --- a/net-analyzer/rrdtool/rrdtool-1.7.2-r100.ebuild +++ b/net-analyzer/rrdtool/rrdtool-1.7.2-r100.ebuild @@ -9,26 +9,30 @@ GENTOO_DEPEND_ON_PERL=no LUA_COMPAT=( lua5-{1..4} luajit ) PYTHON_COMPAT=( python3_{7,8,9} ) -inherit autotools lua perl-module distutils-r1 flag-o-matic multilib +inherit autotools lua perl-module distutils-r1 flag-o-matic MY_P=${P/_/-} DESCRIPTION="A system to store and display time-series data" HOMEPAGE="https://oss.oetiker.ch/rrdtool/" SRC_URI="https://oss.oetiker.ch/rrdtool/pub/${MY_P}.tar.gz" +S="${WORKDIR}/${MY_P}" LICENSE="GPL-2" SLOT="0/8.0.0" KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris" IUSE="dbi doc graph lua perl python rados rrdcgi ruby static-libs tcl tcpd test" + RESTRICT="!test? ( test )" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} ) +REQUIRED_USE=" + python? ( ${PYTHON_REQUIRED_USE} ) lua? ( ${LUA_REQUIRED_USE} test? ( graph ) - )" + ) +" -CDEPEND=" +RDEPEND=" >=dev-libs/glib-2.28.7:2[static-libs(+)?] >=dev-libs/libxml2-2.7.8:2[static-libs(+)?] dbi? ( dev-db/libdbi[static-libs(+)?] ) @@ -44,39 +48,25 @@ CDEPEND=" tcl? ( dev-lang/tcl:0= ) tcpd? ( sys-apps/tcp-wrappers ) " - -DEPEND=" - ${CDEPEND} +DEPEND="${RDEPEND}" +BDEPEND=" sys-apps/groff virtual/pkgconfig virtual/awk - test? ( sys-devel/bc ) -" -RDEPEND=" - ${CDEPEND} -" -BDEPEND="test? ( - lua? ( ${LUA_DEPS} ) -)" -PDEPEND=" - ruby? ( ~dev-ruby/rrdtool-bindings-${PV} ) + python? ( $(python_gen_cond_dep 'dev-python/setuptools[${PYTHON_USEDEP}]') ) + test? ( + sys-devel/bc + lua? ( ${LUA_DEPS} ) + ) " + +PDEPEND="ruby? ( ~dev-ruby/rrdtool-bindings-${PV} )" + PATCHES=( "${FILESDIR}"/${PN}-1.4.9-disable-rrd_graph-perl.patch "${FILESDIR}"/${PN}-1.7.0-disable-rrd_graph-cgi.patch "${FILESDIR}"/${PN}-1.7.1-configure.ac.patch ) -S=${WORKDIR}/${MY_P} - -python_compile() { - cd bindings/python || die - distutils-r1_python_compile -} - -python_install() { - cd bindings/python || die - distutils-r1_python_install -} pkg_setup() { use python && python-single-r1_pkg_setup @@ -86,7 +76,7 @@ src_prepare() { default # At the next version bump, please see if you actually still need this # before adding versions - if ! [ -f doc/rrdrados.pod ]; then + if ! [[ -f doc/rrdrados.pod ]] ; then cp "${FILESDIR}"/${PN}-1.5.5-rrdrados.pod doc/rrdrados.pod else die "File already exists: doc/rrdrados.pod. Remove this code!" @@ -105,7 +95,7 @@ src_prepare() { -e '/^all-local:/s| @COMP_PYTHON@||' \ bindings/Makefile.am || die - if ! use graph; then + if ! use graph ; then sed -i \ -e '2s:rpn1::; 2s:rpn2::; 6s:create-with-source-4::;' \ -e '7s:xport1::; 7s:dcounter1::; 7s:vformatter1::' \ @@ -122,20 +112,20 @@ src_configure() { filter-flags -ffast-math - export RRDDOCDIR=${EPREFIX}/usr/share/doc/${PF} + export RRDDOCDIR="${EPREFIX}"/usr/share/doc/${PF} # to solve bug #260380 [[ ${CHOST} == *-solaris* ]] && append-flags -D__EXTENSIONS__ # Stub configure.ac local myconf=() - if ! use tcpd; then + if ! use tcpd ; then myconf+=( "--disable-libwrap" ) fi - if ! use dbi; then + if ! use dbi ; then myconf+=( "--disable-libdbi" ) fi - if ! use rados; then + if ! use rados ; then myconf+=( "--disable-librados" ) fi @@ -158,6 +148,11 @@ src_configure() { ${myconf[@]} } +python_compile() { + cd bindings/python || die + distutils-r1_python_compile +} + lua_src_compile() { pushd "${BUILD_DIR}"/bindings/lua || die "Failed to change to Lua-binding directory for ${ELUA}" @@ -189,17 +184,23 @@ lua_src_test() { LUA_CPATH="${PWD}/.libs/?.so" emake LUA="${LUA}" test - popd + popd || die } src_test() { export LC_ALL=C + default - if use lua; then + if use lua ; then lua_foreach_impl lua_src_test fi } +python_install() { + cd bindings/python || die + distutils-r1_python_install +} + lua_src_install() { pushd "${BUILD_DIR}"/bindings/lua || die "Failed to change to Lua-binding directory for ${ELUA}" @@ -209,24 +210,24 @@ lua_src_install() { LUA_INSTALL_CMOD="${ED}/$(lua_get_cmod_dir)" \ install - popd + popd || die } src_install() { default if ! use doc ; then - rm -rf "${ED}"/usr/share/doc/${PF}/{html,txt} + rm -rf "${ED}"/usr/share/doc/${PF}/{html,txt} || die fi - if use lua; then + if use lua ; then lua_foreach_impl lua_src_install fi - if use !rrdcgi ; then + if ! use rrdcgi ; then # uses rrdcgi, causes invalid shebang error in Prefix, useless # without rrdcgi installed - rm -f "${ED}"/usr/share/${PN}/examples/cgi-demo.cgi + rm -f "${ED}"/usr/share/${PN}/examples/cgi-demo.cgi || die fi if use perl ; then @@ -236,7 +237,7 @@ src_install() { dodoc CHANGES CONTRIBUTORS NEWS THREADS TODO - find "${ED}"/usr -name '*.la' -exec rm -f {} + + find "${ED}"/usr -name '*.la' -exec rm -f {} + || die keepdir /var/lib/rrdcached/journal/ keepdir /var/lib/rrdcached/db/ diff --git a/net-analyzer/rrdtool/rrdtool-1.7.2.ebuild b/net-analyzer/rrdtool/rrdtool-1.7.2.ebuild deleted file mode 100644 index fb33d065e265..000000000000 --- a/net-analyzer/rrdtool/rrdtool-1.7.2.ebuild +++ /dev/null @@ -1,189 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -DISTUTILS_OPTIONAL=true -DISTUTILS_SINGLE_IMPL=true -GENTOO_DEPEND_ON_PERL=no -PYTHON_COMPAT=( python3_{7,8} ) -inherit autotools perl-module distutils-r1 flag-o-matic multilib - -MY_P=${P/_/-} - -DESCRIPTION="A system to store and display time-series data" -HOMEPAGE="https://oss.oetiker.ch/rrdtool/" -SRC_URI="https://oss.oetiker.ch/rrdtool/pub/${MY_P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0/8.0.0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris" -IUSE="dbi doc graph lua perl python rados rrdcgi ruby static-libs tcl tcpd test" -RESTRICT="!test? ( test )" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -CDEPEND=" - >=dev-libs/glib-2.28.7:2[static-libs(+)?] - >=dev-libs/libxml2-2.7.8:2[static-libs(+)?] - dbi? ( dev-db/libdbi[static-libs(+)?] ) - graph? ( - >=media-libs/libpng-1.5.10:0=[static-libs(+)?] - >=x11-libs/cairo-1.10.2[svg,static-libs(+)?] - >=x11-libs/pango-1.28 - ) - lua? ( dev-lang/lua:0=[deprecated] ) - perl? ( dev-lang/perl:= ) - python? ( ${PYTHON_DEPS} ) - rados? ( sys-cluster/ceph ) - tcl? ( dev-lang/tcl:0= ) - tcpd? ( sys-apps/tcp-wrappers ) -" - -DEPEND=" - ${CDEPEND} - sys-apps/groff - virtual/pkgconfig - virtual/awk - test? ( sys-devel/bc ) -" -RDEPEND=" - ${CDEPEND} -" -PDEPEND=" - ruby? ( ~dev-ruby/rrdtool-bindings-${PV} ) -" -PATCHES=( - "${FILESDIR}"/${PN}-1.4.9-disable-rrd_graph-perl.patch - "${FILESDIR}"/${PN}-1.7.0-disable-rrd_graph-cgi.patch - "${FILESDIR}"/${PN}-1.7.1-configure.ac.patch -) -S=${WORKDIR}/${MY_P} - -python_compile() { - cd bindings/python || die - distutils-r1_python_compile -} - -python_install() { - cd bindings/python || die - distutils-r1_python_install -} - -pkg_setup() { - use python && python-single-r1_pkg_setup -} - -src_prepare() { - default - # At the next version bump, please see if you actually still need this - # before adding versions - if ! [ -f doc/rrdrados.pod ]; then - cp "${FILESDIR}"/${PN}-1.5.5-rrdrados.pod doc/rrdrados.pod - else - die "File already exists: doc/rrdrados.pod. Remove this code!" - fi - - # bug 456810 - # no time to sleep - sed -i \ - -e 's|$LUA_CFLAGS|IGNORE_THIS_BAD_TEST|g' \ - -e 's|^sleep 1$||g' \ - -e '/^dnl.*png/s|^dnl||g' \ - configure.ac || die - - # Python bindings are built/installed manually - sed -i \ - -e '/^all-local:/s| @COMP_PYTHON@||' \ - bindings/Makefile.am || die - - if ! use graph; then - sed -i \ - -e '2s:rpn1::; 2s:rpn2::; 6s:create-with-source-4::;' \ - -e '7s:xport1::; 7s:dcounter1::; 7s:vformatter1::' \ - -e 's|graph1||g' \ - tests/Makefile.am || die - fi - - eautoreconf -} - -src_configure() { - export rd_cv_gcc_flag__Werror=no - export rd_cv_ms_async=ok - - filter-flags -ffast-math - - export RRDDOCDIR=${EPREFIX}/usr/share/doc/${PF} - - # to solve bug #260380 - [[ ${CHOST} == *-solaris* ]] && append-flags -D__EXTENSIONS__ - - # Stub configure.ac - local myconf=() - if ! use tcpd; then - myconf+=( "--disable-libwrap" ) - fi - if ! use dbi; then - myconf+=( "--disable-libdbi" ) - fi - if ! use rados; then - myconf+=( "--disable-librados" ) - fi - - econf \ - $(use_enable graph rrd_graph) \ - $(use_enable lua lua-site-install) \ - $(use_enable lua) \ - $(use_enable perl perl-site-install) \ - $(use_enable perl) \ - $(use_enable python) \ - $(use_enable rrdcgi) \ - $(use_enable static-libs static) \ - $(use_enable tcl) \ - $(use_with tcl tcllib "${EPREFIX}"/usr/$(get_libdir)) \ - --with-perl-options=INSTALLDIRS=vendor \ - --disable-ruby-site-install \ - --disable-ruby \ - ${myconf[@]} -} - -src_compile() { - default - - use python && distutils-r1_src_compile -} - -src_test() { - export LC_ALL=C - default -} - -src_install() { - default - - if ! use doc ; then - rm -rf "${ED}"usr/share/doc/${PF}/{html,txt} - fi - - if use !rrdcgi ; then - # uses rrdcgi, causes invalid shebang error in Prefix, useless - # without rrdcgi installed - rm -f "${ED}"usr/share/${PN}/examples/cgi-demo.cgi - fi - - if use perl ; then - perl_delete_localpod - perl_delete_packlist - fi - - dodoc CHANGES CONTRIBUTORS NEWS THREADS TODO - - find "${ED}"usr -name '*.la' -exec rm -f {} + - - keepdir /var/lib/rrdcached/journal/ - keepdir /var/lib/rrdcached/db/ - - newconfd "${FILESDIR}"/rrdcached.confd rrdcached - newinitd "${FILESDIR}"/rrdcached.init rrdcached - - use python && distutils-r1_src_install -} diff --git a/net-analyzer/sbd/sbd-1.37-r1.ebuild b/net-analyzer/sbd/sbd-1.37-r1.ebuild index 514310c7e942..6b87335cd5a6 100644 --- a/net-analyzer/sbd/sbd-1.37-r1.ebuild +++ b/net-analyzer/sbd/sbd-1.37-r1.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 inherit toolchain-funcs @@ -9,11 +9,12 @@ DESCRIPTION="Netcat-clone, designed to be portable and offer strong encryption" HOMEPAGE="http://tigerteam.se/dl/sbd/" SRC_URI="http://tigerteam.se/dl/sbd/${P}.tar.gz" -LICENSE="GPL-2" +LICENSE="GPL-2+" SLOT="0" -KEYWORDS="amd64 ~hppa ~ppc x86" +KEYWORDS="~amd64 ~hppa ~ppc ~x86" src_prepare() { + default sed -i \ -e '/ -o /{ s| $(UNIX_LDFLAGS) $(LDFLAGS)||g;s|$(CFLAGS)|& $(LDFLAGS)|g }' \ Makefile || die diff --git a/net-analyzer/sguil-sensor/sguil-sensor-1.0.0.ebuild b/net-analyzer/sguil-sensor/sguil-sensor-1.0.0-r1.ebuild similarity index 99% rename from net-analyzer/sguil-sensor/sguil-sensor-1.0.0.ebuild rename to net-analyzer/sguil-sensor/sguil-sensor-1.0.0-r1.ebuild index 7df0389de138..d07d5ee62911 100644 --- a/net-analyzer/sguil-sensor/sguil-sensor-1.0.0.ebuild +++ b/net-analyzer/sguil-sensor/sguil-sensor-1.0.0-r1.ebuild @@ -2,6 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 + inherit user MY_PV="${PV/_p/p}" @@ -12,11 +13,11 @@ SRC_URI="https://github.com/bammv/sguil/archive/v${PV}.tar.gz -> ${P/-sensor}.ta LICENSE="GPL-2 QPL" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="" RDEPEND=" >=dev-lang/tcl-8.3:0=[-threads] >=dev-tcltk/tclx-8.3 + dev-tcltk/tls >=net-analyzer/barnyard-0.2.0-r1 >=net-analyzer/snort-2.4.1-r1 dev-ml/pcre-ocaml @@ -32,12 +33,14 @@ pkg_setup() { src_prepare() { default + sed -i \ -e "s:gateway:${HOSTNAME}:" \ -e 's:/snort_data:/var/lib/sguil:' \ -e 's:DAEMON 0:DAEMON 1:' \ -e 's:DEBUG 1:DEBUG 0:g' \ sensor/sensor_agent.conf || die + sed -i \ -e 's:/var/run/sensor_agent.pid:/run/sguil-sensor.pid:' \ sensor/sensor_agent.tcl || die diff --git a/net-analyzer/ssldump/Manifest b/net-analyzer/ssldump/Manifest index 213e835b43be..b7ac5c7e1f83 100644 --- a/net-analyzer/ssldump/Manifest +++ b/net-analyzer/ssldump/Manifest @@ -1,2 +1,3 @@ DIST ssldump-0.9b3.tar.gz 137435 BLAKE2B e42eeac4daa99a62537ac7ee5152428664fed40256ec10f7c61621f9bbd06476d280af1a6c517eaff253058e3720a282e88604b2f1de0c7ad1b5328597879449 SHA512 ea81558a243950ab43354c9f33c0a4feae0ae859bc2bd6e6b58838a01f4a1e7a6447f2a9ab1fa40bbe8dbd6c3630c489c17fc9c066cacfddfb64269b0cd5090a DIST ssldump-1.1.tar.gz 187436 BLAKE2B 3cafd7263762a7a326fb30722a918bcfaae5b43eedca37a0b5c341efc510e935671dc7ebf71eb807fcacbfce5f77896f310b634028713deb5516390fcfc21f65 SHA512 00ff449d3818a27fbcb46316733428f6a623488e758a67fcb7ee4390835e3279e7242aa0134ddc158740cb8323f5fd9869bd50efb35189dce977d4768d9636c2 +DIST ssldump-1.3.tar.gz 122819 BLAKE2B 8a96746939eb8d9ba33340ff112b1bc5b436a7eb5756fda494065c8f8fd7d6ec9c1c28d8f7f880d25856f24749fd8a8a98d4104753bb68772b2583dafef099b8 SHA512 6da4db890a30673278b17eb00201b6c2535ba476b769bed6ed4e31c06744f32e299d0f0dd6420aa7255e2c982a378cd721d7bf51dd0aeb23211ab678d1e5f26e diff --git a/net-analyzer/ssldump/ssldump-1.3.ebuild b/net-analyzer/ssldump/ssldump-1.3.ebuild new file mode 100644 index 000000000000..aef57fcda192 --- /dev/null +++ b/net-analyzer/ssldump/ssldump-1.3.ebuild @@ -0,0 +1,34 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools toolchain-funcs + +DESCRIPTION="An SSLv3/TLS network protocol analyzer" +HOMEPAGE="https://github.com/adulau/ssldump/" +SRC_URI="https://github.com/adulau/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="openssl" +SLOT="0" +KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" +IUSE="ssl" + +RDEPEND=" + net-libs/libnet:1.1 + net-libs/libpcap + ssl? ( >=dev-libs/openssl-1:0= ) +" +DEPEND="${RDEPEND}" + +src_prepare() { + default + + eautoreconf +} + +src_install() { + dosbin ssldump + doman ssldump.1 + dodoc ChangeLog CREDITS README +} diff --git a/net-analyzer/tcpstat/tcpstat-1.5_p8.ebuild b/net-analyzer/tcpstat/tcpstat-1.5_p8.ebuild index a7ffbe9723e3..d881e2538dcf 100644 --- a/net-analyzer/tcpstat/tcpstat-1.5_p8.ebuild +++ b/net-analyzer/tcpstat/tcpstat-1.5_p8.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -13,7 +13,7 @@ SRC_URI=" LICENSE="BSD-2" SLOT="0" -KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86" +KEYWORDS="amd64 ~ppc ppc64 ~sparc ~x86" IUSE="ipv6" DEPEND=" diff --git a/net-analyzer/tcptrace/tcptrace-6.6.7_p6.ebuild b/net-analyzer/tcptrace/tcptrace-6.6.7_p6.ebuild index f08f5f8fd7de..272209f94e5c 100644 --- a/net-analyzer/tcptrace/tcptrace-6.6.7_p6.ebuild +++ b/net-analyzer/tcptrace/tcptrace-6.6.7_p6.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -14,7 +14,7 @@ SRC_URI=" SLOT="0" LICENSE="GPL-2" -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" +KEYWORDS="amd64 ~ppc ppc64 ~x86" DEPEND=" net-libs/libpcap diff --git a/net-analyzer/xnetload/files/xnetload-1.11.3-libdir.patch b/net-analyzer/xnetload/files/xnetload-1.11.3-libdir.patch new file mode 100644 index 000000000000..3bfbd619c112 --- /dev/null +++ b/net-analyzer/xnetload/files/xnetload-1.11.3-libdir.patch @@ -0,0 +1,11 @@ +--- a/Makefile ++++ b/Makefile +@@ -14,7 +14,7 @@ CC = gcc + + # The next two lines are for building an optimized and stripped program. + CFLAGS += -Wall -DNDEBUG -I/usr/include +-LFLAGS = $(LDFLAGS) -L/usr/lib ++LFLAGS = $(LDFLAGS) + + # These three lines are for building Athlon optimized programs on my system. + #CC=gcc-3.1 diff --git a/net-analyzer/xnetload/xnetload-1.11.3-r1.ebuild b/net-analyzer/xnetload/xnetload-1.11.3-r1.ebuild index d1caa9933a52..1b3e67000f2a 100644 --- a/net-analyzer/xnetload/xnetload-1.11.3-r1.ebuild +++ b/net-analyzer/xnetload/xnetload-1.11.3-r1.ebuild @@ -1,14 +1,15 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 + inherit toolchain-funcs -DESCRIPTION="displays a count and a graph of the traffic over a specified network connection" -LICENSE="GPL-2" -HOMEPAGE="http://www.xs4all.nl/~rsmith/software/" -SRC_URI="http://www.xs4all.nl/~rsmith/software/${P}.tar.gz" +DESCRIPTION="Displays a count and a graph of the traffic over a specified network connection" +HOMEPAGE="https://www.xs4all.nl/~rsmith/software/" +SRC_URI="https://www.xs4all.nl/~rsmith/software/${P}.tar.gz" +LICENSE="GPL-2" SLOT="0" KEYWORDS="amd64 ppc ppc64 sparc x86" @@ -19,13 +20,19 @@ DEPEND=" " RDEPEND="${DEPEND}" +PATCHES=( + "${FILESDIR}/${PN}-1.11.3-libdir.patch" +) + src_prepare() { sed -i \ - -e 's:CFLAGS = -pipe -O2 -Wall:CFLAGS += -Wall:' \ - -e 's:LFLAGS = -s -pipe:LFLAGS = $(LDFLAGS):' \ + -e 's;CFLAGS = -pipe -O2 -Wall;CFLAGS += -Wall;' \ + -e 's;LFLAGS = -s -pipe;LFLAGS = $(LDFLAGS);' \ -e 's:gcc -MM:$(CC) -MM:' \ -e 's:/usr/X11R6:/usr:g' \ Makefile || die + + default } src_compile() { diff --git a/net-fs/Manifest.gz b/net-fs/Manifest.gz index 99cc0c2bdd7e..d69868bd0ea1 100644 Binary files a/net-fs/Manifest.gz and b/net-fs/Manifest.gz differ diff --git a/net-fs/samba/samba-4.14.0.ebuild b/net-fs/samba/samba-4.14.0.ebuild index 2e9b9efddda9..7744a90df298 100644 --- a/net-fs/samba/samba-4.14.0.ebuild +++ b/net-fs/samba/samba-4.14.0.ebuild @@ -83,6 +83,7 @@ COMMON_DEPEND=" $(python_gen_cond_dep " dev-python/subunit[\${PYTHON_MULTI_USEDEP},${MULTILIB_USEDEP}] addc? ( + dev-python/dnspython:=[\${PYTHON_MULTI_USEDEP}] dev-python/markdown[\${PYTHON_MULTI_USEDEP}] ) addns? ( diff --git a/net-ftp/Manifest.gz b/net-ftp/Manifest.gz index 7060774e2a9a..9dac9a3349df 100644 Binary files a/net-ftp/Manifest.gz and b/net-ftp/Manifest.gz differ diff --git a/net-ftp/filezilla/Manifest b/net-ftp/filezilla/Manifest index f9c2ea3873dc..9ef422372412 100644 --- a/net-ftp/filezilla/Manifest +++ b/net-ftp/filezilla/Manifest @@ -1,3 +1,4 @@ DIST FileZilla_3.51.0_src.tar.bz2 4808717 BLAKE2B 67f614032145abe7f715254fd47756d3a537d2eca63be976c29351f79e15d3620e77c1bb7beccc2b61a1df8b86484334a3e77639402c93e8ce28d4b12eb8884f SHA512 b5e0f80b61eb168b41f7582bf10bf0067da76aec3165ffe13819e20eb842ffc0fb12b01c54843b3ec4e7355111c36be249db3526e2ea2eaa77ba4274ffa03e93 DIST FileZilla_3.52.0.5_src.tar.bz2 4811653 BLAKE2B a80d0784e5c85b74cadb944af232bb42fd0170ca31034e51804b56dc06ca2bbc4580a5ed1564bf82436be50be62d86f2017ebf3496ecc00af24837c0da99bbcc SHA512 c0a3f20ad9351ae0bb15e7e488801cdaefc83d5eb1355fcb664150ea588b9fb8c4b446e4b1df5d8b35fb88111a37527037e4dc70ba783d5161b1d91c8dc3bee0 DIST FileZilla_3.52.2_src.tar.bz2 4813167 BLAKE2B af651f4db74e805c866d040aa932c39e1a488bf37b0c215a2cdeae3fd4ab608f84b1b12dfbe8bf197e778760ca26183a3532a370e7a0095c1a250eefdc14717c SHA512 74abb78eaece5ffed044a88bdbbff7be0470e47868b806925ea5666d741370dff910d55849f6ad91fb57f8c1a33c461dc10c9f093d75e7a96ff0d909f3a8f131 +DIST FileZilla_3.53.0_src.tar.bz2 4842563 BLAKE2B e9704e5b0c7afee28c3d3efb9b0f72111e9fc4f2d8d69a935d195a09b685f39b80019de77216b5da4353c65837b5b0d8102b3e9e88cad840f3716372232f8bd3 SHA512 b658a0e67d0f92051e5f5503da64f8bc0b1dd6d9af4b54b34d32c9a6c83abe0709b310d940a8f6676f20a49537baca48df805a88c1fa29d7e7b262f59544deff diff --git a/net-ftp/filezilla/filezilla-3.53.0.ebuild b/net-ftp/filezilla/filezilla-3.53.0.ebuild new file mode 100644 index 000000000000..c8f67f39ebeb --- /dev/null +++ b/net-ftp/filezilla/filezilla-3.53.0.ebuild @@ -0,0 +1,88 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +WX_GTK_VER="3.0-gtk3" + +inherit autotools flag-o-matic wxwidgets xdg + +MY_PV=${PV/_/-} +MY_P="FileZilla_${MY_PV}" + +DESCRIPTION="FTP client with lots of useful features and an intuitive interface" +HOMEPAGE="https://filezilla-project.org/" +SRC_URI="https://download.filezilla-project.org/client/${MY_P}_src.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86" +IUSE="dbus nls test" + +# pugixml 1.7 minimal dependency is for c++11 proper configuration +RDEPEND=">=app-eselect/eselect-wxwidgets-0.7-r1 + >=dev-libs/nettle-3.1:= + >=dev-db/sqlite-3.7 + >=dev-libs/libfilezilla-0.26.0:= + >=dev-libs/pugixml-1.7 + >=net-libs/gnutls-3.5.7 + >=x11-libs/wxGTK-3.0.4:${WX_GTK_VER}[X] + x11-misc/xdg-utils + dbus? ( sys-apps/dbus )" +DEPEND="${RDEPEND} + virtual/pkgconfig + >=sys-devel/libtool-1.4 + nls? ( >=sys-devel/gettext-0.11 ) + test? ( >=dev-util/cppunit-1.13.0 )" + +RESTRICT="!test? ( test )" + +S="${WORKDIR}"/${PN}-${MY_PV} + +DOCS=(AUTHORS ChangeLog NEWS ) + +PATCHES=( + "${FILESDIR}"/${PN}-3.22.1-debug.patch + "${FILESDIR}"/${PN}-3.47.0-metainfo.patch + "${FILESDIR}"/${PN}-3.47.0-disable-shellext_conf.patch + "${FILESDIR}"/${PN}-3.52.2-slibtool.patch +) + +pkg_pretend() { + if [[ ${MERGE_TYPE} != binary ]]; then + if ! test-flag-CXX -std=c++14; then + eerror "${P} requires C++14-capable C++ compiler. Your current compiler" + eerror "does not seem to support -std=c++14 option. Please upgrade your compiler" + eerror "to gcc-4.9 or an equivalent version supporting C++14." + die "Currently active compiler does not support -std=c++14" + fi + fi +} + +src_prepare() { + setup-wxwidgets + default + eautoreconf +} + +src_configure() { + local myeconfargs=( + --disable-autoupdatecheck + --with-pugixml=system + $(use_enable nls locales) + $(use_with dbus) + ) + econf "${myeconfargs[@]}" +} + +pkg_preinst() { + xdg_pkg_preinst +} + +pkg_postinst() { + xdg_pkg_postinst +} + +pkg_postrm() { + xdg_pkg_postrm +} diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz index 78bbb3aa3c20..35b8bb608345 100644 Binary files a/net-libs/Manifest.gz and b/net-libs/Manifest.gz differ diff --git a/net-libs/libnet/files/libnet-1.2-int64_t.patch b/net-libs/libnet/files/libnet-1.2-int64_t.patch new file mode 100644 index 000000000000..b0b968fc3325 --- /dev/null +++ b/net-libs/libnet/files/libnet-1.2-int64_t.patch @@ -0,0 +1,15 @@ +--- a/include/libnet/libnet-structures.h ++++ b/include/libnet/libnet-structures.h +@@ -49,9 +49,9 @@ struct libnet_port_list_chain + /* libnet statistics structure */ + struct libnet_stats + { +- __int64_t packets_sent; /* packets sent */ +- __int64_t packet_errors; /* packets errors */ +- __int64_t bytes_written; /* bytes written */ ++ int64_t packets_sent; /* packets sent */ ++ int64_t packet_errors; /* packets errors */ ++ int64_t bytes_written; /* bytes written */ + }; + + diff --git a/net-libs/libnet/libnet-1.2.ebuild b/net-libs/libnet/libnet-1.2.ebuild index 7e47a083806d..7c9c1dba2b03 100644 --- a/net-libs/libnet/libnet-1.2.ebuild +++ b/net-libs/libnet/libnet-1.2.ebuild @@ -16,6 +16,10 @@ DOCS=( ChangeLog.md README.md doc/MIGRATION.md ) +# This patch is taken from master branch in mainstream commit a1659e2. It is +# necessary in order to support musl libc. +PATCHES=( "${FILESDIR}/${P}-int64_t.patch" ) + src_configure() { econf $(use_enable static-libs static) } diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz index 5a48d5cca415..314b54af478e 100644 Binary files a/net-misc/Manifest.gz and b/net-misc/Manifest.gz differ diff --git a/net-misc/modemmanager/files/modemmanager.initd b/net-misc/modemmanager/files/modemmanager.initd new file mode 100644 index 000000000000..39c94591e5c1 --- /dev/null +++ b/net-misc/modemmanager/files/modemmanager.initd @@ -0,0 +1,11 @@ +#!/sbin/openrc-run +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +command=/usr/sbin/ModemManager +command_background=true +pidfile=/run/modemmanager.pid + +depend() { + need dbus +} diff --git a/net-misc/modemmanager/modemmanager-1.14.8-r1.ebuild b/net-misc/modemmanager/modemmanager-1.14.8-r1.ebuild new file mode 100644 index 000000000000..98c1d10adb11 --- /dev/null +++ b/net-misc/modemmanager/modemmanager-1.14.8-r1.ebuild @@ -0,0 +1,132 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +VALA_USE_DEPEND="vapigen" + +inherit gnome2 readme.gentoo-r1 systemd toolchain-funcs udev vala + +DESCRIPTION="Modem and mobile broadband management libraries" +HOMEPAGE="https://www.freedesktop.org/wiki/Software/ModemManager/" +SRC_URI="https://www.freedesktop.org/software/ModemManager/ModemManager-${PV}.tar.xz" + +LICENSE="GPL-2+" +SLOT="0/1" # subslot = dbus interface version, i.e. N in org.freedesktop.ModemManager${N} +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" + +IUSE="elogind +introspection mbim policykit +qmi systemd +udev vala" +REQUIRED_USE=" + ?? ( elogind systemd ) + vala? ( introspection ) +" + +DEPEND=" + >=dev-libs/glib-2.48.0:2 + udev? ( >=dev-libs/libgudev-230:= ) + introspection? ( >=dev-libs/gobject-introspection-0.9.6:= ) + mbim? ( >=net-libs/libmbim-1.24.0 ) + policykit? ( >=sys-auth/polkit-0.106[introspection] ) + qmi? ( >=net-libs/libqmi-1.26.0:= ) + elogind? ( sys-auth/elogind ) + systemd? ( >=sys-apps/systemd-209 ) +" +RDEPEND="${DEPEND} + policykit? ( acct-group/plugdev ) +" +BDEPEND=" + dev-util/gdbus-codegen + dev-util/glib-utils + >=dev-util/gtk-doc-am-1 + >=sys-devel/gettext-0.19.8 + virtual/pkgconfig + vala? ( $(vala_depend) ) +" + +S="${WORKDIR}/ModemManager-${PV}" + +src_prepare() { + DOC_CONTENTS=" + If your USB modem shows up only as a storage device when you plug it in, + then you should install sys-apps/usb_modeswitch, which will automatically + switch it over to USB modem mode whenever you plug it in.\n" + + if use policykit; then + DOC_CONTENTS+="\nTo control your modem without needing to enter the root password, + add your user account to the 'plugdev' group." + fi + + use vala && vala_src_prepare + gnome2_src_prepare +} + +src_configure() { + local myconf=( + --disable-Werror + --disable-static + --with-dist-version=${PVR} + --with-udev-base-dir="$(get_udevdir)" + $(use_with udev) + $(use_enable introspection) + $(use_with mbim) + $(use_with policykit polkit) + $(use_with systemd systemd-suspend-resume) + $(use_with systemd systemd-journal) + $(use_with qmi) + $(use_enable vala) + ) + if use elogind; then + local pkgconfig="$(tc-getPKG_CONFIG)" + myconf+=( + --with-systemd-suspend-resume + LIBSYSTEMD_LOGIN_CFLAGS="$(${pkgconfig} --cflags "libelogind")" + LIBSYSTEMD_LOGIN_LIBS="$(${pkgconfig} --libs "libelogind")" + ) + fi + gnome2_src_configure "${myconf[@]}" +} + +src_install() { + gnome2_src_install + + # Allow users in plugdev group full control over their modem + if use policykit; then + insinto /usr/share/polkit-1/rules.d/ + doins "${FILESDIR}"/01-org.freedesktop.ModemManager1.rules + fi + + readme.gentoo_create_doc + + newinitd "${FILESDIR}/modemmanager.initd" modemmanager +} + +pkg_postinst() { + gnome2_pkg_postinst + + # The polkit rules file moved to /usr/share + old_rules="${EROOT}/etc/polkit-1/rules.d/01-org.freedesktop.ModemManager.rules" + if [[ -f "${old_rules}" ]]; then + case "$(md5sum ${old_rules})" in + c5ff02532cb1da2c7545c3069e5d0992* | 5c50f0dc603c0a56e2851a5ce9389335* ) + # Automatically delete the old rules.d file if the user did not change it + elog + elog "Removing old ${old_rules} ..." + rm -f "${old_rules}" || eerror "Failed, please remove ${old_rules} manually" + ;; + * ) + elog "The ${old_rules}" + elog "file moved to /usr/share/polkit-1/rules.d/ in >=modemmanager-0.5.2.0-r2" + elog "If you edited ${old_rules}" + elog "without changing its behavior, you may want to remove it." + ;; + esac + fi + + if ! use udev; then + ewarn "You have built ModemManager without udev support. You may have to teach it" + ewarn "about your modem port manually." + fi + + systemd_reenable ModemManager.service + + readme.gentoo_print_elog +} diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz index 3d7dafc32ec3..ef8ae1294f1b 100644 Binary files a/profiles/Manifest.gz and b/profiles/Manifest.gz differ diff --git a/profiles/package.mask b/profiles/package.mask index 96b5ad2161ca..96c9d2f70ec4 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -32,6 +32,21 @@ #--- END OF EXAMPLES --- +# Sergei Trofimovich (2021-03-15) +# Needs a port to network-3. No revdeps. Mask for removal +# in a month. +dev-haskell/network-protocol-xmpp + +# Sergei Trofimovich (2021-03-15) +# Needs a port to ghc-8.10. No revdeps. Mask for removal +# in a month. +dev-haskell/test-framework-th-prime + +# Sergei Trofimovich (2021-03-15) +# Needs a port to ghc-8.10. No revdeps. Mask for removal +# in a month. +dev-haskell/encoding + # Andreas Sturmlechner (2021-03-15) # Unmaintained for >1 year, blocking cleanup of deprecated libraries. # Succeeded by LXQt many years ago (see also: lxqt-base/lxqt-meta). diff --git a/profiles/use.local.desc b/profiles/use.local.desc index 97fa276ecdc9..8cd0451eac67 100644 --- a/profiles/use.local.desc +++ b/profiles/use.local.desc @@ -1468,6 +1468,7 @@ dev-haskell/gtk:gio - Depend on GIO package, thereby enabling certain features. dev-haskell/gtk2hs-buildtools:closuresignals - Use the the GClosure-based signals implementation. dev-haskell/gtk3:fmode-binary - Set the default file translation mode for file I/O operations to _O_BINARY. dev-haskell/gtk3:gio - Depend on GIO package, thereby enabling certain features. +dev-haskell/hackage-security:lukko - Use @lukko@ for file-locking, otherwise use @GHC.IO.Handle.Lock@ dev-haskell/hackage-security:network-uri - Get Network.URI from the network-uri package. dev-haskell/hakyll:buildwebsite - Build the hakyll website dev-haskell/hakyll:checkexternal - Include external link checking @@ -3999,7 +4000,6 @@ media-gfx/gmic:cli - Build CLI interface media-gfx/gmic:digikam - Build media-gfx/digikam plugin media-gfx/gmic:krita - Build media-gfx/krita plugin media-gfx/gmic:opencv - Enable support for webcams using the OpenCV library -media-gfx/gnofract4d:doc - Install user manual media-gfx/gnome-photos:flickr - Ensure runtime Flickr support media-gfx/graphicsmagick:dynamic-loading - Compile graphicsmagick with dynamically loadable modules media-gfx/graphicsmagick:fpx - Enable FlashPix support with media-libs/libfpx @@ -5166,7 +5166,6 @@ media-video/x264-encoder:ffmpegsource - Enable ffmpegsource aka ffms support, di media-video/x264-encoder:interlaced - Enable interlaced encoding support, this can decrease encoding speed by up to 2% media-video/xine-ui:vdr - Enables Video Disk Recorder support net-analyzer/2ping:server - Install the server init scripts. -net-analyzer/argus:libtirpc - Build against net-libs/libtirpc for RPC support net-analyzer/argus-clients:ft - Enable support for flow packets through net-analyzer/flow-tools net-analyzer/barnyard:sguil - Enable sguil (The Analyst Console for Network Security Monitoring) support net-analyzer/barnyard2:gre - Enable GRE support @@ -5211,7 +5210,6 @@ net-analyzer/httping:tfo - Enable support for TCP Fast Open net-analyzer/hydra:gcrypt - Enable radmin2 support through dev-libs/libgcrypt net-analyzer/hydra:libssh - Enable SSH support through net-libs/libssh net-analyzer/hydra:mongodb - MongoDB support through dev-libs/mongo-c-driver -net-analyzer/hydra:ncp - NCP protocol (NetWare) support through ncpfs net-analyzer/icinga2:console - Adds support for line-editing in the console net-analyzer/icinga2:jumbo-build - Combine source files to speed up build process, requires more memory net-analyzer/icinga2:lto - Adds support for link time optimization @@ -5284,8 +5282,11 @@ net-analyzer/netdata:tor - Enable monitoring of tor net-analyzer/netdata:xen - Enable monitoring of xen net-analyzer/netperf:demo - Emit interim results during the run. May affect results net-analyzer/nfdump:ftconv - Build the flow-tools to nfdump converter +net-analyzer/nfdump:jnat - Build nfudmp to support JunOS NAT event logging +net-analyzer/nfdump:nfpcapd - Build nfpcapd collector to create netflow data from precollected pcap traffic net-analyzer/nfdump:nfprofile - Build nfprofile used by NfSen net-analyzer/nfdump:nftrack - Build nfprofile used by PortTracker +net-analyzer/nfdump:nsel - Build nfudmp to support NSEL/NEL event data net-analyzer/nfdump:readpcap - Build nfcapd collector to read from pcap file instead ofnetwork data net-analyzer/nfdump:sflow - Build sflow collector sfcpad net-analyzer/nmap:libssh2 - Enable SSH support through net-libs/libssh2 diff --git a/sci-mathematics/Manifest.gz b/sci-mathematics/Manifest.gz index 8c75209b99be..c918170a3f25 100644 Binary files a/sci-mathematics/Manifest.gz and b/sci-mathematics/Manifest.gz differ diff --git a/sci-mathematics/agda/agda-2.6.1.2.ebuild b/sci-mathematics/agda/agda-2.6.1.2.ebuild index 3468e60ca041..a2a59db413d6 100644 --- a/sci-mathematics/agda/agda-2.6.1.2.ebuild +++ b/sci-mathematics/agda/agda-2.6.1.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -81,6 +81,9 @@ src_prepare() { -i "${S}/${MY_PN}.cabal" \ || die "Could not remove agda-mode from ${MY_PN}.cabal" fi + + cabal_chdeps \ + 'if impl(ghc >= 8.6.4) && impl(ghc < 8.10.3)' 'if impl(ghc >= 8.6.4) && impl(ghc < 8.11.0)' } src_configure() { diff --git a/sys-auth/AusweisApp2/AusweisApp2-1.22.1.ebuild b/sys-auth/AusweisApp2/AusweisApp2-1.22.1.ebuild new file mode 100644 index 000000000000..1a14a298ba88 --- /dev/null +++ b/sys-auth/AusweisApp2/AusweisApp2-1.22.1.ebuild @@ -0,0 +1,48 @@ +# Copyright 2020-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake xdg-utils + +DESCRIPTION="Official authentication app for German ID cards and residence permits" +HOMEPAGE="https://www.ausweisapp.bund.de/" +SRC_URI="https://github.com/Governikus/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="EUPL-1.2" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +BDEPEND=" + dev-qt/linguist-tools:5 + virtual/pkgconfig" + +RDEPEND=" + dev-libs/openssl:0= + dev-qt/qtconcurrent:5 + dev-qt/qtcore:5 + dev-qt/qtdeclarative:5 + dev-qt/qtgui:5 + dev-qt/qtnetwork:5 + dev-qt/qtquickcontrols2:5 + dev-qt/qtsvg:5 + dev-qt/qtwebsockets:5[qml] + dev-qt/qtwidgets:5 + net-libs/http-parser:0= + sys-apps/pcsc-lite + virtual/udev" + +DEPEND="${RDEPEND}" + +src_configure() { + local mycmakeargs=( -DBUILD_SHARED_LIBS=OFF ) + cmake_src_configure +} + +pkg_postinst() { + xdg_icon_cache_update +} + +pkg_postrm() { + xdg_icon_cache_update +} diff --git a/sys-auth/AusweisApp2/Manifest b/sys-auth/AusweisApp2/Manifest index c8eaeb0a3782..71bc1f3358af 100644 --- a/sys-auth/AusweisApp2/Manifest +++ b/sys-auth/AusweisApp2/Manifest @@ -1 +1,2 @@ DIST AusweisApp2-1.22.0.tar.gz 10845370 BLAKE2B 2b35bece49c96f7aca391a918539115351737b9cc6bcb913121f7f44db7ff88fb615bd3a3822d7d5670e83c81ac7c409fffb1696d6dd9310fdbd595c3f7fa88f SHA512 c2340625f4792afccde2f09d54e050efed0e78a7d921f545ec73f4bf23746b7b0c422fffbc87822abe2dc8b69a8439615f3d43179a98a64fa4165503c2e74079 +DIST AusweisApp2-1.22.1.tar.gz 10884409 BLAKE2B 3205bb4acd4145e20f336301c5a3dcb1da6d5fa1254169d0578d675dabb7b12fa84778b62a96ea4cae126800b4ef455b4e7a76154570090b8a74be41a1ba49b2 SHA512 3c66b401d370ae7f4ebb37a25c25d9eb044ec5706b85e656cb4a8ac0d3d6c922fe78f07a832635536f1e38896aad4aaf38ab4fd9bcdf00c9dac90e370b0f2232 diff --git a/sys-auth/Manifest.gz b/sys-auth/Manifest.gz index 5740425b06e5..59ba3a09020e 100644 Binary files a/sys-auth/Manifest.gz and b/sys-auth/Manifest.gz differ diff --git a/sys-cluster/Manifest.gz b/sys-cluster/Manifest.gz index dba46ba6fae0..8b272f3c0979 100644 Binary files a/sys-cluster/Manifest.gz and b/sys-cluster/Manifest.gz differ diff --git a/sys-cluster/ceph/Manifest b/sys-cluster/ceph/Manifest index 75fbf254db9a..09bcbe8bf979 100644 --- a/sys-cluster/ceph/Manifest +++ b/sys-cluster/ceph/Manifest @@ -1,3 +1,3 @@ DIST ceph-14.2.16.tar.gz 130220625 BLAKE2B 30fcf971dd3ebaad8decf0d8d3ade1b554c0f97844db037ca618fd3f133964c08248067dc82c525cbc7deb04949a3a3d07850a5f56e75bcb8e359957d31df85f SHA512 94cab2c9711f5ee2c826ee27b474676c7bb8507c0761ed8d0a520a7e5182c4b353402061ffafbe9b95ac45603f023015752bffbbe0936f4835dfafc9476d3275 -DIST ceph-14.2.17.tar.gz 129270233 BLAKE2B 1e20185f24b7bc806a37ee59fee24138556837722e27a7fb36da268e5c330bb4dac3601dac4373f404c528e55fa79420f965807d215a54f5db9205ebb877166f SHA512 56ae460474afb8f208900c9ec6f55b120dd7229cb3297cb6f4f522cde8e693ede16d6064410074ea3c2a56df67c13fbbd102bce2d489e9b310544e374315b9eb +DIST ceph-14.2.18.tar.gz 129268399 BLAKE2B 31478316fc87a7a924ac653ad193adaa7c3f0e6c1ace8fe6158b139616eb7ed396f81045a4311d18ad8ac6ee555d921568da94e70cf74bbd4918b55e0e03f8ef SHA512 56f9e7fffd2ae6fb70c4a09a3569dff2a17ffeebacbd3a8af22586d2feef654561d0942bb8d2c12b2f313aac268f38ebc3bfb23a287f634fe5a76805445c4d03 DIST ceph-15.2.9.tar.gz 149518360 BLAKE2B 3d1d2cf7e356587d77c1ca3e6b05078a3de656607007d38ff0369f5a76fb9e12a3f06929bcbf19ed5d3de7c8e402dc0972c0b3c7245f64e6f5d94a4a78bb1d00 SHA512 1f55b0a13bf06df782831d0c9d5f8617c22442ab97fb186e6ccb08183e02bf1756caf8633fa6b1cf156c3fb7b1bdff90a60a1249adfad0b9450036e2329bf8ff diff --git a/sys-cluster/ceph/ceph-14.2.17.ebuild b/sys-cluster/ceph/ceph-14.2.18.ebuild similarity index 100% rename from sys-cluster/ceph/ceph-14.2.17.ebuild rename to sys-cluster/ceph/ceph-14.2.18.ebuild diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz index 7bb4c485c395..6f6be385da73 100644 Binary files a/x11-libs/Manifest.gz and b/x11-libs/Manifest.gz differ diff --git a/x11-libs/c++-gtk-utils/Manifest b/x11-libs/c++-gtk-utils/Manifest index 5e27f0a323ae..ec27b38368f1 100644 --- a/x11-libs/c++-gtk-utils/Manifest +++ b/x11-libs/c++-gtk-utils/Manifest @@ -1,2 +1,3 @@ DIST c++-gtk-utils-2.0.34.tar.gz 2865687 BLAKE2B 4978bf9ce5ce364db5ad51bcb2d604ac2e7a22656e2affbc39785b7f27db6c75a77c1965e3524b6c617836aa5ae840c4ef45e0ea65eff01f12acb1ea770c04b2 SHA512 f155e50d152cd1444d282c47e995ea8cd93ead529d0cd86c11d548a266a567c83cf3367cdb82dd8d68af1bce28809c957d3e39595bcb0affe87db8f48718f6d4 DIST c++-gtk-utils-2.2.19.tar.gz 3060284 BLAKE2B 5edd6a5042cb79cc95e8080cd76d284dfa47641c8a01a6d80ff6cfdbecf5797b6a99a5b7f209c35e0da9a2bc5331225dd2f13f30bbcc3bbb04aaabdadb3cb643 SHA512 c6527cc32b6a14a5fe24705a91a6918863f418ec8a274d24c79b65e905efefab53a5e53edfa57b31ed8b14ab8d9d26b4876861cab37e3702df456feb84e1cc5c +DIST c++-gtk-utils-2.2.20.tar.gz 3085409 BLAKE2B 2b0ca2a3beb3ee82416cb1d731704f43398db06bd9bc03dea2875a2d6a1f80dc14b9fe418bea1467caf29d5ba9d8e4feefe7451bb69734561a580ed012755a41 SHA512 1e834c163f1c236e1a2fbdf92e93e98e88ebd6da04b87be52087fa7f7f395a9bd90e111958f3b9473938e7563182ed5c37fd2d2c4ef683933cb16f3b4665d1b3 diff --git a/x11-libs/c++-gtk-utils/c++-gtk-utils-2.2.20.ebuild b/x11-libs/c++-gtk-utils/c++-gtk-utils-2.2.20.ebuild new file mode 100644 index 000000000000..40a1c6ed5a62 --- /dev/null +++ b/x11-libs/c++-gtk-utils/c++-gtk-utils-2.2.20.ebuild @@ -0,0 +1,40 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit virtualx + +DESCRIPTION="A number of classes and functions for programming GTK+ programs using C++" +HOMEPAGE="http://cxx-gtk-utils.sourceforge.net/" +SRC_URI="mirror://sourceforge/${PN/++/xx}/${P}.tar.gz" + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" +IUSE="+gtk nls" + +RDEPEND=" + dev-libs/glib:2 + gtk? ( x11-libs/gtk+:3 )" +DEPEND="${RDEPEND}" +BDEPEND=" + virtual/pkgconfig + nls? ( sys-devel/gettext )" + +src_configure() { + econf \ + --disable-static \ + --without-guile \ + $(use_enable nls) \ + $(use_with gtk) +} + +src_test() { + virtx default +} + +src_install() { + default + find "${ED}" -name '*.la' -delete || die +} diff --git a/x11-libs/c++-gtk-utils/metadata.xml b/x11-libs/c++-gtk-utils/metadata.xml index 9378e9d7e25b..4213bf121d9b 100644 --- a/x11-libs/c++-gtk-utils/metadata.xml +++ b/x11-libs/c++-gtk-utils/metadata.xml @@ -7,5 +7,6 @@ cxx-gtk-utils + http://cxx-gtk-utils.sourceforge.net/2.2/ChangeLog diff --git a/x11-misc/3ddesktop/3ddesktop-0.2.9-r1.ebuild b/x11-misc/3ddesktop/3ddesktop-0.2.9-r1.ebuild deleted file mode 100644 index 1a17ff0dc9bd..000000000000 --- a/x11-misc/3ddesktop/3ddesktop-0.2.9-r1.ebuild +++ /dev/null @@ -1,57 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit autotools eutils - -DESCRIPTION="OpenGL virtual desktop switching" -HOMEPAGE="http://desk3d.sourceforge.net/" -SRC_URI="mirror://sourceforge/desk3d/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ppc x86" - -RDEPEND=" - >=media-libs/freetype-2 - media-libs/freeglut - media-libs/imlib2[X] - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXi - x11-libs/libXmu - x11-libs/libXt - x11-libs/libXxf86vm -" -DEPEND=" - ${RDEPEND} - x11-base/xorg-proto -" - -DOCS=( AUTHORS TODO ChangeLog README README.windowmanagers ) - -src_prepare() { - epatch \ - "${FILESDIR}"/${P}-gcc4.patch \ - "${FILESDIR}"/${P}-asneeded.patch \ - "${FILESDIR}"/${P}-missing-include.patch \ - "${FILESDIR}"/${P}-gl_init.patch \ - "${FILESDIR}"/${P}-Options_Options.patch - - eautoreconf -} - -pkg_postinst() { - echo - elog "This ebuild installed a configuration file called /etc/3ddesktop.conf" - elog "The default configuration makes a screenshot of the virtual desktops" - elog "every X seconds. This is non-optimal behavior." - elog - elog "To enable a more intelligent way of updating the virtual desktops," - elog "execute the following:" - elog - elog " echo \"AutoAcquire 0\" >> /etc/3ddesktop.conf" - elog - elog "This will cause 3ddesktop to update the virtual desktop snapshots" - elog "only when a 3d desktop switch is required." -} diff --git a/x11-misc/3ddesktop/3ddesktop-0.2.9-r2.ebuild b/x11-misc/3ddesktop/3ddesktop-0.2.9-r2.ebuild index 199878c516f1..3db14eaad530 100644 --- a/x11-misc/3ddesktop/3ddesktop-0.2.9-r2.ebuild +++ b/x11-misc/3ddesktop/3ddesktop-0.2.9-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/desk3d/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" +KEYWORDS="amd64 ppc x86" RDEPEND=" >=media-libs/freetype-2 diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz index ebe79138d21e..d770460fcc3e 100644 Binary files a/x11-misc/Manifest.gz and b/x11-misc/Manifest.gz differ diff --git a/x11-misc/cairo-clock/cairo-clock-0.3.4-r1.ebuild b/x11-misc/cairo-clock/cairo-clock-0.3.4-r1.ebuild deleted file mode 100644 index 2f6adc645265..000000000000 --- a/x11-misc/cairo-clock/cairo-clock-0.3.4-r1.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit autotools - -DESCRIPTION="An analog clock displaying the system-time" -HOMEPAGE="https://launchpad.net/cairo-clock" -SRC_URI="http://macslow.thepimp.net/projects/${PN}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ~x86" - -RDEPEND=" - >=dev-libs/glib-2.8 - >=gnome-base/libglade-2.6 - >=gnome-base/librsvg-2.14 - >=x11-libs/cairo-1.2 - >=x11-libs/gtk+-2.10:2 - >=x11-libs/pango-1.10 -" -DEPEND=" - ${RDEPEND} - dev-util/intltool - virtual/pkgconfig - sys-devel/gettext -" -PATCHES=( - "${FILESDIR}"/${P}-desktop.patch - "${FILESDIR}"/${P}-linker.patch -) - -src_prepare() { - default - eautoreconf -} diff --git a/x11-misc/cairo-clock/cairo-clock-0.3.4-r2.ebuild b/x11-misc/cairo-clock/cairo-clock-0.3.4-r2.ebuild index 675a9bf64b02..c0dfcca3fb9f 100644 --- a/x11-misc/cairo-clock/cairo-clock-0.3.4-r2.ebuild +++ b/x11-misc/cairo-clock/cairo-clock-0.3.4-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -10,7 +10,7 @@ SRC_URI="http://macslow.thepimp.net/projects/${PN}/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 ~x86" RDEPEND=" >=dev-libs/glib-2.8 diff --git a/x11-misc/dclock/Manifest b/x11-misc/dclock/Manifest index 15e759bf113d..aae98ba4eba5 100644 --- a/x11-misc/dclock/Manifest +++ b/x11-misc/dclock/Manifest @@ -1,3 +1,2 @@ DIST dclock_2.2.2-12.debian.tar.xz 16112 BLAKE2B 3da6a75834791cbba71d84c8d46d65b18db6a9aa97a085d984b598c8db41fe507965390568377a9167823d0b3856165e58115aa74b05da35fd6432b44ea877e9 SHA512 c6c468a378e421fb9ef2c6e84db991644888f8d2d9afe220142ea26914423387d3aed335b43fa69b38501c3d713d5540bb2efc2e52dd0db1fa1cd3d9c00c1531 -DIST dclock_2.2.2-9.debian.tar.xz 15260 BLAKE2B dab41f4fe79d2ce6ef4effb466c3923c77a94bfaf4b6ca1dde5bd9b92e0d9ff9a5d89dd9b569f831e107bb62de691e24661609b61af84d1a64958de34304f9be SHA512 025d1d228930adb6e2b13226188b6c3d37aef59786f23826f301c7b22dabba5cfc24f76347fe2f199c239daea968cd043293bd60524110235855cb77c9e4d1f0 DIST dclock_2.2.2.orig.tar.gz 63583 BLAKE2B b1208439e3a689ff1e00cbdbfa7e3a559b7ec7705ab0834cf350d1ba1e3dcd01d4746e90999f6215cfa9e101a4bd8cf42ff324a307c792028479077152b5414b SHA512 c43ba031fd0d9ba2bc7e8fe9becc73591bfc47cd4ca931df03fa55207cfb148e24e5d702a7de5af8b67e188c561eae2fb7da14162f6a982d0abbb3251c32372c diff --git a/x11-misc/dclock/dclock-2.2.2_p12.ebuild b/x11-misc/dclock/dclock-2.2.2_p12.ebuild index 23c19ae370cf..f716d8cf1f53 100644 --- a/x11-misc/dclock/dclock-2.2.2_p12.ebuild +++ b/x11-misc/dclock/dclock-2.2.2_p12.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -13,7 +13,7 @@ SRC_URI=" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" +KEYWORDS="amd64 ppc x86" IUSE="xft" RDEPEND=" diff --git a/x11-misc/dclock/dclock-2.2.2_p9.ebuild b/x11-misc/dclock/dclock-2.2.2_p9.ebuild deleted file mode 100644 index 748340c6f6ef..000000000000 --- a/x11-misc/dclock/dclock-2.2.2_p9.ebuild +++ /dev/null @@ -1,72 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit flag-o-matic toolchain-funcs - -DESCRIPTION="Digital clock for the X window system" -HOMEPAGE="https://packages.qa.debian.org/d/dclock.html" -SRC_URI=" - mirror://debian/pool/main/d/${PN}/${PN}_${PV/_p*/}.orig.tar.gz - mirror://debian/pool/main/d/${PN}/${PN}_${PV/_p/-}.debian.tar.xz -" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ppc x86" -IUSE="xft" - -RDEPEND=" - xft? ( - media-libs/freetype - x11-libs/libXft - ) - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXt -" -DEPEND=" - ${RDEPEND} - app-text/rman - x11-misc/imake - xft? ( virtual/pkgconfig ) -" - -S=${WORKDIR}/${P/_p*/} - -PATCHES=( - "${WORKDIR}"/debian/patches - "${FILESDIR}"/${PN}-2.2.2_p4-include.patch -) - -src_configure() { - if use xft; then - append-cppflags \ - -DXFT_SUPPORT \ - $( $(tc-getPKG_CONFIG) --cflags freetype2) - else - append-cppflags -UXFT_SUPPORT - sed -i -e '/EXTRA_LIBRARIES/s|^|#|g' Imakefile || die - fi - - xmkmf || die -} - -src_compile() { - emake \ - CC="$(tc-getCC)" \ - CFLAGS="${CFLAGS}" \ - CPPFLAGS="${CPPFLAGS}" \ - EXTRA_LDOPTIONS="${LDFLAGS}" -} - -src_install() { - default - emake DESTDIR="${D}" install.man - - insinto /usr/share/sounds - doins sounds/* - - insinto /usr/share/X11/app-defaults - newins Dclock.ad DClock -} diff --git a/x11-misc/dclock/files/dclock-2.2.2_p4-include.patch b/x11-misc/dclock/files/dclock-2.2.2_p4-include.patch deleted file mode 100644 index 223cd9f55279..000000000000 --- a/x11-misc/dclock/files/dclock-2.2.2_p4-include.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/dclock.c -+++ b/dclock.c -@@ -7,6 +7,7 @@ - * manager: *Dclock.seconds: on - */ - #include -+#include /* exit() */ - #include - #include - #include "Dclock.h" diff --git a/x11-misc/efax-gtk/Manifest b/x11-misc/efax-gtk/Manifest index 5e4ca4405d47..710870329cfb 100644 --- a/x11-misc/efax-gtk/Manifest +++ b/x11-misc/efax-gtk/Manifest @@ -1,2 +1 @@ -DIST efax-gtk-3.2.14.src.tgz 1241132 BLAKE2B 8907907681076d9238219a42c7a490f15b988019be2dd291131fd48122421f8f9476ae59f4832395ff56c44b0981490f3c38c49df643dbc1125f33e735392bbf SHA512 28e0814c209c4c398a27b4f421b0902942fb2088e94d992c344093d755a74176cedce2912ad6f5c0a21fde1fc57acd8c5bb97bd98c42b76bdf2ab1b5919a595e DIST efax-gtk-3.2.15.src.tgz 1253414 BLAKE2B 1cd5eadced1e1ad03cb3d05b2068ce232c5632cebdba3320b721b773685f9ba4f1c69f4f0f0f0e261fce127ccaeb2f8eb5b95a4f6cbcc7adcc36c4a22729acb8 SHA512 83ba678162c2ec5c62eeba941a712f507aaeef3a42dfffe8a7dedca72af5ee46626e9c709d7617fc3bf62191ce0f6b10bac2498e1996cc45270db638fdfb7e63 diff --git a/x11-misc/efax-gtk/efax-gtk-3.2.14.ebuild b/x11-misc/efax-gtk/efax-gtk-3.2.14.ebuild deleted file mode 100644 index 776229b9a314..000000000000 --- a/x11-misc/efax-gtk/efax-gtk-3.2.14.ebuild +++ /dev/null @@ -1,57 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="A graphical frontend for the 'efax' application" -HOMEPAGE="http://efax-gtk.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${P}.src.tgz" - -LICENSE="GPL-2 LGPL-2.1" -SLOT="0" -KEYWORDS="amd64 ~ppc ~ppc64 x86" - -RDEPEND=" - >=dev-libs/glib-2.10 - media-libs/tiff:0= - x11-libs/libX11 - x11-libs/c++-gtk-utils:0[gtk] - x11-libs/gtk+:3 -" -DEPEND=" - ${RDEPEND} - virtual/pkgconfig - sys-devel/gettext -" - -DOCS="AUTHORS BUGS ChangeLog README" -PATCHES=( - "${FILESDIR}"/${PN}-3.2.13-fno-common.patch -) - -src_prepare() { - default - # Prevent sandbox violation with chown/chgrp and existing spooldir - sed -i -e '/ch.*lp.*spooldir/d' efax-gtk-faxfilter/Makefile.in || die - - sed -i \ - -e '/^Categories/s:Office;::' \ - ${PN}.desktop || die -} - -src_configure() { - econf \ - --with-gtk-version=gtk3 -} - -src_install() { - default - # File collision with net-misc/efax wrt #401221 - mv "${ED}"/usr/share/man/man1/efax{,-0.9a}.1 || die - mv "${ED}"/usr/share/man/man1/efix{,-0.9a}.1 || die -} - -pkg_postinst() { - local spooldir="${EROOT}"/var/spool/fax - [[ -d ${spooldir} ]] && chown lp:lp "${spooldir}" -} diff --git a/x11-misc/efax-gtk/efax-gtk-3.2.15.ebuild b/x11-misc/efax-gtk/efax-gtk-3.2.15.ebuild index 1f8dcfaca924..fd4111a4aa70 100644 --- a/x11-misc/efax-gtk/efax-gtk-3.2.15.ebuild +++ b/x11-misc/efax-gtk/efax-gtk-3.2.15.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.src.tgz" LICENSE="GPL-2 LGPL-2.1" SLOT="0" -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" +KEYWORDS="amd64 ~ppc ~ppc64 x86" RDEPEND=" >=dev-libs/glib-2.10 diff --git a/x11-misc/efax-gtk/files/efax-gtk-3.2.13-fno-common.patch b/x11-misc/efax-gtk/files/efax-gtk-3.2.13-fno-common.patch deleted file mode 100644 index 4cfd79afd164..000000000000 --- a/x11-misc/efax-gtk/files/efax-gtk-3.2.13-fno-common.patch +++ /dev/null @@ -1,35 +0,0 @@ ---- a/efax/efaxos.h -+++ b/efax/efaxos.h -@@ -11,10 +11,6 @@ - #define UNIXSIGS SIGHUP, SIGQUIT, SIGIOT, SIGALRM - #define CATCHSIGS ANSISIGS, UNIXSIGS - --/* Bit order reversal table. */ -- --extern unsigned char normalbits [ ] ; -- - typedef enum ttymodes /* serial port modes: */ - { - COMMAND, /* 19200 8N1, no f/c, DTR high */ ---- a/efax/efaxlib.h -+++ b/efax/efaxlib.h -@@ -208,7 +208,7 @@ - /* Bit reversal lookup tables (note that the `normalbits' array - is the one actually used for the bit reversal. */ - --uchar reversebits [ 256 ], normalbits [ 256 ] ; -+extern uchar reversebits [ 256 ], normalbits [ 256 ] ; - - void initbittab(void) ; - ---- a/efax/efaxlib.c -+++ b/efax/efaxlib.c -@@ -48,6 +48,8 @@ - return n < 0 ; - } - -+uchar reversebits [ 256 ], normalbits [ 256 ] ; -+ - /* Provide dummy gettext() function if there is no internationalisation support */ - - #ifndef ENABLE_NLS diff --git a/x11-misc/lineak-defaultplugin/lineak-defaultplugin-0.9.0-r2.ebuild b/x11-misc/lineak-defaultplugin/lineak-defaultplugin-0.9.0-r2.ebuild index 16aac45e5d34..cd584ce7ab0e 100644 --- a/x11-misc/lineak-defaultplugin/lineak-defaultplugin-0.9.0-r2.ebuild +++ b/x11-misc/lineak-defaultplugin/lineak-defaultplugin-0.9.0-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/lineak/${MY_P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" +KEYWORDS="amd64 ppc x86" IUSE="debug" RDEPEND=" @@ -40,6 +40,6 @@ src_prepare() { src_configure() { econf \ $(use_enable debug) \ - --with-lineak-plugindir="${EROOT}/usr/$(get_libdir)/lineakd" \ + --with-lineak-plugindir="${EPREFIX}/usr/$(get_libdir)/lineakd" \ USER_LDFLAGS="${LDFLAGS}" } diff --git a/x11-misc/lineak-xosdplugin/lineak-xosdplugin-0.9.0-r2.ebuild b/x11-misc/lineak-xosdplugin/lineak-xosdplugin-0.9.0-r2.ebuild index 5499b6eedf13..5ad5aca6757c 100644 --- a/x11-misc/lineak-xosdplugin/lineak-xosdplugin-0.9.0-r2.ebuild +++ b/x11-misc/lineak-xosdplugin/lineak-xosdplugin-0.9.0-r2.ebuild @@ -1,14 +1,13 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit multilib MY_P=${P/.0/} - DESCRIPTION="Xosd plugin for LINEAK" HOMEPAGE="http://lineak.sourceforge.net/" SRC_URI="mirror://sourceforge/lineak/${MY_P}.tar.gz" +S="${WORKDIR}/${MY_P}" LICENSE="GPL-2" SLOT="0" @@ -19,11 +18,8 @@ DEPEND=" =x11-misc/lineakd-${PV}* x11-libs/xosd " -RDEPEND=" - ${DEPEND} -" +RDEPEND="${DEPEND}" -S=${WORKDIR}/${MY_P} PATCHES=( "${FILESDIR}"/${P}-gcc43.patch ) @@ -31,7 +27,7 @@ PATCHES=( src_configure() { econf \ $(use_enable debug) \ - --with-lineak-plugindir="${EROOT}/usr/$(get_libdir)/lineakd" \ + --with-lineak-plugindir="${EPREFIX}/usr/$(get_libdir)/lineakd" \ --with-x } diff --git a/x11-misc/nitrogen/nitrogen-1.6.1-r1.ebuild b/x11-misc/nitrogen/nitrogen-1.6.1-r1.ebuild index 68f5dd2023f7..d8a653ff0195 100644 --- a/x11-misc/nitrogen/nitrogen-1.6.1-r1.ebuild +++ b/x11-misc/nitrogen/nitrogen-1.6.1-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -10,7 +10,7 @@ SRC_URI="https://github.com/l3ib/nitrogen/releases/download/${PV}/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" +KEYWORDS="amd64 ~ppc ~x86" IUSE="nls xinerama" RDEPEND=" diff --git a/x11-misc/rofi/Manifest b/x11-misc/rofi/Manifest index 419e55af09c0..4786f50a50b8 100644 --- a/x11-misc/rofi/Manifest +++ b/x11-misc/rofi/Manifest @@ -1,3 +1 @@ -DIST rofi-1.5.4.tar.gz 535259 BLAKE2B 8560dfee631c66a6f2178c0af6926ef317ed6d2cfe3ae46264e5b1ce429113ce810e4fed4c86a81acbbd51c85ad2593f40a39d982d7da0aa8ccc55537cadd2bb SHA512 181dedb0905bfab76f7ad313d299f4c80ee4efb11a2c6345b16044b7fb3f54bc7e304ee9352e562932e55108e328e5f6bd2c1d7fd9bcdec3d8022c2dc4f8d394 -DIST rofi-1.6.0.tar.gz 558808 BLAKE2B 45849f71becd3ab69b85dae64af34ad42199c20976304b89b013405f1d7fbbfa8fdf7d3ac4c26563cc2f5924fad64d45da1ba7dcad8857fb127eaf4b40c08824 SHA512 a993b0d49681eae4bc4aa84277f6daf1467e53bc40fa43e97ccf3f834763a3c9a1ed8b5d1d628158febc9e8b339be3fb745ae5b4e1d86e9f84b7af4b6a30ea23 DIST rofi-1.6.1.tar.gz 569262 BLAKE2B 938b45f8326b5a28e349ac9f7028c476274faa4f932a773acc350d5e1dc8d5c05c7cfb7ec10f1ab5d8c83590074424c3379768671d37ee799d78e508b8c4a4cb SHA512 b54e75818a98fa9262a3016260051837de189d49beff4f4a158cb2e7f41438641377e11d75c164f423e6a86d8b8fca3b76e2630611678525465d06c21b393f60 diff --git a/x11-misc/rofi/rofi-1.5.4-r1.ebuild b/x11-misc/rofi/rofi-1.5.4-r1.ebuild deleted file mode 100644 index 6d0d5474b2bf..000000000000 --- a/x11-misc/rofi/rofi-1.5.4-r1.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit autotools toolchain-funcs - -DESCRIPTION="A window switcher, run dialog and dmenu replacement" -HOMEPAGE="https://github.com/davatorium/rofi" -SRC_URI="https://github.com/davatorium/rofi/releases/download/${PV}/${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="amd64 ~arm64 x86" -IUSE="test windowmode" -RESTRICT="!test? ( test )" - -RDEPEND=" - dev-libs/glib:2 - gnome-base/librsvg:2 - media-libs/freetype - x11-libs/cairo[X,xcb(+)] - x11-libs/libXft - x11-libs/libXinerama - x11-libs/libxcb - x11-libs/libxkbcommon[X] - x11-libs/pango[X] - x11-libs/startup-notification - x11-libs/xcb-util - x11-libs/xcb-util-wm - x11-libs/xcb-util-xrm -" -DEPEND=" - ${RDEPEND} - virtual/pkgconfig - x11-base/xorg-proto - test? ( >=dev-libs/check-0.11 ) -" -PATCHES=( - "${FILESDIR}"/${PN}-0.15.12-Werror.patch - "${FILESDIR}"/${PN}-1.5.0-gtk-settings-test.patch -) - -src_prepare() { - default - - eautoreconf -} - -src_configure() { - tc-export CC - - econf \ - $(use_enable test check) \ - $(use_enable windowmode) -} diff --git a/x11-misc/rofi/rofi-1.6.0.ebuild b/x11-misc/rofi/rofi-1.6.0.ebuild deleted file mode 100644 index 2eed2dccd62c..000000000000 --- a/x11-misc/rofi/rofi-1.6.0.ebuild +++ /dev/null @@ -1,57 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit autotools toolchain-funcs - -DESCRIPTION="A window switcher, run dialog and dmenu replacement" -HOMEPAGE="https://github.com/davatorium/rofi" -SRC_URI="https://github.com/davatorium/rofi/releases/download/${PV}/${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~arm64 ~x86" -IUSE="+drun test +windowmode" -RESTRICT="!test? ( test )" - -RDEPEND=" - dev-libs/glib:2 - gnome-base/librsvg:2 - media-libs/freetype - virtual/jpeg - x11-libs/cairo[X,xcb(+)] - x11-libs/libXft - x11-libs/libXinerama - x11-libs/libxcb - x11-libs/libxkbcommon[X] - x11-libs/pango[X] - x11-libs/startup-notification - x11-libs/xcb-util - x11-libs/xcb-util-wm - x11-libs/xcb-util-xrm -" -DEPEND=" - ${RDEPEND} - virtual/pkgconfig - x11-base/xorg-proto - test? ( >=dev-libs/check-0.11 ) -" -PATCHES=( - "${FILESDIR}"/${PN}-0.15.12-Werror.patch - "${FILESDIR}"/${PN}-1.5.0-gtk-settings-test.patch -) - -src_prepare() { - default - - eautoreconf -} - -src_configure() { - tc-export CC - - econf \ - $(use_enable drun) \ - $(use_enable test check) \ - $(use_enable windowmode) -} diff --git a/x11-misc/rofi/rofi-1.6.1.ebuild b/x11-misc/rofi/rofi-1.6.1.ebuild index 297c2f078d6b..c919a190ff0f 100644 --- a/x11-misc/rofi/rofi-1.6.1.ebuild +++ b/x11-misc/rofi/rofi-1.6.1.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/davatorium/rofi/releases/download/${PV}/${P}.tar.gz" LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64 ~arm64 ~x86" +KEYWORDS="amd64 ~arm64 x86" IUSE="+drun test +windowmode" RESTRICT="!test? ( test )" diff --git a/x11-misc/sisctrl/sisctrl-0.0.20051202-r1.ebuild b/x11-misc/sisctrl/sisctrl-0.0.20051202-r1.ebuild index 53c9511c8cc6..eca4dc548443 100644 --- a/x11-misc/sisctrl/sisctrl-0.0.20051202-r1.ebuild +++ b/x11-misc/sisctrl/sisctrl-0.0.20051202-r1.ebuild @@ -1,7 +1,8 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 + inherit flag-o-matic DESCRIPTION="tool that allows you to tune SiS drivers from X" @@ -12,6 +13,7 @@ LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~x86" +BDEPEND="virtual/pkgconfig" RDEPEND=" dev-libs/glib:2 x11-libs/gtk+:2 @@ -21,10 +23,11 @@ RDEPEND=" " DEPEND=" ${RDEPEND} - virtual/pkgconfig x11-base/xorg-proto " -DOCS="AUTHORS ChangeLog NEWS README" + +DOCS=( AUTHORS ChangeLog NEWS README ) + PATCHES=( "${FILESDIR}"/${P}-no-xv.patch ) @@ -32,5 +35,5 @@ PATCHES=( src_configure() { append-libs -lm econf \ - --with-xv-path="${EROOT}/usr/$(get_libdir)" + --with-xv-path="${EPREFIX}/usr/$(get_libdir)" } diff --git a/x11-misc/sux/sux-1.0.1.ebuild b/x11-misc/sux/sux-1.0.1.ebuild index 9c84c56d3da9..4cff435296df 100644 --- a/x11-misc/sux/sux-1.0.1.ebuild +++ b/x11-misc/sux/sux-1.0.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.tar.gz" LICENSE="MIT" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~sparc ~x86" +KEYWORDS="~alpha amd64 ~arm ~arm64 ppc ~sparc x86" RDEPEND="x11-apps/xauth" DEPEND="${RDEPEND}" diff --git a/x11-misc/trayer-srg/Manifest b/x11-misc/trayer-srg/Manifest index 6ca5f2c51065..7f8792aa53f8 100644 --- a/x11-misc/trayer-srg/Manifest +++ b/x11-misc/trayer-srg/Manifest @@ -1,2 +1 @@ -DIST trayer-srg-1.1.7.tar.gz 27987 BLAKE2B aaaa1609bebe91c7b2d3934d68075fa16f393896b7f9300dd6aecd7aa8666a7f3474711fbbc9dae5f72ed5ba8b63d0275f590a5a82ea4547b640a75a81012fc5 SHA512 5bb049af01c3f3f62dc8a5c1932985b92c98e4e2083aebd1dc09256746e097239be54ebc739801773878882a5c8f168a4a13bdac292388f79079ad52c41b2cad DIST trayer-srg-1.1.8.tar.gz 28025 BLAKE2B 3eca8faf7237e1941a611a85a4460310dda1a8d89cb96ae2ac7d77c47a7f8b4fa4bb1a2bcc549fef285ca14a74dce23d9af1b349bb5b0ff9d3bf4abe1ed06351 SHA512 5ae92fdcee64ad1ca59846874dcd4bd4859adeeb80a86f1ed97d62e6306f8ec62d1ee26dba251257242dc25d158a6a550e69f2fcc8739242a2311e37fe1ce310 diff --git a/x11-misc/trayer-srg/trayer-srg-1.1.7.ebuild b/x11-misc/trayer-srg/trayer-srg-1.1.7.ebuild deleted file mode 100644 index 45e6091acf64..000000000000 --- a/x11-misc/trayer-srg/trayer-srg-1.1.7.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit toolchain-funcs - -DESCRIPTION="trayer fork with multi monitor support and cleaned up codebase" -HOMEPAGE="https://github.com/sargon/trayer-srg" -SRC_URI="https://github.com/sargon/${PN}/archive/${P/-srg/}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT GPL-2+" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="" - -RDEPEND=" - x11-libs/gdk-pixbuf:2 - x11-libs/gtk+:2 - x11-libs/libX11 -" -DEPEND="${RDEPEND} - virtual/pkgconfig -" - -S="${WORKDIR}"/${PN}-trayer-${PV} - -src_configure() { - # Custom configure script - ./configure --prefix="${EPREFIX}" || die -} - -src_compile() { - emake DEVEL=1 TARGET=${PN} CC="$(tc-getCC)" -} - -src_install() { - dobin ${PN} - einstalldocs -} diff --git a/x11-misc/trayer-srg/trayer-srg-1.1.8.ebuild b/x11-misc/trayer-srg/trayer-srg-1.1.8.ebuild index 8a9b9e21d068..d8bdfca96e17 100644 --- a/x11-misc/trayer-srg/trayer-srg-1.1.8.ebuild +++ b/x11-misc/trayer-srg/trayer-srg-1.1.8.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -11,7 +11,7 @@ SRC_URI="https://github.com/sargon/${PN}/archive/${P/-srg/}.tar.gz -> ${P}.tar.g LICENSE="MIT GPL-2+" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="" RDEPEND=" diff --git a/x11-misc/trayer/Manifest b/x11-misc/trayer/Manifest index a2fa373bc415..ee5cb7c5e9a2 100644 --- a/x11-misc/trayer/Manifest +++ b/x11-misc/trayer/Manifest @@ -1,2 +1 @@ DIST trayer-1.0-sourceforge.tar.gz 29713 BLAKE2B 6a874781979c512e4fea06b0dcef30be73821e502553ebdad38ab2e152d070f6633dd6f8059d5532a51648ea10cbdfd752a65da11d2a992687a6f3ee4d289d01 SHA512 9903a78a1c185515e87552732449937daa23187d54a3ccbf19bc9fc569d6a440600c879fe78edbea3eff6b66a1f3fc5054d474dfeaca53af3521a6f18b454049 -DIST trayer-1.0.tar.gz 30445 BLAKE2B f95df1496392064b803e712e57a4ec76ed6e9a62dadb254eb044954e38620590cd486dc37d46d56598a7f2db5f27051db47e78df2d788092ccf3cdb7707978e0 SHA512 c46093ee18908b7cf8e52d2f10adeb0eefc90562b87862a5459cc4563e53528107ee1dba47b1cb88e378bdac40d64a1d8cb9ecbf014aef997c44f242b49534f7 diff --git a/x11-misc/trayer/trayer-1.0-r3.ebuild b/x11-misc/trayer/trayer-1.0-r3.ebuild deleted file mode 100644 index f130f5ec280a..000000000000 --- a/x11-misc/trayer/trayer-1.0-r3.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit toolchain-funcs - -DESCRIPTION="Lightweight GTK+ based systray for UNIX desktop" -HOMEPAGE="http://home.gna.org/fvwm-crystal/" -SRC_URI="http://download.gna.org/fvwm-crystal/trayer/${P}.tar.gz" -LICENSE="GPL-2" - -SLOT="0" -KEYWORDS="amd64 ppc ppc64 x86" -IUSE="" - -RDEPEND=" - dev-libs/glib:2 - x11-libs/gdk-pixbuf:2 - x11-libs/gtk+:2 - x11-libs/libX11 -" -DEPEND=" - ${RDEPEND} - virtual/pkgconfig -" - -PATCHES=( - "${FILESDIR}"/${P}-dont-include-gdk-pixbuf-xlib.patch - "${FILESDIR}"/${P}-dont-include-libXmu.patch - "${FILESDIR}"/${P}-as-needed-and-pre-stripped.patch -) - -src_compile() { - tc-export PKG_CONFIG - - emake -j1 CC=$(tc-getCC) CFLAGS="${CFLAGS}" CPPFLAGS="${CPPFLAGS}" -} - -src_install() { - dobin trayer - doman trayer.1 - einstalldocs -} diff --git a/x11-misc/trayer/trayer-1.0-r4.ebuild b/x11-misc/trayer/trayer-1.0-r4.ebuild index db168a56b03e..d83e08e8deda 100644 --- a/x11-misc/trayer/trayer-1.0-r4.ebuild +++ b/x11-misc/trayer/trayer-1.0-r4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -10,7 +10,7 @@ SRC_URI="https://sourceforge.net/projects/fvwm-crystal/files/${PN}/${PV}/${P}.ta LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" +KEYWORDS="amd64 ppc ppc64 x86" RDEPEND=" dev-libs/glib:2 diff --git a/x11-misc/xautolock/xautolock-2.2_p7.ebuild b/x11-misc/xautolock/xautolock-2.2_p7.ebuild index 1abba4868157..2281d2a7c003 100644 --- a/x11-misc/xautolock/xautolock-2.2_p7.ebuild +++ b/x11-misc/xautolock/xautolock-2.2_p7.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -14,7 +14,7 @@ SRC_URI=" " LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~sparc ~x86" +KEYWORDS="amd64 ~arm ~arm64 ppc ~sparc x86" RDEPEND=" x11-libs/libXScrnSaver diff --git a/x11-misc/xdesktopwaves/Manifest b/x11-misc/xdesktopwaves/Manifest index 60a54f7429c9..fbd0debff27d 100644 --- a/x11-misc/xdesktopwaves/Manifest +++ b/x11-misc/xdesktopwaves/Manifest @@ -1,2 +1 @@ -DIST xdesktopwaves-1.3.tar.gz 49302 BLAKE2B 96348d80ba71a179df09afbaa8f2fb79725e049203e9644769e5a41b7fa8a9cae06ef2002ac3062f317f84419ae2ef739e7a90142b9b06118f51754d295e70ed SHA512 7dd3eb4f3a9291e9afab7aab7385cc271af2754adecde85ef3a2dfbc6a0bd96bab440cdb9f34cabb9e7c6d9ee25cdc64bf57ba7edc4df03f344b5b10404cd52e DIST xdesktopwaves-1.4.tar.gz 50259 BLAKE2B 5512746c9a035878f50abfc35c088f2953c5a0decaab6e0fc3cd31e29e75d100430c36df5a0043f64222521e939797ad24b9147a66cf5ba20f7f4c22fc78767d SHA512 06ec5bea51737d066beccad57db63ef7e56e59c18bb7c1dcaf06f6691940ac32a32b7cd06d9e3f16ad472e3d793c391b072a753e0088ab71ae7304b20b2fa3ba diff --git a/x11-misc/xdesktopwaves/files/xdesktopwaves-1.3-gentoo.patch b/x11-misc/xdesktopwaves/files/xdesktopwaves-1.3-gentoo.patch deleted file mode 100644 index 80e219edc6a8..000000000000 --- a/x11-misc/xdesktopwaves/files/xdesktopwaves-1.3-gentoo.patch +++ /dev/null @@ -1,38 +0,0 @@ ---- a/Makefile -+++ b/Makefile -@@ -11,14 +11,13 @@ - - #=========================== C compiler configuration ========================== - --CC = gcc --CFLAGS = -I/usr/X11R6/include -O2 -+CFLAGS += $(shell pkg-config --cflags x11 xext) - - #============================= Linker configuration ============================ - --LINK = gcc --LFLAGS = -L/usr/X11R6/lib --LIBS = -lm -lX11 -lXext -+LINK = $(CC) -+LFLAGS = $(LDFLAGS) -+LIBS = -lm $(shell pkg-config --libs x11 xext) - - #============================ Installer configuration ========================== - ---- a/xdwapi/Makefile -+++ b/xdwapi/Makefile -@@ -1,10 +1,9 @@ - # Makefile for the xdesktopwaves API and its demo program - --CC = gcc --CFLAGS = -I/usr/X11R6/include -O2 --LINK = gcc --LFLAGS = -L/usr/X11R6/lib --LIBS = -lm -lX11 -+CFLAGS += $(shell pkg-config --cflags x11 xext) -+LINK = $(CC) -+LFLAGS = $(LDFLAGS) -+LIBS = -lm $(shell pkg-config --libs x11 xext) - - all: xdwapidemo - diff --git a/x11-misc/xdesktopwaves/xdesktopwaves-1.3-r2.ebuild b/x11-misc/xdesktopwaves/xdesktopwaves-1.3-r2.ebuild deleted file mode 100644 index 2104e57383da..000000000000 --- a/x11-misc/xdesktopwaves/xdesktopwaves-1.3-r2.ebuild +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit eutils toolchain-funcs - -DESCRIPTION="A cellular automata setting the background of your X Windows desktop under water" -HOMEPAGE="http://xdesktopwaves.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" -LICENSE="GPL-2" - -SLOT="0" -RDEPEND="x11-libs/libXext" -DEPEND="${RDEPEND} - x11-base/xorg-proto" -KEYWORDS="amd64 ppc x86" -IUSE="" - -PATCHES=( "${FILESDIR}"/${P}-gentoo.patch ) - -src_compile() { - tc-export CC - emake - emake -C xdwapi -} - -src_install() { - dobin xdesktopwaves xdwapi/xdwapidemo - doman xdesktopwaves.1 - insinto /usr/share/pixmaps - doins xdesktopwaves.xpm - make_desktop_entry xdesktopwaves - einstalldocs -} - -pkg_preinst() { - elog "To see what xdesktopwaves is able to do, start it by running" - elog "'xdesktopwaves' and then run 'xdwapidemo'. You should see the" - elog "supported effects on your desktop" -} diff --git a/x11-misc/xdesktopwaves/xdesktopwaves-1.4.ebuild b/x11-misc/xdesktopwaves/xdesktopwaves-1.4.ebuild index 901b11eb7789..1e5d62650fd1 100644 --- a/x11-misc/xdesktopwaves/xdesktopwaves-1.4.ebuild +++ b/x11-misc/xdesktopwaves/xdesktopwaves-1.4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -17,7 +17,7 @@ DEPEND=" ${RDEPEND} x11-base/xorg-proto " -KEYWORDS="~amd64 ~ppc ~x86" +KEYWORDS="amd64 ppc x86" PATCHES=( "${FILESDIR}"/${PN}-1.4-gentoo.patch diff --git a/x11-misc/xdiskusage/Manifest b/x11-misc/xdiskusage/Manifest index c28097819c73..546d746f7e29 100644 --- a/x11-misc/xdiskusage/Manifest +++ b/x11-misc/xdiskusage/Manifest @@ -1,2 +1 @@ -DIST xdiskusage-1.51.tgz 54248 BLAKE2B a1e41eef4e3d303c7bc02cb485ab2ca33bb03c57f9713459b68621a611751f5af35be9918bbef86294e70ddcc8e2fb678b5dfa9baa237954a46fd12120bbf96f SHA512 73335bbd5dc3e1f753efb84e7921fe7568f83daae7c4026c8b23fbacc4257b885de56f4dc8f682b03663a56f7def1227b8a4b6abf419aff8ecdd26ae51d4885a DIST xdiskusage-1.52.tgz 54458 BLAKE2B 6e91402c4e43e1dfafbd2e689282aea1305ac309a491fd410b16502b2176cfe9a8b17a7379eef5ddea074cc550e7801d91c13db0a7b119b3ab48f32f786f0e5b SHA512 d561f84ca2c8ff73a9abe8c6e34baed430aaa6c6793064b2aa5856249dd4b309d50c3f6b19824a8c948aa8a71f7a3056771937fdce3f3fcb8f2fc8b0f39cdf54 diff --git a/x11-misc/xdiskusage/xdiskusage-1.51.ebuild b/x11-misc/xdiskusage/xdiskusage-1.51.ebuild deleted file mode 100644 index 233643fc4012..000000000000 --- a/x11-misc/xdiskusage/xdiskusage-1.51.ebuild +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -DESCRIPTION="user-friendly program to show you what is using up all your disk space" -HOMEPAGE="http://xdiskusage.sourceforge.net/" -SRC_URI="http://xdiskusage.sourceforge.net/${P}.tgz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ~ppc x86" - -RDEPEND=" - >=x11-libs/fltk-1.3:1 -" -DEPEND=" - ${RDEPEND} -" - -src_compile() { - emake \ - CXXFLAGS="${CXXFLAGS} $(fltk-config --cxxflags)" \ - LDLIBS="$(fltk-config --ldflags)" -} - -src_install() { - dobin ${PN} - doman ${PN}.1 - dodoc README -} diff --git a/x11-misc/xdiskusage/xdiskusage-1.52.ebuild b/x11-misc/xdiskusage/xdiskusage-1.52.ebuild index 555166755fd6..d651d779077d 100644 --- a/x11-misc/xdiskusage/xdiskusage-1.52.ebuild +++ b/x11-misc/xdiskusage/xdiskusage-1.52.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -9,7 +9,7 @@ SRC_URI="http://xdiskusage.sourceforge.net/${P}.tgz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~arm64 ~ppc ~x86" +KEYWORDS="amd64 ~arm64 ~ppc x86" RDEPEND=" >=x11-libs/fltk-1.3:1 diff --git a/x11-misc/xfishtank/Manifest b/x11-misc/xfishtank/Manifest index ca1d5ddc5b56..2763902dcbbf 100644 --- a/x11-misc/xfishtank/Manifest +++ b/x11-misc/xfishtank/Manifest @@ -1,2 +1 @@ -DIST xfishtank-2.1tp.tar.gz 187513 BLAKE2B e2acec91ef52776bee82ea1b4df347b7fe509377687e74422d6dff81d7fce8a4009e4d0f45327a8401e4ae9782440d9f6478d1dd501c6e4e7d595d94b2d40b1a SHA512 641efa1104685d94589c2d9d365108308cb1b0dd238dbba6dc333c5922bda371536c0e26a63645351ac245a18f2386e4c47b4a1fc2a7f4b0400d37db846976a1 DIST xfishtank-2.5.tar.gz 153464 BLAKE2B 0bb3121b84c3d08ea2251a70f9ad569e90fe6299ad3ee4942ec83d80483fcf4db0b0079161c28ff63461597f76b0d0532a65c1bde8aa821ff6bc92be189843f2 SHA512 1bfe16737bdbc2b7cf74abb98408bf632d8881f15753005424f84eba4afca756b07fa7ad424df800ee3f3e46e033b8f60142877bcd9a7e4e806e318ee283721f diff --git a/x11-misc/xfishtank/files/xfishtank-2.1-implicits.patch b/x11-misc/xfishtank/files/xfishtank-2.1-implicits.patch deleted file mode 100644 index b00118631bee..000000000000 --- a/x11-misc/xfishtank/files/xfishtank-2.1-implicits.patch +++ /dev/null @@ -1,75 +0,0 @@ ---- a/read.c -+++ b/read.c -@@ -1,5 +1,7 @@ - #include - #include -+#include -+#include - #include "compact.h" - #include "medcut.h" - ---- a/medcut.c -+++ b/medcut.c -@@ -1,4 +1,5 @@ - #include -+#include - #include "medcut.h" - - #define RED 0 ---- a/xfish.c -+++ b/xfish.c -@@ -46,6 +46,9 @@ - #endif - - #include -+#include -+#include -+#include - #ifdef sgi - #define _BSD_SIGNALS - #endif -@@ -848,8 +850,8 @@ - struct colr_data colrs[256]; - - colormap = XDefaultColormap(Dpy, screen); - -- if (colormap == NULL) -+ if (colormap == 0) - { - return; - } -@@ -1812,9 +1814,11 @@ - high_res_sleep(seconds) - double seconds; - { -- int fds = 0; -+ fd_set fds; - struct timeval timeout; - -+ FD_ZERO(&fds); -+ - timeout.tv_sec = seconds; - timeout.tv_usec = (seconds - timeout.tv_sec) * 1000000.0; - select(0, &fds, &fds, &fds, &timeout); ---- a/makeh.c -+++ b/makeh.c -@@ -1,6 +1,6 @@ -- -+#include - #include -- -+#include - main() - { - FILE *fp; ---- a/gifread.c -+++ b/gifread.c -@@ -56,6 +56,8 @@ - - #include - #include -+#include -+#include - #if defined(SYSV) || defined(SVR4) - #include - #else /* SYSV */ diff --git a/x11-misc/xfishtank/xfishtank-2.1-r2.ebuild b/x11-misc/xfishtank/xfishtank-2.1-r2.ebuild deleted file mode 100644 index 3e5fbb14c7ea..000000000000 --- a/x11-misc/xfishtank/xfishtank-2.1-r2.ebuild +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit toolchain-funcs - -MY_P=${P}tp - -DESCRIPTION="Turns your root window into an aquarium" -HOMEPAGE="http://www.ibiblio.org/pub/Linux/X11/demos/" -SRC_URI="http://www.ibiblio.org/pub/Linux/X11/demos/${MY_P}.tar.gz" - -LICENSE="public-domain" -SLOT="0" -KEYWORDS="amd64 ppc ppc64 x86 ~x86-linux" -IUSE="" - -RDEPEND="x11-libs/libX11 - x11-libs/libXt - x11-libs/libXext" -DEPEND="${RDEPEND} - x11-base/xorg-proto - x11-misc/imake" - -S=${WORKDIR}/${MY_P} - -PATCHES=( "${FILESDIR}"/${P}-implicits.patch ) - -src_compile() { - xmkmf || die - emake CDEBUGFLAGS="${CFLAGS}" CC="$(tc-getCC)" \ - EXTRA_LDOPTIONS="${LDFLAGS}" ${PN} -} diff --git a/x11-misc/xfishtank/xfishtank-2.5.ebuild b/x11-misc/xfishtank/xfishtank-2.5.ebuild index c98482c9096f..7ef03d5d699d 100644 --- a/x11-misc/xfishtank/xfishtank-2.5.ebuild +++ b/x11-misc/xfishtank/xfishtank-2.5.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -10,7 +10,7 @@ SRC_URI="https://dev.gentoo.org/~jer/${P}.tar.gz" LICENSE="public-domain" SLOT="0" -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-linux" +KEYWORDS="amd64 ppc ppc64 x86 ~x86-linux" RDEPEND=" media-libs/imlib2[X] diff --git a/x11-misc/xkbd/Manifest b/x11-misc/xkbd/Manifest index 83c85c527345..98bc0f060635 100644 --- a/x11-misc/xkbd/Manifest +++ b/x11-misc/xkbd/Manifest @@ -1,2 +1 @@ -DIST xkbd-0.8.16.tar.gz 347616 BLAKE2B a7ee906d6ae3328d5366b88ebe960b6fdf84a5cad1c1db4b1a0056fc5842196699dfa749c3c0398054bc54073b422798c0efaf57c8116d05b6754c84d6abae03 SHA512 8410f722cb93069eea26f9d1ed6b9fea76ed5222b8586c2f78ccc1a0f040a964e165df0611ce72c108dbc7adeec31515595c81be3867e68c0cadd8846d985d4a DIST xkbd-0.8.18.tar.gz 50421 BLAKE2B 7652f33cdf00584cc55fcb9dbced9d92c57cf6383b6164d8c026bf88c962e7469b094de7454b451745feb396fbe5ad561193c9d4de8e7b9f65c27a55e7cf478c SHA512 335e18e76e6bf8b7142eb785c9003e8a3d80719e6737149be8e1178bd7281fada6808ea0b18538caf3c3fa1d62778a3d6a45a1fa8b3b0845dca19f3e62942831 diff --git a/x11-misc/xkbd/files/xkbd-0.8.15-fix-keysyms-search.patch b/x11-misc/xkbd/files/xkbd-0.8.15-fix-keysyms-search.patch deleted file mode 100644 index ff30537add44..000000000000 --- a/x11-misc/xkbd/files/xkbd-0.8.15-fix-keysyms-search.patch +++ /dev/null @@ -1,13 +0,0 @@ -http://bugs.gentoo.org/287075 - ---- a/src/libvirtkeys.c -+++ b/src/libvirtkeys.c -@@ -341,7 +341,7 @@ - - for (keycode = 0; ((keycode < (maxKeycode - minKeycode + 1)) && !found); keycode++) - { -- for (column = 0; ((column < keysymsPerKeycode) && !found); column++) -+ for (column = 0; ((column < (keysymsPerKeycode > 4 ? 4 : keysymsPerKeycode)) && !found); column++) - { - if (keymap[(keycode * keysymsPerKeycode + column)] == ks) - { diff --git a/x11-misc/xkbd/files/xkbd-0.8.15-increase-delay.patch b/x11-misc/xkbd/files/xkbd-0.8.15-increase-delay.patch deleted file mode 100644 index deadcd7cddb1..000000000000 --- a/x11-misc/xkbd/files/xkbd-0.8.15-increase-delay.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -ruN xkbd-0.8.15/data/en_GB.qwerty.xkbd.in xkbd-0.8.15-new/data/en_GB.qwerty.xkbd.in ---- xkbd-0.8.15/data/en_GB.qwerty.xkbd.in 2003-08-10 10:46:29.000000000 -0700 -+++ xkbd-0.8.15-new/data/en_GB.qwerty.xkbd.in 2008-03-23 02:52:52.000000000 -0700 -@@ -24,6 +24,7 @@ - - # button style, can be rounded ( default ), square or plain - button_style square -+repeat_delay 50 - - - # -diff -ruN xkbd-0.8.15/data/en_US.qwerty.xkbd.in xkbd-0.8.15-new/data/en_US.qwerty.xkbd.in ---- xkbd-0.8.15/data/en_US.qwerty.xkbd.in 2002-11-28 03:46:04.000000000 -0800 -+++ xkbd-0.8.15-new/data/en_US.qwerty.xkbd.in 2008-03-23 02:50:39.000000000 -0700 -@@ -26,6 +26,7 @@ - - # button style, can be rounded ( default ), square or plain - # button_style plain -+repeat_delay 50 - - - diff --git a/x11-misc/xkbd/files/xkbd-0.8.16-desktop.patch b/x11-misc/xkbd/files/xkbd-0.8.16-desktop.patch deleted file mode 100644 index 987270d1d398..000000000000 --- a/x11-misc/xkbd/files/xkbd-0.8.16-desktop.patch +++ /dev/null @@ -1,19 +0,0 @@ -Fixes following QA issues: - * QA Notice: This package installs one or more .desktop files that do not - * pass validation. - * - * /usr/share/applications/inputmethods/xkbd.desktop: error: (will be fatal in the future): value "xkbd.png" for key "Icon" in group "Desktop Entry" is an icon name with an extension, but there should be no extension as described in the Icon Theme Specification if the value is not an absolute path - * /usr/share/applications/inputmethods/xkbd.desktop: error: value "Panel;Utility;MB" for key "Categories" in group "Desktop Entry" contains an unregistered value "MB"; values extending the format should start with "X-" - * /usr/share/applications/inputmethods/xkbd.desktop: error: value "Panel;Utility;MB" for key "Categories" in group "Desktop Entry" contains an unregistered value "Panel"; values extending the format should start with "X-" - * ---- a/xkbd.desktop 2003-09-29 20:29:35.000000000 +0300 -+++ b/xkbd.desktop 2017-02-16 16:23:40.927035269 +0200 -@@ -3,6 +3,6 @@ - Comment=Virtual Keyboard - Exec=xkbd - Type=Application --Icon=xkbd.png --Categories=Panel;Utility;MB -+Icon=xkbd -+Categories=Utility;Accessibility - X-MB-INPUT-MECHANSIM=True diff --git a/x11-misc/xkbd/files/xkbd-0.8.16-fix-geometry.patch b/x11-misc/xkbd/files/xkbd-0.8.16-fix-geometry.patch deleted file mode 100644 index d90824085ea4..000000000000 --- a/x11-misc/xkbd/files/xkbd-0.8.16-fix-geometry.patch +++ /dev/null @@ -1,36 +0,0 @@ ---- xkbd-0.8.16/src/xkbd.c -+++ xkbd-0.8.16/src/xkbd.c -@@ -307,21 +307,22 @@ - 0, BlackPixel(display, screen_num), - WhitePixel(display, screen_num)); - -+ wret = DisplayWidth(display, screen_num); -+ hret = DisplayHeight(display, screen_num)/4; -+ xret = 0; -+ yret = DisplayHeight(display, screen_num) - hret; -+ - // deactivate geometry for 0.8.16 release - mb - geometry = NULL; - if (geometry != NULL) - { -- XParseGeometry(geometry, &xret, &yret, &wret, &hret ); -- } -- else -- { -- if (wm_type != WM_MATCHBOX) -- { -- wret = DisplayWidth(display, screen_num); -- hret = DisplayHeight(display, screen_num)/4; -- xret = 0; -- yret = DisplayHeight(display, screen_num) - hret; -- } -+ int flags; -+ -+ flags = XParseGeometry(geometry, &xret, &yret, &wret, &hret ); -+ if( flags & XNegative ) -+ xret += DisplayWidth( display, screen_num ) - wret; -+ if( flags & YNegative ) -+ yret += DisplayHeight( display, screen_num ) - hret; - } - - /* check for user selected keyboard conf file */ diff --git a/x11-misc/xkbd/xkbd-0.8.16-r1.ebuild b/x11-misc/xkbd/xkbd-0.8.16-r1.ebuild deleted file mode 100644 index d3c9125a799e..000000000000 --- a/x11-misc/xkbd/xkbd-0.8.16-r1.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -DESCRIPTION="onscreen soft keyboard for X11" -HOMEPAGE="http://trac.hackable1.org/trac/wiki/Xkbd" -SRC_URI="http://trac.hackable1.org/trac/raw-attachment/wiki/Xkbd/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ~arm ~ppc x86" -IUSE="debug" - -RDEPEND="x11-libs/libXrender - x11-libs/libX11 - x11-libs/libXft - x11-libs/libXtst - x11-libs/libXpm - media-libs/freetype - dev-libs/expat - sys-libs/zlib" -DEPEND="${RDEPEND} - x11-base/xorg-proto" - -DOCS=( AUTHORS ) -PATCHES=( - "${FILESDIR}"/${P}-fix-geometry.patch - "${FILESDIR}"/${P}-desktop.patch - "${FILESDIR}"/${PN}-0.8.15-increase-delay.patch - "${FILESDIR}"/${PN}-0.8.15-fix-keysyms-search.patch -) - -src_configure() { - econf \ - $(use_enable debug) -} diff --git a/x11-misc/xkbd/xkbd-0.8.18.ebuild b/x11-misc/xkbd/xkbd-0.8.18.ebuild index d7baae0ef8c1..062dfdd982f6 100644 --- a/x11-misc/xkbd/xkbd-0.8.18.ebuild +++ b/x11-misc/xkbd/xkbd-0.8.18.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -10,7 +10,7 @@ SRC_URI="https://github.com/mahatma-kaganovich/${PN}/archive/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~arm ~ppc ~x86" +KEYWORDS="amd64 ~arm ~ppc x86" IUSE="debug +xft +xpm" RDEPEND=" diff --git a/x11-misc/xkeycaps/files/xkeycaps-2.47-man.patch b/x11-misc/xkeycaps/files/xkeycaps-2.47-man.patch deleted file mode 100644 index f68629ef3eaf..000000000000 --- a/x11-misc/xkeycaps/files/xkeycaps-2.47-man.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ur xkeycaps-2.47.orig/xkeycaps.man xkeycaps-2.47/xkeycaps.man ---- xkeycaps-2.47.orig/xkeycaps.man 2006-01-02 02:22:17.000000000 +0200 -+++ xkeycaps-2.47/xkeycaps.man 2008-12-07 22:51:38.000000000 +0200 -@@ -267,7 +267,7 @@ - the physical keys: it is immutable (unless you repaint your keyboard...) - .TP 10 - .B \fIChord\fP --This term refers to a set of two or more keys held down simultaniously (by -+This term refers to a set of two or more keys held down simultaneously (by - analogy with piano keyboards.) All but one of the keys will generally be - Modifier Keys. Sometimes \fIConstellation\fP is used to mean the same thing. - .TP 10 diff --git a/x11-misc/xkeycaps/xkeycaps-2.47-r2.ebuild b/x11-misc/xkeycaps/xkeycaps-2.47-r2.ebuild deleted file mode 100644 index 0c3b4ce21aa7..000000000000 --- a/x11-misc/xkeycaps/xkeycaps-2.47-r2.ebuild +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit toolchain-funcs - -DESCRIPTION="GUI frontend to xmodmap" -HOMEPAGE="https://packages.qa.debian.org/x/xkeycaps.html" -SRC_URI="mirror://debian/pool/main/x/${PN}/${PN}_${PV}.orig.tar.gz" - -LICENSE="HPND" -SLOT="0" -KEYWORDS="amd64 ppc ppc64 x86" -IUSE="" - -RDEPEND="x11-misc/xbitmaps - x11-libs/libX11 - x11-libs/libXmu - x11-libs/libXt - x11-libs/libXaw - x11-libs/libXext" -DEPEND="${RDEPEND} - x11-base/xorg-proto - x11-misc/imake - >=sys-apps/sed-4" - -DOCS=( README defining.txt hierarchy.txt sgi-microsoft.txt ) -PATCHES=( - "${FILESDIR}"/${P}-Imakefile.patch - "${FILESDIR}"/${P}-man.patch -) - -src_compile() { - xmkmf || die - sed -i -e "s,all:: xkeycaps.\$(MANSUFFIX).html,all:: ,g" \ - Makefile || die - emake EXTRA_LDOPTIONS="${LDFLAGS}" CC="$(tc-getCC)" \ - CDEBUGFLAGS="${CFLAGS}" -} - -src_install() { - default - newman ${PN}.man ${PN}.1 -} diff --git a/x11-misc/xkeycaps/xkeycaps-2.47_p7.ebuild b/x11-misc/xkeycaps/xkeycaps-2.47_p7.ebuild index 646273eb1ed3..bef2b91b62d2 100644 --- a/x11-misc/xkeycaps/xkeycaps-2.47_p7.ebuild +++ b/x11-misc/xkeycaps/xkeycaps-2.47_p7.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -13,7 +13,7 @@ SRC_URI=" LICENSE="HPND" SLOT="0" -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" +KEYWORDS="amd64 ppc ppc64 x86" RDEPEND=" x11-libs/libX11 diff --git a/x11-misc/xlockmore/Manifest b/x11-misc/xlockmore/Manifest index d48d9210205d..0a192762fa69 100644 --- a/x11-misc/xlockmore/Manifest +++ b/x11-misc/xlockmore/Manifest @@ -1,3 +1,4 @@ DIST xlockmore-5.50.tar.xz 1632968 BLAKE2B 2e692d16d70e3186ec1f31c192414b286f8815f2f428a6f7f43b3de0117c51c4ad2fbdfb91debe2ecb75c8683212b5d33bee62d81374552703d578b02d3af036 SHA512 627a905c4641d6083676a766931f23c06e2ac5af9b43447ccf03143d329d24b786aac6b248318929399b5fae98f1ec17e676466b5cbd09f180377c483694c569 DIST xlockmore-5.65.tar.xz 1945636 BLAKE2B d026975551e8ceafdcc7b8d8b6e404634f329d8d1f65e153b51798981103a023479dd58f2485c774aaf58f5928ea28a9f409c733ccfc75f98b65302e7e478ac5 SHA512 ecbf7e5c087843265eb4a537b3fe06a0d86d5f67d88c45137b6a7f4f5b30522d44fb87b5628cd9e042f90af129863fd3a4c2b5e2305df2dc3dfd867a03469ad8 +DIST xlockmore-5.66.tar.xz 1995064 BLAKE2B 630643f2968a5015dd35b4e1a24cd3d4e7ef9d6d75b0916416e93ab28bacb5a161983b036d9042a5686b2f17ba493ad510e2df9f7443488f9b988662e644ec7a SHA512 d0a4665e23b32cc3370703e55396cd5c9659f836aa13a1737dd709632746cf9221acd66a529b9e05af981e5bef539e70582959b9d821854b93ef735ad1cd928d DIST xlockmore-5.66ALPHA12.tar.xz 2083320 BLAKE2B 271c3e67076086759e325315bebb63a509adde6ee93a9cdae7c1022649231a34a9d944a94676ecee5fb53b3105766095f3e9f4f17df60de14fee1e6742b729c2 SHA512 e495dac3ce0cb1983ee2757198babc05adbadf3cad90c576af8dc83f4c49a45cdc3411106df910ccdc9701b842d7ead96cb2f253ccad094464e900e9548f963a diff --git a/x11-misc/xlockmore/xlockmore-5.65-r1.ebuild b/x11-misc/xlockmore/xlockmore-5.65-r1.ebuild index bec091ad9f0f..600c7b14b222 100644 --- a/x11-misc/xlockmore/xlockmore-5.65-r1.ebuild +++ b/x11-misc/xlockmore/xlockmore-5.65-r1.ebuild @@ -13,7 +13,7 @@ SRC_URI=" LICENSE="BSD GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86" +KEYWORDS="~alpha amd64 ~arm ~hppa ppc ppc64 ~sparc x86" IUSE="crypt debug gtk imagemagick motif nas opengl pam truetype xinerama xlockrc vtlock" REQUIRED_USE=" diff --git a/x11-misc/xlockmore/xlockmore-5.66.ebuild b/x11-misc/xlockmore/xlockmore-5.66.ebuild new file mode 100644 index 000000000000..e701a66751bd --- /dev/null +++ b/x11-misc/xlockmore/xlockmore-5.66.ebuild @@ -0,0 +1,120 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools flag-o-matic pam + +DESCRIPTION="Just another screensaver application for X" +HOMEPAGE="https://www.sillycycle.com/xlockmore.html" +SRC_URI=" + https://www.sillycycle.com/xlock/${P/_alpha/ALPHA}.tar.xz + https://www.sillycycle.com/xlock/recent-releases/${P/_alpha/ALPHA}.tar.xz +" +S="${WORKDIR}/${P/_alpha/ALPHA}" + +LICENSE="BSD GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86" +IUSE="crypt debug gtk imagemagick motif nas opengl pam truetype xinerama xlockrc vtlock" + +REQUIRED_USE=" + || ( crypt pam ) + pam? ( !xlockrc ) + xlockrc? ( !pam ) +" + +BDEPEND="virtual/pkgconfig" +RDEPEND=" + x11-libs/libX11 + x11-libs/libXext + x11-libs/libXmu + x11-libs/libXpm + x11-libs/libXt + gtk? ( x11-libs/gtk+:2 ) + imagemagick? ( media-gfx/imagemagick:= ) + motif? ( >=x11-libs/motif-2.3:0 ) + nas? ( media-libs/nas ) + opengl? ( + virtual/opengl + virtual/glu + truetype? ( >=media-libs/ftgl-2.1.3_rc5 ) + ) + pam? ( sys-libs/pam ) + truetype? ( media-libs/freetype:2 ) + xinerama? ( x11-libs/libXinerama ) +" +DEPEND=" + ${RDEPEND} + x11-base/xorg-proto +" + +PATCHES=( + "${FILESDIR}"/${PN}-5.46-freetype261.patch + "${FILESDIR}"/${PN}-5.47-CXX.patch + "${FILESDIR}"/${PN}-5.47-strip.patch + "${FILESDIR}"/${PN}-5.64_alpha0-LDFLAGS.patch +) + +src_prepare() { + default + + sed -i \ + -e '/XLOCKLIBPATHS="-L/d' \ + -e '/XMLOCKLIBPATHS="-L/d' \ + -e 's|/lib|'"${EPREFIX}/$(get_libdir)"'|g' \ + configure.ac || die + + eautoreconf +} + +src_configure() { + local myconf=() + + if use opengl && use truetype; then + myconf=( --with-ftgl ) + append-cppflags -DFTGL213 + else + myconf=( --without-ftgl ) + fi + + myconf+=( + $(use_enable pam) + $(use_enable xlockrc) + $(use_enable vtlock) + $(use_with crypt) + $(use_with debug editres) + $(use_with gtk gtk2) + $(use_with imagemagick magick) + $(use_with motif) + $(use_with nas) + $(use_with opengl mesa) + $(use_with opengl) + $(use_with truetype freetype) + $(use_with truetype ttf) + $(use_with xinerama) + --disable-mb + --enable-appdefaultdir=/usr/share/X11/app-defaults + --enable-syslog + --enable-vtlock + --without-esound + --without-gtk + ) + + econf "${myconf[@]}" +} + +src_install() { + local DOCS=( README docs/{3d.howto,cell_automata,HACKERS.GUIDE,Purify,Revisions,TODO} ) + default + + if use pam; then + pamd_mimic_system xlock auth + fperms 755 /usr/bin/xlock + else + fperms 4755 /usr/bin/xlock + fi + + docinto html + dodoc docs/xlock.html +} diff --git a/x11-misc/xpad/Manifest b/x11-misc/xpad/Manifest index 04fc452ba667..aa66759aaa15 100644 --- a/x11-misc/xpad/Manifest +++ b/x11-misc/xpad/Manifest @@ -1,3 +1 @@ -DIST xpad-4.2.tar.bz2 244275 BLAKE2B e7552d4788c8182f696010faa1600c783999bd8b8d87e421f85ec9cc8e36a89b112e4f30d0d2205ba1f12915dc88d2aea98890aef8ab9ac0a6290b7d14837597 SHA512 4d619c9198198f4380d37b29243b76069c0e036fd30d7c6e2aa9105e8b7b1e0520c0c35fbf71f6cbd58be4a8799ddb04602694971cb46f70789b732eaa4d59b7 -DIST xpad-5.3.0.tar.bz2 158165 BLAKE2B d020a36b11d7e79af4375a89276d4763c5362b5bea5a1076fd0f6e6a726c10c78364f3ac05f948049fde956864f84d27c1b93606d5d473bdcd15f2a31527358d SHA512 a38f152192741c9c9d0742d1999ffa49e18a3e8652919ba6963101b776a51784b04beb90449abaf54ef35f964c3fbdc5b7ad0fe79cf795f39641776ef381e83d DIST xpad-5.4.0.tar.bz2 163394 BLAKE2B 478e96b6c09748f4643d287887f8432642f42e6786e6473832328f7d1202a1a23d96f2a06859e8da096b0e6c420df06269b6c2459e67cbceb29b9f569d565931 SHA512 a20b1d16d0d9e4cb0b88c969165eb9514b69a0eaef91eca8a3fb4da08ea8a2db32891de3c8a2a4a97db21bf78f515c7b6f798c59ba155f480f866334fca7986f diff --git a/x11-misc/xpad/xpad-4.2.ebuild b/x11-misc/xpad/xpad-4.2.ebuild deleted file mode 100644 index 3396c56dfc1c..000000000000 --- a/x11-misc/xpad/xpad-4.2.ebuild +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -DESCRIPTION="a sticky note application for jotting down things to remember" -HOMEPAGE="https://launchpad.net/xpad" -SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.bz2" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="amd64 ~arm ppc x86" -IUSE="" - -RDEPEND=" - >=x11-libs/gtk+-2.12:2 - >=dev-libs/glib-2.38:2 - x11-libs/libICE - x11-libs/libSM - x11-libs/pango -" -DEPEND=" - ${RDEPEND} - >=dev-util/intltool-0.31 - virtual/pkgconfig - sys-devel/gettext -" diff --git a/x11-misc/xpad/xpad-5.3.0.ebuild b/x11-misc/xpad/xpad-5.3.0.ebuild deleted file mode 100644 index 7bf9ed46b966..000000000000 --- a/x11-misc/xpad/xpad-5.3.0.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit autotools - -DESCRIPTION="a sticky note application for jotting down things to remember" -HOMEPAGE="https://launchpad.net/xpad" -SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.bz2" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~arm ~ppc ~x86" - -RDEPEND=" - >=dev-libs/glib-2.56:2 - app-accessibility/at-spi2-atk - dev-libs/atk - sys-devel/gettext - x11-libs/gdk-pixbuf - x11-libs/gtk+:3[X] - x11-libs/gtksourceview:3.0 - x11-libs/libICE - x11-libs/libSM - x11-libs/pango -" -DEPEND=" - ${RDEPEND} - >=dev-util/intltool-0.31 - sys-devel/gettext - virtual/pkgconfig -" - -src_prepare() { - default - - eautoreconf -} diff --git a/x11-misc/xpad/xpad-5.4.0.ebuild b/x11-misc/xpad/xpad-5.4.0.ebuild index 8f36edf945ac..56d33df01196 100644 --- a/x11-misc/xpad/xpad-5.4.0.ebuild +++ b/x11-misc/xpad/xpad-5.4.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -10,7 +10,7 @@ SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.bz2" LICENSE="GPL-3" SLOT="0" -KEYWORDS="~amd64 ~arm ~ppc ~x86" +KEYWORDS="amd64 ~arm ppc x86" RDEPEND=" >=dev-libs/glib-2.56:2 diff --git a/x11-misc/xscreensaver-app/xscreensaver-app-2.3-r3.ebuild b/x11-misc/xscreensaver-app/xscreensaver-app-2.3-r3.ebuild deleted file mode 100644 index a4de3213fff7..000000000000 --- a/x11-misc/xscreensaver-app/xscreensaver-app-2.3-r3.ebuild +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit autotools toolchain-funcs - -MY_PN=${PN/-a/.A} -MY_PN=${MY_PN/xs/XS} -MY_PN=${MY_PN/s/S} - -DESCRIPTION="XScreenSaver dockapp for the Window Maker window manager" -HOMEPAGE="http://xscreensaverapp.sourceforge.net/" -SRC_URI="mirror://sourceforge/project/xscreensaverapp/${MY_PN}/${PV}/${MY_PN}-${PV}.tar.gz" - -SLOT="0" -LICENSE="GPL-2" -KEYWORDS="amd64 x86" - -CDEPEND=" - x11-libs/libdockapp - x11-libs/libX11 -" -DEPEND=" - ${CDEPEND} - virtual/pkgconfig - x11-base/xorg-proto -" -RDEPEND=" - ${CDEPEND} - x11-misc/xscreensaver -" - -S=${WORKDIR}/${MY_PN}-${PV} - -src_prepare() { - rm configure.in || die - cp "${FILESDIR}"/${PN}-2.3-configure.ac configure.ac || die - - eautoreconf -} - -src_install() { - dobin ${MY_PN} - dodoc README NEWS ChangeLog TODO AUTHORS -} diff --git a/x11-misc/xscreensaver-app/xscreensaver-app-2.3-r4.ebuild b/x11-misc/xscreensaver-app/xscreensaver-app-2.3-r4.ebuild index 02dacca65c2a..9b0667e303b8 100644 --- a/x11-misc/xscreensaver-app/xscreensaver-app-2.3-r4.ebuild +++ b/x11-misc/xscreensaver-app/xscreensaver-app-2.3-r4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/project/xscreensaverapp/${MY_PN}/${PV}/${MY_PN}-${ SLOT="0" LICENSE="GPL-2" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" CDEPEND=" x11-libs/libdockapp diff --git a/x11-misc/xscreensaver/files/xscreensaver-5.45-configure.ac-sandbox.patch b/x11-misc/xscreensaver/files/xscreensaver-5.45-configure.ac-sandbox.patch new file mode 100644 index 000000000000..cee3a30897f6 --- /dev/null +++ b/x11-misc/xscreensaver/files/xscreensaver-5.45-configure.ac-sandbox.patch @@ -0,0 +1,146 @@ +From 6e4e7c657f6628109c9809561f2c5d7bf51c8c8e Mon Sep 17 00:00:00 2001 +From: Sebastian Pipping +Date: Tue, 16 Mar 2021 00:55:54 +0100 +Subject: [PATCH] configure.ac: Stop asking rpm and dpkg things, we're on + Gentoo + +--- + configure.ac | 115 --------------------------------------------------- + 1 file changed, 115 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 603b993..6ef2631 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -3917,25 +3917,6 @@ for d in /usr/share/fonts/X11 \ + done + AC_MSG_RESULT($have_bitmap_fonts) + +-# In case we didn't guess the font directory properly, check RPMs and DEBs too. +-if test $have_bitmap_fonts != yes ; then +- for r in 100dpi 75dpi ; do +- for f in xfonts-$r \ +- xorg-x11-fonts-$r \ +- xorg-x11-fonts-ISO8859-1-$r \ +- ; do +- if test $have_bitmap_fonts != yes ; then +- AC_MSG_CHECKING(for $f) +- if ( rpm -q "$f" 2>&- >&- ) || +- ( dpkg -s "$f" 2>&- | grep -q '^Status:.*installed' ) ; then +- have_bitmap_fonts=yes +- fi +- AC_MSG_RESULT($have_bitmap_fonts) +- fi +- done +- done +-fi +- + + ############################################################################### + # +@@ -4876,102 +4857,6 @@ for bad_choice in xscreensaver xscreensaver-demo xscreensaver-command ; do + fi + done + +- +-# Now let's warn if there's a previous RPM version already installed. +-# But don't bother with this test if we are currently *building* an RPM. +- +-if test -z "$RPM_PACKAGE_VERSION" ; then +- +- rpmnames="xscreensaver xscreensaver-base xscreensaver-extras" +- +- # M4 sucks!! +- changequote(X,Y) +- rpmv=`(rpm -qv $rpmnames) 2>/dev/null | \ +- sed -n 's/^[-a-z]*-\([0-9][0-9]*[.][0-9][0-9a-z]*\)-.*$/\1/p' | \ +- head -1` +- changequote([,]) +- +- if test \! -z "$rpmv" ; then +- +- # M4 sucks!! +- changequote(A,B) +- rpmbdir=`rpm -ql $rpmnames | sed -n 's@^\(.*/\)xscreensaver-demo$@\1@p'` +- rpmhdir=`rpm -ql $rpmnames | sed -n 's@^\(.*/\)popsquares$@\1@p'` +- rpmcdir=`rpm -ql $rpmnames | sed -n 's@^\(.*/\)popsquares\.xml$@\1@p'` +- rpmadir=`rpm -ql $rpmnames | sed -n 's@^\(.*/\)XScreenSaver$@\1@p'` +- changequote([,]) +- +- err=" (DIFFERS)" +- if test -z "$rpmbdir" ; then rpmbdir='???' +- elif test "$rpmbdir" != "${bindir}/" ; then rpmbdir="$rpmbdir$err";fi +- +- if test -z "$rpmhdir" ; then rpmhdir='???' +- elif test "$rpmhdir" != "${HACKDIR}/" ; then rpmhdir="$rpmhdir$err";fi +- +- if test -z "$rpmcdir" ; then rpmcdir='???' +- elif test "$rpmcdir" != "${HACK_CONF_DIR}/"; then rpmcdir="$rpmcdir$err";fi +- +- if test -z "$rpmadir" ; then rpmadir='???' +- elif test "$rpmadir" != "${APPDEFAULTS}/" ; then rpmadir="$rpmadir$err";fi +- +- warning=no +- warnL "There is already an installed RPM of xscreensaver" +- warn2 "version \"$rpmv\" on this system." +- echo "" +- warn2 "It is currently installed in these directories:" +- echo "" +- warn2 "User programs: $rpmbdir$berr" +- warn2 "Screen savers: $rpmhdir$herr" +- warn2 "Configuration: $rpmcdir$cerr" +- warn2 "App Defaults: $rpmadir$aerr" +- fi +-fi +- +-# Also warn if there's a Debian package installed. +-# +-debnames="xscreensaver xscreensaver-data xscreensaver-data-extra" +-debv='' +-for dpkg in $debnames ; do +- if test -z "$debv"; then +- debv=`dpkg -s $dpkg 2>/dev/null | sed -n 's/^Version: \(.*\)$/\1/p'` +- fi +-done +- +-if test \! -z "$debv" ; then +- +- # M4 sucks!! +- changequote(A,B) +- debbdir=`dpkg -L $debnames 2>&- | sed -n 's@^\(.*/bin/\)xscreensaver$@\1@p'` +- debhdir=`dpkg -L $debnames 2>&- | sed -n 's@^\(.*/\)popsquares$@\1@p'` +- debcdir=`dpkg -L $debnames 2>&- | sed -n 's@^\(.*/\)popsquares\.xml$@\1@p'` +- debadir=`dpkg -L $debnames 2>&- | sed -n 's@^\(.*/\)XScreenSaver[^/]*$@\1@p'` +- changequote([,]) +- +- err=" (DIFFERS)" +- if test -z "$debbdir" ; then debbdir='???' +- elif test "$debbdir" != "${bindir}/" ; then debbdir="$debbdir$err"; fi +- +- if test -z "$debhdir" ; then debhdir='???' +- elif test "$debhdir" != "${HACKDIR}/" ; then debhdir="$debhdir$err"; fi +- +- if test -z "$debcdir" ; then debcdir='???' +- elif test "$debcdir" != "${HACK_CONF_DIR}/" ; then debcdir="$debcdir$err"; fi +- +- if test -z "$debadir" ; then debadir='???' +- elif test "$debadir" != "${APPDEFAULTS}/" ; then debadir="$debadir$err"; fi +- +- warning=no +- warnL "There is already an installed dpkg of xscreensaver" +- warn2 "version \"$debv\" on this system." +- echo "" +- warn2 "It is currently installed in these directories:" +- echo "" +- warn2 "User programs: $debbdir$berr" +- warn2 "Screen savers: $debhdir$herr" +- warn2 "Configuration: $debcdir$cerr" +- warn2 "App Defaults: $debadir$aerr" +-fi +- + echo "" + echo "$warnsep" + echo "" +-- +2.30.2 + diff --git a/x11-misc/xscreensaver/xscreensaver-5.45.ebuild b/x11-misc/xscreensaver/xscreensaver-5.45.ebuild index 0cb931ea7de0..f54eda2fff69 100644 --- a/x11-misc/xscreensaver/xscreensaver-5.45.ebuild +++ b/x11-misc/xscreensaver/xscreensaver-5.45.ebuild @@ -76,6 +76,7 @@ PATCHES=( "${FILESDIR}"/${PN}-5.44-blurb-hndl-test-passwd.patch "${FILESDIR}"/${PN}-5.44-gentoo.patch "${FILESDIR}"/${PN}-5.45-gcc.patch + "${FILESDIR}"/${PN}-5.45-configure.ac-sandbox.patch ) src_prepare() { diff --git a/x11-misc/xsetleds/xsetleds-0.1.3-r2.ebuild b/x11-misc/xsetleds/xsetleds-0.1.3-r2.ebuild index cd140527393c..240350523025 100644 --- a/x11-misc/xsetleds/xsetleds-0.1.3-r2.ebuild +++ b/x11-misc/xsetleds/xsetleds-0.1.3-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -13,7 +13,7 @@ SRC_URI=" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~sparc ~x86" +KEYWORDS="~alpha amd64 ~hppa ~ia64 ~mips ppc ~sparc x86" RDEPEND=" x11-libs/libX11 diff --git a/x11-misc/xsnap/xsnap-1.5.15-r1.ebuild b/x11-misc/xsnap/xsnap-1.5.15-r1.ebuild deleted file mode 100644 index f8f3dd11c404..000000000000 --- a/x11-misc/xsnap/xsnap-1.5.15-r1.ebuild +++ /dev/null @@ -1,65 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit toolchain-funcs - -DESCRIPTION="Program to interactively take a 'snapshot' of a region of the screen" -HOMEPAGE="ftp://ftp.ac-grenoble.fr/ge/Xutils/" -SRC_URI="ftp://ftp.ac-grenoble.fr/ge/Xutils/${P}.tar.bz2" - -LICENSE="GPL-3+" -SLOT="0" -KEYWORDS="amd64 ppc x86 ~amd64-linux" -IUSE="" - -COMMON_DEPEND=" - media-libs/libpng:0 - virtual/jpeg:0 - x11-libs/libX11 - x11-libs/libXft - x11-libs/libXpm -" -RDEPEND=" - ${COMMON_DEPEND} - media-fonts/font-misc-misc -" -DEPEND=" - ${COMMON_DEPEND} - app-text/rman - dev-lang/perl - x11-base/xorg-proto - x11-misc/imake -" - -DOCS=( AUTHORS Changelog README ) -PATCHES=( "${FILESDIR}"/${P}-root_name.patch ) - -src_prepare() { - default - - sed -i \ - -e 's|/usr/share/locale|$(LOCALEDIR)|g' \ - -e 's|/usr/share/man/man1|$(MANDIR)|g' \ - -e '/cd po.*install/s|cd.*|$(MAKE) -C po LOCALEDIR=$(LOCALEDIR) install|' \ - -e '21s|.*|LOCALEDIR = /usr/share/locale|' \ - Imakefile || die - sed -i \ - -e '/^LOCALEDIR=/d' \ - po/Makefile || die - - xmkmf || die - - sed -i \ - -e '/ CC = /d' \ - -e '/ LD = /d' \ - -e '/ CDEBUGFLAGS = /d' \ - -e '/ CCOPTIONS = /d' \ - -e 's|CPP = cpp|CPP = $(CC)|g' \ - Makefile || die -} - -src_compile() { - tc-export CC - emake CCOPTIONS="${CFLAGS}" EXTRA_LDOPTIONS="${LDFLAGS}" -} diff --git a/x11-misc/xsnap/xsnap-1.5.15-r2.ebuild b/x11-misc/xsnap/xsnap-1.5.15-r2.ebuild index 920e4a2ffcc9..e28502a5b0ca 100644 --- a/x11-misc/xsnap/xsnap-1.5.15-r2.ebuild +++ b/x11-misc/xsnap/xsnap-1.5.15-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -10,7 +10,7 @@ SRC_URI="ftp://ftp.ac-grenoble.fr/ge/Xutils/${P}.tar.bz2" LICENSE="GPL-3+" SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux" +KEYWORDS="amd64 ppc x86 ~amd64-linux" IUSE="" COMMON_DEPEND=" diff --git a/x11-misc/xtrlock/Manifest b/x11-misc/xtrlock/Manifest index dc098a88c16a..64921ab0b771 100644 --- a/x11-misc/xtrlock/Manifest +++ b/x11-misc/xtrlock/Manifest @@ -1,2 +1 @@ -DIST xtrlock_2.12.tar.xz 20620 BLAKE2B d40599f5fec67b8e89f1028dafc929a9b21d6ae1f6e094658d07859e7f74e4686d338e1e03393f9981a62030839969b57493a8655e225b963df8dc04cf6b62f6 SHA512 8392a8c254726e99d2324415bfdac6e577f725942d4e7fd39c915637f87814f1737aefa903a1502632272cabbb10182070dc15ec5d3e5268c9c1b53218d00f36 DIST xtrlock_2.13.tar.xz 21156 BLAKE2B 879c27936cf8058707cbdb2247e1044c8c5eadf74dcb2bcfd5ec8f4b2bab80da6859118e48943de97f7696e41456771bf274b03728a61f5ac6bef8b471192dce SHA512 656e1e77194b816b04260a88c8046b8ef25d6df0405de6fe1ee1dfb2ebfa528a329c1b67be70eaac5ce4ee6a4159d728d363bf8a59232941b76b1e6d14aa91aa diff --git a/x11-misc/xtrlock/xtrlock-2.12.ebuild b/x11-misc/xtrlock/xtrlock-2.12.ebuild deleted file mode 100644 index d7bea7933844..000000000000 --- a/x11-misc/xtrlock/xtrlock-2.12.ebuild +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit toolchain-funcs - -DESCRIPTION="A simplistic screen locking program for X" -HOMEPAGE="http://ftp.debian.org/debian/pool/main/x/xtrlock/" -SRC_URI="mirror://debian/pool/main/x/${PN}/${P/-/_}.tar.xz" - -SLOT="0" -LICENSE="GPL-3" -KEYWORDS="amd64 ppc x86" - -RDEPEND=" - x11-libs/libX11 -" -DEPEND=" - ${RDEPEND} - x11-base/xorg-proto - x11-misc/imake -" - -src_compile() { - xmkmf || die - emake CDEBUGFLAGS="${CFLAGS} -DSHADOW_PWD" CC="$(tc-getCC)" \ - EXTRA_LDOPTIONS="${LDFLAGS}" xtrlock -} - -src_install() { - dobin xtrlock - chmod u+s "${D}"/usr/bin/xtrlock - newman xtrlock.man xtrlock.1 - dodoc debian/changelog -} diff --git a/x11-misc/xtrlock/xtrlock-2.13.ebuild b/x11-misc/xtrlock/xtrlock-2.13.ebuild index 87544effb0d1..48d686600b3c 100644 --- a/x11-misc/xtrlock/xtrlock-2.13.ebuild +++ b/x11-misc/xtrlock/xtrlock-2.13.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -10,7 +10,7 @@ SRC_URI="mirror://debian/pool/main/x/${PN}/${P/-/_}.tar.xz" SLOT="0" LICENSE="GPL-3" -KEYWORDS="~amd64 ~ppc ~x86" +KEYWORDS="amd64 ppc x86" RDEPEND=" x11-libs/libX11 diff --git a/x11-misc/xwit/Manifest b/x11-misc/xwit/Manifest index 8cce36e4f132..e0b850c31d53 100644 --- a/x11-misc/xwit/Manifest +++ b/x11-misc/xwit/Manifest @@ -1,3 +1,2 @@ -DIST xwit_3.4-15.debian.tar.gz 20722 BLAKE2B fcec4b3cdfa0f4d0b90e172f4539bfb622e77c902e351d9423555bbb43706c79e3d2cb15bb83021151a4876cc2c3bdacb62f074d6af50e2896a55b20b31df5e1 SHA512 047e00e5ff0282729495f39c7cb264837306da46d24e4d95e835d6d0060acd0bfa8f8cedff37ab8c503f267d8c5d42e5af0120cba6260e6eb9dd8c9a3a9dab46 DIST xwit_3.4-16.debian.tar.xz 17840 BLAKE2B 05e772134c4c2c97c81b2367cdcbd73b21c5a4498a482b52dbbbc081426a623f242c3c77c73af3d6e6dbf46c1f1a7240b3677700006a691717402c309ccea644 SHA512 09086d375bb4c7b87c468a3ddad0ae62ad58e168c7875ea9e29bc37e599b193c7e8ff167ac471bb49f836b216876279430d03f462b62286130ed5c3ad0859263 DIST xwit_3.4.orig.tar.gz 14557 BLAKE2B d023b89d02c8520421b35a69c3834d0493a1ab771b160c6c0592e9e43684062a7da9ed56491e90ba2948ba51b2d36f7b0c26ededdfa61a684b2a010d71865a56 SHA512 265114f81ede19e477685373e39deed3cf7cd3fd9dbb445362f34ea96dac6d9686d1c55cf882636f7d02598c83f5ee1ca2688fcbd01f6fc7ef34cac75691df94 diff --git a/x11-misc/xwit/xwit-3.4_p15.ebuild b/x11-misc/xwit/xwit-3.4_p15.ebuild deleted file mode 100644 index 6f20325979dd..000000000000 --- a/x11-misc/xwit/xwit-3.4_p15.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit toolchain-funcs - -DESCRIPTION="A collection of simple routines to call some of those X11 functions" -HOMEPAGE="https://tracker.debian.org/pkg/xwit" -SRC_URI=" - mirror://debian/pool/main/x/${PN}/${PN}_${PV/_p*/}.orig.tar.gz - mirror://debian/pool/main/x/${PN}/${PN}_${PV/_p/-}.debian.tar.gz -" - -LICENSE="public-domain HPND" -SLOT="0" -KEYWORDS="~amd64 ~ppc x86" -IUSE="" - -RDEPEND="x11-libs/libX11" -DEPEND="${RDEPEND} - x11-base/xorg-proto" - -S=${WORKDIR}/${P/_p*/}.orig - -PATCHES=( "${WORKDIR}"/debian/patches ) - -src_prepare() { - default - sed -i \ - -e 's|gcc|${CC}|g' \ - Makefile || die - tc-export CC -} - -src_install() { - dobin xwit - newman xwit.man xwit.1 - einstalldocs -} diff --git a/x11-misc/xwit/xwit-3.4_p16.ebuild b/x11-misc/xwit/xwit-3.4_p16.ebuild index cc910e726870..5047e5de035c 100644 --- a/x11-misc/xwit/xwit-3.4_p16.ebuild +++ b/x11-misc/xwit/xwit-3.4_p16.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -13,7 +13,7 @@ SRC_URI=" LICENSE="public-domain HPND" SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" +KEYWORDS="~amd64 ~ppc x86" RDEPEND=" x11-libs/libX11 diff --git a/x11-misc/xxkb/xxkb-1.11.1-r1.ebuild b/x11-misc/xxkb/xxkb-1.11.1-r1.ebuild index 1e86000e76f5..2b78dab9a9dd 100644 --- a/x11-misc/xxkb/xxkb-1.11.1-r1.ebuild +++ b/x11-misc/xxkb/xxkb-1.11.1-r1.ebuild @@ -14,7 +14,7 @@ SRC_URI=" LICENSE="Artistic-2" SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" +KEYWORDS="amd64 ~ppc x86" IUSE="svg" RDEPEND=" diff --git a/x11-themes/Manifest.gz b/x11-themes/Manifest.gz index 323ae9563bb0..9a80ac06f1b2 100644 Binary files a/x11-themes/Manifest.gz and b/x11-themes/Manifest.gz differ diff --git a/x11-themes/silver-xcursors/silver-xcursors-0.4-r1.ebuild b/x11-themes/silver-xcursors/silver-xcursors-0.4-r1.ebuild index d66bdc73fbc2..b254ff70fcc0 100644 --- a/x11-themes/silver-xcursors/silver-xcursors-0.4-r1.ebuild +++ b/x11-themes/silver-xcursors/silver-xcursors-0.4-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -10,7 +10,7 @@ SRC_URI="http://www.kde-look.org/CONTENT/content-files/$MY_P.tar.bz2" LICENSE="LGPL-2.1" SLOT="0" -KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~sparc ~x86" +KEYWORDS="~alpha amd64 ~hppa ~ia64 ~mips ppc ~sparc x86" S="${WORKDIR}/${MY_P:5}"