mirrors/guru
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/guru.git synced 2026-07-17 11:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge updates from master

Browse Source
This commit is contained in:
Repository mirror & CI
2022-03-10 09:51:21 +00:00
parent 887153cbb2 51bcb233f5
commit be88c0bff7
52 changed files with 1425 additions and 324 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app-admin/customrescuecd-x86_64/Manifest
View File

@@ -1 +1 @@
DIST CUSTOMRESCUECD-x86_64-0.12.5.iso 1610612736 BLAKE2B 6acba5a50e4693308a3653d0fa0eef8abe3a62f180d6712a4306626f625f022ddfcfaf160ecdacfe35554df5b730f3477dfe5ab6af5930af7e988a7df5e397db SHA512 2b9e43f1b375db5cce9684489710e289c64bc2967cfd92d8d4bdace9b803b6f0d73732b3e80cfa3060ee2ac072ecb2d3bd5dbfc2bf10fc1acbdb4129d8a44d7f
DIST CUSTOMRESCUECD-x86_64-0.12.6.iso 1613086720 BLAKE2B 3f09ad7bae1f8847476d9b1ae58bfb3c463ff4131438bc3f0aa605146db93ebcc90b6164ef7cfc201ae8bba46ba61b6d578e55444c04c647c6d972d6dc211e85 SHA512 6cf6136070ebafdcb934949ad41294e8c6753723c6ea4be56283b5299f51ae27856a9daeff74c7a67991139e4eb9bd172b0ea9f0e4cec645e170e6a6516e2c9a

55
app-admin/customrescuecd-x86_64/customrescuecd-x86_64-0.12.6.ebuild Normal file
View File

@@ -0,0 +1,55 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
MY_P="CUSTOMRESCUECD-x86_64"
DESCRIPTION="A system rescue cd or usbstick for desktop and server based on gentoo"
HOMEPAGE="https://sourceforge.net/projects/customrescuecd"
SRC_URI="mirror://sourceforge/customrescuecd/"${MY_P}"-"${PV}".iso"
LICENSE="GPL-3"
SLOT="${PV}"
KEYWORDS="~amd64"
RESTRICT="bindist mirror"
S=${WORKDIR}
src_unpack() { :; }
src_install() {
insinto "/usr/share/${PN%-*}"
doins "${DISTDIR}/${MY_P}-${PV}.iso"
}
pkg_postinst() {
local f=${EROOT}/usr/share/${PN%-*}/${PN}-newest.iso
# no version newer than ours? we're the newest!
if ! has_version ">${CATEGORY}/${PF}"; then
ln -f -s -v "${MY_P}-${PV}.iso" "${f}" || die
fi
}
pkg_postrm() {
local f=${EROOT}/usr/share/${PN%-*}/${PN}-newest.iso
# if there is no version newer than ours installed
if ! has_version ">${CATEGORY}/${PF}"; then
# and we are truly and completely uninstalled...
if [[ ! ${REPLACED_BY_VERSION} ]]; then
# then find an older version to set the symlink to
local newest_version=$(best_version "<${CATEGORY}/${PF}")
if [[ ${newest_version} ]]; then
# update the symlink
ln -f -s -v "${newest_version%-r*}.iso" "${f}" || die
else
# last version removed? clean up the symlink
rm -v "${f}" || die
# and the parent directory
rmdir "${f%/*}" || die
fi
fi
fi
}

30
app-misc/cpufetch/files/cpufetch-0.98-makefile.patch
View File

@@ -1,30 +0,0 @@
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,4 @@
-CC ?= gcc
-
-CFLAGS+=-Wall -Wextra -pedantic -fstack-protector-all -pedantic -std=c99
+CFLAGS+=-Wall -Wextra -pedantic -std=c99
SANITY_FLAGS=-Wfloat-equal -Wshadow -Wpointer-arith
PREFIX ?= /usr
@@ -35,17 +33,15 @@
OUTPUT=cpufetch.exe
endif
-all: CFLAGS += -O3
all: $(OUTPUT)
-debug: CFLAGS += -g -O0
debug: $(OUTPUT)
-static: CFLAGS += -static -O3
+static: CFLAGS += -static
static: $(OUTPUT)
$(OUTPUT): Makefile $(SOURCE) $(HEADERS)
- $(CC) $(CFLAGS) $(SANITY_FLAGS) $(SOURCE) -o $(OUTPUT)
+ $(CC) $(CFLAGS) $(LDFLAGS) $(SANITY_FLAGS) $(SOURCE) -o $(OUTPUT)
run: $(OUTPUT)
./$(OUTPUT)

57
app-misc/cpufetch/files/cpufetch-1.01-makefile.patch Normal file
View File

@@ -0,0 +1,57 @@
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,3 @@
-CC ?= gcc
-
CFLAGS+=-Wall -Wextra -pedantic
SANITY_FLAGS=-Wfloat-equal -Wshadow -Wpointer-arith
@@ -23,17 +21,17 @@
HEADERS += $(SRC_DIR)freq/freq.h
CFLAGS += -pthread
endif
- CFLAGS += -DARCH_X86 -std=c99 -fstack-protector-all
+ CFLAGS += -DARCH_X86 -std=c99
else ifeq ($(arch), $(filter $(arch), ppc64le ppc64 ppcle ppc))
SRC_DIR=src/ppc/
SOURCE += $(COMMON_SRC) $(SRC_DIR)ppc.c $(SRC_DIR)uarch.c $(SRC_DIR)udev.c
HEADERS += $(COMMON_HDR) $(SRC_DIR)ppc.h $(SRC_DIR)uarch.h $(SRC_DIR)udev.c
- CFLAGS += -DARCH_PPC -std=gnu99 -fstack-protector-all
+ CFLAGS += -DARCH_PPC -std=gnu99
else ifeq ($(arch), $(filter $(arch), arm aarch64_be aarch64 arm64 armv8b armv8l armv7l armv6l))
SRC_DIR=src/arm/
SOURCE += $(COMMON_SRC) $(SRC_DIR)midr.c $(SRC_DIR)uarch.c $(SRC_DIR)soc.c $(SRC_DIR)udev.c
HEADERS += $(COMMON_HDR) $(SRC_DIR)midr.h $(SRC_DIR)uarch.h $(SRC_DIR)soc.h $(SRC_DIR)udev.c $(SRC_DIR)socs.h
- CFLAGS += -DARCH_ARM -Wno-unused-parameter -std=c99 -fstack-protector-all
+ CFLAGS += -DARCH_ARM -Wno-unused-parameter -std=c99
os := $(shell uname -s)
ifeq ($(os), Darwin)
@@ -58,18 +56,8 @@
OUTPUT=cpufetch.exe
endif
-all: CFLAGS += -O2
all: $(OUTPUT)
-debug: CFLAGS += -g -O0
-debug: $(OUTPUT)
-
-static: CFLAGS += -static -O2
-static: $(OUTPUT)
-
-strict: CFLAGS += -O2 -Werror -fsanitize=undefined -D_FORTIFY_SOURCE=2
-strict: $(OUTPUT)
-
freq_nov.o: Makefile $(SRC_DIR)freq/freq_nov.c $(SRC_DIR)freq/freq_nov.h
$(CC) $(CFLAGS) $(SANITY_FLAGS) -c -pthread $(SRC_DIR)freq/freq_nov.c -o $@
@@ -80,7 +68,7 @@
$(CC) $(CFLAGS) $(SANITY_FLAGS) -c -mavx512f -mfma -pthread $(SRC_DIR)freq/freq_avx512.c -o $@
$(OUTPUT): Makefile $(SOURCE) $(HEADERS)
- $(CC) $(CFLAGS) $(SANITY_FLAGS) $(SOURCE) -o $(OUTPUT)
+ $(CC) $(CFLAGS) $(LDFLAGS) $(SANITY_FLAGS) $(SOURCE) -o $(OUTPUT)
run: $(OUTPUT)
./$(OUTPUT)

2
app-misc/fastfetch/Manifest
View File

@@ -1 +1 @@
DIST fastfetch-0.604.tar.gz 324226 BLAKE2B 75860f98b5eaca0a59e29618a9d7bd2542aff12eb9761186b6233ffe17212df0b54e387b86511540b4e1522f017f73a1286ec58b0f54a4687a9f11fbb5235652 SHA512 09a531be1d35deb7ad34dd9059baa8abaa1d9872d27178d467d743e74d6b8e49549762f893ce2538c14c52dd392ed25ed4b68218d2bcda9b1e86f6bf1310011e
DIST fastfetch-0.612.tar.gz 326712 BLAKE2B e9b1d68058080fb2148af651748b4e84a9f9cb167723bd045c1ee4d9f25393de17be499c39c0440dd0690406d562416428b68717b34b150911b64d7bf67835a4 SHA512 368eb2258880587a1f7345eed9aea3fdfd05526232207bef0472bb8f7555316ded0686de425bb0856da3d8ad319def0ff37ca860ce1bd3c0aa480935b7851bbb

4
app-misc/fastfetch/fastfetch-0.604.ebuild → app-misc/fastfetch/fastfetch-0.612.ebuild
View File

@@ -11,8 +11,8 @@ if [[ ${PV} == *9999 ]]; then
inherit git-r3
EGIT_REPO_URI="https://github.com/LinusDierheimer/fastfetch.git"
else
COMMIT="0cb6e40bacfed8c217afc4bd580b7905d6d6893b"
VERSION_REV="0cb6e40"
COMMIT="4e68c09f2795e3bd91bdfa06998b688db0326a67"
VERSION_REV="4e68c09"
SRC_URI="https://github.com/LinusDierheimer/fastfetch/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
S="${WORKDIR}/${PN}-${COMMIT}"
fi

3
app-misc/zellij/zellij-0.25.0-r1.ebuild
View File

@@ -327,7 +327,6 @@ LICENSE="
"
SLOT="0"
KEYWORDS="~amd64"
QA_FLAGS_IGNORED="usr/bin/.*"
BDEPEND="
app-text/mandown
@@ -336,6 +335,8 @@ BDEPEND="
# dev-util/cargo-make
#"
QA_FLAGS_IGNORED="usr/bin/zellij"
src_configure() {
local myfeatures=(
disable_automatic_asset_installation

2
dev-R/commonmark/Manifest
View File

@@ -1 +1 @@
DIST commonmark_1.7.tar.gz 134002 BLAKE2B 10c6360037c39c6e9d31c238673af73a45ff262d354998d20b4f952611a45e98ae3498bd4f4dcd817fd878309609218d91d418d392243652a6fcb75d5b4f958d SHA512 23f384bae4cc46153f3dc61599234a17a04c9fef2eae0dca744a9a8b43768f8f96f779a0fbb7c3ff9f6ba39d3f3512bb382b32960bf2875cc5a5bb8de4ece5e9
DIST commonmark_1.8.0.tar.gz 139478 BLAKE2B 5ee85af7a85e5fac061aaf833a20ed58bac994bd83fb3dd212edc935fcb111a73deabe0d2ed6c3c569fd0eb348eb2fde64208453a961aca03c02eb08c97a008b SHA512 268c0427a501f64227bac1d0fa6b1768c63782c643693e3903333fc3e81e35e168596dbed11303621014bb9be0a4044fc557ac3e14609c15e24950a2ae11661c

8
dev-R/commonmark/commonmark-1.7.ebuild → dev-R/commonmark/commonmark-1.8.0.ebuild
View File

@@ -1,4 +1,4 @@
# Copyright 1999-2021 Gentoo Authors
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -9,4 +9,8 @@ DESCRIPTION='High Performance CommonMark and github markdown rendering in R'
KEYWORDS="~amd64"
LICENSE='BSD-2'
RDEPEND="${DEPEND}"
SUGGESTED_PACKAGES="
dev-R/curl
dev-R/testthat
dev-R/xml2
"

2
dev-R/isoband/Manifest
View File

@@ -1 +1 @@
DIST isoband_0.2.4.tar.gz 2010708 BLAKE2B 34f805cc3f7cd27109580c772cc6491adaf9baf1e199fd9bbfdbea64a7a3b673a4358e36214bb26c963cba208c7bd9f8666064dd712ff7ba731a7d50b27cf095 SHA512 8d83afd3b5cecc33721e52b9241fd7cb1fde6b8d9e35da6ca8afbda63e603f71d4208fdb22777d6a992bf26eb66680d85d44ad267cdf89a2a6007afbe2ee8cde
DIST isoband_0.2.5.tar.gz 1671911 BLAKE2B ea47f5388d9807caef1fa83b8a671fc7f381ad2c6bae78e590a11acfbf04dbc86f5b884ce283e527a7edce6825ede5b8dd7ad87214436adb9a07b1a1855a37b6 SHA512 2cf3c9c5c176bc5fa9f6db4d0ef1ad49391473b01d810afeb1e26f67bdbcad13bd903a23ae438fd5f3dd579c51b0e5b09b4791e8e9b9a051b03c3c76beb7f4af

14
dev-R/isoband/isoband-0.2.4.ebuild → dev-R/isoband/isoband-0.2.5.ebuild
View File

@@ -1,4 +1,4 @@
# Copyright 1999-2021 Gentoo Authors
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -8,3 +8,15 @@ inherit R-packages
DESCRIPTION='Generate Isolines and Isobands from regularky spaced elevation grids'
KEYWORDS="~amd64"
LICENSE='MIT'
SUGGESTED_PACKAGES="
dev-R/covr
dev-R/ggplot2
dev-R/knitr
dev-R/magick
dev-R/microbenchmark
dev-R/rmarkdown
dev-R/sf
dev-R/testthat
dev-R/xml2
"

2
dev-R/jsonlite/Manifest
View File

@@ -1 +1 @@
DIST jsonlite_1.7.2.tar.gz 421716 BLAKE2B fa1fc59fefdd31085d0f1ccec02069f8bccfb6f73b3d21a459b47b17af7b2aef6db7e57886a609407d36569e9fe3e6ac9a6d98f1483fdb8cac14abfb3144b5cb SHA512 7156958ea4666440161c6d91a7bc988b674b06299aa3acae97cdedbe597353fa38ffcd276934cf7d8080ce560e7265db3ddd90c7a437cc44cc30756640023ed1
DIST jsonlite_1.8.0.tar.gz 1051625 BLAKE2B 70b3ff9fdc4f023f2394c03764c44795860236a5bd60f3e38016b198f0e70fd5252f841b868315a3c68eb6c7c6a9bfc4efea1c7e0a04c98ee7b1a99f047cbe16 SHA512 ecaab90e2f7bf5f21d358cfaa3df96987a4f7bd7a2cd648e967d0a4a476d261c9fc848abdf60a13b2ea4a5c612b135bb686faf22aa94d8388e3fe7090bd8ec0e

13
dev-R/jsonlite/jsonlite-1.7.2.ebuild → dev-R/jsonlite/jsonlite-1.8.0.ebuild
View File

@@ -1,4 +1,4 @@
# Copyright 1999-2021 Gentoo Authors
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -10,3 +10,14 @@ KEYWORDS="~amd64"
LICENSE='MIT'
#unbundling status: https://github.com/jeroen/jsonlite/issues/201
SUGGESTED_PACKAGES="
dev-R/httr
dev-R/curl
dev-R/vctrs
dev-R/testthat
dev-R/knitr
dev-R/rmarkdown
dev-R/R-rsp
dev-R/sf
"

2
dev-R/knitr/Manifest
View File

@@ -1 +1 @@
DIST knitr_1.33.tar.gz 892378 BLAKE2B 9569a9f6deb1178883c496ac12559467af4d603f9d6cc2d279555a0021b87f25e896611ad2e21459371ae7c03bb4e6937ec91c3da82b2f59eafda01b7ec6a251 SHA512 bf27f1b9face9eac504b329e17d778243fb0dfd699b2525e77fe6be8260284a7618db2db257856138754cb93b7a7ab03cd4fddacc348ec6c2f2c1432237f781a
DIST knitr_1.37.tar.gz 895567 BLAKE2B c49470fc0fc5df287a97bbff652e7ef86ae76bbd147b1901ce3f1c95c2f3d33caeccb1681e8c4d2b111ae85eac96ea9f936cf91612e4d1e8b5f6747848e56412 SHA512 ad4adeac96cf1b14b0d37ff584220a40d5685545d98970d0660e22f0630c279a34257afba87a003fa204e2c6e7f65c515600fecb205eafa90c71a2e0b6636865

24
dev-R/knitr/knitr-1.33.ebuild
View File

@@ -1,24 +0,0 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
inherit R-packages
DESCRIPTION='A General-Purpose Package for Dynamic report generation in R'
KEYWORDS="~amd64"
LICENSE='GPL-2+'
DEPEND="
>=dev-R/yaml-2.1.19
>=dev-R/xfun-0.21
>=dev-R/evaluate-0.10
dev-R/highr
>=dev-lang/R-3.2.3
dev-R/markdown
>=dev-R/stringr-0.6
"
RDEPEND="
${DEPEND}
app-text/pandoc
"

53
dev-R/knitr/knitr-1.37.ebuild Normal file
View File

@@ -0,0 +1,53 @@
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
inherit R-packages
DESCRIPTION='A General-Purpose Package for Dynamic report generation in R'
KEYWORDS="~amd64"
LICENSE='GPL-2+'
DEPEND="
>=dev-R/yaml-2.1.19
>=dev-R/xfun-0.27
>=dev-R/evaluate-0.10
dev-R/highr
>=dev-lang/R-3.2.3
>=dev-R/stringr-0.6
"
RDEPEND="
${DEPEND}
app-text/pandoc
"
SUGGESTED_PACKAGES="
dev-R/markdown
dev-R/formatR
dev-R/testit
dev-R/digest
>=dev-R/rgl-0.95.1201
dev-R/codetools
dev-R/rmarkdown
>=dev-R/htmlwidgets-0.7
dev-R/webshot
>=dev-R/tikzDevice-0.10
dev-R/tinytex
>=dev-R/reticulate-1.4
>=dev-R/JuliaCall-0.11.1
dev-R/magick
dev-R/png
dev-R/jpeg
dev-R/gifski
>=dev-R/xml2-1.2.0
dev-R/httr
>=dev-R/DBI-0.4.1
dev-R/showtext
dev-R/tibble
dev-R/sass
dev-R/bslib
dev-R/ragg
>=dev-R/styler-1.2.0
>=dev-R/targets-0.6.0
"

2
dev-R/magrittr/Manifest
View File

@@ -1 +1 @@
DIST magrittr_2.0.1.tar.gz 265580 BLAKE2B d524af6004741fe8d6bc0e3442d1c6f836b88937feac8352f49a12d6e58e954fd4e53e28e310629369168b94658cd7eac8b42701803bddb5041e9b7528b44b80 SHA512 aa27f64ba09494a5afbe0263ec379c4a73110de45f43c6265437192c01c33a0df6dce98bd0ace021b2f380be84c040c7177b00c396842b3415d137e9e01896d2
DIST magrittr_2.0.2.tar.gz 267039 BLAKE2B f850cbcff41f8610c7f5c10e5fbc413db404b31d33a0dd6d1c9d3ac73878c737d7cd3ebcf02adc9e873bec22f3d01358fe76871f476136012946e664231c808b SHA512 9f008b9723fd3422c2f7cb5b6791d2941379148778f685c59c6f0c1e76e303f5f322ef4db0bb6d75f3d3f92abf7e0d6d333b4afa9821f0609863c5666f72672f

13
dev-R/magrittr/magrittr-2.0.1.ebuild → dev-R/magrittr/magrittr-2.0.2.ebuild
View File

@@ -1,4 +1,4 @@
# Copyright 1999-2021 Gentoo Authors
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
@@ -9,9 +9,10 @@ DESCRIPTION='A Forward-Pipe Operator for R'
LICENSE='MIT'
KEYWORDS="~amd64"
DEPEND="
>=dev-lang/R-3.3
dev-R/glue
>=dev-R/rlang-0.4.10
SUGGESTED_PACKAGES="
dev-R/covr
dev-R/knitr
dev-R/rlang
dev-R/rmarkdown
dev-R/testthat
"
RDEPEND="${DEPEND}"

2
dev-R/mime/Manifest
View File

@@ -1 +1 @@
DIST mime_0.10.tar.gz 13047 BLAKE2B 974c4b5eeba48c198301706ad605ff9b85c849f3df58336dc06f814f8c3072b18bb008d02ad099e9cf31562c21b41a04f8c614260363043956a9a4f57da97311 SHA512 6c5401b11e7a480744ef21db51a3afd49d4a5dda1440ee2f8aba95e90b3ebdc596bfeec993b72b953bd99cdae37b16f031e4f6e54e74ded7d78c810eb29812cd
DIST mime_0.12.tar.gz 12562 BLAKE2B 62f88bc0f414216f062d93541f20ef650756a51ec88e27a29ecf1e4418182a5bedf855cbfd77dc63497f15a0e2a64c8b07d81eb91c4ef2f74e74a2c54ca4926f SHA512 07de5e9f72ff66148a7f93b5cba77a0d2243eda9889e129f4e121f9143f36ed6fadfbc94e74ea916b74d66a923fb135c745643679737237c66336201f0b48b4e

2
dev-R/mime/mime-0.10.ebuild → dev-R/mime/mime-0.12.ebuild
View File

@@ -1,4 +1,4 @@
# Copyright 1999-2021 Gentoo Authors
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7

2
dev-R/openssl/Manifest
View File

@@ -1 +1 @@
DIST openssl_1.4.5.tar.gz 1311351 BLAKE2B ea474c31471fbe5bef52c7980669cb928901758bc8774d22a431f1786bbc1958eeb0823c2ab1509dec1432fc7d693ead73184b7e9392e4d446b88db50d97bba2 SHA512 8811a02a553e217931f28b2efb8e8051762e4aad3b9b9e32ab9b879fe1752d295ee05c5e2847c1671fc860575489d7ea53f7b5c9665f3dc7f9cb8942ad404085
DIST openssl_2.0.0.tar.gz 1200448 BLAKE2B b4ad712a1330555b0eb387ee3adcf8efde86f427269c95de90a196e9bc335daa1bb491c83748516605d40c63d8ba6445f8d1914e20d9a5cab77478cd60adaa55 SHA512 c432910e880e2297bbe4da91ae5043e75d9c356eb086ff314f0bf4994185158f332907b887891ed8666ad20b438c0316c893c6d8b4f6d38e0fd1b4094a0b9aed

15
dev-R/openssl/openssl-1.4.5.ebuild → dev-R/openssl/openssl-2.0.0.ebuild
View File

@@ -1,4 +1,4 @@
# Copyright 1999-2021 Gentoo Authors
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -12,10 +12,21 @@ LICENSE='MIT'
DEPEND="dev-R/askpass"
RDEPEND="
${DEPEND}
dev-libs/openssl
>=dev-libs/openssl-1.0.2
"
src_prepare() {
tc-export AR
R-packages_src_prepare
}
SUGGESTED_PACKAGES="
dev-R/curl
>=dev-R/testthat-2.1.0
dev-R/digest
dev-R/knitr
dev-R/rmarkdown
dev-R/jsonlite
dev-R/jose
dev-R/sodium
"

2
dev-R/pillar/Manifest
View File

@@ -1 +1 @@
DIST pillar_1.6.1.tar.gz 1111747 BLAKE2B e60445ca3abae2bc90f27cc6daeaa06732facc7c5d2d68d34566e22022b0e4fd5115d6e234a27ee8876d134c5e25d53c0152343e4baaae0d5a4a4c3cead38b2c SHA512 f93ca2b1522f12621be241383ed589aadd1240d668d85d848413282c3c4dc5671bdef23dafeeb5613b6aa72ad9e0624289b8cec7cb1156fae25783baf16f2536
DIST pillar_1.7.0.tar.gz 529668 BLAKE2B ce6e6c85deeb85679254b9403472fbf3c26d05421c1990215ed81420bf44183890eb630640f4e3319f1069bc7e9107ff99abc4ae674ce4e946ab646d28c145e3 SHA512 10a5247372bdb0cef03a3cc36c4efc776ae8ca5fce117b2c1368e06e97b9f0351a9edcd55e2a28d03e1ea9c2c5d0995534f2e6501090b35eebe93b4233dd473c

28
dev-R/pillar/pillar-1.6.1.ebuild → dev-R/pillar/pillar-1.7.0.ebuild
View File

@@ -1,4 +1,4 @@
# Copyright 1999-2021 Gentoo Authors
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
@@ -15,13 +15,37 @@ LICENSE='GPL-3'
KEYWORDS="~amd64"
DEPEND="
dev-R/cli
>=dev-R/cli-2.3.0
>=dev-R/crayon-1.3.4
>=dev-R/ellipsis-0.3.2
dev-R/fansi
dev-R/glue
dev-R/lifecycle
>=dev-R/rlang-0.3.0
>=dev-R/utf8-1.1.0
>=dev-R/vctrs-0.3.8
"
RDEPEND="${DEPEND}"
SUGGESTED_PACKAGES="
dev-R/bit64
dev-R/debugme
dev-R/DiagrammeR
dev-R/dplyr
dev-R/formattable
dev-R/ggplot2
dev-R/knitr
dev-R/lubridate
dev-R/nanotime
dev-R/nycflights13
dev-R/palmerpenguins
dev-R/rmarkdown
dev-R/scales
dev-R/stringi
dev-R/survival
>=dev-R/testthat-3.1.1
dev-R/tibble
>=dev-R/units-0.7.2
dev-R/vdiffr
dev-R/withr
"

2
dev-R/testthat/Manifest
View File

@@ -1 +1 @@
DIST testthat_3.0.3.tar.gz 686260 BLAKE2B c0d71ca7f58cc44f4ac3827868477883209d87e2fc0d493b3ae5600ec481dac0209c93c7d59b6a77f8e4f4036fad32e8f5d7117399768e3932ca1919334e1be5 SHA512 fd5bf00044917bacc4ba04bec5dc80e2d52a4cf66b82ca947ec8852c8ef13c1742966a57d924e007a40a92f9bea10adf00c7fe8ba0b0f27bc8551becd5a4a80a
DIST testthat_3.1.2.tar.gz 698658 BLAKE2B 704a664e4230f7af8e3c9920f3d6ec7c89c2259cc53a726d142cf460f623b47128f820b12b81ba88105d668947bacf813af700440c006b56905fb946106a8541 SHA512 b68695474de58adfa5a7cf987766b96647c0953c55eb0f9b3cca7d01b03fcb484acadf9c33b271a85ae680dff8027911111ba57b32881b38e177564e8585fea1

18
dev-R/testthat/testthat-3.0.3.ebuild → dev-R/testthat/testthat-3.1.2.ebuild
View File

@@ -1,4 +1,4 @@
# Copyright 1999-2021 Gentoo Authors
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -29,6 +29,20 @@ DEPEND="
>=dev-R/R6-2.2.0
>=dev-R/rlang-0.4.9
>=dev-R/waldo-0.2.4
>=dev-R/withr-2.3.0
>=dev-R/withr-2.4.3
"
RDEPEND="${DEPEND}"
SUGGESTED_PACKAGES="
dev-R/covr
>=dev-R/curl-0.9.5
>=dev-R/diffviewer-0.1.0
dev-R/knitr
dev-R/mockery
dev-R/rmarkdown
dev-R/rstudioapi
dev-R/shiny
dev-R/usethis
>=dev-R/vctrs-0.1.0
dev-R/xml2
"

14
dev-cpp/fbthrift/fbthrift-2022.02.28.00.ebuild → dev-cpp/fbthrift/fbthrift-2022.02.28.00-r1.ebuild
View File

@@ -1,9 +1,11 @@
# Copyright 1999-2021 Gentoo Authors
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
inherit cmake
PYTHON_COMPAT=( python3_{8..10} pypy3 )
inherit cmake python-single-r1
DESCRIPTION="Facebook's branch of Apache Thrift, including a new C++ server"
HOMEPAGE="https://github.com/facebook/fbthrift"
@@ -23,13 +25,19 @@ RDEPEND="
dev-libs/libfmt
dev-libs/openssl:0=
sys-libs/zlib
${PYTHON_DEPS}
"
DEPEND="
${RDEPEND}
$(python_gen_cond_dep 'dev-python/six[${PYTHON_USEDEP}]')
"
DEPEND="${RDEPEND}"
BDEPEND="
sys-devel/bison
sys-devel/flex
"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
src_configure() {
local mycmakeargs=(
-DLIB_INSTALL_DIR=$(get_libdir)

1
dev-python/sysv_ipc/Manifest Normal file
View File

@@ -0,0 +1 @@
DIST sysv_ipc-1.1.0.tar.gz 99448 BLAKE2B c8f5be7169a720a3e104072eea94d4b024d515efb6ca3e3d8e73ab45750a992bc5e0dc26c4b4483d91d9dfed7bbbe619efb01e76cd6bc598bce9967835b4b3a9 SHA512 30615c7fcd2ce45b5602fbd61bc2061f5fd44eb7d8ec0bcfd2979e2e750b0f7093bad938cb715ba65dac306c576f76973d462ecc52785fc8f7bacc70a84d79ff

9
dev-python/sysv_ipc/metadata.xml Normal file
View File

@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<description>co-maintainers welcome</description>
<email>lssndrbarbieri@gmail.com</email>
<name>Alessandro Barbieri</name>
</maintainer>
</pkgmetadata>

23
dev-python/sysv_ipc/sysv_ipc-1.1.0.ebuild Normal file
View File

@@ -0,0 +1,23 @@
# Copyright 2020-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
PYTHON_COMPAT=( python3_{8..10} pypy3 )
inherit distutils-r1
DESCRIPTION="System V IPC primitives for python"
HOMEPAGE="
https://pypi.org/project/sysv-ipc/
https://semanchuk.com/philip/sysv_ipc/
"
SRC_URI="https://semanchuk.com/philip/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
KEYWORDS="~amd64"
DOCS=( README ReadMe.html history.html )
distutils_enable_tests unittest

2
dev-python/tooz/Manifest
View File

@@ -1 +1 @@
DIST tooz-2.9.0.tar.gz 95365 BLAKE2B 378634d6ed99d370426ad5d9812f47e02bf99c9325270ff7193d6e7dd647fc49719111f652cda482693865fade140940f6c85b01cf447b714ccdb612c21963a4 SHA512 56d4d74dc9decee1944b1f5fcc482e3243da5dacdbfaddc33eb408c1362705519a64db8289350ecfca2565c0aa184f9b20a0bdd50da5605c4f8b2dee50e94210
DIST tooz-2.10.1.tar.gz 95627 BLAKE2B 046ac561f235c54be4a7984fb8d4f9c55e59a19284c9a2565d4001e78c55bf79e0247669e544dd8f4d4d78a3874282da92fbec05f615b561740cf7246042ecd8 SHA512 c968561ea950e2da3be47c4bb1bdc2cb5e0de62ce7f9bf371f455185b0587085b8224a853a183a9b1a8d5221ed054fa0b80da29fb6bfb1ac88b9793476f9c87c

11
dev-python/tooz/tooz-2.9.0.ebuild → dev-python/tooz/tooz-2.10.1.ebuild
View File

@@ -1,4 +1,4 @@
# Copyright 1999-2021 Gentoo Authors
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -10,7 +10,7 @@ inherit distutils-r1
DESCRIPTION="Library centralizing the most common distributed primitives"
HOMEPAGE="
https://opendev.org/openstack/tooz
https://pypi.org/project/tooz
https://pypi.org/project/tooz/
https://launchpad.net/python-tooz
"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
@@ -39,6 +39,13 @@ BDEPEND="
>=dev-python/pifpaf-0.10.0[${PYTHON_USEDEP}]
>=dev-python/ddt-1.2.1[${PYTHON_USEDEP}]
>=dev-python/nose-1.3.7[${PYTHON_USEDEP}]
dev-python/etcd3[${PYTHON_USEDEP}]
dev-python/etcd3gw[${PYTHON_USEDEP}]
dev-python/pymemcache[${PYTHON_USEDEP}]
dev-python/pymysql[${PYTHON_USEDEP}]
dev-python/sysv_ipc[${PYTHON_USEDEP}]
dev-python/zake[${PYTHON_USEDEP}]
)
"

1
dev-python/zake/Manifest Normal file
View File

@@ -0,0 +1 @@
DIST zake-0.2.2.tar.gz 13544 BLAKE2B 622f56430a2451c24f687d319188d35cef62059a4bfd9983be323184de6f7b346d236e1fec8922a130b263296e3a1569aa1dc4f6dacbceff68c1dcba81401181 SHA512 40da54970553e2e560de2f76c54ab55287e29f99c53c41c2c50fa8642855f1632319aa80e77f4f2ae0a776b94667839385e6323a174cd76219420be71adf7484

25
dev-python/zake/metadata.xml Normal file
View File

@@ -0,0 +1,25 @@
<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>lssndrbarbieri@gmail.com</email>
<name>Alessandro Barbieri</name>
</maintainer>
<longdescription lang="en">
A python package that works to provide a nice set of testing utilities for the kazoo library.
It includes the following functionality:
Storage access (for viewing what was saved/created).
Kazoo mostly compatible client API.
Sync/transaction/create/get/delete... commands.
Listener support.
And more...
It simplifies testing by providing a client that has a similar API as the kazoo client so that your tests (or applications/libraries that use kazoo) do not require a real zookeeper server to be tested with (since this is not available in all testing environments).
</longdescription>
<upstream>
<remote-id type="github">yahoo/Zake</remote-id>
<remote-id type="pypi">zake</remote-id>
</upstream>
</pkgmetadata>

32
dev-python/zake/zake-0.2.2.ebuild Normal file
View File

@@ -0,0 +1,32 @@
# Copyright 2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
PYTHON_COMPAT=( python3_{8..9} )
inherit distutils-r1
DESCRIPTION="Provide a nice set of testing utilities for the kazoo library"
HOMEPAGE="
https://pypi.org/project/zake/
https://github.com/yahoo/Zake
"
SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="~amd64"
RDEPEND=">=dev-python/kazoo-1.3.1[${PYTHON_USEDEP}]"
DEPEND="
${REDEPEND}
dev-python/six[${PYTHON_USEDEP}]
"
BDEPEND="
test? (
dev-python/testtools[${PYTHON_USEDEP}]
)
"
distutils_enable_tests nose

1
mail-client/mailspring-bin/Manifest
View File

@@ -1 +1,2 @@
DIST mailspring-1.10.0-amd64.deb 95774210 BLAKE2B 26d9bab6f2b7b0e8a8fa99a0dcda2ef23455fd0af3ea50ff68c0f8d3bd8a19907d1154bfb144eba7444bbc3a9b881ee82859227b31b7ca87d87fd596d35d40c0 SHA512 baa8e04da73c926d483a86118a7c971e4081de0f9feb28c8dfcb35d2e2cb990e605cebafc43de87892c959c9cd733609d3af86939e8c9beddbf3e387e42bd683
DIST mailspring-1.9.2-amd64.deb 88917330 BLAKE2B 58ed41ab51e41b59b16ec0c1cea0bc8e41208f51355c2eefac6a80995b90f97439fb419f1ba2a2f9a808ea3bc3f8487e037ab89cdf54808ca492e76c14944498 SHA512 e096118a3707aa139c31d2d27ce85438055640afef2acb57339e40d60d102cd30bc6979d2873805414f98b13b7a2662b7f141b29cd47ee6289d878f755de5db3

63
mail-client/mailspring-bin/mailspring-bin-1.10.0.ebuild Normal file
View File

@@ -0,0 +1,63 @@
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
inherit unpacker xdg
DESCRIPTION="A beautiful, fast and fully open source mail client for Mac, Windows and Linux"
HOMEPAGE="https://getmailspring.com/"
SRC_URI="https://github.com/Foundry376/Mailspring/releases/download/${PV}/mailspring-${PV}-amd64.deb"
S="${WORKDIR}"
LICENSE="GPL-3"
SLOT="0"
KEYWORDS="~amd64"
RDEPEND="
app-accessibility/at-spi2-atk:2
app-accessibility/at-spi2-core:2
app-crypt/libsecret
app-crypt/mit-krb5
dev-libs/atk
dev-libs/expat
dev-libs/glib:2
dev-libs/nspr
dev-libs/nss
dev-libs/openssl-compat:1.0.0
gnome-base/gvfs
media-libs/alsa-lib
media-libs/mesa
net-print/cups
sys-apps/dbus
sys-devel/libtool
sys-libs/db:5.3
x11-libs/cairo
x11-libs/gdk-pixbuf:2
x11-libs/gtk+:3
x11-libs/gtk+:3
x11-libs/libdrm
x11-libs/libX11
x11-libs/libxcb
x11-libs/libXcomposite
x11-libs/libXdamage
x11-libs/libXext
x11-libs/libXfixes
x11-libs/libxkbcommon
x11-libs/libXrandr
x11-libs/libxshmfence
x11-libs/pango
x11-misc/xdg-utils
"
QA_PREBUILT="*"
src_unpack(){
unpack_deb ${A}
}
src_install(){
cp -R "${S}"/* "${D}" || die "Installing binary files failed"
mv "${D}/usr/share/doc/mailspring" "${D}/usr/share/doc/${PF}" || die
mv "${D}/usr/share/appdata" "${D}/usr/share/metainfo" || die
}

52
media-libs/skia/files/skia-97-questionable-flags.patch Normal file
View File

@@ -0,0 +1,52 @@
--- /var/tmp/portage/media-libs/skia-97-r1/work/skia-f2093bf1b076210bd017f237eaab84ea4d3d6771/gn/skia/BUILD.gn
+++ skia-f2093bf1b076210bd017f237eaab84ea4d3d6771/gn/skia/BUILD.gn
@@ -335,7 +335,7 @@
config("no_exceptions") {
# Exceptions are disabled by default on Windows. (Use /EHsc to enable them.)
if (!is_win) {
- cflags_cc = [ "-fno-exceptions" ]
+ cflags_cc = [ "" ]
}
}
@@ -572,7 +572,7 @@
if (is_win) {
cflags_cc = [ "/GR-" ]
} else {
- cflags_cc = [ "-fno-rtti" ]
+ cflags_cc = [ "" ]
}
}
}
@@ -592,10 +592,6 @@
if (is_mac || is_ios) {
ldflags = [ "-dead_strip" ]
} else {
- cflags += [
- "-fdata-sections",
- "-ffunction-sections",
- ]
ldflags = [ "-Wl,--gc-sections" ]
}
if (target_cpu == "wasm") {
--- /var/tmp/portage/media-libs/skia-97-r1/work/skia-f2093bf1b076210bd017f237eaab84ea4d3d6771/modules/canvaskit/compile.sh
+++ skia-f2093bf1b076210bd017f237eaab84ea4d3d6771/modules/canvaskit/compile.sh
@@ -358,7 +358,6 @@
-DSK_DISABLE_AAA \
-DSK_FORCE_8_BYTE_ALIGNMENT \
-DEMSCRIPTEN_HAS_UNBOUND_TYPE_NAMES=0 \
- -fno-rtti \
$WASM_GPU \
$WASM_PATHOPS \
$WASM_RT_SHADER \
--- /var/tmp/portage/media-libs/skia-97-r1/work/skia-f2093bf1b076210bd017f237eaab84ea4d3d6771/modules/pathkit/compile.sh
+++ skia-f2093bf1b076210bd017f237eaab84ea4d3d6771/modules/pathkit/compile.sh
@@ -113,7 +113,7 @@
--no-entry \
--pre-js $BASE_DIR/helper.js \
--pre-js $BASE_DIR/chaining.js \
--fno-rtti -fno-exceptions -DEMSCRIPTEN_HAS_UNBOUND_TYPE_NAMES=0 \
+-DEMSCRIPTEN_HAS_UNBOUND_TYPE_NAMES=0 \
$WASM_CONF \
-s ERROR_ON_UNDEFINED_SYMBOLS=1 \
-s EXPORT_NAME="PathKitInit" \

232
media-libs/skia/files/skia-97-system-skcms-headers.patch Normal file
View File

@@ -0,0 +1,232 @@
--- /var/tmp/portage/media-libs/skia-97-r1/work/skia-f2093bf1b076210bd017f237eaab84ea4d3d6771/dm/DMSrcSink.cpp
+++ skia-f2093bf1b076210bd017f237eaab84ea4d3d6771/dm/DMSrcSink.cpp
@@ -28,7 +28,7 @@
#include "include/ports/SkImageGeneratorWIC.h"
#include "include/private/SkImageInfoPriv.h"
#include "include/private/SkTLogic.h"
-#include "include/third_party/skcms/skcms.h"
+#include "skcms.h"
#include "include/utils/SkNullCanvas.h"
#include "include/utils/SkPaintFilterCanvas.h"
#include "include/utils/SkRandom.h"
--- /var/tmp/portage/media-libs/skia-97-r1/work/skia-f2093bf1b076210bd017f237eaab84ea4d3d6771/experimental/wasm-skp-debugger/compile.sh
+++ skia-f2093bf1b076210bd017f237eaab84ea4d3d6771/experimental/wasm-skp-debugger/compile.sh
@@ -130,7 +130,7 @@
$RELEASE_CONF \
-I. \
-Ithird_party/icu \
- -Ithird_party/skcms \
+ -lskcms \
-DSK_DISABLE_AAA \
-DSK_FORCE_8_BYTE_ALIGNMENT \
-std=c++17 \
--- /var/tmp/portage/media-libs/skia-97-r1/work/skia-f2093bf1b076210bd017f237eaab84ea4d3d6771/gm/pictureshadercache.cpp
+++ skia-f2093bf1b076210bd017f237eaab84ea4d3d6771/gm/pictureshadercache.cpp
@@ -22,7 +22,7 @@
#include "include/core/SkString.h"
#include "include/core/SkSurface.h"
#include "include/core/SkTileMode.h"
-#include "include/third_party/skcms/skcms.h"
+#include "skcms.h"
#include <utility>
--- /var/tmp/portage/media-libs/skia-97-r1/work/skia-f2093bf1b076210bd017f237eaab84ea4d3d6771/gm/readpixels.cpp
+++ skia-f2093bf1b076210bd017f237eaab84ea4d3d6771/gm/readpixels.cpp
@@ -23,7 +23,7 @@
#include "include/core/SkString.h"
#include "include/core/SkTypes.h"
#include "include/gpu/GrDirectContext.h"
-#include "include/third_party/skcms/skcms.h"
+#include "skcms.h"
#include "tools/Resources.h"
#include <string.h>
--- /var/tmp/portage/media-libs/skia-97-r1/work/skia-f2093bf1b076210bd017f237eaab84ea4d3d6771/gn/gn_to_bp.py
+++ skia-f2093bf1b076210bd017f237eaab84ea4d3d6771/gn/gn_to_bp.py
@@ -485,10 +485,6 @@
gn_to_bp_utils.GrabDependentValues(js, '//:nanobench', 'sources',
nanobench_srcs, 'skia')
-# skcms is a little special, kind of a second-party library.
-local_includes.add("include/third_party/skcms")
-dm_includes .add("include/third_party/skcms")
-
# Android's build will choke if we list headers.
def strip_headers(sources):
return {s for s in sources if not s.endswith('.h')}
--- /var/tmp/portage/media-libs/skia-97-r1/work/skia-f2093bf1b076210bd017f237eaab84ea4d3d6771/include/core/SkColorSpace.h
+++ skia-f2093bf1b076210bd017f237eaab84ea4d3d6771/include/core/SkColorSpace.h
@@ -11,7 +11,7 @@
#include "include/core/SkRefCnt.h"
#include "include/private/SkFixed.h"
#include "include/private/SkOnce.h"
-#include "include/third_party/skcms/skcms.h"
+#include "skcms.h"
#include <memory>
class SkData;
--- /var/tmp/portage/media-libs/skia-97-r1/work/skia-f2093bf1b076210bd017f237eaab84ea4d3d6771/include/private/SkEncodedInfo.h
+++ skia-f2093bf1b076210bd017f237eaab84ea4d3d6771/include/private/SkEncodedInfo.h
@@ -12,7 +12,7 @@
#include "include/core/SkData.h"
#include "include/core/SkImageInfo.h"
-#include "include/third_party/skcms/skcms.h"
+#include "skcms.h"
struct SkEncodedInfo {
public:
--- /var/tmp/portage/media-libs/skia-97-r1/work/skia-f2093bf1b076210bd017f237eaab84ea4d3d6771/modules/canvaskit/compile.sh
+++ skia-f2093bf1b076210bd017f237eaab84ea4d3d6771/modules/canvaskit/compile.sh
@@ -353,7 +353,7 @@
$RELEASE_CONF \
-I. \
-Ithird_party/icu \
- -Ithird_party/skcms \
+ -lskcms \
-Ithird_party/externals/icu/source/common/ \
-DSK_DISABLE_AAA \
-DSK_FORCE_8_BYTE_ALIGNMENT \
--- /var/tmp/portage/media-libs/skia-97-r1/work/skia-f2093bf1b076210bd017f237eaab84ea4d3d6771/public.bzl
+++ skia-f2093bf1b076210bd017f237eaab84ea4d3d6771/public.bzl
@@ -534,7 +534,6 @@
"include/pathops",
"include/ports",
"include/private",
- "include/third_party/skcms",
"include/utils",
"include/utils/mac",
"src/codec",
--- /var/tmp/portage/media-libs/skia-97-r1/work/skia-f2093bf1b076210bd017f237eaab84ea4d3d6771/src/core/SkColorSpace.cpp
+++ skia-f2093bf1b076210bd017f237eaab84ea4d3d6771/src/core/SkColorSpace.cpp
@@ -8,7 +8,7 @@
#include "include/core/SkColorSpace.h"
#include "include/core/SkData.h"
#include "include/private/SkTemplates.h"
-#include "include/third_party/skcms/skcms.h"
+#include "skcms.h"
#include "src/core/SkColorSpacePriv.h"
#include "src/core/SkOpts.h"
--- /var/tmp/portage/media-libs/skia-97-r1/work/skia-f2093bf1b076210bd017f237eaab84ea4d3d6771/src/core/SkColorSpaceXformSteps.cpp
+++ skia-f2093bf1b076210bd017f237eaab84ea4d3d6771/src/core/SkColorSpaceXformSteps.cpp
@@ -5,7 +5,7 @@
* found in the LICENSE file.
*/
-#include "include/third_party/skcms/skcms.h"
+#include "skcms.h"
#include "src/core/SkColorSpacePriv.h"
#include "src/core/SkColorSpaceXformSteps.h"
#include "src/core/SkRasterPipeline.h"
--- /var/tmp/portage/media-libs/skia-97-r1/work/skia-f2093bf1b076210bd017f237eaab84ea4d3d6771/src/gpu/GrDataUtils.cpp
+++ skia-f2093bf1b076210bd017f237eaab84ea4d3d6771/src/gpu/GrDataUtils.cpp
@@ -8,7 +8,7 @@
#include "src/gpu/GrDataUtils.h"
#include "include/private/SkTPin.h"
-#include "include/third_party/skcms/skcms.h"
+#include "skcms.h"
#include "src/core/SkColorSpaceXformSteps.h"
#include "src/core/SkCompressedDataUtils.h"
#include "src/core/SkConvertPixels.h"
--- /var/tmp/portage/media-libs/skia-97-r1/work/skia-f2093bf1b076210bd017f237eaab84ea4d3d6771/src/images/SkImageEncoderFns.h
+++ skia-f2093bf1b076210bd017f237eaab84ea4d3d6771/src/images/SkImageEncoderFns.h
@@ -12,7 +12,7 @@
#include "include/core/SkICC.h"
#include "include/core/SkTypes.h"
#include "include/private/SkColorData.h"
-#include "include/third_party/skcms/skcms.h"
+#include "skcms.h"
typedef void (*transform_scanline_proc)(char* dst, const char* src, int width, int bpp);
--- /var/tmp/portage/media-libs/skia-97-r1/work/skia-f2093bf1b076210bd017f237eaab84ea4d3d6771/tests/AndroidCodecTest.cpp
+++ skia-f2093bf1b076210bd017f237eaab84ea4d3d6771/tests/AndroidCodecTest.cpp
@@ -18,7 +18,7 @@
#include "include/core/SkSize.h"
#include "include/core/SkString.h"
#include "include/core/SkTypes.h"
-#include "include/third_party/skcms/skcms.h"
+#include "skcms.h"
#include "src/codec/SkCodecImageGenerator.h"
#include "src/core/SkPixmapPriv.h"
#include "tests/Test.h"
--- /var/tmp/portage/media-libs/skia-97-r1/work/skia-f2093bf1b076210bd017f237eaab84ea4d3d6771/tests/CodecTest.cpp
+++ skia-f2093bf1b076210bd017f237eaab84ea4d3d6771/tests/CodecTest.cpp
@@ -37,7 +37,7 @@
#include "include/encode/SkWebpEncoder.h"
#include "include/private/SkMalloc.h"
#include "include/private/SkTemplates.h"
-#include "include/third_party/skcms/skcms.h"
+#include "skcms.h"
#include "include/utils/SkRandom.h"
#include "src/codec/SkCodecImageGenerator.h"
#include "src/core/SkAutoMalloc.h"
--- /var/tmp/portage/media-libs/skia-97-r1/work/skia-f2093bf1b076210bd017f237eaab84ea4d3d6771/tests/ColorSpaceTest.cpp
+++ skia-f2093bf1b076210bd017f237eaab84ea4d3d6771/tests/ColorSpaceTest.cpp
@@ -12,7 +12,7 @@
#include "include/core/SkRefCnt.h"
#include "include/core/SkStream.h"
#include "include/core/SkTypes.h"
-#include "include/third_party/skcms/skcms.h"
+#include "skcms.h"
#include "src/core/SkColorSpacePriv.h"
#include "tests/Test.h"
#include "tools/Resources.h"
--- /var/tmp/portage/media-libs/skia-97-r1/work/skia-f2093bf1b076210bd017f237eaab84ea4d3d6771/tests/ICCTest.cpp
+++ skia-f2093bf1b076210bd017f237eaab84ea4d3d6771/tests/ICCTest.cpp
@@ -9,7 +9,7 @@
#include "include/core/SkICC.h"
#include "include/core/SkString.h"
-#include "include/third_party/skcms/skcms.h"
+#include "skcms.h"
#include "src/core/SkColorSpacePriv.h"
#include "tests/Test.h"
#include "tools/Resources.h"
--- /var/tmp/portage/media-libs/skia-97-r1/work/skia-f2093bf1b076210bd017f237eaab84ea4d3d6771/tests/NonlinearBlendingTest.cpp
+++ skia-f2093bf1b076210bd017f237eaab84ea4d3d6771/tests/NonlinearBlendingTest.cpp
@@ -6,7 +6,7 @@
*/
#include "include/core/SkColorSpace.h"
-#include "include/third_party/skcms/skcms.h"
+#include "skcms.h"
#include "src/core/SkColorSpaceXformSteps.h"
#include "tests/Test.h"
--- /var/tmp/portage/media-libs/skia-97-r1/work/skia-f2093bf1b076210bd017f237eaab84ea4d3d6771/tools/doxygen/Doxyfile
+++ skia-f2093bf1b076210bd017f237eaab84ea4d3d6771/tools/doxygen/Doxyfile
@@ -795,7 +795,6 @@
../../include/docs \
../../include/gpu \
../../include/pathops \
- ../../third_party/skcms \
../../modules/particles/include \
../../modules/skottie/include \
../../modules/sksg/include \
--- /var/tmp/portage/media-libs/skia-97-r1/work/skia-f2093bf1b076210bd017f237eaab84ea4d3d6771/tools/imgcvt.cpp
+++ skia-f2093bf1b076210bd017f237eaab84ea4d3d6771/tools/imgcvt.cpp
@@ -10,7 +10,7 @@
#include "include/core/SkImage.h"
#include "include/core/SkStream.h"
#include "include/core/SkSurface.h"
-#include "include/third_party/skcms/skcms.h"
+#include "skcms.h"
#include "src/core/SkColorSpacePriv.h"
static void write_png(const char* path, sk_sp<SkImage> img) {
--- /var/tmp/portage/media-libs/skia-97-r1/work/skia-f2093bf1b076210bd017f237eaab84ea4d3d6771/tools/rewrite_includes.py
+++ skia-f2093bf1b076210bd017f237eaab84ea4d3d6771/tools/rewrite_includes.py
@@ -76,8 +76,7 @@
need_rewriting = []
for file_path in to_rewrite():
if ('/generated/' in file_path or
- 'tests/sksl/' in file_path or
- 'third_party/skcms' in file_path):
+ 'tests/sksl/' in file_path):
continue
if (file_path.endswith('.h') or
file_path.endswith('.c') or

52
media-libs/skia/files/skia-97-system-skcms.patch Normal file
View File

@@ -0,0 +1,52 @@
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -93,7 +93,7 @@
"GR_TEST_UTILS=1",
]
}
- libs = []
+ libs = [ "skcms" ]
lib_dirs = []
if (skia_use_gl && skia_use_angle) {
defines += [ "SK_ANGLE" ]
@@ -1110,21 +1110,6 @@
sources = [ "src/codec/SkRawCodec.cpp" ]
}
-import("third_party/skcms/skcms.gni")
-skia_source_set("skcms") {
- cflags = []
- if (!is_win || is_clang) {
- cflags += [
- "-w",
- "-std=c11",
- ]
- }
-
- public = [ "include/third_party/skcms/skcms.h" ]
- include_dirs = [ "include/third_party/skcms" ]
- sources = rebase_path(skcms_sources, ".", "third_party/skcms")
-}
-
optional("typeface_freetype") {
enabled = skia_use_freetype
@@ -1225,7 +1210,6 @@
":gpu",
":graphite",
":pdf",
- ":skcms",
":xps",
]
@@ -2096,9 +2080,9 @@
test_app("imgcvt") {
sources = [ "tools/imgcvt.cpp" ]
deps = [
- ":skcms",
":skia",
]
+ libs = [ "skcms" ]
}
test_app("fm") {
sources = [

101
media-libs/skia/files/skia-97-system-vulkan.patch Normal file
View File

@@ -0,0 +1,101 @@
--- /var/tmp/portage/media-libs/skia-97-r1/work/skia-f2093bf1b076210bd017f237eaab84ea4d3d6771/BUILD.gn
+++ skia-f2093bf1b076210bd017f237eaab84ea4d3d6771/BUILD.gn
@@ -1479,10 +1479,6 @@
deps = [ "experimental/sktext" ]
}
-config("our_vulkan_headers") {
- include_dirs = [ "include/third_party/vulkan" ]
-}
-
# Targets guarded by skia_enable_tools may use //third_party freely.
if (skia_enable_tools) {
skia_public_includes = [
@@ -1569,7 +1565,6 @@
skia_source_set("public_headers_warnings_check") {
sources = [ "tools/public_headers_warnings_check.cpp" ]
configs = [
- ":our_vulkan_headers",
":cpp14",
]
if (defined(skia_header_target_default_configs)) {
@@ -1681,10 +1676,6 @@
test_lib("gpu_tool_utils") {
public_defines = []
- # Bots and even devs may not have Vulkan headers, so put
- # include/third_party/vulkan on our path so they're always available.
- all_dependent_configs = [ ":our_vulkan_headers" ]
-
defines = []
if (skia_enable_discrete_gpu) {
defines += [ "SK_ENABLE_DISCRETE_GPU" ]
@@ -2204,7 +2195,6 @@
test_app("skpinfo") {
sources = [ "tools/skpinfo.cpp" ]
- configs = [ ":our_vulkan_headers" ]
deps = [
":flags",
":skia",
--- /var/tmp/portage/media-libs/skia-97-r1/work/skia-f2093bf1b076210bd017f237eaab84ea4d3d6771/include/gpu/vk/GrVkVulkan.h
+++ skia-f2093bf1b076210bd017f237eaab84ea4d3d6771/include/gpu/vk/GrVkVulkan.h
@@ -11,7 +11,7 @@
#include "include/core/SkTypes.h"
#if SKIA_IMPLEMENTATION || !defined(SK_VULKAN)
-#include "include/third_party/vulkan/vulkan/vulkan_core.h"
+#include "vulkan/vulkan_core.h"
#else
// For google3 builds we don't set SKIA_IMPLEMENTATION so we need to make sure that the vulkan
// headers stay up to date for our needs
@@ -21,7 +21,7 @@
#ifdef SK_BUILD_FOR_ANDROID
// This is needed to get android extensions for external memory
#if SKIA_IMPLEMENTATION || !defined(SK_VULKAN)
-#include "include/third_party/vulkan/vulkan/vulkan_android.h"
+#include "vulkan/vulkan_android.h"
#else
// For google3 builds we don't set SKIA_IMPLEMENTATION so we need to make sure that the vulkan
// headers stay up to date for our needs
--- /var/tmp/portage/media-libs/skia-97-r1/work/skia-f2093bf1b076210bd017f237eaab84ea4d3d6771/modules/particles/BUILD.gn
+++ skia-f2093bf1b076210bd017f237eaab84ea4d3d6771/modules/particles/BUILD.gn
@@ -27,7 +27,6 @@
sources = skia_particle_sources
configs += [
"../../:skia_private",
- "../../:our_vulkan_headers",
]
}
}
--- /var/tmp/portage/media-libs/skia-97-r1/work/skia-f2093bf1b076210bd017f237eaab84ea4d3d6771/third_party/vulkanmemoryallocator/BUILD.gn
+++ skia-f2093bf1b076210bd017f237eaab84ea4d3d6771/third_party/vulkanmemoryallocator/BUILD.gn
@@ -12,7 +12,6 @@
include_dirs = [
"../..",
- "../../include/third_party/vulkan",
]
sources = [
--- /var/tmp/portage/media-libs/skia-97-r1/work/skia-f2093bf1b076210bd017f237eaab84ea4d3d6771/tools/check-headers-self-sufficient
+++ skia-f2093bf1b076210bd017f237eaab84ea4d3d6771/tools/check-headers-self-sufficient
@@ -32,7 +32,6 @@
r'include/private/.*_impl\.h',
r'include/private/.*_neon\.h',
r'include/private/.*_sse\.h',
- r'include/third_party/vulkan/.*',
r'include/utils/mac/SkCGUtils\.h',
r'include/views/SkOSWindow_.*\.h',
r'modules/.*',
--- /var/tmp/portage/media-libs/skia-97-r1/work/skia-f2093bf1b076210bd017f237eaab84ea4d3d6771/tools/rewrite_includes.py
+++ skia-f2093bf1b076210bd017f237eaab84ea4d3d6771/tools/rewrite_includes.py
@@ -43,7 +43,7 @@
# Don't count our local Vulkan headers as Skia headers;
# we don't want #include <vulkan/vulkan_foo.h> rewritten to point to them.
# Nor do we care about things in node_modules, used by *Kits.
-ignorelist = ['include/third_party/vulkan', 'node_modules']
+ignorelist = ['node_modules']
assert '/' in [os.sep, os.altsep]
def fix_path(p):

16
media-libs/skia/files/skia-97-system-zlib.patch Normal file
View File

@@ -0,0 +1,16 @@
--- a/third_party/zlib/BUILD.gn
+++ b/third_party/zlib/BUILD.gn
@@ -196,13 +196,3 @@
config("zlib_config") {
}
-
-third_party("compression_utils_portable") {
- visibility = [ "//third_party/externals/angle2:*" ]
- public_include_dirs = [ "../externals/zlib/google" ]
- sources = [
- "../externals/zlib/google/compression_utils_portable.cc",
- "../externals/zlib/google/compression_utils_portable.h",
- ]
- public_deps = [ ":zlib" ] # either system or from source
-}

11
media-libs/skia/metadata.xml
View File

@@ -8,7 +8,14 @@
</maintainer>
<longdescription lang="en">
Skia is an open source 2D graphics library which provides common APIs that work across a variety of hardware and software platforms. It serves as the graphics engine for Google Chrome and Chrome OS, Android, Mozilla Firefox and Firefox OS, and many other products.
Skia is sponsored and managed by Google, but is available for use by anyone under the BSD Free Software License. While engineering of the core components is done by the Skia development team, we consider contributions from any source.
</longdescription>
<use>
<flag name="ccpr">enable coverage counting path renderer</flag>
<flag name="freetype">enable <pkg>media-libs/freetype</pkg> support</flag>
<flag name="harfbuzz">enable <pkg>media-libs/harfbuzz</pkg> support</flag>
<flag name="lottie">Play back bodymovin lottie files</flag>
<flag name="opencl">enable opencl support</flag>
<flag name="rive">enable support for rive files</flag>
<flag name="vulkan">enable vulkan backend</flag>
</use>
</pkgmetadata>

213
media-libs/skia/skia-97-r1.ebuild Normal file
View File

@@ -0,0 +1,213 @@
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
PYTHON_COMPAT=( python3_9 )
inherit ninja-utils python-any-r1 toolchain-funcs
#https://github.com/google/skia/blob/master/include/core/SkMilestone.h
COMMIT="f2093bf1b076210bd017f237eaab84ea4d3d6771"
DESCRIPTION="A complete 2D graphic library for drawing Text, Geometries, and Images"
HOMEPAGE="
https://skia.org
https://github.com/google/skia
"
SRC_URI="https://github.com/google/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
S="${WORKDIR}/${PN}-${COMMIT}"
KEYWORDS="~amd64"
LICENSE="BSD"
SLOT="0"
IUSE="+ccpr debug ffmpeg +fontconfig +freetype +harfbuzz +icu jit +jpeg +lottie lua opencl +opengl +pdf +png +rive vulkan +webp +zlib +X +xml"
#TODO: find out how to enable and link: angle dawn piex sfntly wuffs
CDEPEND="
media-libs/skcms:=
ffmpeg? ( media-video/ffmpeg )
fontconfig? ( media-libs/fontconfig )
freetype? ( media-libs/freetype )
harfbuzz? ( media-libs/harfbuzz:=[icu?] )
icu? ( dev-libs/icu:= )
jpeg? ( media-libs/libjpeg-turbo )
lua? ( dev-lang/lua:* )
opengl? ( virtual/opengl )
png? ( media-libs/libpng )
webp? ( media-libs/libwebp )
xml? ( dev-libs/expat )
zlib? ( sys-libs/zlib )
"
RDEPEND="
${CDEPEND}
opencl? ( virtual/opencl )
"
DEPEND="
${PYTHON_DEPS}
${CDEPEND}
opencl? ( dev-util/opencl-headers )
vulkan? ( dev-util/vulkan-headers )
"
BDEPEND="dev-util/gn"
PATCHES=(
"${FILESDIR}/${P}-system-skcms-headers.patch"
"${FILESDIR}/${P}-system-skcms.patch"
"${FILESDIR}/${P}-system-vulkan.patch"
"${FILESDIR}/${P}-questionable-flags.patch"
"${FILESDIR}/${P}-system-zlib.patch"
)
REQUIRED_USE="
X? ( opengl )
"
src_prepare() {
rm -r include/third_party/* || die
rm -r third_party/skcms || die
default
}
src_configure() {
python_setup
tc-export AR CC CXX
local myconf_gn=()
passflags() {
local _f _x
_f=( ${1} )
_x="[$(printf '"%s", ' "${_f[@]}")]"
myconf_gn+=( extra_${2}="${_x}" )
}
passflags "${CFLAGS}" cflags_c
passflags "${CXXFLAGS}" cflags_cc
passflags "${LDFLAGS}" ldflags
# skia_qt_path = getenv("QT_PATH") #todo
myconf_gn+=(
ar=\"${AR}\"
cc=\"${CC}\"
cxx=\"${CXX}\"
is_component_build=false
is_official_build=true
is_shared_library=true
skia_build_fuzzers=false
skia_compile_sksl_tests=false
skia_enable_android_utils=false #android
skia_enable_api_available_macro = true
skia_enable_flutter_defines = false
skia_enable_fontmgr_android=false #android
skia_enable_fontmgr_win_gdi=false #windows
skia_enable_nga=false
skia_enable_tools=false
skia_enable_winuwp = false
skia_generate_workarounds = false
skia_include_multiframe_procs = false
skia_lex = false
skia_skqp_global_error_tolerance=0
skia_update_fuchsia_sdk=false #fuchsia
skia_use_angle=false #todo
skia_use_dawn=false #todo
skia_use_direct3d=false #windows
skia_use_dng_sdk=false
skia_use_libheif=false #android only
skia_use_experimental_xform=false
skia_use_fixed_gamma_text=false #android
skia_use_fonthost_mac=false #mac
skia_use_libgifcodec=false #todo
skia_use_metal=false #ios
skia_use_ndk_images=false #android
skia_use_piex=false #todo
skia_use_sfml=false #todo
skia_use_sfntly=false #todo
skia_use_webgl=false #todo
skia_use_wuffs=false #todo
skia_use_xps=false #windows
skia_compile_processors = $(usex processors true false)
skia_enable_ccpr=$(usex cppr true false)
skia_enable_gpu=$(usex gpu true false)
skia_enable_gpu_debug_layers=$(usex debug true false)
skia_enable_pdf=$(usex pdf true false)
skia_enable_skottie=$(usex lottie true false)
skia_enable_skrive=$(usex rive true false)
skia_enable_skvm_jit_when_possible=$(usex jit true false)
skia_enable_svg=$(usex svg true false)
skia_pdf_subset_harfbuzz =$(usex harfbuzz true false)
skia_use_egl=$(usex opengl true false)
skia_use_expat=$(usex xml true false)
skia_use_ffmpeg=$(usex ffmpeg true false)
skia_use_fontconfig=$(usex fontconfig true false)
skia_use_gl=$(usex opengl true false)
skia_use_harfbuzz=$(usex harfbuzz true false)
skia_use_icu=$(usex icu true false)
skia_use_libjpeg_turbo_decode=$(usex jpeg true false)
skia_use_libjpeg_turbo_encode=$(usex jpeg true false)
skia_use_libpng_decode=$(usex png true false)
skia_use_libpng_encode=$(usex png true false)
skia_use_libwebp_decode=$(usex webp true false)
skia_use_libwebp_encode=$(usex webp true false)
skia_use_lua=$(usex lua true false)
skia_use_opencl=$(usex opencl true false)
skia_use_vma=$(usex vulkan true false)
skia_use_vulkan=$(usex vulkan true false)
skia_use_x11=$(usex X true false)
skia_use_zlib=$(usex zlib true false)
)
if use freetype; then
myconf_gn+=( skia_enable_fontmgr_custom_directory=true )
myconf_gn+=( skia_enable_fontmgr_custom_embedded=true )
myconf_gn+=( skia_enable_fontmgr_custom_empty=true )
myconf_gn+=( skia_use_freetype=true )
myconf_gn+=( skia_use_system_freetype2=true )
if use fontconfig; then
myconf_gn+=( skia_enable_fontmgr_fontconfig=true )
myconf_gn+=( skia_enable_fontmgr_FontConfigInterface=true )
fi
else
myconf_gn+=( skia_enable_fontmgr_custom_directory=false )
myconf_gn+=( skia_enable_fontmgr_custom_embedded=false )
myconf_gn+=( skia_enable_fontmgr_custom_empty=false )
myconf_gn+=( skia_use_freetype=false )
myconf_gn+=( skia_use_system_freetype2=false )
fi
if ! use freetype !! ! use fontconfig; then
myconf_gn+=( skia_enable_fontmgr_fontconfig=false )
myconf_gn+=( skia_enable_fontmgr_FontConfigInterface=false )
fi
# skia_use_angle=$(usex angle true false)
# skia_use_piex=$(usex piex true false)
# skia_use_sfntly=$(usex sfntly true false)
# skia_use_wuffs=$(usex wuffs true false)
use harfbuzz && myconf_gn+=( skia_use_system_harfbuzz=true )
use icu && myconf_gn+=( skia_use_system_icu=true )
use jpeg && myconf_gn+=( skia_use_system_libjpeg_turbo=true )
use lua && myconf_gn+=( skia_use_system_lua=true )
use png && myconf_gn+=( skia_use_system_libpng=true )
use webp && myconf_gn+=( skia_use_system_libwebp=true )
use zlib && myconf_gn+=( skia_use_system_zlib=true )
myconf_gn="${myconf_gn[@]} ${EXTRA_GN}"
set -- gn gen --args="${myconf_gn% }" out/Release || die
echo "$@"
"$@" || die
}
src_compile() {
eninja -C out/Release
}
src_install() {
dolib.so out/Release/*.so
insinto "/usr/include/${PN}"
doins -r include/.
}

282
sys-apps/intel-cmt-cat/files/intel-cmt-cat-4.3.0-respect-flags.patch Normal file
View File

@@ -0,0 +1,282 @@
--- a/examples/c/CAT_MBA/Makefile
+++ b/examples/c/CAT_MBA/Makefile
@@ -35,17 +35,16 @@
###############################################################################
LIBDIR ?= ../../../lib
-CFLAGS =-I$(LIBDIR) \
+CFLAGS += -I$(LIBDIR) \
-W -Wall -Wextra -Wstrict-prototypes -Wmissing-prototypes \
-Wmissing-declarations -Wold-style-definition -Wpointer-arith \
-Wcast-qual -Wundef -Wwrite-strings \
- -Wformat -Wformat-security -fstack-protector -fPIE -D_FORTIFY_SOURCE=2 \
- -Wunreachable-code -Wsign-compare -Wno-endif-labels \
- -g -O2
+ -Wformat -Wformat-security -fPIE \
+ -Wunreachable-code -Wsign-compare -Wno-endif-labels
ifneq ($(EXTRA_CFLAGS),)
CFLAGS += $(EXTRA_CFLAGS)
endif
-LDFLAGS=-L$(LIBDIR) -pie -z noexecstack -z relro -z now
+LDFLAGS += -L$(LIBDIR) -pie -z noexecstack -z relro -z now
LDLIBS=-lpqos -lpthread
# ICC and GCC options
--- a/examples/c/CMT_MBM/Makefile
+++ b/examples/c/CMT_MBM/Makefile
@@ -35,17 +35,16 @@
###############################################################################
LIBDIR ?= ../../../lib
-CFLAGS =-I$(LIBDIR) -pthread \
+CFLAGS += -I$(LIBDIR) -pthread \
-W -Wall -Wextra -Wstrict-prototypes -Wmissing-prototypes \
-Wmissing-declarations -Wold-style-definition -Wpointer-arith \
-Wcast-qual -Wundef -Wwrite-strings \
- -Wformat -Wformat-security -fstack-protector -fPIE -D_FORTIFY_SOURCE=2 \
- -Wunreachable-code -Wsign-compare -Wno-endif-labels \
- -g -O2
+ -Wformat -Wformat-security -fPIE \
+ -Wunreachable-code -Wsign-compare -Wno-endif-labels
ifneq ($(EXTRA_CFLAGS),)
CFLAGS += $(EXTRA_CFLAGS)
endif
-LDFLAGS=-L$(LIBDIR) -pie -z noexecstack -z relro -z now
+LDFLAGS += -L$(LIBDIR) -pie -z noexecstack -z relro -z now
LDLIBS=-lpqos -lpthread
# ICC and GCC options
--- a/examples/c/PSEUDO_LOCK/Makefile
+++ b/examples/c/PSEUDO_LOCK/Makefile
@@ -35,15 +35,14 @@
###############################################################################
LIBDIR ?= ../../../lib
-LDFLAGS = -L$(LIBDIR) -pie -z noexecstack -z relro -z now
+LDFLAGS += -L$(LIBDIR) -pie -z noexecstack -z relro -z now
LDLIBS = -lpqos -lrt -lpthread
-CFLAGS = -I$(LIBDIR) \
+CFLAGS += -I$(LIBDIR) \
-W -Wall -Wextra -Wstrict-prototypes -Wmissing-prototypes \
-Wmissing-declarations -Wold-style-definition -Wpointer-arith \
-Wcast-qual -Wundef -Wwrite-strings \
- -Wformat -Wformat-security -fstack-protector -fPIE -D_FORTIFY_SOURCE=2 \
- -Wunreachable-code -Wsign-compare -Wno-endif-labels \
- -g -O2
+ -Wformat -Wformat-security -fPIE \
+ -Wunreachable-code -Wsign-compare -Wno-endif-labels
ifneq ($(EXTRA_CFLAGS),)
CFLAGS += $(EXTRA_CFLAGS)
endif
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -37,12 +37,12 @@
VERSION = 4.3.0
SO_VERSION = 4
SHARED ?= y
-LDFLAGS = -L. -lpthread -z noexecstack -z relro -z now
-CFLAGS = -pthread -I./ -D_GNU_SOURCE \
+LDFLAGS += -L. -lpthread -z noexecstack -z relro -z now
+CFLAGS += -pthread -I./ -D_GNU_SOURCE \
-W -Wall -Wextra -Wstrict-prototypes -Wmissing-prototypes \
-Wmissing-declarations -Wold-style-definition -Wpointer-arith \
-Wcast-qual -Wundef -Wwrite-strings \
- -Wformat -Wformat-security -fstack-protector \
+ -Wformat -Wformat-security \
-Wunreachable-code -Wsign-compare -Wno-endif-labels
ifneq ($(EXTRA_CFLAGS),)
CFLAGS += $(EXTRA_CFLAGS)
@@ -83,9 +83,7 @@
# DEBUG build
ifeq ($(DEBUG),y)
-CFLAGS += -g -ggdb -Og -DDEBUG
-else
-CFLAGS += -g -O2 -D_FORTIFY_SOURCE=2
+CFLAGS += -DDEBUG
endif
# RMID CUSTOM
@@ -114,7 +112,7 @@
endif
HDR = pqos.h
-PREFIX ?= /usr/local
+PREFIX ?= /usr
LIB_INSTALL_DIR ?= $(PREFIX)/lib
HDR_DIR ?= $(PREFIX)/include
DEPFILE = $(LIB).dep
--- a/pqos/Makefile
+++ b/pqos/Makefile
@@ -35,13 +35,13 @@
###############################################################################
LIBDIR ?= ../lib
-LDFLAGS = -L$(LIBDIR) -pie -z noexecstack -z relro -z now
+LDFLAGS += -L$(LIBDIR) -pie -z noexecstack -z relro -z now
LDLIBS = -lpqos -lpthread
-CFLAGS = -I$(LIBDIR) \
+CFLAGS += -I$(LIBDIR) \
-W -Wall -Wextra -Wstrict-prototypes -Wmissing-prototypes \
-Wmissing-declarations -Wold-style-definition -Wpointer-arith \
-Wcast-qual -Wundef -Wwrite-strings \
- -Wformat -Wformat-security -fstack-protector -fPIE \
+ -Wformat -Wformat-security -fPIE \
-Wunreachable-code -Wsign-compare -Wno-endif-labels
ifneq ($(EXTRA_CFLAGS),)
CFLAGS += $(EXTRA_CFLAGS)
@@ -68,9 +68,7 @@
# DEBUG build
ifeq ($(DEBUG),y)
-CFLAGS += -g -ggdb -O0 -DDEBUG
-else
-CFLAGS += -g -O2 -D_FORTIFY_SOURCE=2
+CFLAGS += -DDEBUG
endif
# RMID CUSTOM
@@ -83,7 +81,7 @@
MAN = pqos.8
# XXX: modify as desired
-PREFIX ?= /usr/local
+PREFIX ?= /usr
BIN_DIR = $(PREFIX)/bin
MAN_DIR = $(PREFIX)/man/man8
--- a/rdtset/Makefile
+++ b/rdtset/Makefile
@@ -35,13 +35,13 @@
###############################################################################
LIBDIR ?= ../lib
-LDFLAGS = -L$(LIBDIR) -pie -z noexecstack -z relro -z now
+LDFLAGS += -L$(LIBDIR) -pie -z noexecstack -z relro -z now
LDLIBS = -lpqos -lpthread
-CFLAGS = -I$(LIBDIR) \
+CFLAGS += -I$(LIBDIR) \
-W -Wall -Wextra -Wstrict-prototypes -Wmissing-prototypes \
-Wmissing-declarations -Wold-style-definition -Wpointer-arith \
-Wcast-qual -Wundef -Wwrite-strings \
- -Wformat -Wformat-security -fstack-protector -fPIE \
+ -Wformat -Wformat-security -fPIE \
-Wunreachable-code -Wsign-compare -Wno-endif-labels \
-D_GNU_SOURCE
ifneq ($(EXTRA_CFLAGS),)
@@ -69,9 +69,7 @@
# DEBUG build
ifeq ($(DEBUG),y)
-CFLAGS += -g -ggdb -O0 -DDEBUG
-else
-CFLAGS += -g -O2 -D_FORTIFY_SOURCE=2
+CFLAGS += -DDEBUG
endif
# RMID CUSTOM
@@ -90,7 +88,7 @@
MAN = rdtset.8
# XXX: modify as desired
-PREFIX ?= /usr/local
+PREFIX ?= /usr
BIN_DIR = $(PREFIX)/bin
MAN_DIR = $(PREFIX)/man/man8
--- a/tools/membw/Makefile
+++ b/tools/membw/Makefile
@@ -38,21 +38,19 @@
MAN = membw.8
# XXX: modify as desired
-PREFIX ?= /usr/local
+PREFIX ?= /usr
BIN_DIR = $(PREFIX)/bin
MAN_DIR = $(PREFIX)/man/man8
-CFLAGS=-W -Wall -Wextra -Wstrict-prototypes -Wmissing-prototypes \
+CFLAGS += -W -Wall -Wextra -Wstrict-prototypes -Wmissing-prototypes \
-Wmissing-declarations -Wold-style-definition -Wpointer-arith \
-Wcast-qual -Wundef -Wwrite-strings \
- -Wformat -Wformat-security -fstack-protector -fPIE \
+ -Wformat -Wformat-security -fPIE \
-Wunreachable-code -Wsign-compare -Wno-endif-labels \
- -Winline -msse4.2
+ -Winline
ifeq ($(DEBUG),y)
-CFLAGS += -O0 -g -DDEBUG
-else
-CFLAGS += -O3 -g -D_FORTIFY_SOURCE=2
+CFLAGS += -DDEBUG
endif
HAS_AVX512 := $(shell $(CC) -mavx512f -dM -E - < /dev/null 2> /dev/null | grep -c "AVX512F")
--- a/unit-test/lib/Makefile
+++ b/unit-test/lib/Makefile
@@ -15,18 +15,16 @@
TESTS = $(TESTS_SRCS:%.c=$(BIN_DIR)/%)
-LDFLAGS = -L$(MOCK_DIR) -lpthread -lcmocka -lpqosmock -z noexecstack -z relro -z now
-CFLAGS = -pthread -I$(LIB_DIR) -I$(MOCK_DIR) \
+LDFLAGS += -L$(MOCK_DIR) -lpthread -lcmocka -lpqosmock -z noexecstack -z relro -z now
+CFLAGS += -pthread -I$(LIB_DIR) -I$(MOCK_DIR) \
-D_GNU_SOURCE \
-W -Wall -Wextra -Wstrict-prototypes \
-Wold-style-definition -Wpointer-arith \
-Wcast-qual -Wundef -Wwrite-strings \
- -Wformat -Wformat-security -fstack-protector \
+ -Wformat -Wformat-security \
-Wunreachable-code -Wsign-compare -Wno-endif-labels \
-D'PQOS_LOCAL=' -D'PQOS_API='
-CFLAGS += -g -ggdb -O0
-
all: $(TESTS)
$(OBJ_DIR)/%.o: $(LIB_DIR)/%.c $(OBJ_DIR)/%.d
@@ -528,4 +526,4 @@
clean:
rm -rf $(BIN_DIR)
- rm -rf $(OBJ_DIR)
\ Manca newline alla fine del file
+ rm -rf $(OBJ_DIR)
--- a/unit-test/mock/Makefile
+++ b/unit-test/mock/Makefile
@@ -38,12 +38,12 @@
LIB = libpqosmock
SHARED ?= y
-LDFLAGS = -L. -lpthread -z noexecstack -z relro -z now
-CFLAGS = -pthread -I$(LIB_DIR) -D_GNU_SOURCE \
+LDFLAGS += -L. -lpthread -z noexecstack -z relro -z now
+CFLAGS += -pthread -I$(LIB_DIR) -D_GNU_SOURCE \
-W -Wall -Wextra -Wstrict-prototypes -Wmissing-prototypes \
-Wmissing-declarations -Wold-style-definition -Wpointer-arith \
-Wcast-qual -Wundef -Wwrite-strings \
- -Wformat -Wformat-security -fstack-protector \
+ -Wformat -Wformat-security \
-Wunreachable-code -Wsign-compare -Wno-endif-labels
ifneq ($(EXTRA_CFLAGS),)
CFLAGS += $(EXTRA_CFLAGS)
@@ -82,9 +82,7 @@
# DEBUG build
ifeq ($(DEBUG),y)
-CFLAGS += -g -ggdb -O0 -DDEBUG
-else
-CFLAGS += -g -O2 -D_FORTIFY_SOURCE=2
+CFLAGS += -DDEBUG
endif
# Build targets and dependencies
@@ -155,4 +153,4 @@
.PHONY: clean
clean:
- -rm -f $(CLEAN_OBJS) $(LIB)* $(DEPFILES)
\ Manca newline alla fine del file
+ -rm -f $(CLEAN_OBJS) $(LIB)* $(DEPFILES)

6
sys-apps/intel-cmt-cat/intel-cmt-cat-4.3.0.ebuild
View File

@@ -41,7 +41,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
PATCHES=(
"${FILESDIR}/${PN}-perl-makefile.patch"
"${FILESDIR}/${PN}-do-not-strip.patch"
"${FILESDIR}/${PN}-respect-flags.patch"
"${FILESDIR}/${P}-respect-flags.patch"
)
distutils_enable_tests unittest
@@ -79,7 +79,7 @@ src_install() {
dobin tools/membw/membw
dobin snmp/rdt-agentx.pl
dodoc ChangeLog README
dodoc ChangeLog README.md
docinto membw
dodoc tools/membw/README
docinto pqos
@@ -87,7 +87,7 @@ src_install() {
docinto lib
dodoc lib/README
docinto lib/python
dodoc lib/python/README.txt
dodoc lib/python/README.md
docinto snmp
dodoc snmp/README
docinto rdtset

1
sys-libs/safeclib/Manifest
View File

@@ -1,2 +1 @@
DIST safeclib-3.6.0_p20210407.tar.gz 2281868 BLAKE2B 1690f4ac7504cdd37cd353cd0ddab8d9807a583113a5893fd0633c69b7434c3eecf361ae501570819bb8d75a057c0c861f6c594429162558c73330bcd2c04df5 SHA512 2e21a06b4a423ea7a7782b101ba9f0e8a60efaaec49314360014ebae02d0a02a4275ccecc618560b08dc357b9fbb4c5b220db70012728dbb3815635e8dad16c8
DIST safeclib-3.7.1.tar.xz 539072 BLAKE2B 55e828f2c195325a9a3648f57d1e60a6657289ff03ebe626d5884f41014d747591fd2240286d4060ffc58c368e68464bed49eb34a5d78cdd1e204861ca8425cc SHA512 bf43e3a94855b7b12df6a3c88a534c40297df40259e4930dc1b98117b381c5bfaa2e4f17748e731bb6065c02d47ba98d50e336d60cf60e62d4fa0a6b45de53c1

11
sys-libs/safeclib/files/gh96.patch
View File

@@ -1,11 +0,0 @@
--- a/src/safeclib_private.h
+++ b/src/safeclib_private.h
@@ -52,6 +52,8 @@
/* Needed since the switch to time64_t */
#if defined CONFIG_COMPAT_32BIT_TIME && defined _LINUX_TIME64_H && defined __VDSO_TIME32_H
#define time_t old_time32_t
+#elif defined _LINUX_TIME64_H && !defined __VDSO_TIME32_H
+#define time_t time64_t
#endif
#define RCNEGATE(x) (-(x))

11
sys-libs/safeclib/files/safeclib-3.7.1-stdarg.patch Normal file
View File

@@ -0,0 +1,11 @@
--- a/Kbuild
+++ b/Kbuild
@@ -30,7 +30,7 @@
# Test module definition
obj-m := slkm.o testslkm.o
-ccflags-y := -I$(src)/include -I$(src) -I$(src)/src
+ccflags-y := -I$(src)/include -I$(src) -I$(src)/src -iwithprefix include
# Functions in the kernel that don't have a 1-to-1 name correlation
# __HAVE_ARCH_STRLCPY

106
sys-libs/safeclib/safeclib-3.6.0_p20210407-r2.ebuild
View File

@@ -1,106 +0,0 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
MODULE_OPTIONAL_USE=modules
inherit autotools linux-info linux-mod
MY_REV="986f6d34e49637d68cb41221307231f0ea79ca4d"
DESCRIPTION="safec libc extension with all C11 Annex K functions"
HOMEPAGE="https://github.com/rurban/safeclib"
SRC_URI="https://github.com/rurban/safeclib/archive/${MY_REV}.tar.gz -> ${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
KEYWORDS="~amd64"
IUSE="+constraint-handler doc +extensions modules norm-compat +nullslack test unsafe valgrind"
RESTRICT="!test? ( test )"
PATCHES=( "${FILESDIR}/gh96.patch" )
BDEPEND="
doc? ( app-doc/doxygen[dot] )
valgrind? ( dev-util/valgrind )
"
S="${WORKDIR}/${PN}-${MY_REV}"
MODULE_NAMES="slkm(misc:${S}:${S})"
BUILD_TARGETS="all"
BUILD_PARAMS="-f Makefile.kernel"
pkg_setup() {
if use modules ; then
CONFIG_CHECK="COMPAT_32BIT_TIME"
ERROR_COMPAT_32BIT_TIME="module require COMPAT_32BIT_TIME to build"
fi
linux-mod_pkg_setup
}
src_prepare() {
default
eautoreconf
#duplicate the working folder
#one for the library and one for the module
cd "${WORKDIR}" || die
cp -r "${S}" "${S}-lib" || die
}
src_configure() {
export VARTEXFONTS="${T}/fonts"
if use modules ; then
set_kvobj ko
econf "${myconf[@]}" --disable-wchar
fi
cd "${S}-lib" || die
#forcing wchar because of https://github.com/rurban/safeclib/issues/95
local myconf=(
--disable-static
--disable-valgrind-sgcheck
--enable-shared
--disable-Werror
$(use_enable constraint-handler)
$(use_enable doc)
$(use_enable extensions)
$(use_enable norm-compat)
$(use_enable nullslack)
$(use_enable unsafe)
$(use_enable valgrind)
)
econf "${myconf[@]}" --enable-wchar
}
src_compile() {
if use modules ; then
linux-mod_src_compile
fi
cd "${S}-lib" || die
default
}
src_install() {
if use modules ; then
linux-mod_src_install
fi
cd "${S}-lib" || die
default
einstalldocs
if use doc ; then
dodoc -r doc/.
# wcsstr towupper towlower manpages collide with sys-apps/man-pages
rm "${ED}/usr/share/man/man3/towlower.3" || die
rm "${ED}/usr/share/man/man3/towupper.3" || die
rm "${ED}/usr/share/man/man3/wcsstr.3" || die
fi
}
src_test() {
cd "${S}-lib" || die
emake check
}

108
sys-libs/safeclib/safeclib-3.6.0_p20210407-r3.ebuild
View File

@@ -1,108 +0,0 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
MODULE_OPTIONAL_USE=modules
inherit autotools linux-info linux-mod
MY_REV="986f6d34e49637d68cb41221307231f0ea79ca4d"
DESCRIPTION="safec libc extension with all C11 Annex K functions"
HOMEPAGE="https://github.com/rurban/safeclib"
SRC_URI="https://github.com/rurban/safeclib/archive/${MY_REV}.tar.gz -> ${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
KEYWORDS="~amd64"
IUSE="+constraint-handler doc +extensions modules norm-compat +nullslack test unsafe valgrind"
RESTRICT="!test? ( test )"
PATCHES=( "${FILESDIR}/gh96.patch" )
BDEPEND="
doc? ( app-doc/doxygen[dot] )
valgrind? ( dev-util/valgrind )
"
S="${WORKDIR}/${PN}-${MY_REV}"
MODULE_NAMES="slkm(misc:${S}:${S})"
BUILD_TARGETS="all"
BUILD_PARAMS="-f Makefile.kernel"
pkg_setup() {
if use modules ; then
CONFIG_CHECK="COMPAT_32BIT_TIME"
ERROR_COMPAT_32BIT_TIME="module require COMPAT_32BIT_TIME to build"
fi
linux-mod_pkg_setup
}
src_prepare() {
default
eautoreconf
#duplicate the working folder
#one for the library and one for the module
cd "${WORKDIR}" || die
cp -r "${S}" "${S}-lib" || die
}
src_configure() {
export VARTEXFONTS="${T}/fonts"
if use modules ; then
set_kvobj ko
econf "${myconf[@]}" --disable-wchar
fi
cd "${S}-lib" || die
#forcing wchar because of https://github.com/rurban/safeclib/issues/95
local myconf=(
--disable-static
--disable-valgrind-sgcheck
--enable-shared
--disable-Werror
$(use_enable constraint-handler)
$(use_enable doc)
$(use_enable extensions)
$(use_enable norm-compat)
$(use_enable nullslack)
$(use_enable unsafe)
$(use_enable valgrind)
)
econf "${myconf[@]}" --enable-wchar
}
src_compile() {
if use modules ; then
linux-mod_src_compile
fi
cd "${S}-lib" || die
default
}
src_install() {
if use modules ; then
linux-mod_src_install
fi
cd "${S}-lib" || die
default
einstalldocs
if use doc ; then
rm -rf doc/man || die
dodoc -r doc/.
docompress -x "/usr/share/doc/${PF}/html"
# wcsstr towupper towlower manpages collide with sys-apps/man-pages
rm "${ED}/usr/share/man/man3/towlower.3" || die
rm "${ED}/usr/share/man/man3/towupper.3" || die
rm "${ED}/usr/share/man/man3/wcsstr.3" || die
fi
}
src_test() {
cd "${S}-lib" || die
emake check
}

6
sys-libs/safeclib/safeclib-3.7.1.ebuild → sys-libs/safeclib/safeclib-3.7.1-r1.ebuild
View File

@@ -22,9 +22,11 @@ BDEPEND="
valgrind? ( dev-util/valgrind )
"
PATCHES=( "${FILESDIR}/${P}-stdarg.patch" )
MODULE_NAMES="slkm(misc:${S}:${S})"
BUILD_TARGETS="all"
BUILD_PARAMS="-f Makefile.kernel"
BUILD_PARAMS="-f Makefile.kernel V=1"
pkg_setup() {
if use modules ; then
@@ -64,7 +66,7 @@ src_configure() {
if use modules ; then
set_kvobj ko
econf "${myconf[@]}" --disable-wchar
ECONF_PARAMS="${myconf[@]} --disable-wchar"
fi
cd "${S}-lib" || die