Sync with portage [Wed Nov 25 13:46:35 MSK 2020].

master
Calculate Linux 4 years ago
parent 85c58bad93
commit 5d0e909970

@ -1,23 +1,23 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512
MANIFEST Manifest.files.gz 29267 BLAKE2B a91acb3a1e15a4474decbbbdc9d46d848612a2d2da199b106bf1b6afb73a6037edd1ccc7d2d8ec8ef0fa2813e3ca3a0549f28fa3a0784a5dfd3f371f4489a883 SHA512 5dd095a622f7a1fc4757116ea30fab3ee08543d2344437fa9aa5873be17aca4e0033bf2a2d9fe666112a80775cf7c09b2384025372a00b82aa234641520e1b2e
TIMESTAMP 2020-11-24T04:08:38Z
MANIFEST Manifest.files.gz 29292 BLAKE2B cbbd0a18d4bafa0a0f40ea9f63ae048962f2e20554b2424b3ea9dc88ea7dd04b419bddf28c8203842a2454b1d756edc093b18fdbd21ee1123f7acf05040ce9d7 SHA512 05b085a0bad664c42c4a7fb0d9cecd37ea603729f3f631e4317c3f1c78ce4a0719a20fc72d2066288a804b8022e35ce1ade60abc8ecbae33cd68f2b851c477dd
TIMESTAMP 2020-11-25T10:08:34Z
-----BEGIN PGP SIGNATURE-----
iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAl+8h0ZfFIAAAAAALgAo
iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAl++LSJfFIAAAAAALgAo
aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
klCIrA//evrryb9AHpbD1T0107SLow1qVxYB3IAzz3jIvx4lAdctmjK2h/6t+oND
Pv9MzboI6CHVV1SrnAkE6DeTmHLTUAzBhL/G7+lBa2772ViMa4whv7gXaVKPRuH8
vTvvLDdOUUYpxNyXfYobngZbpiObhPmuRmAD+LE+yP9O5oUiHpWTVeRHazNr+UjF
Y/i6mxcepHUoDIAP12MbfRAN4r/3JUBJiKE+xGK2QRPXwyy+h1CcSCRnxM9XeqJh
gPxLaCEV3/j8NF070+IahjMzFlFGb0MNWy3+0gkWen669YvSmG8F6VCB29N2mYUp
/rNsUHTJLGCl7ZOEYU6zyuGE7xU+QrGYzAgeYyce8RBVNu7G2LxkgNEW+iCMgg9v
xnXq3VzYAfY2VFopnlZkeh+q7cOSfEJt6ABv/e5VF6dy/LTjxoFL1WQfbNLCR7mv
7gPdW+Ia4U0Rq9ZOmgS5AxWTF01AeM4q7wwm6jGcdauKojNXZTUbhjAWIoGhhEaS
D4uHNiWUycs5D2NmDWuYyoQlKHENH85hdgBCTjoCmUkumiFcZoPjo4vYQ2okcLz6
47xrcMKCh6kw3O/u4Ogibx/VzeP451rs5ZKDDlK94DbkHhqbTl1pupNiitekWoyS
/EmnmgR2WcP7Z7yKSDmgAKBM/TdQiAtRP7UdG3qg7jRvZdfSVB4=
=0F6S
klBCvw//fyCr/N/2Cwp4ATOuTznbuRf5Bi+fqNsiehVAlK6vQ2bj944BX3c6YiAD
+xl7vI/Q5jC0F2zWpjg5RbH2C4C6AjZJ4K+yfi80YFBtcb+fzkU23n5Q8nc4QB+J
ejqzjQ0xCJJa3st+1Gznbx72EYdZhbfa+M49Uh9S3uYUAahdetUK0BLuXpNt9c02
ZIZjS1ys0sQTUUPf+O25BPivTixvHosD9KKOnX1VSfuQXU5iXhwe8S4EcOmwO56F
ie8ftGd/O1lCIP37ggwgUWU2nwejkLjBT0JhEFoft0SXJtLzC6TjsK7DGz7iFew8
iouA+tn1ShHYunUhQY7xoO3bCaWKKqKkNmjkcSOnh8W9o506hiR6UkYXQjdgxFvF
NDFSZ8KTnZ3TWq37/XqwyAe8HT50N7nl+BFLLjQpyfy1hP3xKz255/GdR41YgstF
Owixc52vzyu60N1k5KT+qddyB/+/qOXWIVxUrL2al4IspQb7FAnDD+9e6UX3cJ5/
oBudvkwt9966bYUAQj3nlPi2/k+0sXAgjDO0KTNE36MDbo6zFHZbLH7I5K+s/eVn
5kzEiyA0k1JzQtBremiNTUagLXSvT3HJngPU4DHP22ncd8IqMZFfR7kTryIxdtZK
3x+Su/I89at6EZTmdoAHkg79w6mCrSTXbKfewFasLomaAuj4GJQ=
=kiew
-----END PGP SIGNATURE-----

Binary file not shown.

Binary file not shown.

@ -1,3 +1,5 @@
DIST Bitwarden-1.22.2-amd64.deb 47983282 BLAKE2B f84bdfb44803fc13292b4fdd8653a9217efcfea08ed58407929d3061bce436727f1ec86ff99e6b968de17510ddb0aaeb2781beaae198661d30496050db90cf3f SHA512 131e49ef2dc74b601e31eb6a07da92ae43747c4fdf4729b84fb35f95c4bc38731e6b6f9185b919ede5c7c2cd4813dbddaea172d1287cd60f747b3032e12c09e9
DIST Bitwarden-1.23.0-amd64.deb 47990216 BLAKE2B 7383c4b2b4b0c60bc78abdbb333846ed12d00025d90a6b2c49c177ffe53046652c4e8e4738a6d25495e087c38835ae03131a2f332cf9afaa0c00a613ea5e1349 SHA512 f23f8ba987308a2753fa8fc9450f01abcc49f2917d9a9f5feb64540ba0640630cd757a88d8aa3caad2a5f5383f8fdaac7845f59b33966dcc8ac6fec3cc3618c7
EBUILD bitwarden-desktop-bin-1.22.2.ebuild 1464 BLAKE2B 0521f369c01aca63eb2c1115daba08af89e556ba02fef56eef527be668d980ef12513e755493056a3563ede87393118e8890d13820707d7ca6364a66e1d17c85 SHA512 245c57f1026a8d3e863cf4c61c1f9d1b0b466f82285c964e29d8e4ce37643fd65d14f72c03ecf2c2d21795008d290acf391f35612038b70479e38ba7d8f052b6
EBUILD bitwarden-desktop-bin-1.23.0.ebuild 1485 BLAKE2B dc6de23e0c4138771e6c17d509b36041f1d780179003dabdd3034981ce869aa84e7bb3137464468a0a26b8619045273a8babbc36034a55978686fe287cb4c752 SHA512 a6fdc2dbefba14548cc9582e7c0848b22ec9bed551457bf4bc2950c498410cbfde31f18e144db975fe78641744a95af5a029f2e945266a8672e79d9caaa374c8
MISC metadata.xml 303 BLAKE2B d92d9a59d759d67d5c87577ad1b8255f016f1228044100ba18d6ec73a7ca054ca0403399d677f2470a782721e7179d693860eb2c52a35cace59e58348d38df93 SHA512 81073a2078b481982c3beffcb76a84e19521e4bc6255095848e5479fc13c5a60b8a0d861156b02ff26c80529111dade666758e22a341ba8a31f9a89304a215c1

@ -0,0 +1,78 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
inherit unpacker xdg-utils
MY_PN="Bitwarden"
DESCRIPTION="Bitwarden password manager desktop client"
HOMEPAGE="https://bitwarden.com/"
SRC_URI="https://github.com/bitwarden/desktop/releases/download/v${PV}/Bitwarden-${PV}-amd64.deb"
LICENSE="GPL-3"
SLOT="0"
KEYWORDS="~amd64"
IUSE=""
RDEPEND="
app-accessibility/at-spi2-atk:2
app-accessibility/at-spi2-core:2
app-crypt/libsecret
dev-libs/atk
dev-libs/expat
dev-libs/glib
dev-libs/nspr
dev-libs/nss
media-libs/alsa-lib
net-print/cups
sys-apps/dbus
sys-apps/util-linux
x11-libs/cairo
x11-libs/gdk-pixbuf:2
x11-libs/gtk+:3
x11-libs/libX11
x11-libs/libxcb
x11-libs/libXcomposite
x11-libs/libXcursor
x11-libs/libXdamage
x11-libs/libXext
x11-libs/libXfixes
x11-libs/libXi
x11-libs/libXrandr
x11-libs/libXrender
x11-libs/libXScrnSaver
x11-libs/libXtst
x11-libs/pango
"
S="${WORKDIR}"
QA_PREBUILT="
opt/Bitwarden/*.so
opt/Bitwarden/bitwarden
opt/Bitwarden/chrome-sandbox
"
src_install() {
insinto /opt
doins -r opt/${MY_PN}
fperms 755 /opt/Bitwarden/bitwarden
fperms 4755 /opt/Bitwarden/chrome-sandbox
insinto /usr/share/applications
doins usr/share/applications/bitwarden.desktop
insinto /usr/share/icons
doins -r usr/share/icons/hicolor
}
pkg_postinst() {
xdg_desktop_database_update
xdg_icon_cache_update
}
pkg_postrm() {
xdg_desktop_database_update
xdg_icon_cache_update
}

@ -1,8 +1,6 @@
AUX sudo-1.9.2-glibc-2.32.patch 10057 BLAKE2B 2027bbef7db5f4a523959e9456ebe625028f55607a22869bcc7deb9ec3787d28d3955fc0a0670976c557f070fa31a56bb167d1c6618f955163a240f852c5a4f6 SHA512 de7147130e923ce083637231f5e5a6dcf41cdd1a2bf901754b573239898d144938ebaaa55a8b1cd44138f313bfa59de6b8eac5d18ecb7c61e501dc0213f144b6
DIST sudo-1.9.2.tar.gz 3890859 BLAKE2B 879917b8045c999a17ef36006732509aa546ee6bb04de77191fb637aa0420d54f9e51ec69b697c22119d638393e9c84efcc1ca5e6e8ee5f0c08bb1ca07f3acea SHA512 20afdf2604b1c93395157382b24f225cd1ff88d3a892362e2d69fecd240c4e7171f05032c08be1778cd1dea6e460025e4241f57272fac0ea3550e220b6d73d21
DIST sudo-1.9.3p1.tar.gz 3958071 BLAKE2B b681c120faa5dc7f25e27c1be423d68cea70f63dcdfea2183fd386a34dec0376555453399d3f8886c66c6507343648d40b59a058710432154061b210df2a704c SHA512 3ad13fd03e5b371fd6bf7909731ffc11431d2182a744b654f7e5d4b810e47955d49bc78f551afe13ec56acbce694139c33a15bc022cea41b17af5496b8b7f89f
EBUILD sudo-1.9.2-r1.ebuild 7013 BLAKE2B db8445fef0e42c472efeae9210c773b89145b2a578a6705ab77b8dcfe56ce976e5f0a747bb3884dbd8741facc6ba7051517315a644cfbfc01a90958b271e336e SHA512 e76ff722a7dea45b23f7144fce001c05ce1fa12348ca8ec0e586160b69dacc99e9bc8b877962b525b94255517f7d1d862590e1a73cd436791f7b8985dc17a7a8
EBUILD sudo-1.9.2.ebuild 6922 BLAKE2B ca1543dde3d569c92ea36d494ac8c11eb9c6fccfaf1c34696cbf7e37e8f88009c9805fccf658423fe6898493289383d3dfb1562a6a99e8f17fab9b4d7e84c76c SHA512 8559891753c2ee5679edefffb878a21be2c861fd07427a760d79e6aecbfa0cabba3a8ab8a1bcd56b5c1e1ca5d454c657360ef00ad1de9f0c868d32627a3a9ddc
DIST sudo-1.9.4rc1.tar.gz 3990112 BLAKE2B f08f5651c6688bcf9ebaf95fcadeb5a78e7f78201d1d67fb9808b950df1f882b80b162acb79ee37c2b786045286202746fcb82c4659d57cafdfe74d4da79e86e SHA512 cf745dd1f798097fff38b6c74e9446005e589990b3580ba42e1af6bd68fbf084d6da836795a83f5222274ffff305a0899aae103723e68fd1c0ccaee7f16a477a
EBUILD sudo-1.9.3_p1.ebuild 6892 BLAKE2B 3ad32318e45533045e40e7d4ad282b5a218c9531d98dda7a6d92bc0568ee874e020f4497811e7e2dad677d8d14962d2e5aadb014d5d1e01a4559fda16867e39f SHA512 34803aae1dd4a8aaa696b7b4c72d69d9dbe08a25072aac9b8a2a3f9e47eed84a9273c2cc6f1c496477a88b8df74e5587cf8761906970d574ea140fd0a41ca639
EBUILD sudo-1.9.4_rc1.ebuild 6901 BLAKE2B 57b94080303df4d32651aab3cd4be8601f59ff13138eb6b8941854255942422d338e47047ff98b1ec9c86863e77f2e1b36901ed001daf715f23b15ae65264709 SHA512 ecb146a12fe3ea3d32ef237e0e67a99d3eadd6ad99997c327eb31027b0f45aa6dbed9dec03ed5c39c62ddd1131762fdc708899e76b2a867416dc0997c1f0727e
EBUILD sudo-9999.ebuild 6901 BLAKE2B 57b94080303df4d32651aab3cd4be8601f59ff13138eb6b8941854255942422d338e47047ff98b1ec9c86863e77f2e1b36901ed001daf715f23b15ae65264709 SHA512 ecb146a12fe3ea3d32ef237e0e67a99d3eadd6ad99997c327eb31027b0f45aa6dbed9dec03ed5c39c62ddd1131762fdc708899e76b2a867416dc0997c1f0727e
MISC metadata.xml 1161 BLAKE2B 0c501bf06edca82993ece857f9f7565f99da15df36c916bc9dc57e78bccf2b247c382e97dd6c97cc7f5375e1a0513c1a30ecbf097516e96319fd1797257fb117 SHA512 d6bc9cf11ea1bd28c19bfe167580556af517d92c958d63cd7872ab5076840eca39a7ab3d1f56e84fc0fcfb675d7a89c23ccdd3629f665c45232be1140eb950ac

@ -1,308 +0,0 @@
# HG changeset patch
# User Todd C. Miller <Todd.Miller@sudo.ws>
# Date 1598395693 21600
# Node ID e30482f26924b07775d87ae591e54ad72e794d5e
# Parent 1ede927d99b3cb06ba514c9fd2fd7fa9a014a1b2
Use sigabbrev_np(3) to access signal abbreviations if supported.
glibc-2.32 has removed sys_sigabbrev[], we can use sigabbrev_np(3) instead.
diff -r 1ede927d99b3 -r e30482f26924 config.h.in
--- a/config.h.in Mon Aug 17 19:37:09 2020 -0600
+++ b/config.h.in Tue Aug 25 16:48:13 2020 -0600
@@ -740,6 +740,9 @@
/* Define to 1 if you have the `sig2str' function. */
#undef HAVE_SIG2STR
+/* Define to 1 if you have the `sigabbrev_np' function. */
+#undef HAVE_SIGABBREV_NP
+
/* Define to 1 if you use S/Key. */
#undef HAVE_SKEY
diff -r 1ede927d99b3 -r e30482f26924 configure
--- a/configure Mon Aug 17 19:37:09 2020 -0600
+++ b/configure Tue Aug 25 16:48:13 2020 -0600
@@ -23687,9 +23687,21 @@
if test x"${ac_cv_func_sig2str}${ac_cv_func_str2sig}" != x"yesyes"; then
- COMPAT_TEST_PROGS="${COMPAT_TEST_PROGS}${COMPAT_TEST_PROGS+ }strsig_test"
- HAVE_SIGNAME="false"
- ac_fn_c_check_decl "$LINENO" "sys_signame" "ac_cv_have_decl_sys_signame" "
+ for ac_func in sigabbrev_np
+do :
+ ac_fn_c_check_func "$LINENO" "sigabbrev_np" "ac_cv_func_sigabbrev_np"
+if test "x$ac_cv_func_sigabbrev_np" = xyes; then :
+ cat >>confdefs.h <<_ACEOF
+#define HAVE_SIGABBREV_NP 1
+_ACEOF
+
+fi
+done
+
+ if test x"${ac_cv_func_sigabbrev_np}" != x"yes"; then
+ COMPAT_TEST_PROGS="${COMPAT_TEST_PROGS}${COMPAT_TEST_PROGS+ }strsig_test"
+ HAVE_SIGNAME="false"
+ ac_fn_c_check_decl "$LINENO" "sys_signame" "ac_cv_have_decl_sys_signame" "
$ac_includes_default
#include <signal.h>
@@ -23705,7 +23717,7 @@
_ACEOF
if test $ac_have_decl = 1; then :
- HAVE_SIGNAME="true"
+ HAVE_SIGNAME="true"
fi
ac_fn_c_check_decl "$LINENO" "_sys_signame" "ac_cv_have_decl__sys_signame" "
@@ -23724,7 +23736,7 @@
_ACEOF
if test $ac_have_decl = 1; then :
- HAVE_SIGNAME="true"
+ HAVE_SIGNAME="true"
fi
ac_fn_c_check_decl "$LINENO" "sys_sigabbrev" "ac_cv_have_decl_sys_sigabbrev" "
@@ -23743,12 +23755,12 @@
_ACEOF
if test $ac_have_decl = 1; then :
- HAVE_SIGNAME="true"
-
-fi
-
- if test "$HAVE_SIGNAME" != "true"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for undeclared sys_sigabbrev" >&5
+ HAVE_SIGNAME="true"
+
+fi
+
+ if test "$HAVE_SIGNAME" != "true"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for undeclared sys_sigabbrev" >&5
$as_echo_n "checking for undeclared sys_sigabbrev... " >&6; }
if ${sudo_cv_var_sys_sigabbrev+:} false; then :
$as_echo_n "(cached) " >&6
@@ -23777,17 +23789,18 @@
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sudo_cv_var_sys_sigabbrev" >&5
$as_echo "$sudo_cv_var_sys_sigabbrev" >&6; }
- if test "$sudo_cv_var_sys_sigabbrev" = yes; then
- $as_echo "#define HAVE_SYS_SIGABBREV 1" >>confdefs.h
-
- else
- case " $LIBOBJS " in
+ if test "$sudo_cv_var_sys_sigabbrev" = yes; then
+ $as_echo "#define HAVE_SYS_SIGABBREV 1" >>confdefs.h
+
+ else
+ case " $LIBOBJS " in
*" signame.$ac_objext "* ) ;;
*) LIBOBJS="$LIBOBJS signame.$ac_objext"
;;
esac
- SIGNAME=signame.lo
+ SIGNAME=signame.lo
+ fi
fi
fi
fi
diff -r 1ede927d99b3 -r e30482f26924 configure.ac
--- a/configure.ac Mon Aug 17 19:37:09 2020 -0600
+++ b/configure.ac Tue Aug 25 16:48:13 2020 -0600
@@ -3498,29 +3498,32 @@
dnl Also enable unit tests for sig2str() and str2sig().
dnl
if test x"${ac_cv_func_sig2str}${ac_cv_func_str2sig}" != x"yesyes"; then
- COMPAT_TEST_PROGS="${COMPAT_TEST_PROGS}${COMPAT_TEST_PROGS+ }strsig_test"
- HAVE_SIGNAME="false"
- AC_CHECK_DECLS([sys_signame, _sys_signame, sys_sigabbrev], [
- HAVE_SIGNAME="true"
- ], [ ], [
+ AC_CHECK_FUNCS([sigabbrev_np])
+ if test x"${ac_cv_func_sigabbrev_np}" != x"yes"; then
+ COMPAT_TEST_PROGS="${COMPAT_TEST_PROGS}${COMPAT_TEST_PROGS+ }strsig_test"
+ HAVE_SIGNAME="false"
+ AC_CHECK_DECLS([sys_signame, _sys_signame, sys_sigabbrev], [
+ HAVE_SIGNAME="true"
+ ], [ ], [
AC_INCLUDES_DEFAULT
#include <signal.h>
- ])
- if test "$HAVE_SIGNAME" != "true"; then
- AC_CACHE_CHECK([for undeclared sys_sigabbrev],
- [sudo_cv_var_sys_sigabbrev],
- [AC_LINK_IFELSE(
- [AC_LANG_PROGRAM([[extern char **sys_sigabbrev;]], [[return sys_sigabbrev[1];]])],
- [sudo_cv_var_sys_sigabbrev=yes],
- [sudo_cv_var_sys_sigabbrev=no]
- )
- ]
- )
- if test "$sudo_cv_var_sys_sigabbrev" = yes; then
- AC_DEFINE(HAVE_SYS_SIGABBREV)
- else
- AC_LIBOBJ(signame)
- SIGNAME=signame.lo
+ ])
+ if test "$HAVE_SIGNAME" != "true"; then
+ AC_CACHE_CHECK([for undeclared sys_sigabbrev],
+ [sudo_cv_var_sys_sigabbrev],
+ [AC_LINK_IFELSE(
+ [AC_LANG_PROGRAM([[extern char **sys_sigabbrev;]], [[return sys_sigabbrev[1];]])],
+ [sudo_cv_var_sys_sigabbrev=yes],
+ [sudo_cv_var_sys_sigabbrev=no]
+ )
+ ]
+ )
+ if test "$sudo_cv_var_sys_sigabbrev" = yes; then
+ AC_DEFINE(HAVE_SYS_SIGABBREV)
+ else
+ AC_LIBOBJ(signame)
+ SIGNAME=signame.lo
+ fi
fi
fi
fi
diff -r 1ede927d99b3 -r e30482f26924 lib/util/sig2str.c
--- a/lib/util/sig2str.c Mon Aug 17 19:37:09 2020 -0600
+++ b/lib/util/sig2str.c Tue Aug 25 16:48:13 2020 -0600
@@ -1,7 +1,7 @@
/*
* SPDX-License-Identifier: ISC
*
- * Copyright (c) 2012-2015, 2017-2019 Todd C. Miller <Todd.Miller@sudo.ws>
+ * Copyright (c) 2012-2015, 2017-2020 Todd C. Miller <Todd.Miller@sudo.ws>
*
* Permission to use, copy, modify, and distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
@@ -32,20 +32,24 @@
#include <unistd.h>
#include "sudo_compat.h"
+#include "sudo_util.h"
-#if defined(HAVE_DECL_SYS_SIGNAME) && HAVE_DECL_SYS_SIGNAME == 1
-# define sudo_sys_signame sys_signame
-#elif defined(HAVE_DECL__SYS_SIGNAME) && HAVE_DECL__SYS_SIGNAME == 1
-# define sudo_sys_signame _sys_signame
-#elif defined(HAVE_DECL_SYS_SIGABBREV) && HAVE_DECL_SYS_SIGABBREV == 1
-# define sudo_sys_signame sys_sigabbrev
-#else
-# ifdef HAVE_SYS_SIGABBREV
- /* sys_sigabbrev is not declared by glibc */
-# define sudo_sys_signame sys_sigabbrev
+#if !defined(HAVE_SIGABBREV_NP)
+# if defined(HAVE_DECL_SYS_SIGNAME) && HAVE_DECL_SYS_SIGNAME == 1
+# define sigabbrev_np(_x) sys_signame[(_x)]
+# elif defined(HAVE_DECL__SYS_SIGNAME) && HAVE_DECL__SYS_SIGNAME == 1
+# define sigabbrev_np(_x) _sys_signame[(_x)]
+# elif defined(HAVE_SYS_SIGABBREV)
+# define sigabbrev_np(_x) sys_sigabbrev[(_x)]
+# if defined(HAVE_DECL_SYS_SIGABBREV) && HAVE_DECL_SYS_SIGABBREV == 0
+ /* sys_sigabbrev is not declared by glibc */
+ extern const char *const sys_sigabbrev[NSIG];
+# endif
+# else
+# define sigabbrev_np(_x) sudo_sys_signame[(_x)]
+ extern const char *const sudo_sys_signame[NSIG];
# endif
-extern const char *const sudo_sys_signame[NSIG];
-#endif
+#endif /* !HAVE_SIGABBREV_NP */
/*
* Translate signal number to name.
@@ -77,15 +81,18 @@
return 0;
}
#endif
- if (signo > 0 && signo < NSIG && sudo_sys_signame[signo] != NULL) {
- strlcpy(signame, sudo_sys_signame[signo], SIG2STR_MAX);
- /* Make sure we always return an upper case signame. */
- if (islower((unsigned char)signame[0])) {
- int i;
- for (i = 0; signame[i] != '\0'; i++)
- signame[i] = toupper((unsigned char)signame[i]);
+ if (signo > 0 && signo < NSIG) {
+ const char *cp = sigabbrev_np(signo);
+ if (cp != NULL) {
+ strlcpy(signame, cp, SIG2STR_MAX);
+ /* Make sure we always return an upper case signame. */
+ if (islower((unsigned char)signame[0])) {
+ int i;
+ for (i = 0; signame[i] != '\0'; i++)
+ signame[i] = toupper((unsigned char)signame[i]);
+ }
+ return 0;
}
- return 0;
}
errno = EINVAL;
return -1;
diff -r 1ede927d99b3 -r e30482f26924 lib/util/str2sig.c
--- a/lib/util/str2sig.c Mon Aug 17 19:37:09 2020 -0600
+++ b/lib/util/str2sig.c Tue Aug 25 16:48:13 2020 -0600
@@ -1,7 +1,7 @@
/*
* SPDX-License-Identifier: ISC
*
- * Copyright (c) 2019 Todd C. Miller <Todd.Miller@sudo.ws>
+ * Copyright (c) 2019-2020 Todd C. Miller <Todd.Miller@sudo.ws>
*
* Permission to use, copy, modify, and distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
@@ -37,19 +37,22 @@
#include "sudo_compat.h"
#include "sudo_util.h"
-#if defined(HAVE_DECL_SYS_SIGNAME) && HAVE_DECL_SYS_SIGNAME == 1
-# define sudo_sys_signame sys_signame
-#elif defined(HAVE_DECL__SYS_SIGNAME) && HAVE_DECL__SYS_SIGNAME == 1
-# define sudo_sys_signame _sys_signame
-#elif defined(HAVE_DECL_SYS_SIGABBREV) && HAVE_DECL_SYS_SIGABBREV == 1
-# define sudo_sys_signame sys_sigabbrev
-#else
-# ifdef HAVE_SYS_SIGABBREV
- /* sys_sigabbrev is not declared by glibc */
-# define sudo_sys_signame sys_sigabbrev
+#if !defined(HAVE_SIGABBREV_NP)
+# if defined(HAVE_DECL_SYS_SIGNAME) && HAVE_DECL_SYS_SIGNAME == 1
+# define sigabbrev_np(_x) sys_signame[(_x)]
+# elif defined(HAVE_DECL__SYS_SIGNAME) && HAVE_DECL__SYS_SIGNAME == 1
+# define sigabbrev_np(_x) _sys_signame[(_x)]
+# elif defined(HAVE_SYS_SIGABBREV)
+# define sigabbrev_np(_x) sys_sigabbrev[(_x)]
+# if defined(HAVE_DECL_SYS_SIGABBREV) && HAVE_DECL_SYS_SIGABBREV == 0
+ /* sys_sigabbrev is not declared by glibc */
+ extern const char *const sys_sigabbrev[NSIG];
+# endif
+# else
+# define sigabbrev_np(_x) sudo_sys_signame[(_x)]
+ extern const char *const sudo_sys_signame[NSIG];
# endif
-extern const char *const sudo_sys_signame[NSIG];
-#endif
+#endif /* !HAVE_SIGABBREV_NP */
/*
* Many systems use aliases for source backward compatibility.
@@ -154,11 +157,11 @@
}
}
- /* Check sys_signame[]. */
for (signo = 1; signo < NSIG; signo++) {
- if (sudo_sys_signame[signo] != NULL) {
+ const char *cp = sigabbrev_np(signo);
+ if (cp != NULL) {
/* On macOS sys_signame[] may contain lower-case names. */
- if (strcasecmp(signame, sudo_sys_signame[signo]) == 0) {
+ if (strcasecmp(signame, cp) == 0) {
*result = signo;
return 0;
}

@ -1,263 +0,0 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
inherit pam multilib libtool systemd tmpfiles
MY_P="${P/_/}"
MY_P="${MY_P/beta/b}"
DESCRIPTION="Allows users or groups to run commands as other users"
HOMEPAGE="https://www.sudo.ws/"
if [[ ${PV} == "9999" ]] ; then
inherit mercurial
EHG_REPO_URI="https://www.sudo.ws/repos/sudo"
else
uri_prefix=
case ${P} in
*_beta*|*_rc*) uri_prefix=beta/ ;;
esac
SRC_URI="https://www.sudo.ws/sudo/dist/${uri_prefix}${MY_P}.tar.gz
ftp://ftp.sudo.ws/pub/sudo/${uri_prefix}${MY_P}.tar.gz"
if [[ ${PV} != *_beta* ]] && [[ ${PV} != *_rc* ]] ; then
KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~sparc-solaris"
fi
fi
# Basic license is ISC-style as-is, some files are released under
# 3-clause BSD license
LICENSE="ISC BSD"
SLOT="0"
IUSE="gcrypt ldap libressl nls offensive pam sasl +secure-path selinux +sendmail skey ssl sssd"
DEPEND="
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] )
"
RDEPEND="
${DEPEND}
>=app-misc/editor-wrapper-3
virtual/editor
ldap? ( dev-lang/perl )
pam? ( sys-auth/pambase )
selinux? ( sec-policy/selinux-sudo )
sendmail? ( virtual/mta )
"
BDEPEND="
sys-devel/bison
virtual/pkgconfig
"
S="${WORKDIR}/${MY_P}"
REQUIRED_USE="
pam? ( !skey )
skey? ( !pam )
"
REQUIRED_USE="?? ( gcrypt ssl )"
MAKEOPTS+=" SAMPLES="
src_prepare() {
default
elibtoolize
}
set_secure_path() {
# FIXME: secure_path is a compile time setting. using PATH or
# ROOTPATH is not perfect, env-update may invalidate this, but until it
# is available as a sudoers setting this will have to do.
einfo "Setting secure_path ..."
# first extract the default ROOTPATH from build env
SECURE_PATH=$(unset ROOTPATH; . "${EPREFIX}"/etc/profile.env;
echo "${ROOTPATH}")
case "${SECURE_PATH}" in
*/usr/sbin*) ;;
*) SECURE_PATH=$(unset PATH;
. "${EPREFIX}"/etc/profile.env; echo "${PATH}")
;;
esac
if [[ -z ${SECURE_PATH} ]] ; then
ewarn " Failed to detect SECURE_PATH, please report this"
fi
# then remove duplicate path entries
cleanpath() {
local newpath thisp IFS=:
for thisp in $1 ; do
if [[ :${newpath}: != *:${thisp}:* ]] ; then
newpath+=:${thisp}
else
einfo " Duplicate entry ${thisp} removed..."
fi
done
SECURE_PATH=${newpath#:}
}
cleanpath /bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:/opt/bin${SECURE_PATH:+:${SECURE_PATH}}
# finally, strip gcc paths #136027
rmpath() {
local e newpath thisp IFS=:
for thisp in ${SECURE_PATH} ; do
for e ; do [[ ${thisp} == ${e} ]] && continue 2 ; done
newpath+=:${thisp}
done
SECURE_PATH=${newpath#:}
}
rmpath '*/gcc-bin/*' '*/gnat-gcc-bin/*' '*/gnat-gcc/*'
einfo "... done"
}
src_configure() {
local SECURE_PATH
set_secure_path
# audit: somebody got to explain me how I can test this before I
# enable it.. - Diego
# plugindir: autoconf code is crappy and does not delay evaluation
# until `make` time, so we have to use a full path here rather than
# basing off other values.
myeconfargs=(
# requires some python eclass
--disable-python
--enable-tmpfiles.d="${EPREFIX}"/usr/lib/tmpfiles.d
--enable-zlib=system
--with-editor="${EPREFIX}"/usr/libexec/editor
--with-env-editor
--with-plugindir="${EPREFIX}"/usr/$(get_libdir)/sudo
--with-rundir="${EPREFIX}"/run/sudo
--with-vardir="${EPREFIX}"/var/db/sudo
--without-linux-audit
--without-opie
$(use_enable gcrypt)
$(use_enable nls)
$(use_enable sasl)
$(use_enable ssl openssl)
$(use_with ldap)
$(use_with ldap ldap_conf_file /etc/ldap.conf.sudo)
$(use_with offensive insults)
$(use_with offensive all-insults)
$(use_with pam)
$(use_with pam pam-login)
$(use_with secure-path secure-path "${SECURE_PATH}")
$(use_with selinux)
$(use_with sendmail)
$(use_with skey)
$(use_with sssd)
)
econf "${myeconfargs[@]}"
}
src_install() {
default
if use ldap ; then
dodoc README.LDAP
cat <<-EOF > "${T}"/ldap.conf.sudo
# See ldap.conf(5) and README.LDAP for details
# This file should only be readable by root
# supported directives: host, port, ssl, ldap_version
# uri, binddn, bindpw, sudoers_base, sudoers_debug
# tls_{checkpeer,cacertfile,cacertdir,randfile,ciphers,cert,key}
EOF
if use sasl ; then
cat <<-EOF >> "${T}"/ldap.conf.sudo
# SASL directives: use_sasl, sasl_mech, sasl_auth_id
# sasl_secprops, rootuse_sasl, rootsasl_auth_id, krb5_ccname
EOF
fi
insinto /etc
doins "${T}"/ldap.conf.sudo
fperms 0440 /etc/ldap.conf.sudo
insinto /etc/openldap/schema
newins doc/schema.OpenLDAP sudo.schema
fi
pamd_mimic system-auth sudo auth account session
pamd_mimic system-auth sudo-i auth account session
keepdir /var/db/sudo/lectured
fperms 0700 /var/db/sudo/lectured
fperms 0711 /var/db/sudo #652958
# Don't install into /run as that is a tmpfs most of the time
# (bug #504854)
rm -rf "${ED}"/run || die
find "${ED}" -type f -name "*.la" -delete || die #697812
}
pkg_postinst() {
tmpfiles_process sudo.conf
#652958
local sudo_db="${EROOT}/var/db/sudo"
if [[ "$(stat -c %a "${sudo_db}")" -ne 711 ]] ; then
chmod 711 "${sudo_db}" || die
fi
if use ldap ; then
ewarn
ewarn "sudo uses the /etc/ldap.conf.sudo file for ldap configuration."
ewarn
if grep -qs '^[[:space:]]*sudoers:' "${ROOT}"/etc/nsswitch.conf ; then
ewarn "In 1.7 series, LDAP is no more consulted, unless explicitly"
ewarn "configured in /etc/nsswitch.conf."
ewarn
ewarn "To make use of LDAP, add this line to your /etc/nsswitch.conf:"
ewarn " sudoers: ldap files"
ewarn
fi
fi
if use prefix ; then
ewarn
ewarn "To use sudo, you need to change file ownership and permissions"
ewarn "with root privileges, as follows:"
ewarn
ewarn " # chown root:root ${EPREFIX}/usr/bin/sudo"
ewarn " # chown root:root ${EPREFIX}/usr/lib/sudo/sudoers.so"
ewarn " # chown root:root ${EPREFIX}/etc/sudoers"
ewarn " # chown root:root ${EPREFIX}/etc/sudoers.d"
ewarn " # chown root:root ${EPREFIX}/var/db/sudo"
ewarn " # chmod 4111 ${EPREFIX}/usr/bin/sudo"
ewarn
fi
elog "To use the -A (askpass) option, you need to install a compatible"
elog "password program from the following list. Starred packages will"
elog "automatically register for the use with sudo (but will not force"
elog "the -A option):"
elog ""
elog " [*] net-misc/ssh-askpass-fullscreen"
elog " net-misc/x11-ssh-askpass"
elog ""
elog "You can override the choice by setting the SUDO_ASKPASS environmnent"
elog "variable to the program you want to use."
}

@ -68,16 +68,12 @@ BDEPEND="
S="${WORKDIR}/${MY_P}"
REQUIRED_USE="
pam? ( !skey )
skey? ( !pam )
?? ( pam skey )
?? ( gcrypt ssl )
"
REQUIRED_USE="?? ( gcrypt ssl )"
MAKEOPTS+=" SAMPLES="
PATCHES=( "${FILESDIR}/${P}-glibc-2.32.patch" ) # drop for releases after 1.9.2
src_prepare() {
default
elibtoolize

Binary file not shown.

@ -1,7 +1,10 @@
AUX duplicity-0.8.15-fix-docs-cmd.patch 888 BLAKE2B 17627c86ed5b895ff08c6394b407b69f8653913d7e1bbbcd994c574a817e7f018a8b6f26819a147387414f9997b32e95fc76e2f4583158ee453d03a489b8b4b7 SHA512 a901c5870fcc6745873b5850b2d2544948cb766d72d7ca8f8869d03bc9512f4527ec62df3f29a1151675a91e6c6b3816069008d1b5d56e45b787e2bddaed4aa5
AUX duplicity-0.8.16-fix-docs-cmd.patch 900 BLAKE2B 11146466f54446cd7c24d7a2cb5dc15e337df870bd134adf7d8e1ecc839a6d6f21aeeea38fbf9bd5c9ef5cfe15d99ce40e536e0d5b8db99f4348a5f96d6231cf SHA512 8dd321bf4ff06145c04a8a1378b2933dac83eae6d770a96a0f6c2362e0f84b496702b792c46468b757f4859d1b4ff9202fd976500d8d05ac056ecaf4b760e5bf
AUX duplicity-0.8.17-fix-docs-cmd.patch 868 BLAKE2B 15d7843d53fe56142c582fbf4531406795f8c30abd1ae1afbf8e4ab702f6a34689f120519e6c0eb49fdbe0824b96b249f94a151185fb69d879959e428a760a8c SHA512 1eed49dd38d1af1001356fc8c3114c3d0fff4c96eb1f697b588efc94641b51c4a45e5265bf8a03007f44622536eb4505ee9cd227cdb7292964fc629102df9eb9
DIST duplicity-0.8.15.tar.gz 1482647 BLAKE2B e1ddd4232611ad5fcf8faa5135c925aef68a21eb9dec50de7194562a0d4871e9c58132faf9340f71367025dcc84cbc6f1aae69bd37cae294d4200a8ca8b796b3 SHA512 2d048377c839ae56fc2828997c9aa7ba8c339e815e1e2ae738652037508ec276a2c72583687da34408fadd4839011e242b51bc73cca954227fc51db5683c258c
DIST duplicity-0.8.16.tar.gz 1470714 BLAKE2B c9b2df3a7f008d44595b76d5f1d86ef53996d3ad788415e3a0fa122a7246bb5ae92e73be5079b3cef9a9a93a0b106f3be6405882028d79dc49194276a7c8f4a7 SHA512 67e8fe7d5db7da82d82f24892d721e32cd63fcdb8bbc5e60508af06e4c9b637f593ce0b1902c31433c92ed97035880e44368e9a461ad197511171f67de937f73
DIST duplicity-0.8.17.tar.gz 1351433 BLAKE2B 39c87c421bb8a4bf27e60c16b6dde559ed4468a1062f02623d8e37deb62e63101b6fb5524e5a991139d39422cab2803b89007bf1ca5819817ab3b53d5318b88c SHA512 6f9f6b45953d2bc7ed403d68bdc419f384e07f831c783af720f15f88b100f5becb3f83f65cfc715b02686c24d18c5ec8f80c27789d1ec01cdc8efefa7590c211
EBUILD duplicity-0.8.15.ebuild 1213 BLAKE2B 8508a2135b3ca0438e15cbd198a7060cf81eec4cdb1c08f5b4c0e4fe13a17831611f1a173174400f9f272ffae803b756886694d3950d646252ec9058c52a448e SHA512 922bd8eca9e3222b8ece9677eb1b1a343cd0edd26a274773bd10d79cc0c4f935e3f9d484c460f5c0336595a1d92a80e4c9d079ab3c1ae4cf2f2a92e0d66dc0cd
EBUILD duplicity-0.8.16.ebuild 1215 BLAKE2B aeb0926a8b5497858a2ff183eda686ae5a84b0d94e7535db14130b7f15222c8c30408ed7cd374cf6e450606fa8ac945bd9fc7b8c2183c6fa98a54e0ca39c1069 SHA512 88dc9fb68fb3f244721b411ef20f5f64e7f35b280f2cd084082433f15fab89eaa51e51d0d971c883a98acb394e1951f9fc6f2931be5596e2b4bd797f1805fa88
EBUILD duplicity-0.8.17.ebuild 1215 BLAKE2B aeb0926a8b5497858a2ff183eda686ae5a84b0d94e7535db14130b7f15222c8c30408ed7cd374cf6e450606fa8ac945bd9fc7b8c2183c6fa98a54e0ca39c1069 SHA512 88dc9fb68fb3f244721b411ef20f5f64e7f35b280f2cd084082433f15fab89eaa51e51d0d971c883a98acb394e1951f9fc6f2931be5596e2b4bd797f1805fa88
MISC metadata.xml 440 BLAKE2B 1fdef6e6e4835b9d663576f20d9d26f7ca5cb75a42bf5835cc2b059aa95790929c7dbc186b083857ac3019f678c8bd960a7d9ae8e994124ba2b504bd20e9c83c SHA512 a5082caa1b6c4d7de1de0fa130400cc02a601c99a7c877c781b4dcae45ebfde22f348c51bba405fbc72b2adfcdf1e3c60500346ac20fa1d507a7ecaa7d0f8a9a

@ -0,0 +1,51 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
PYTHON_COMPAT=( python3_6 python3_7 python3_8 )
inherit distutils-r1
DESCRIPTION="Secure backup system using gnupg to encrypt data"
HOMEPAGE="https://www.nongnu.org/duplicity/"
SRC_URI="https://code.launchpad.net/${PN}/$(ver_cut 1-2)-series/$(ver_cut 1-3)/+download/${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
IUSE="s3 test"
CDEPEND="
net-libs/librsync
app-crypt/gnupg
dev-python/fasteners[${PYTHON_USEDEP}]
"
DEPEND="${CDEPEND}
dev-python/setuptools[${PYTHON_USEDEP}]
dev-python/setuptools_scm[${PYTHON_USEDEP}]
test? (
app-arch/par2cmdline
dev-python/mock[${PYTHON_USEDEP}]
dev-python/pexpect[${PYTHON_USEDEP}]
)
"
RDEPEND="${CDEPEND}
dev-python/paramiko[${PYTHON_USEDEP}]
dev-python/future[${PYTHON_USEDEP}]
s3? ( dev-python/boto[${PYTHON_USEDEP}] )
"
RESTRICT="test"
PATCHES=(
"${FILESDIR}/${P}-fix-docs-cmd.patch"
)
python_test() {
esetup.py test
}
pkg_postinst() {
elog "Duplicity has many optional dependencies to support various backends."
elog "Currently it's up to you to install them as necessary."
}

@ -0,0 +1,28 @@
--- duplicity-0.8.17/setup.py 2020-11-24 19:32:40.089024404 -0500
+++ duplicity-0.8.17/setup.py 2020-11-24 19:33:32.326309755 -0500
@@ -93,17 +93,6 @@
u'bin/rdiffdir.1'
]
),
- (u'share/doc/duplicity-%s' % Version,
- [
- u'AUTHORS',
- u'CHANGELOG.md',
- u'COPYING',
- u'README.md',
- u'README-LOG.md',
- u'README-REPO.md',
- u'README-TESTING.md',
- ],
- ),
]
if not os.environ.get(u'READTHEDOCS') == u'True':
@@ -339,7 +328,6 @@
],
test_suite=u"testing",
cmdclass={
- u"build_scripts": BuildScriptsCommand,
u"install": InstallCommand,
u"install_data": InstallDataCommand,
u"sdist": SdistCommand,

Binary file not shown.

@ -3,6 +3,7 @@ AUX ekey-egd-linux.conf.2 266 BLAKE2B 387aa2985ddd362f2c0d9eedbfcd23b24a52b210d8
AUX ekey-egd-linux.init.2 456 BLAKE2B d4e7900bc0e2a089744cc1bf49084cf83c2d8f8ade84bbdea39d6c21f7896bc22e8ef7b650a2efb198b19bea5abb983b20dbafde019d8fc1ec3d57171f491a9f SHA512 55e7be6464b685aa5b290bd310020f4a01926d07a9cb071fc117081bc751a902ebbb9db51a81a5168a34cebc2ecc02360b4917356e25a2e205f57491739ff190
AUX ekeyd-1.1.5-const_char_usage.patch 1094 BLAKE2B e19d837be0652844c95cf87af8381a09f1913471609616ded55e6e3d7e0876f8996d31909e72c0ec759b324e54cc785bbde77c4eaf4f87e81935521d71427176 SHA512 92198522e3dd90d2274d9c5171c216c3a3db9d334b2b14363781456f167a65df5370a7dcf430246d944e1e14e5278bf130e068063e600589f74026ca39e319a5
AUX ekeyd-1.1.5-enoent.patch 863 BLAKE2B ec953667eaa23dcf91b15b01689c4be6315641dadaf9021240d67039ed88f651a3fe131581b60e71da8a4d9776952bed9db144c1340c98cf119e5746b53a16c9 SHA512 ace451e7aafc61e21422a81e50d3954189f80fec50160002c579db27865b46c95dc6db557533a9aa6ef3ca744394542754ba46f96de90a026e19a14477522e50
AUX ekeyd-1.1.5-makefile-lua-libs.patch 355 BLAKE2B 89c73bb607a3a31d783027a3dff7feb2ad72e20041b76e54c656523323e017e7be12d29a628d808cc09208faed213ab2ea9b5982f138c24bc02ca3d95b3ac4e7 SHA512 a6c4a72760ec7b52db32d55d58e72e87e6d16a34a8a54bed410f17099249db044dcddf50c70b374fa71767184922bfb0bfc29d5603cb13177b652a9459aa7d9d
AUX ekeyd-1.1.5-misc.patch 1245 BLAKE2B 555c6406461226ec8867f226e88bb9ca4f39d0a726c241c1638dd3339434b9f1d34620319de42c62e034da12cabebb739c92cc5df96ec9d3c79b339be839d6a2 SHA512 5a1a523fab7146e97f8396ef82d6755e1b209df728ee83dae87619a0a6d84b0b44e41b9e67f287b7f3d54a2ef80a19320650662cca0f1dfe0053eba75d113f04
AUX ekeyd-1.1.5-path-fixes.patch 1918 BLAKE2B cf29e1f7fbaef728d0c4db2b71b1ac611ba5905c16b20b511f282a649359a0e458d44e0ca9b46db9b9abbd1da8935caa5605312314fb6027589ba03aa23f9759 SHA512 aba7b1cba96e678725fc8b47b56d815d59ce015ff6a4f72eaaf5fe8b7a99ddedf05ef3534a51772330209fb3cef235d76207103ee1e7a1f3315f4a52d2c0c2be
AUX ekeyd-1.1.5-remove-werror.patch 1205 BLAKE2B c10ae2dc785a3bcb98a47af002d3f96b7908046dddc091f8342a7a61d4a38278f05b677445bdf60ad3260af6d723c1a06b3bd0a279b1ba4ffb07e3a5ae2f3c5b SHA512 2ea01bbe642bd52351e8ab9b7b62147c5bec7918305dc2c5be9291e3ae98fdd90f0e6e36c450e4db6220076a45a22cf870c81b3e23beed9170f262c857acecfd
@ -10,5 +11,6 @@ AUX ekeyd-1.1.5-udev-rule.patch 2325 BLAKE2B 5617dd160c6f3617bb93dc97755f22c535e
AUX ekeyd.init.2 699 BLAKE2B 4ce17a42ffc60b49232cc0bb5a19d36fecc55071df699a7ad7da6a49de352a599b8f0f11fc05fa4159d8975245e7b6181e96303182870519a7f57070a6b54da4 SHA512 3c1fe923e6f08d83d02b9559fa5b817e9abdbc97a50815ab01c7c17e3e953f54701eb1110340dc164bb67ef67905041054cd4fc98c11ea5932a539f4330c8b71
AUX ekeyd.service 157 BLAKE2B d7976301d7eb0d9be05de574f3b25c13ed3767629dff7024e7621a2d29686045cfd7664e2127a87b92d32e719b470a2795159e45c310bfdcfffa75897341213f SHA512 1082a1dc58b820882015c4f09d5154691d9d8810bfe953049a6853ea5025ec7cff2377ee931ec8ceef295241083c162e582a75fd0b134f7e8789f6d470285445
DIST ekeyd_1.1.5.orig.tar.gz 101366 BLAKE2B 7edd6d291f7553864c9aa96ee3d9533e33b6c94989b2c6b1a56eda42f61afe1633af5e7c3c8f5f57920ac0577f8567d1b09238eae35138ab2023600f01096466 SHA512 c30620d5e54a49929be72ed04448a4f08eb9658dbf7534586c49a3b43bdd5fc95a0659e09cc04b012c339ca20a1e914fa5a4b4d970171c46b64235f284516b9a
EBUILD ekeyd-1.1.5-r1.ebuild 4873 BLAKE2B dc8d7e9f7c66df2d5c9deeb86199cf7bb033de50ac8616f53351d9601eff49d6fa8b4eebcbfb22de9bf17119e3bce9da55bcea19d141f64b47b93abb144c9e16 SHA512 6fa70427d545a093f7316f06d61b7e7ebfb7a5b3e7c0735dfb59ef85a7bd2635f9a5065b244a40ba053419aa4baa4afbc9a0b99411a181b480321118edc6cb5e
EBUILD ekeyd-1.1.5-r1.ebuild 4787 BLAKE2B a7c0dca3f0eb471b061884e3898f254bf7f186d5cc0c70f93a1421248616ebbddeabaec1d802291ee64a4edbcb8a056fabc9775de839890e36e5a111f28269aa SHA512 99b54a375305242dd898cd62bcf1684f93ed3b9b3fb23504155dbb0c941df4c7eb309ccadb030a9fd7a52c4db74bd3c34bc0a245bf4144bdf23da86776a3501c
EBUILD ekeyd-1.1.5-r100.ebuild 4907 BLAKE2B aee773b503a180067973c06da3248f6ac315acdae9e6b53b07f76dd30fe08ff3f26c150fa490411abc5f63135487fd51b8186897a0a8494bd0e757d3cfdbc0a9 SHA512 00b228d5c04b5db68f49489d45150126c8582f63d9f1dddc1690f3f1b70b4e3565a8a147ae44efd820e78d173fe58327c46f2f227ceea7d0d9fbdab010a7f626
MISC metadata.xml 775 BLAKE2B f20c01d6a705492bfeeb4788f3f2950ac5f3a012abaaacb4e526ff7b5685475515c229f8c14ca7961ad946497a3636d02e6a9e4ee4e6bedf5cbeee39af6c4a27 SHA512 7a202bbf5b18e938f16ecb0773fdb80ec72d00d3d88f396632e552cfa3c7e7c4104362e34aec356833800833b7b531d9694906dd1174ee76f06ad8ef09758b03

@ -1,9 +1,9 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
EAPI=7
inherit eutils multilib linux-info toolchain-funcs udev systemd
inherit multilib linux-info toolchain-funcs udev systemd
DESCRIPTION="Entropy Key userspace daemon"
HOMEPAGE="http://www.entropykey.co.uk/"
@ -15,7 +15,7 @@ KEYWORDS="~amd64 ~x86"
IUSE="kernel_linux munin minimal usb"
REQUIRED_USE="minimal? ( !munin )"
EKEYD_RDEPEND="dev-lang/lua"
EKEYD_RDEPEND="dev-lang/lua:0"
EKEYD_DEPEND="${EKEYD_RDEPEND}"
EKEYD_RDEPEND="${EKEYD_RDEPEND}
dev-lua/luasocket
@ -23,7 +23,6 @@ EKEYD_RDEPEND="${EKEYD_RDEPEND}
munin? ( net-analyzer/munin )"
RDEPEND="!minimal? ( ${EKEYD_RDEPEND} )
!app-crypt/ekey-egd-linux
virtual/service-manager"
DEPEND="!minimal? ( ${EKEYD_DEPEND} )"
@ -35,14 +34,14 @@ pkg_setup() {
fi
}
src_prepare() {
epatch "${FILESDIR}/${P}-const_char_usage.patch";
epatch "${FILESDIR}/${P}-enoent.patch";
epatch "${FILESDIR}/${P}-path-fixes.patch";
epatch "${FILESDIR}/${P}-udev-rule.patch";
epatch "${FILESDIR}/${P}-remove-werror.patch";
epatch "${FILESDIR}/${P}-misc.patch";
}
PATCHES=(
"${FILESDIR}"/${P}-const_char_usage.patch
"${FILESDIR}"/${P}-enoent.patch
"${FILESDIR}"/${P}-path-fixes.patch
"${FILESDIR}"/${P}-udev-rule.patch
"${FILESDIR}"/${P}-remove-werror.patch
"${FILESDIR}"/${P}-misc.patch
)
src_compile() {
local osname

@ -0,0 +1,170 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
LUA_COMPAT=( lua5-1 )
inherit multilib linux-info lua-single toolchain-funcs udev systemd
DESCRIPTION="Entropy Key userspace daemon"
HOMEPAGE="http://www.entropykey.co.uk/"
SRC_URI="mirror://ubuntu/pool/universe/e/ekeyd/ekeyd_${PV}.orig.tar.gz"
LICENSE="MIT GPL-2" # GPL-2 (only) for init script
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="kernel_linux munin minimal usb"
REQUIRED_USE="${LUA_REQUIRED_USE}
minimal? ( !munin )"
EKEYD_RDEPEND="${LUA_DEPS}"
EKEYD_DEPEND="${EKEYD_RDEPEND}"
EKEYD_RDEPEND="${EKEYD_RDEPEND}
$(lua_gen_cond_dep '
dev-lua/luasocket[${LUA_USEDEP}]
')
kernel_linux? ( virtual/udev )
munin? ( net-analyzer/munin )"
RDEPEND="!minimal? ( ${EKEYD_RDEPEND} )
virtual/service-manager"
DEPEND="!minimal? ( ${EKEYD_DEPEND} )"
CONFIG_CHECK="~USB_ACM"
pkg_setup() {
if ! use minimal && use kernel_linux && ! use usb && linux_config_exists; then
check_extra_config
fi
lua-single_pkg_setup
}
PATCHES=(
"${FILESDIR}"/${P}-const_char_usage.patch
"${FILESDIR}"/${P}-enoent.patch
"${FILESDIR}"/${P}-path-fixes.patch
"${FILESDIR}"/${P}-udev-rule.patch
"${FILESDIR}"/${P}-remove-werror.patch
"${FILESDIR}"/${P}-misc.patch
"${FILESDIR}"/${P}-makefile-lua-libs.patch
)
src_compile() {
local osname
# Override automatic detection: upstream provides this with uname,
# we don't like using uname.
case ${CHOST} in
*-linux-*)
osname=linux;;
*-freebsd*)
osname=freebsd;;
*-kfrebsd-gnu)
osname=gnukfreebsd;;
*-openbsd*)
osname=openbsd;;
*)
die "Unsupported operating system!"
;;
esac
emake -C host \
CC="$(tc-getCC)" \
LUA_V=${ELUA#lua} \
LUA_INC="-I$(lua_get_include_dir)" \
OSNAME=${osname} \
OPT="${CFLAGS}" \
BUILD_ULUSBD=no \
$(use minimal && echo egd-linux)
}
src_install() {
exeinto /usr/libexec
newexe host/egd-linux ekey-egd-linux
newman host/egd-linux.8 ekey-egd-linux.8
newconfd "${FILESDIR}"/ekey-egd-linux.conf.2 ekey-egd-linux
newinitd "${FILESDIR}"/ekey-egd-linux.init.2 ekey-egd-linux
dodoc doc/* AUTHORS ChangeLog THANKS
use minimal && return
# from here on, install everything that is not part of the minimal
# support.
emake -C host \
DESTDIR="${D}" \
MANZCMD=cat MANZEXT= \
install-ekeyd
# We move the daemons around to avoid polluting the available
# commands.
dodir /usr/libexec
mv "${D}"/usr/sbin/ekey*d "${D}"/usr/libexec
systemd_dounit "${FILESDIR}/ekeyd.service"
newinitd "${FILESDIR}"/${PN}.init.2 ${PN}
if use kernel_linux; then
local rules="${FILESDIR}/90-ekeyd.rules"
udev_newrules ${rules} 90-${PN}.rules
fi
if use munin; then
exeinto /usr/libexec/munin/plugins
doexe munin/ekeyd_stat_
insinto /etc/munin/plugin-conf.d
newins munin/plugin-conf.d_ekeyd ekeyd
fi
}
pkg_postinst() {
elog "${CATEGORY}/${PN} now install also the EGD client service ekey-egd-linux."
elog "To use this service, you need enable EGDTCPSocket for the ekeyd service"
elog "managing the key(s)."
elog ""
elog "The daemon will send more entropy to the kernel once the available pool"
elog "falls below the value set in the kernel.random.write_wakeup_threshold"
elog "sysctl entry."
elog ""
ewarn "Since version 1.1.4-r1, ekey-egd-linux will *not* set the watermark for"
ewarn "you, instead you'll have to configure the sysctl in /etc/sysctl.conf"
use minimal && return
# from here on, document everything that is not part of the minimal
# support.
elog ""
elog "To make use of your EntropyKey, make sure to execute ekey-rekey"
elog "the first time, and then start the ekeyd service."
elog ""
elog "By default ekeyd will feed the entropy directly to the kernel's pool;"
elog "if your system has jumps in load average, you might prefer using the"
elog "EGD compatibility mode, by enabling EGDTCPSocket for ekeyd and then"
elog "starting the ekey-egd-linux service."
elog ""
elog "The same applies if you intend to provide entropy for multiple hosts"
elog "over the network. If you want to have the ekey-egd-linux service on"
elog "other hosts, you can enable the 'minimal' USE flag."
elog ""
elog "The service supports multiplexing if you wish to use multiple"
elog "keys, just symlink /etc/init.d/ekeyd -> /etc/init.d/ekeyd.identifier"
elog "and it'll be looking for /etc/entropykey/identifier.conf"
elog ""
if use kernel_linux; then
elog "Some versions of Linux have a faulty CDC ACM driver that stops"
elog "EntropyKey from working properly; please check the compatibility"
elog "table at http://www.entropykey.co.uk/download/"
else
elog "Make sure your operating system supports the CDC ACM driver"
elog "or otherwise you won't be able to use the EntropyKey."
fi
elog ""
elog "If you're unsure about the working state of the CDC ACM driver"
elog "enable the usb USE flag and use the userland USB daemon"
}

@ -0,0 +1,15 @@
If LUA_V is passed directly to LIBS it ends up being expanded to an empty
string at link time.
--- a/host/Makefile
+++ b/host/Makefile
@@ -111,7 +111,8 @@
CFLAGS += '-DEKEYD_VERSION_S=""$(EKEYD_VERSION_S)""'
CFLAGS += $(EXTRA_CFLAGS)
-LIBS += -llua -lm $(LIBDL)
+LUA_LIBS += -llua$(LUA_V) -lm
+LIBS += $(LUA_LIBS) $(LIBDL)
LDFLAGS += $(LIBDIRS)

@ -2,5 +2,5 @@ AUX swtpm-0.5.0-build-sys-Remove-WError.patch 431 BLAKE2B 8b0d63dcab783a322c72aa
AUX swtpm-0.5.0-disable-test-dependencies.patch 696 BLAKE2B 7cbfb36e82b88d125dabaab8508803cde8b4fe414b1bf0e193421a7632597baa3142dcefa1bd53c7ebe6fea529ad827fc65bfd42bd617c415043b795d5c36c15 SHA512 32931311e8a4c57ae167379db5ff3decc5c1b3b891f180e6ee4991a9cf366ac26049c2e3eabc434eef3890635317f2f2cb1a80cf827a4c3e44fe76943665e85c
AUX swtpm-0.5.0-fix-localca-path.patch 1318 BLAKE2B 1d8c7367cdc92232d13b4169e387afcd7247ffbdc785cad0d4e40ca9ee7710036f4a7debc1c6112afe255b19422a32b76f72efba04840136f28a72d241aa091e SHA512 e327b581dd1cf9bf92d400fc2574a585ea8708ba6b7e2c89fe368cfc990e464773900488736944b0f97cfd6e65b6aebf39e55ef22428fcc2510c8205ef77d738
DIST swtpm-0.5.1.tar.gz 309464 BLAKE2B 630a9add9a17e016f0158666bd3f4eafa773b7a2645820346d5f2847023310f8df4c2491184c5f5d02a83aa2bb53f8c266e5f2a6b07ab92502f08c7f1fa697ea SHA512 8a034b1da916797b9869a4ff478a4c7093b1343ce2556054d2228214520f0e2a63a1d69709bf2cc62fe45710dd9a41c0eee488af9396e8baf8099e697593638c
EBUILD swtpm-0.5.1.ebuild 1781 BLAKE2B 4750376ba21c306fc760550f7fb981adea7f3effb47151915a17bbed45f631cbab561e9511851dd077455098c04cd7d5dde5ec3124c1ce0bb91295f3d9368567 SHA512 69b8be6c46441a7a78b4274dd2afd4e2dab0e7555c3e3b0a2e9d2286445ee4da994c111d016a40ce3d5d4dc713a494b379fe9f9b5bda82a3ffa684ac5c4fef47
EBUILD swtpm-0.5.1-r1.ebuild 1778 BLAKE2B 28621e58fbb497bff343104090a2a4d88c9eebd43ef71f36f6cc027b83f89ba4e611c2e99ab8b108592b5f2edb73194564340bc1937aa25f6f673ade75043d3a SHA512 e94b8db862f039a80077b3e40e46c97a013b958bc76435aa212cf0e433fe8973b957a932a1ba9730b26defb5b6c5a9911fe775008dc89cf736bfa3b52fad2995
MISC metadata.xml 457 BLAKE2B defc06c2642823aa760cafc22e90f891f9337358bfaa446778e1f4107f6e295ec21b5987f49bdcee3fd7b68084be1b864d7569e74bd729345e4886b08c617a06 SHA512 c80e24dc4ec41e5aae1e7fe67208c945e62c02f469164d0a76445269e3e0204674cd593956f99fa1539505e1a70a15bbf6c02afcf6b38592f04f3c4d3f275e08

@ -41,7 +41,6 @@ DEPEND="${COMMON_DEPEND}
test? (
net-misc/socat
dev-tcltk/expect
${PYTHON_DEPS}
)
"
@ -58,6 +57,7 @@ PATCHES=(
src_prepare() {
use test || eapply "${FILESDIR}/${PN}-0.5.0-disable-test-dependencies.patch"
python_setup
default
eautoreconf
}

@ -7,8 +7,9 @@ AUX trousers-0.3.14-Makefile.am-Mark-tddl.a-nodist.patch 746 BLAKE2B 91dec77a329
AUX trousers-0.3.14-fno-common.patch 385 BLAKE2B 7ed20c894c4687275804adf8d820227e5b246f02880d38b29dc6a17d12a4932059f237913f8d1841d56ee32c652cf732c01e77cd1235255b8e2fc28bc9a78027 SHA512 cf771b065d972b9974c93ec67a471a8ed3da737178a14b2d14537ee7948544bcbf071201d42d6e2b1333a3c30e8104cd1dbb344327a424597e5046e50137a692
AUX trousers-0.3.14-libressl.patch 877 BLAKE2B 6416ecf1cf99678299e4ac39756920de61e598ec9b9c91c17cf8eddfa10af145b813756e2fae3b39fef8682eeb2ee722b3979d52570f41b99708fb4ba2cebe2d SHA512 3aba9ec7554d4fdb941063f771b40c5700efefdbb6e5df186824e93a6b2c61801acb4be60cdbe71dcee9360c0f59229e5d17f1a18aa981132807b5e74efc2d59
AUX trousers-0.3.14-tcsd-fixes.patch 2203 BLAKE2B 8085cfd36817e35d54d39a012037945440fcae6e5040f7a7fd35a3c814df93264382a87eb06758b6042b64bef851ab3d5f5e424c2b946c0d1eaa92ebb97a733f SHA512 cc2827ed501cc29dcadd00537161804a62918c9dc703b2a773227aaf74a695d026b44c70848819a78b01cc785831117ae9dfa1d4c30133241b97dd32e8e838ba
AUX trousers-0.3.15-libressl.patch 1018 BLAKE2B b762dfb984f84644e04076aeab8317555961103e0eb9c19e6b9fc5b5635054f0d53121e94d4887cd804628dcedff4c62362298a1bf7f520ff6c5eff6db769745 SHA512 9b0b01a326cc0149ace71f045a38a065e2ca61d640321b253dfc905c81913c97788922214cfe949e871dbf98c5487c61e023032a137b2ee70a4c45f7e1f03484
DIST trousers-0.3.14.tar.gz 1378438 BLAKE2B 3dc2824fa2ca1b1f1181f98d59e85276e7d38af4bfc07ee8246431d9ccb300a8e0820b318643d4cf5d757d2a49492c8686e2fe9de03484263d2189d4bbaa32d0 SHA512 bf87f00329cf1d76a12cf6b6181fa22f90e76af3c5786e6e2db98438d2d3f0c0e05364374664173f45e3a2f6c0e2364948d0b958a7845cb23fcb340150cd9b21
DIST trousers-0.3.15.tar.gz 4699936 BLAKE2B 53c60498ed6a9d3d87295b00676e5d0d82452918c35af6b98c7979ffa2dc04dd817e7cd3f4a33ca17c30b90eab53d80b2bb25306fe9db7bda2125019edfed280 SHA512 769c7d891c6306c1b3252448f86e3043ee837e566c9431f5b4353512113e2907f6ce29c91e8044c420025b79c5f3ff2396ddce93f73b1eb2a15ea1de89ac0fdb
EBUILD trousers-0.3.14-r3.ebuild 1673 BLAKE2B 4c86cb8c9764179850cb778094a3dcdcbd4775955858981e8d5ce958217f51e2d6529059e31f61149156d517fe2f3179f7d85ae9a4724f3c2f1aa9c34da6bd84 SHA512 555038110e4fe3ff35c5fbfb9d1f35e3f72345dbbd31381b0de9a4f09404c1241456088d185c5dc2d94eda55d54277820d9a8145493b8499f1734bfb7f6413e2
EBUILD trousers-0.3.15.ebuild 1562 BLAKE2B b427a21182f75ac304587320e2b08f3ecc6b0d0febb8235d927571ba2ad0eb0f64937044e35fbe8870b3d60ef843be9a738120fff76d4a28847a058694df0e25 SHA512 02d06a37160c3448c75a23b9d8c6e7689de9c8d533a7037e1a4091705778e824071c81f1b8aab2d7f769cddb1c5c31970c6fd3000b8834b7976e4d1101aefb07
EBUILD trousers-0.3.15.ebuild 1597 BLAKE2B a402299093ac80756a929fd82b503c5ee718969fb4676a83d58a027ae3b2174bdc988d6a7e505ba64a5e9057143d7e2601e8698ca078bc2f8a4734aabc1d3c3d SHA512 1ff94752e3051e2d469e0f73f094ac7336b41b809cabaf8781925889da8f0d23bf52cabb9c0553c75c4a176a2351f58d8a32cba53acffff4ace5366ce913d29f
MISC metadata.xml 507 BLAKE2B 1674e8c11713df517fd8d2aead0b5207a114de5b34559ed1b1a2527e73ee7e749a13d5a7e10330f940bc61c51ed9083e3ce423db428503f25295e1fd3b64d576 SHA512 f1c304734694001da4b95f1f18cb6891d3fc9df1db1013ad7155b2f60fd466f46947b3fa9e78d50c2a4a2fb1d0ca98b8ebb8017dde2bfcadd847e422df8885d7

@ -0,0 +1,31 @@
From 88e90ee4c36f0decdf7c15e271bccb8b0809a21a Mon Sep 17 00:00:00 2001
From: Stefan Strogin <stefan@steils.org>
Date: Tue, 24 Nov 2020 11:08:13 +0200
Subject: [PATCH] trousers: do not re-declare RSA_set0_key with LibreSSL
The method RSA_set0_key is provided by LibreSSL since 2.7.0, that means
in all currently supported versions.
Upstream-Status: Submitted
[https://sourceforge.net/p/trousers/trousers/merge-requests/2/]
Signed-off-by: Stefan Strogin <stefan@steils.org>
---
src/trspi/crypto/openssl/rsa.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/trspi/crypto/openssl/rsa.c b/src/trspi/crypto/openssl/rsa.c
index 24f13e7..cf46c08 100644
--- a/src/trspi/crypto/openssl/rsa.c
+++ b/src/trspi/crypto/openssl/rsa.c
@@ -38,7 +38,7 @@
#define DEBUG_print_openssl_errors()
#endif
-#if (OPENSSL_VERSION_NUMBER < 0x10100001L) || defined(LIBRESSL_VERSION_NUMBER)
+#if (OPENSSL_VERSION_NUMBER < 0x10100001L)
static int
RSA_set0_key(RSA *r, BIGNUM *n, BIGNUM *e, BIGNUM *d)
{
--
2.29.2

@ -29,6 +29,7 @@ BDEPEND="virtual/pkgconfig"
PATCHES=(
"${FILESDIR}/${PN}-0.3.13-nouseradd.patch"
"${FILESDIR}/${PN}-0.3.14-Makefile.am-Mark-tddl.a-nodist.patch"
"${FILESDIR}/${P}-libressl.patch"
)
DOCS="AUTHORS ChangeLog NICETOHAVES README TODO"

@ -6,5 +6,5 @@ DIST veracrypt-1.24_p4.tar.gz 25212608 BLAKE2B 12d124cc5c869b8112e29624fcc5af3dd
DIST veracrypt-1.24_p7.tar.gz 25113248 BLAKE2B 8ead3325ce6fadf4ca8211ea45daaa82a655f29006f224235f44200839289d42fabe84da2e731fc6a169a7d157535c719b2cd9294524e68532c0065e41ed733c SHA512 d149736d4d6740a89bfce892f44757600c6411776b471a208a75b4573bbc6125535ef1b68c2f55903ff82f4d0fff13b8b07d3cf15c7a301c39158aefffc29e17
EBUILD veracrypt-1.24_p2.ebuild 3122 BLAKE2B 1fee5173e4c599692ccaa0737c3103405478cdba846055002a0c7c803e90c4886da8aa8c18d37a669b5964fda4e5ee022311239b8edb3caff000dde40cda51d8 SHA512 b908d997ceec7ecbbd1fdca1ccc92a205b40879d29730cd5148a57734d4038386a656ac6ed5afc29b8f369764a8e4032e2ca382eda4c59089fffe6282126d171
EBUILD veracrypt-1.24_p4.ebuild 2538 BLAKE2B 5860c80d59157f5eb10a6017d837a7eaaf746aba035760b3d4a03bfa00f53fed9b62e83c706ff729a7c873c71cf80ef32eba7269b75c9a9ea5d4d3eb14e20094 SHA512 ecb74dbd33d71828558fab05e246cd7d2bda552f3b9998ecd97b5259a3cee54fb8fb3fcf1b75399fbd41c3d308e91d3f188795baffb7f5284561e9bd3a0856e4
EBUILD veracrypt-1.24_p7.ebuild 2539 BLAKE2B de8b817eccd3c079c59c09272b7ccdc8c4d354694eec1e8533af94fbe91923024ff16e2e9055d923cf431905ad56e20bed23cd6a25c90694c09e9bb9caba7a20 SHA512 6b9b71177d6e67d211af262b98317db801b2cd4fc3408b404dc512eaf698e0725b45b9bd10d58929ba09e7e0ea219736c3588f4a8a0c79f79ba05b42ac70d516
EBUILD veracrypt-1.24_p7.ebuild 2538 BLAKE2B 5860c80d59157f5eb10a6017d837a7eaaf746aba035760b3d4a03bfa00f53fed9b62e83c706ff729a7c873c71cf80ef32eba7269b75c9a9ea5d4d3eb14e20094 SHA512 ecb74dbd33d71828558fab05e246cd7d2bda552f3b9998ecd97b5259a3cee54fb8fb3fcf1b75399fbd41c3d308e91d3f188795baffb7f5284561e9bd3a0856e4
MISC metadata.xml 399 BLAKE2B a7d22abada8009869e82b80f8b2274e1acc2fb1488d584c9d730f231057519404445a0d048ad70a47f7d946bc987f836fdfd87da296537a307e234175e521acc SHA512 ac0676510d8d2ac2430dd244ed5e4d18de1cbb7050563fcdd46fc8511c9813dc3609565a6c071f75d9cd26e73c1f453cc8cf9b9b47e0822bd93548a8baaf62ca

@ -15,7 +15,7 @@ SRC_URI="https://github.com/${PN}/VeraCrypt/archive/VeraCrypt_${MY_PV}.tar.gz ->
# For this reason, we don't have to worry about their licenses
LICENSE="Apache-2.0 BSD truecrypt-3.0"
SLOT="0"
KEYWORDS="~amd64"
KEYWORDS="amd64"
IUSE="+asm cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_ssse3 doc X"
RESTRICT="bindist mirror"

Binary file not shown.

@ -8,12 +8,12 @@ DIST emacs-25.3-patches-2.tar.xz 2488 BLAKE2B 93c6a18e7f729a5b4d299974581c99835e
DIST emacs-25.3.tar.xz 42854740 BLAKE2B 4f4e2572bbef48b75c561497fc22046081e56099b6174725d79b15a5b16d5c886eaf8ff3f75cf561e989ebb092ab9e98ba7503e720a9db7560758b30d5116f23 SHA512 1cce656451b6ca8502ebb229e88bd3ef48b7f9444a10eeac4ea43bd5491b2efacd641dfa35227a33362c3866493d3449cf1df81606563eef44bba0ed668e457f
DIST emacs-26.3.tar.xz 44415140 BLAKE2B aa8434e6431992ee40402f03a890dd2c49784ee76f437888efe61d66b9aa2bdb816eb0bfe1055e9e154a8bb3ed065fee71623741b474d465a96964618ec775e3 SHA512 4d5a4319253afb081e105a3697eb6eeb8d8a0da18cd41346e376ca5af1e180a26e641f76c64fad1b0253168f14a511f0a4d9d4141524fb1cf4d04f25b05a76e9
DIST emacs-27.1.tar.xz 43752012 BLAKE2B 433fbf234c711954269e7e10348abbd4a2bc4c357a59164c625a5ccee2de85a149636c70ad3fad3c09dbbd24900badfd2c0c645017bb33ab3e25d3decff72057 SHA512 dfb26531d2c19cf9fb56505f03d799654b45e5f9528e777900e8280ed2c1d21e04c52f510528e31e015977c471ae63164cedee6174b7439ebcf479a21fc18064
EBUILD emacs-18.59-r13.ebuild 4354 BLAKE2B 0c7713a041659ddda2794957a830532fc31ad9a4dca38dc3f662be580f4f4a24b97e8c7de6cbbd5230524934e2e7d59f5aa263815996e3c51343504a4701f237 SHA512 97c565fcd3d4dab90e1967ec071d93a993aacfdac020137b19e7b063b384aadb86f2131aa45a48fff4b8730427b9d81fd51f9d4b66a3dc0334deb2fb0c21f4d6
EBUILD emacs-23.4-r19.ebuild 10987 BLAKE2B 9837cedc2675773c59e583f40f4d3bbcdeac64235912569638e7aa879037b0d53a38fd25e81698f8993ce822562cb6ce9f3f6b8f6a404945caab9dec24c3cbe9 SHA512 dfa1b140f5ba8d9787d2e2b3a4c183c1657faabb73c4973aeaad1d911c293ead947374b674ae80e782d1b437a9d69ba574a0b231d2f6e30e72c18291e7973f17
EBUILD emacs-24.5-r8.ebuild 10839 BLAKE2B 71f333423f8399ff9a4eb343d5c521c24f43705c84819d671396c90d94f691a13047afba7880e09d71a586110f1a2a911327c4d6b3fa3ae9e98ba924c2cbfc29 SHA512 dc1f984e87cc347dcc8708ba4c52d1b66e031ac19c0e203df28e940e64ac02aaca56c978d1cfbf553d7ddf3847a67c8ee54888f4beb1d0cdd7534035ce264c90
EBUILD emacs-25.3-r7.ebuild 11181 BLAKE2B 1db9d77454b1390a8747b5cf63941554ec2e88430b13d36e95c2ba050356fdcc0084fec2c7b0b1320e206d901626e736c23e83911dd0ffe93d85d4370179fb1e SHA512 dda6dbfa227997eafa93d363779162b074766a9313774cd4aa4006e605ad9967f86f61b27d0b817d01afce9cc3148c40f63cb47dae9f1267122512cdc37454d1
EBUILD emacs-26.3-r2.ebuild 11968 BLAKE2B 60a9d7c23bf25d6c1a8d6b8d65c3689891a86756d2b0ae2dbad1ff3671afdb7b2dff60eb0e2863bd834480910f41e9a3f04bd20368158686a64ca3281623defd SHA512 ca3729faa843ee6e7f0ca7140c9cc8425b1a62e98a2fdd2cb6ced64afbec0bf5e84fd0e1a8dc990de0f85cb53ad3ed4efb8faed059246f5aa7b3539083851763
EBUILD emacs-27.1-r1.ebuild 13513 BLAKE2B 1bc8d27d10cba67c9201ce3dc76111cbb5a57d98e1637661e45af3b58d98d48ea5ed22c13d8f7f19c91aaef6ee68dc2323c5c3d6ab38dddca113320c96069239 SHA512 02316ba347aaaa2ba0bff764dd87e99d5cf49e0f8dc604ee57b8a7acb69c27a315dd76cfcd1a83ba957356c1f3ec45338d36850a3008511ceef6aafd082d4559
EBUILD emacs-27.1.9999-r1.ebuild 13477 BLAKE2B 0331ea699d68acfff608efcc88f367e30633c0b115a04ed24328325786fb06730d7b063996a2b85ab01a74f8d790edbd706a8d6dc49e4f6ccab6c4d793e5c0b2 SHA512 e26cf52c1e67c57a9f9dec311a45e0ff6d8531e75774e55790bdeac257b9e03f189eeaa5ba82e09856e2ad892f0e4355e3f5010ee29812ec5ac99e6c3839de37
EBUILD emacs-28.0.9999.ebuild 13448 BLAKE2B db0e9b950299594bd63f8a5b755bb52f8dfc47cbb10cca4ad71638d80e06bbbbb88e42bc5ec5c04ba96e86d56c2165a9ce153768dfe7be42462a5e67f50d837e SHA512 3cf9cdcb2b176472a0402d365119f674637a1218b35adab9edc14d67ce9e57d674a9932831b47e4367ff14f7f3efa74165b7350f0ca8a8971910a090aebf516d
EBUILD emacs-18.59-r13.ebuild 4370 BLAKE2B eda9ea6895a647fb6576737cd1f45f528ac1fbc09aa45ad8c90d9b77130aac4f56f209808cf405c3a696afbf22fa919e5cb4ab0420925fdf971e0038fd868502 SHA512 c00ea63528ffe15ee6a40dc559d9736eed3aaaaa2a23237158a4a41386369e28dc7303d39146d82e640b8d601376d842de475fe892ce9e1eb453215bee66f796
EBUILD emacs-23.4-r20.ebuild 11175 BLAKE2B 81160f566444d92fc5ea43f78334590e94a22facf875a51b55e932e460dcf8d09aef6a338e207966ac95353f79ccc639e6aea6021bcd1d6a96d30a5877ed388d SHA512 32a5899626ad5fce7067df0445458af251a5ff14e9bdece643c7784770e576600c0670cbdb588e341d7e81799a45186f35554e20ce5d8a2ef910b2f12a623b62
EBUILD emacs-24.5-r9.ebuild 11045 BLAKE2B 9f96003288deb53fd79f259d7c84c2daf95fe501e8183684c0a4ddff1ddeda0fb6e2a2e224dce2ad8df573ada00d9c7ba1ae8d0ad26cb926a51d4b86780149ad SHA512 17038fe4cd88fcb220d23eda3c22a498639af4b05b0d3da38b2b5eb3b4a210c6aef9cfa8b6cd3fcf5830ac7b422533b3aeaf1b9c65edcd0a7502a860717e0d51
EBUILD emacs-25.3-r8.ebuild 11387 BLAKE2B aa940b1226a213ae9260db0517ad9e7da2a4fc2ddeb5d2d08414f36a207ee3089fb109f603496511865814848f016d4a40d4699085af25640c18c27f5da9289d SHA512 b55fa576211fd48ddce54f9a8b4718c81ec6d425fe895fe97f44b4f5c74ddbad84ffc920eed7140c6b1f234de134d7643cf91c7e98030d761f8cad000c4bdbbf
EBUILD emacs-26.3-r3.ebuild 12205 BLAKE2B 79b910b2bb1e50f52ee2af4b8b3099a96eee2d37fa268daf551ceb7da87afd6bf2da0b126e4a223bc714dc5beb473e102465c5bd8d295bda8abe6169647175f1 SHA512 86f2afa0d62bf84952eb4a16052a9779b87595025de6cfa2c4d118b362ae56b3510f56c942ee7508d8897c1514e38c02d759230a64bb73c8d280060009326b50
EBUILD emacs-27.1-r2.ebuild 13750 BLAKE2B 3c6cc5c865676e09d7902637b76106148f5a2cf7f64cd47056401e91421668a8b9ab162d9e0e47cabd155f7d8451e576e06c84a1937ad173b300578b6795adf1 SHA512 37316aea5e8c4fbfcfbfe61e01edba0cf137f76d5b8ceba40c4aff32454f91cf9f5724f2682481ee3b512e4b75d7d224be7fd7f94b26a66c552893b5f370fea5
EBUILD emacs-27.1.9999-r1.ebuild 13714 BLAKE2B 156f0487d366dffffa9ddef9647733f59842bc6ce0078f746b70e5836722911e8f7b10f3b6dc4e96ce0e388e25d5faf56c059dbee9b7b99bb64ef2103571acbd SHA512 d9173643778778a0c6e721a924a6e26ea8fc29dfb7f2c5de359d82402fc7a9da1800efd2be906e7270807004140a37c59c1f39429711b9769c1a2dd44e8b18e6
EBUILD emacs-28.0.9999.ebuild 13685 BLAKE2B 95c15cb3aba782ed60b393e23f29d2d6d7ed79fd37711fc96f8d24080a287900e1f8f6b01ce3c22746ea3395f838ed524fdb90006844f1a665f2c140078e51f2 SHA512 32ad801c80e322b5112bec39de7d7b0bd9bcc12654c874b54cc189d029e5fd683af20b06e9c28eea72bee9def032bc8af7658a8b0720e7bc68c695f1d9fecf56
MISC metadata.xml 3000 BLAKE2B f580f25a92f18d36e29880184ddacfc3f59af8e86c9e9b5e0ab0deeff7fb367a79a0331db4d8d85f9c338feba342d683caa3294d06d11e2c1a3c715a5c2649b8 SHA512 ce622b330c89f3c545ccf0f899efd19795cb3279d15762b04248ebaed07e288b51f45f6f0776f5cf6f44f90500220b8026384016808d722085dad2cad020cb51

@ -3,7 +3,7 @@
EAPI=7
inherit toolchain-funcs flag-o-matic multilib
inherit toolchain-funcs flag-o-matic multilib eapi8-dosym
DESCRIPTION="The extensible self-documenting text editor"
HOMEPAGE="https://www.gnu.org/software/emacs/"
@ -123,7 +123,7 @@ src_install() {
yow env server
do
mv "${D}"${basedir}/etc/${i} "${D}"/usr/libexec/emacs/${PV}/${i} || die
dosym ../../../../libexec/emacs/${PV}/${i} ${basedir}/etc/${i}
dosym8 -r /usr/libexec/emacs/${PV}/${i} ${basedir}/etc/${i}
done
for i in test-distrib make-docfile; do
rm "${D}"${basedir}/etc/${i} || die
@ -135,7 +135,7 @@ src_install() {
# move Info files
dodir /usr/share/info
mv "${D}"${basedir}/info "${D}"/usr/share/info/emacs-${SLOT} || die
dosym ../../info/emacs-${SLOT} "${basedir}"/info
dosym8 -r /usr/share/info/emacs-${SLOT} ${basedir}/info
docompress -x /usr/share/info
# move Info dir to avoid collisions with the dir file generated by portage

@ -16,7 +16,8 @@ SLOT="23"
KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
IUSE="alsa aqua athena dbus games gconf gif gpm gtk gui gzip-el jpeg kerberos livecd m17n-lib motif png sound source svg tiff toolkit-scroll-bars Xaw3d xft +xpm"
RDEPEND="app-emacs/emacs-common-gentoo[games?,gui(-)?]
RDEPEND="acct-group/mail
app-emacs/emacs-common-gentoo[games?,gui(-)?]
net-libs/liblockfile
sys-libs/ncurses:0=
kerberos? ( virtual/krb5 )
@ -249,6 +250,10 @@ src_install() {
touch "${ED}"/usr/share/info/${EMACS_SUFFIX}/.keepinfodir
docompress -x /usr/share/info/${EMACS_SUFFIX}/dir.orig
# movemail must be setgid mail
fowners root:mail /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail
fperms 2751 /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail
# avoid collision between slots, see bug #169033 e.g.
rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el
rm -rf "${ED}"/usr/share/{applications,icons}

@ -15,7 +15,8 @@ SLOT="24"
KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
IUSE="acl alsa aqua athena dbus games gconf gfile gif gpm gsettings gtk gtk2 gui gzip-el imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif png selinux sound source ssl svg tiff toolkit-scroll-bars wide-int Xaw3d xft +xpm zlib"
RDEPEND="app-emacs/emacs-common-gentoo[games?,gui(-)?]
RDEPEND="acct-group/mail
app-emacs/emacs-common-gentoo[games?,gui(-)?]
net-libs/liblockfile
sys-libs/ncurses:0=
acl? ( virtual/acl )
@ -229,7 +230,7 @@ src_compile() {
}
src_install() {
emake DESTDIR="${D}" NO_BIN_LINK=t install
emake DESTDIR="${D}" NO_BIN_LINK=t BLESSMAIL_TARGET= install
mv "${ED}"/usr/bin/{emacs-${FULL_VERSION}-,}${EMACS_SUFFIX} \
|| die "moving emacs executable failed"
@ -242,6 +243,10 @@ src_install() {
touch "${ED}"/usr/share/info/${EMACS_SUFFIX}/.keepinfodir
docompress -x /usr/share/info/${EMACS_SUFFIX}/dir.orig
# movemail must be setgid mail
fowners root:mail /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail
fperms 2751 /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail
# avoid collision between slots, see bug #169033 e.g.
rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el
rm -rf "${ED}"/usr/share/{applications,icons}

@ -15,7 +15,8 @@ SLOT="25"
KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif gpm gsettings gtk gtk2 gui gzip-el imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif png selinux sound source ssl svg tiff toolkit-scroll-bars wide-int Xaw3d xft +xpm zlib"
RDEPEND="app-emacs/emacs-common-gentoo[games?,gui(-)?]
RDEPEND="acct-group/mail
app-emacs/emacs-common-gentoo[games?,gui(-)?]
net-libs/liblockfile
sys-libs/ncurses:0=
acl? ( virtual/acl )
@ -238,7 +239,7 @@ src_compile() {
}
src_install() {
emake DESTDIR="${D}" NO_BIN_LINK=t install
emake DESTDIR="${D}" NO_BIN_LINK=t BLESSMAIL_TARGET= install
mv "${ED}"/usr/bin/{emacs-${FULL_VERSION}-,}${EMACS_SUFFIX} \
|| die "moving emacs executable failed"
@ -251,6 +252,10 @@ src_install() {
touch "${ED}"/usr/share/info/${EMACS_SUFFIX}/.keepinfodir
docompress -x /usr/share/info/${EMACS_SUFFIX}/dir.orig
# movemail must be setgid mail
fowners root:mail /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail
fperms 2751 /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail
# avoid collision between slots, see bug #169033 e.g.
rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el
rm -rf "${ED}"/usr/share/{appdata,applications,icons}

@ -26,7 +26,7 @@ RDEPEND="app-emacs/emacs-common-gentoo[games?,gui(-)?]
lcms? ( media-libs/lcms:2 )
libxml2? ( >=dev-libs/libxml2-2.2.0 )
mailutils? ( net-mail/mailutils[clients] )
!mailutils? ( net-libs/liblockfile )
!mailutils? ( acct-group/mail net-libs/liblockfile )
selinux? ( sys-libs/libselinux )
ssl? ( net-libs/gnutls:0= )
systemd? ( sys-apps/systemd )
@ -256,7 +256,7 @@ src_compile() {
}
src_install() {
emake DESTDIR="${D}" NO_BIN_LINK=t install
emake DESTDIR="${D}" NO_BIN_LINK=t BLESSMAIL_TARGET= install
mv "${ED}"/usr/bin/{emacs-${FULL_VERSION}-,}${EMACS_SUFFIX} || die
mv "${ED}"/usr/share/man/man1/{emacs-,}${EMACS_SUFFIX}.1 || die
@ -267,6 +267,12 @@ src_install() {
touch "${ED}"/usr/share/info/${EMACS_SUFFIX}/.keepinfodir
docompress -x /usr/share/info/${EMACS_SUFFIX}/dir.orig
# movemail must be setgid mail
if ! use mailutils; then
fowners root:mail /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail
fperms 2751 /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail
fi
# avoid collision between slots, see bug #169033 e.g.
rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el
rm -rf "${ED}"/usr/share/{appdata,applications,icons}

@ -57,7 +57,7 @@ RDEPEND="app-emacs/emacs-common-gentoo[games?,gui(-)?]
lcms? ( media-libs/lcms:2 )
libxml2? ( >=dev-libs/libxml2-2.2.0 )
mailutils? ( net-mail/mailutils[clients] )
!mailutils? ( net-libs/liblockfile )
!mailutils? ( acct-group/mail net-libs/liblockfile )
selinux? ( sys-libs/libselinux )
ssl? ( net-libs/gnutls:0= )
systemd? ( sys-apps/systemd )
@ -299,7 +299,7 @@ src_configure() {
#}
src_install() {
emake DESTDIR="${D}" NO_BIN_LINK=t install
emake DESTDIR="${D}" NO_BIN_LINK=t BLESSMAIL_TARGET= install
mv "${ED}"/usr/bin/{emacs-${FULL_VERSION}-,}${EMACS_SUFFIX} || die
mv "${ED}"/usr/share/man/man1/{emacs-,}${EMACS_SUFFIX}.1 || die
@ -310,6 +310,12 @@ src_install() {
touch "${ED}"/usr/share/info/${EMACS_SUFFIX}/.keepinfodir
docompress -x /usr/share/info/${EMACS_SUFFIX}/dir.orig
# movemail must be setgid mail
if ! use mailutils; then
fowners root:mail /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail
fperms 2751 /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail
fi
# avoid collision between slots, see bug #169033 e.g.
rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el
rm -rf "${ED}"/usr/share/{appdata,applications,icons}

@ -57,7 +57,7 @@ RDEPEND="app-emacs/emacs-common-gentoo[games?,gui(-)?]
lcms? ( media-libs/lcms:2 )
libxml2? ( >=dev-libs/libxml2-2.2.0 )
mailutils? ( net-mail/mailutils[clients] )
!mailutils? ( net-libs/liblockfile )
!mailutils? ( acct-group/mail net-libs/liblockfile )
selinux? ( sys-libs/libselinux )
ssl? ( net-libs/gnutls:0= )
systemd? ( sys-apps/systemd )
@ -298,7 +298,7 @@ src_configure() {
#}
src_install() {
emake DESTDIR="${D}" NO_BIN_LINK=t install
emake DESTDIR="${D}" NO_BIN_LINK=t BLESSMAIL_TARGET= install
mv "${ED}"/usr/bin/{emacs-${FULL_VERSION}-,}${EMACS_SUFFIX} || die
mv "${ED}"/usr/share/man/man1/{emacs-,}${EMACS_SUFFIX}.1 || die
@ -309,6 +309,12 @@ src_install() {
touch "${ED}"/usr/share/info/${EMACS_SUFFIX}/.keepinfodir
docompress -x /usr/share/info/${EMACS_SUFFIX}/dir.orig
# movemail must be setgid mail
if ! use mailutils; then
fowners root:mail /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail
fperms 2751 /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail
fi
# avoid collision between slots, see bug #169033 e.g.
rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el
rm -rf "${ED}"/usr/share/{appdata,applications,icons}

@ -57,7 +57,7 @@ RDEPEND="app-emacs/emacs-common-gentoo[games?,gui(-)?]
lcms? ( media-libs/lcms:2 )
libxml2? ( >=dev-libs/libxml2-2.2.0 )
mailutils? ( net-mail/mailutils[clients] )
!mailutils? ( net-libs/liblockfile )
!mailutils? ( acct-group/mail net-libs/liblockfile )
selinux? ( sys-libs/libselinux )
ssl? ( net-libs/gnutls:0= )
systemd? ( sys-apps/systemd )
@ -297,7 +297,7 @@ src_configure() {
#}
src_install() {
emake DESTDIR="${D}" NO_BIN_LINK=t install
emake DESTDIR="${D}" NO_BIN_LINK=t BLESSMAIL_TARGET= install
mv "${ED}"/usr/bin/{emacs-${FULL_VERSION}-,}${EMACS_SUFFIX} || die
mv "${ED}"/usr/share/man/man1/{emacs-,}${EMACS_SUFFIX}.1 || die
@ -308,6 +308,12 @@ src_install() {
touch "${ED}"/usr/share/info/${EMACS_SUFFIX}/.keepinfodir
docompress -x /usr/share/info/${EMACS_SUFFIX}/dir.orig
# movemail must be setgid mail
if ! use mailutils; then
fowners root:mail /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail
fperms 2751 /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail
fi
# avoid collision between slots, see bug #169033 e.g.
rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el
rm -rf "${ED}"/usr/share/{appdata,applications,icons}

Binary file not shown.

@ -1,4 +1,6 @@
DIST diskimage-builder-3.3.1.tar.gz 450130 BLAKE2B 09f3b3549527d726f8479e1f8dc89ae50fdeacf6969e43f5b35591fa0a9d38ae0dd03b7292633604a938b0ef14e31b4e655645643bae22df4f3519c75d9dde83 SHA512 095c0968f5ceeb220c3871ccd14c7bf7c1b3d883bcb02f9cfe7406d5a336c36a813c8290bf133441a2a59972f485596aa5620b755016aba348afe3b7fc723c9f
DIST diskimage-builder-3.4.0.tar.gz 477142 BLAKE2B 998c4769f8b1e973628a6ab790c78afa32d3de23df6dda62e94917916aa92419d16a58ba3029bad6641508de2f404bfb16101197720ed050a1db6a92434e3144 SHA512 a05fc9b836cf8273d0c73ab1e95ecbd2172c56e457ba8ae00cb3a5f13b499dc1e8d81f262d155e8e2005bdc14af25370af9dfb3b2bf29342d5110edc7e630a87
EBUILD diskimage-builder-3.3.1.ebuild 1123 BLAKE2B 864def556b24d1d5f048ca54bc1e437c8a17a3eac033ab5c87e3a46d3ae96aba2a3830d5b2c3ac15b01e59cee88a4b7b9aac1a0642cbdb9e3a7140966d9edfee SHA512 07bfc8bb21aa626cae72ff38b2bb422963fabe83e93842d0bb9408e5e6a33b4b35df1fdceee8b2387fb946884c8bec41fe8ac5071bd660b6e8c12c0c780f9c24
EBUILD diskimage-builder-3.4.0.ebuild 1125 BLAKE2B beae746e25dd0a358a5eb8151176adc2f089352c91bb05ebe34b0b720dd4a33a1c28bfa6c9436a23bf6c682e5fe118814434181e0d98e3fe9ff25c6ac1ec884a SHA512 46e20a6883aad54feeceb035e4eb7cd30aec2de300541ce018227a578d03221d5259e128969370b0c7e82b2eec9a35d781ec9ae28c1f2907bc0d355d560a3683
EBUILD diskimage-builder-9999.ebuild 1125 BLAKE2B beae746e25dd0a358a5eb8151176adc2f089352c91bb05ebe34b0b720dd4a33a1c28bfa6c9436a23bf6c682e5fe118814434181e0d98e3fe9ff25c6ac1ec884a SHA512 46e20a6883aad54feeceb035e4eb7cd30aec2de300541ce018227a578d03221d5259e128969370b0c7e82b2eec9a35d781ec9ae28c1f2907bc0d355d560a3683
MISC metadata.xml 718 BLAKE2B 04a2c90bcae79f187feb346d0b73f1d6dd1c1581123ca26bfd3182d97239a37e81875d7a3a7b03c4aa08f2974bd25be5f3021e2e48195d5d09e18b606b5b4c87 SHA512 8e16e9d92a81049d414ae54eaf7a4467982cbd949230adcfab22b636ba2b91885d80e9b047788ccd07eab547ae2f85a56d989b971b64bd926e6ca70972398277

@ -0,0 +1,39 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
PYTHON_COMPAT=( python3_{6,7,8} )
DISTUTILS_USE_SETUPTOOLS=rdepend
inherit distutils-r1
DESCRIPTION="Golden Disk Image builder."
HOMEPAGE="http://docs.openstack.org/developer/diskimage-builder/"
if [[ ${PV} == 9999* ]]; then
inherit git-r3
EGIT_REPO_URI="https://opendev.org/openstack/diskimage-builder.git"
else
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
fi
LICENSE="Apache-2.0"
SLOT="0"
IUSE=""
CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
DEPEND="${CDEPEND}"
RDEPEND="${CDEPEND}
>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
!~dev-python/Babel-2.4.0[${PYTHON_USEDEP}]
>=dev-python/networkx-1.10[${PYTHON_USEDEP}]
>=dev-python/pyyaml-3.12[${PYTHON_USEDEP}]
>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
app-emulation/qemu
sys-block/parted
sys-fs/multipath-tools
sys-fs/dosfstools
sys-apps/gptfdisk
!dev-python/dib-utils[${PYTHON_USEDEP}]"

@ -1,16 +1,11 @@
DIST firecracker-v0.22.0-aarch64 1615168 BLAKE2B 56965a1999038e9b59e37230177812b936ad1b3cba91b6f805a1a6ecc81903f093c13b75ff78c8720d67596bdd71378cc757bda0b6061e3fb4d62607e299b065 SHA512 fb42bc5ecd0af487490f2c4bd3804d2430263740bbdec66c063d9b6c865d6b9c42b31cafb78d4a0cc40c11cc5242608b9d30676e55ac2b8dcb05d5f3db535bdf
DIST firecracker-v0.22.0-x86_64 1657736 BLAKE2B 84dbe8db596017e312fad1cd3c72d1b5d7306ad400a320431c8cae5b901b534f2735ac75cb5b9133c6c6f2603b877e4842d54165972a46df4193fbbc513c3b2d SHA512 ac9544e8b770ff7a0c9234feb3154522bd6163f3903993cd019cc4abaa90ad24447f18e65e1022aafb7274ca97281286f898a50ac9f27c7f661d48df52d7fd08
DIST firecracker-v0.22.1-aarch64 1624032 BLAKE2B e5705e423e032c480bbdd499bb4e0b5674079b096bd0983f21f3e9c664d442a76f3a195075a641445505b777823a4c1670a1544828b84370e21d5bde4c091ed3 SHA512 4d9222e19d616a017780711c426d0aa5b41571e744648cc3a922601857387ebcb9dc0a238019e7a33e45445221d93d739c0ec8c465ab922583bac2970a1af003
DIST firecracker-v0.22.1-x86_64 1658032 BLAKE2B 1513ed2b0ad550a0e21fb77bc5fb84091ff73b4e79c716238b14366234d303bb391d3e6a58878529f8131c72bd53d81a18caf06230d290bbefc08f280d856e5c SHA512 5327a22a1c0dc4e9a1ceba8455933131ddb9ef91e0a9b875a7b5c5f45f309fe40b841a26b5d0bdd24e18bb7472c264598d59fb0db20bdf5ec39f47b23ede44fa
DIST firecracker-v0.23.0-aarch64 1596888 BLAKE2B 94453641206b32c42f86542d7c38a1e24e991abc1d425183e624f8a72cc74a51cf36e3463bd1c20b309a4bc4e97ebfb8cd95c47061e51cecdb8a8b28120879ad SHA512 08a51979e5979cbc5e8477e9400bcc03757a416e606903296764982f78a432749d168c4566d31df20a9bf68894b3e7cb1cbf39aee559513daa25280a9c891d2f
DIST firecracker-v0.23.0-x86_64 2041024 BLAKE2B cb6a0d356a734ffb28ef6b88517983d1b9efac4127f8979fad085dab503446471d851ec00ff4da39b216f6fc9ba6a5d9d744455c0f1c1cbd7ef881d624536873 SHA512 5a24a95805240c1125f7fd17e69d5fea92781c3767f0a884aa8e433200e8f469b33502342d47843e5612d83d3157df59bf94a960a202978ca70dcf8f31865882
DIST jailer-v0.22.0-aarch64 1322088 BLAKE2B 72db7eba02371af2a53b6ebd8c9fb909bd027cdd2b4207e0b2a02febe587780f9aa3be665b37580907ab8a58d8745cbcda90a85bda56a42b2eb8be9a931af13f SHA512 86ca629b3060cefa9e31292844486c6d9b6fa0538b6d515e4cbb07fa4a675ce93d5f87fcd769f62aea0df029cdbd7a5055a282b8344ed35d895606aca7f22a14
DIST jailer-v0.22.0-x86_64 1427600 BLAKE2B 7ab09cce8963c89dae7c89c3a2d1dc582fdf8c11c3e051deb08c70fd2995a2154c493432e39851bebc62c1f6a9f98cfc9a9fa4107c5d9cf8ba940d4bb3349d86 SHA512 f2dcaee775cd1cdea4c1c1f6e89b82ba6636ab065291b704faaa836f864f14802a56af76ce397d7f98e9420d55720dc4459ae4443babfc7bb16d64dde11cb854
DIST jailer-v0.22.1-aarch64 1322088 BLAKE2B 7e5e1d106789af37a9a113b005184c2e65943beaec08e99b149bdcd72237c089d9a8126e2b498b433dd94181ab8042205cad31beba1352707081fdc08e7a4293 SHA512 6e147d581870a46e6cad7efb949265a47d1471ae5744216f8a591ffa00001590e2939b8153107b3188e224069207c82624efc98ae5d5becb6c324860ce509548
DIST jailer-v0.22.1-x86_64 1427600 BLAKE2B f592c951594a2739cb56accbfc2c971f44aa7d4fde36d8a170b8c72749ba25020caf6505865ca9ab4932386b9a9a4e0b2bf984fc2712b6d4c5bf7c3df23aa085 SHA512 f28b08c5baf003eae93bbb7199136c76b9c104928ccb74ad7ca3af0269c4eebd80528a995caa5aff5bc70997932cd1485e416046a8e4a6c199be430c4a72213a
DIST firecracker-v0.23.1-aarch64 3328424 BLAKE2B 2191e73700c9107fc30e84a044c0377c4486ecfee99deba99b0f6400036befca0d2f3f101154d851f0d7423208f8afc28e87678ed6005235ea9757a1913df3f6 SHA512 a1f5245cbe637f42f1145eb9daf3578610102535a046ea4be93dcd122194fd90305fde32840d59c50b798aa8326ea0d7ed715ab96f980a7d0e66608c33aa7ce0
DIST firecracker-v0.23.1-x86_64 3290472 BLAKE2B 62315d4962b4debbdac383098e656e6c469b491f7303a7aaab06c885ec653b202f6a49a43ae0b76188d2f73b229c68435e19d316992eed64645decef3f611d5e SHA512 4bfb756a2ee2942a158857dfe82de838b52bc161d0ba97255eace1af4b57c3a630dfbb51413433a4fbfb3d95ba02719a608c1ea3f28a5485d005daa2c71abbef
DIST jailer-v0.23.0-aarch64 1350040 BLAKE2B def85c85daa27c648c638ed14128fef941a416269c536c55413116a686d5a0e614976fd718576a6e275ff12a1873885e1d569e2e054cb054f1278ecbe1279d74 SHA512 48de8688cf40e696f0a56689a2e6256f2be159fb1b593b223a9547c4760c1e94e245e1de77bfeeefbeffb8046b33768da1915482a62d6b36321b8c225bdef791
DIST jailer-v0.23.0-x86_64 1457312 BLAKE2B 9a92c415e27a8442da18ab3134023acdc7b49f1246d332a864fb700180914c6b9a7f8747b1eef1657290df5287a946e0d5b0b689bd0b7a60486b472ba7b55290 SHA512 203d24794c3125afdd8cb1b07e69da4fcc40bdc9a3ec7c8e8a2deb8dc1a691156294eb4168c2422f631136a4fed7413136631b3957999fe00fb645aaed16f87d
EBUILD firecracker-bin-0.22.0.ebuild 2671 BLAKE2B 90fedb9dc0ada3a20208f9cecc8f3ad069bde62cad3f6e69ad860d326e4b9788bc51ff287e2f2f7d80e939adeb227113d516a33a14f73ed7633667716d12e94e SHA512 0504df61896eb6e3c29254bfbb6c122cb6325e20607f6757bfc7abd09b35dbeb95127fedb821fa24ae6c13e099cfa8c7fab8e0d00764c41c8a3e2f62f74d4002
EBUILD firecracker-bin-0.22.1.ebuild 2671 BLAKE2B 90fedb9dc0ada3a20208f9cecc8f3ad069bde62cad3f6e69ad860d326e4b9788bc51ff287e2f2f7d80e939adeb227113d516a33a14f73ed7633667716d12e94e SHA512 0504df61896eb6e3c29254bfbb6c122cb6325e20607f6757bfc7abd09b35dbeb95127fedb821fa24ae6c13e099cfa8c7fab8e0d00764c41c8a3e2f62f74d4002
DIST jailer-v0.23.1-aarch64 2812344 BLAKE2B ef0b98a5438880d8473117dc051421faf4c9f4640fe017ba9cedeb88a02ff2a34fe6e0333bb7cb31cd436a95536efe5237d6a49ead6c7d1d3777928cc54f0baf SHA512 38876afcf6c5883b30156246b4b74905157b668a3e6fbe852b38a09a7f5ab5814fb9eaec87ef94390d2a40806c7b387b4266c8a0c4b4fba5e720f61d571bbcd7
DIST jailer-v0.23.1-x86_64 2589888 BLAKE2B b22a908d551b3da8f882b9c18031f0904808d8f77783c046f9a8855e713074ea61327b7c8c5f875361728bd33e33e4cd84431ead5f1fae68bdca8161e88bdd1c SHA512 a6829ffbacd35349214087f4ba1b88304c6bfd23b50d9f97319a93fae5c94c6d0590649fbd0917f9d82b6a2a6faab1f7e37a447864a4960e0b77407ae535212a
EBUILD firecracker-bin-0.23.0.ebuild 2668 BLAKE2B a8d81736e88bdba6216d6ce24f500fdb4be820cf3bd8a1b6ca1a27c67e068f05d2a9d4dc3944c7ad7c1acedf6ecac6f4984cbdd3b1c8f3ca72f5550e3b714fba SHA512 297f046eef8e3a18d50aa26591b3923c6e2bf8f24986e947b685186df88fd7fd974466f77423410ce6120a0195e9bc9ada1aecde47d825e554da22edba3e2afc
EBUILD firecracker-bin-0.23.1.ebuild 2668 BLAKE2B a8d81736e88bdba6216d6ce24f500fdb4be820cf3bd8a1b6ca1a27c67e068f05d2a9d4dc3944c7ad7c1acedf6ecac6f4984cbdd3b1c8f3ca72f5550e3b714fba SHA512 297f046eef8e3a18d50aa26591b3923c6e2bf8f24986e947b685186df88fd7fd974466f77423410ce6120a0195e9bc9ada1aecde47d825e554da22edba3e2afc
MISC metadata.xml 385 BLAKE2B 5637756b0993be1ae2695067acc7fdbeaae6c0d5e5cac29563a15bd54815d9b9e2c21d516754e95214f2007846c7b477ad7f70f3f42007d70552313e12e57942 SHA512 83790f17e3b5da6bea49d28a82b7eeb8caba881042450f63570cac4d3bd5d64c326ccc053b5b2f225b9fc68a8379707a77d2a484e51d9ce93399bab25058a123

@ -1,82 +0,0 @@
# Copyright 2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
inherit linux-info
DESCRIPTION="Secure and fast microVMs for serverless computing (static build)"
HOMEPAGE="https://firecracker-microvm.github.io https://github.com/firecracker-microvm/firecracker"
SRC_URI="
amd64? (
https://github.com/firecracker-microvm/firecracker/releases/download/v${PV}/firecracker-v${PV}-x86_64
https://github.com/firecracker-microvm/firecracker/releases/download/v${PV}/jailer-v${PV}-x86_64
)
arm64? (
https://github.com/firecracker-microvm/firecracker/releases/download/v${PV}/firecracker-v${PV}-aarch64
https://github.com/firecracker-microvm/firecracker/releases/download/v${PV}/jailer-v${PV}-aarch64
)"
LICENSE="|| ( Apache-2.0 MIT Apache-2.0-with-LLVM-exceptions ) MPL-2.0"
SLOT="0"
KEYWORDS="-* ~amd64"
RESTRICT="test strip"
RDEPEND="!app-emulation/firecracker
acct-group/kvm"
QA_PREBUILT="/usr/bin/firecracker
/usr/bin/jailer"
S="${WORKDIR}"
pkg_pretend() {
if use kernel_linux && kernel_is lt 4 14; then
eerror "Firecracker requires a host kernel of 4.14 or higher."
elif use kernel_linux; then
if ! linux_config_exists; then
eerror "Unable to check your kernel for KVM support"
else
CONFIG_CHECK="~KVM ~TUN ~BRIDGE ~VHOST_VSOCK"
ERROR_KVM="You must enable KVM in your kernel to continue"
ERROR_KVM_AMD="If you have an AMD CPU, you must enable KVM_AMD in"
ERROR_KVM_AMD+=" your kernel configuration."
ERROR_KVM_INTEL="If you have an Intel CPU, you must enable"
ERROR_KVM_INTEL+=" KVM_INTEL in your kernel configuration."
ERROR_TUN="You will need the Universal TUN/TAP driver compiled"
ERROR_TUN+=" into your kernel or loaded as a module to use"
ERROR_TUN+=" virtual network devices."
ERROR_BRIDGE="You will also need support for 802.1d"
ERROR_BRIDGE+=" Ethernet Bridging for some network configurations."
ERROR_VHOST_VSOCK="To use AF_VSOCK sockets for communication"
ERROR_VHOST_VSOCK+=" between host and guest, you will need to enable"
ERROR_VHOST_VSOCK+=" the vhost virtio-vsock driver in your kernel."
if use amd64 || use amd64-linux; then
if grep -q AuthenticAMD /proc/cpuinfo; then
CONFIG_CHECK+=" ~KVM_AMD"
elif grep -q GenuineIntel /proc/cpuinfo; then
CONFIG_CHECK+=" ~KVM_INTEL"
fi
fi
# Now do the actual checks setup above
check_extra_config
fi
fi
}
src_unpack() { :; }
src_compile() { :; }
src_install() {
if use amd64; then
my_arch=x86_64
elif use arm64; then
my_arch=aarch64
fi
newbin "${DISTDIR}/firecracker-v${PV}-${my_arch}" firecracker
newbin "${DISTDIR}/jailer-v${PV}-${my_arch}" jailer
}

@ -19,7 +19,7 @@ SRC_URI="
LICENSE="|| ( Apache-2.0 MIT Apache-2.0-with-LLVM-exceptions ) MPL-2.0"
SLOT="0"
KEYWORDS="-* ~amd64"
KEYWORDS="~amd64"
RESTRICT="test strip"

@ -4,10 +4,12 @@ AUX qemu-2.11.1-capstone_include_path.patch 264 BLAKE2B 955b498c0ea2657ee4c9d005
AUX qemu-4.0.0-mkdir_systemtap.patch 333 BLAKE2B e7e35e7fe510e7e1a86005f3d51384a81d1de7705f3b856656ec71cc0a2a29626e94918b3cc23b32e47c8073b77b62b498e71c3e956549e25ee5f4da1a8ac9cf SHA512 de48a7d663bd78051ed8a1f62d8b0b8e3bfe58d8a0001daf12518dbd087be3154e766be11c607485e7dd851b08d5675c4fb2a2fe5cf18f3b900164a4d93eab10
AUX qemu-4.2.0-cflags.patch 508 BLAKE2B 86724caca22a4bd2b21db306d04d8c0f6a542a15b82bb4e340f3ddb8471f47e854276ff33adee7bd5682ecb797efdb048e9d028d954a064712d1e817e1eb6e26 SHA512 5bfb8f0e739d7bb260b5b5b0a2d28f30b97833b8037227c511f55c9bd9502241c891e7e3780e750598ccfd7fb01615254f1c7f6634787fec67539a61a217e18d
AUX qemu-5.1.0-pixman-for-vhost-user-gpu.patch 1788 BLAKE2B 9eddc15909cac5eb3357eb4e16921b8b51ba1107eaf272ce48e6f89705fa246ad3a8cd02abc534329671de3849f83a8515d22c39437961b5de25459f697d4600 SHA512 8df97af001e9d5c671da7ba1d651fae7ddca2f16337741ffa551227ae86bc627b6cbf37332beb0a6c9ee2444b7f40474804c4a7b79140d3e2b1dfe310a0b2502
AUX qemu-5.1.0-usb-host-workaround-libusb-bug.patch 2625 BLAKE2B 273ba203e765866d91c592388eee695163c947b4b2f077354985e0ce18206ce018e3c223cc0eee5d02b8867e5615817979854039d472da958da2dd9df3e6bbe7 SHA512 b2143cf0c62db0462ceb0d2e5e9210706f27ac9216e2ee7e0a96ec66818e5a425e68463b3a0d167128b10e5bb4f04b16576c4ae050520690bda268de295b74f0
AUX qemu-5.1.0-usb-oob-CVE-2020-14364.patch 3210 BLAKE2B f812f4bb18e540ebafeb9bf7e95423b48696b639c26525244e7d783eb5ef46453b263831b325b78b90bbb86a585e4f90a3b8ee9c379d52051a2c051891566363 SHA512 08f6fedba9e30eb00a31a0b73a6a7fe11dd215692064330bed5f5701479e1ef63a374460d04b843175b216aee0ca9fc25d8f52987f0680f244583dd8ad75b538
AUX qemu-binfmt.initd.head 1442 BLAKE2B 23aa5338914aa7c47f9b1cc1d28291abd0ea037a33cca81f990decfafac2907c86c042350c9dd45591d16330846d4e11d2c8a2a409a68ad81656d9c2c51964c0 SHA512 3fec8946a37bfbd2089f5d95089ed5987a198fc0139ee7482d4bb38c2ffa0e165667a7853afcf2b458bc3e2a6540f172c929ca5a334a00db47e2d0f881382c0e
AUX qemu-binfmt.initd.tail 245 BLAKE2B dd59f2944c6e3f0c4d282b94b687a9b5c51dd77c5103fb9889bd9ce56874495397676ae6c8375d9e9e23094828477240778d9e0f361e68cdd63fdad574851561 SHA512 bcca16805f8380d52cc591ea3d65a8f6e5de456730618f6aee301510edb75d235a22d4d7aeed224882210392840adb403eb53234b6cb76a4cb24533852a8b737
DIST qemu-5.1.0.tar.xz 62911540 BLAKE2B 6a3ecbda2d9274f2736ffbc88d2006be31f153e7687e1425c1a297975f0e828cd2eafc11d11b589991acda87a489dd256ccf5a8947f91bb9431e515e979d8f29 SHA512 e213edb71d93d5167ddce7546220ecb7b52a7778586a4f476f65bd1e510c9cfc6d1876238a7b501d9cc3fd31cc2ae4b7fb9e753bc3f12cc17cd16dfce2a96ba3
EBUILD qemu-5.1.0-r2.ebuild 25351 BLAKE2B c3624676180d440ec6393a90448df6b19c7b8cd5c31ecd306aec08855db631eaf32a23b2ca0e8d754ba910579dd7ed127b5d34cc98032a7bd1bdb2603b46702f SHA512 cede20b3a6e7b2777a1bc11eccb66bc407b2ec5476826c952e98f431939b3ba90d2a409409e422dfb1cc036584ac2a6d8ee820a11ffc02d72366f1a003b965af
EBUILD qemu-5.1.0-r3.ebuild 25427 BLAKE2B 467d899116d0ae97a06a07087b6b46b79062ad6e355748dbe3370ea9b1f0aed83ebab72dc0bec07daa3698256253c5dfe2faea6613ced5e8bdd0a464fb028627 SHA512 fd4296097c84d76747a9dd86717bdf6264cfded314c05fff57f253abad430d4d627e3ad4acaf9a717669177adfdbf63e96d065af9625f572ac33337d7bc3c570
EBUILD qemu-9999.ebuild 25343 BLAKE2B 0d52b5cbed012cf93359a2395eb4f250909d4e0475f0422ca5e8554eadab5212b5b4518a081ec8afcdafada119a08ff4d73334bd42ea3f96abcee730ab89d676 SHA512 759677892efee099ee8f64a0af464bfa4959e6aa185a70af509ad9c4b3f0908d3c8f159d303bc95e165b4aefbce2dc25d74f3983c4b200cbbf56e432e02b132d
MISC metadata.xml 4458 BLAKE2B 521a9c7b7c3371ca4352decbaf2324ef22822a176bf22b4f26761dfc40535cb4a6d6438f39ae6803804fdac8891bd2ded0f972279eec9076b80803826946f954 SHA512 9ba9e2805b6fa423fad3da849f57fdc328e8d6276a0a3d15a8970fc117d8174a76a20be96cf9eaa2a92149de922aa0c9b807cd4f2412f335375088dc32a79b61

@ -0,0 +1,82 @@
From 202d69a715a4b1824dcd7ec1683d027ed2bae6d3 Mon Sep 17 00:00:00 2001
Message-Id: <202d69a715a4b1824dcd7ec1683d027ed2bae6d3.1606202550.git.mprivozn@redhat.com>
From: Gerd Hoffmann <kraxel@redhat.com>
Date: Mon, 24 Aug 2020 13:00:57 +0200
Subject: [PATCH] usb-host: workaround libusb bug
libusb_get_device_speed() does not work for
libusb_wrap_sys_device() devices in v1.0.23.
Buglink: https://bugzilla.redhat.com/show_bug.cgi?id=1871090
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Message-id: 20200824110057.32089-1-kraxel@redhat.com
Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
---
hw/usb/host-libusb.c | 37 ++++++++++++++++++++++++++++++++++++-
1 file changed, 36 insertions(+), 1 deletion(-)
diff --git a/hw/usb/host-libusb.c b/hw/usb/host-libusb.c
index c474551d84..08604f787f 100644
--- a/hw/usb/host-libusb.c
+++ b/hw/usb/host-libusb.c
@@ -39,6 +39,11 @@
#endif
#include <libusb.h>
+#ifdef CONFIG_LINUX
+#include <sys/ioctl.h>
+#include <linux/usbdevice_fs.h>
+#endif
+
#include "qapi/error.h"
#include "migration/vmstate.h"
#include "monitor/monitor.h"
@@ -885,6 +890,7 @@ static void usb_host_ep_update(USBHostDevice *s)
static int usb_host_open(USBHostDevice *s, libusb_device *dev, int hostfd)
{
USBDevice *udev = USB_DEVICE(s);
+ int libusb_speed;
int bus_num = 0;
int addr = 0;
int rc;
@@ -935,7 +941,36 @@ static int usb_host_open(USBHostDevice *s, libusb_device *dev, int hostfd)
usb_ep_init(udev);
usb_host_ep_update(s);
- udev->speed = speed_map[libusb_get_device_speed(dev)];
+ libusb_speed = libusb_get_device_speed(dev);
+#ifdef CONFIG_LINUX
+ if (hostfd && libusb_speed == 0) {
+ /*
+ * Workaround libusb bug: libusb_get_device_speed() does not
+ * work for libusb_wrap_sys_device() devices in v1.0.23.
+ *
+ * Speeds are defined in linux/usb/ch9.h, file not included
+ * due to name conflicts.
+ */
+ int rc = ioctl(hostfd, USBDEVFS_GET_SPEED, NULL);
+ switch (rc) {
+ case 1: /* low */
+ libusb_speed = LIBUSB_SPEED_LOW;
+ break;
+ case 2: /* full */
+ libusb_speed = LIBUSB_SPEED_FULL;
+ break;
+ case 3: /* high */
+ case 4: /* wireless */
+ libusb_speed = LIBUSB_SPEED_HIGH;
+ break;
+ case 5: /* super */
+ case 6: /* super plus */
+ libusb_speed = LIBUSB_SPEED_SUPER;
+ break;
+ }
+ }
+#endif
+ udev->speed = speed_map[libusb_speed];
usb_host_speed_compat(s);
if (s->ddesc.iProduct) {
--
2.26.2

@ -0,0 +1,860 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
PYTHON_COMPAT=( python3_{6,7,8,9} )
PYTHON_REQ_USE="ncurses,readline"
PLOCALES="bg de_DE fr_FR hu it sv tr zh_CN"
FIRMWARE_ABI_VERSION="4.0.0-r50"
inherit eutils linux-info toolchain-funcs multilib python-r1 \
udev fcaps readme.gentoo-r1 pax-utils l10n xdg-utils
if [[ ${PV} = *9999* ]]; then
EGIT_REPO_URI="https://git.qemu.org/git/qemu.git"
EGIT_SUBMODULES=(
tests/fp/berkeley-{test,soft}float-3
ui/keycodemapdb
)
inherit git-r3
SRC_URI=""
else
SRC_URI="https://download.qemu.org/${P}.tar.xz"
KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
fi
DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools"
HOMEPAGE="http://www.qemu.org http://www.linux-kvm.org"
LICENSE="GPL-2 LGPL-2 BSD-2"
SLOT="0"
IUSE="accessibility +aio alsa bzip2 capstone +caps +curl debug doc
+fdt glusterfs gnutls gtk infiniband iscsi io-uring
jack jemalloc +jpeg kernel_linux
kernel_FreeBSD lzo multipath
ncurses nfs nls numa opengl +oss +pin-upstream-blobs
plugins +png pulseaudio python rbd sasl +seccomp sdl sdl-image selinux
+slirp
smartcard snappy spice ssh static static-user systemtap test usb
usbredir vde +vhost-net vhost-user-fs virgl virtfs +vnc vte xattr xen
xfs +xkb zstd"
COMMON_TARGETS="aarch64 alpha arm cris hppa i386 m68k microblaze microblazeel
mips mips64 mips64el mipsel nios2 or1k ppc ppc64 riscv32 riscv64 s390x
sh4 sh4eb sparc sparc64 x86_64 xtensa xtensaeb"
IUSE_SOFTMMU_TARGETS="${COMMON_TARGETS}
avr lm32 moxie rx tricore unicore32"
IUSE_USER_TARGETS="${COMMON_TARGETS}
aarch64_be armeb mipsn32 mipsn32el ppc64abi32 ppc64le sparc32plus
tilegx"
use_softmmu_targets=$(printf ' qemu_softmmu_targets_%s' ${IUSE_SOFTMMU_TARGETS})
use_user_targets=$(printf ' qemu_user_targets_%s' ${IUSE_USER_TARGETS})
IUSE+=" ${use_softmmu_targets} ${use_user_targets}"
RESTRICT="!test? ( test )"
# Allow no targets to be built so that people can get a tools-only build.
# Block USE flag configurations known to not work.
REQUIRED_USE="${PYTHON_REQUIRED_USE}
qemu_softmmu_targets_arm? ( fdt )
qemu_softmmu_targets_microblaze? ( fdt )
qemu_softmmu_targets_mips64el? ( fdt )
qemu_softmmu_targets_ppc64? ( fdt )
qemu_softmmu_targets_ppc? ( fdt )
qemu_softmmu_targets_riscv32? ( fdt )
qemu_softmmu_targets_riscv64? ( fdt )
static? ( static-user !alsa !gtk !jack !opengl !pulseaudio !plugins !rbd !snappy )
static-user? ( !plugins )
virtfs? ( caps xattr )
vte? ( gtk )
plugins? ( !static !static-user )
"
# Dependencies required for qemu tools (qemu-nbd, qemu-img, qemu-io, ...)
# and user/softmmu targets (qemu-*, qemu-system-*).
#
# Yep, you need both libcap and libcap-ng since virtfs only uses libcap.
#
# The attr lib isn't always linked in (although the USE flag is always
# respected). This is because qemu supports using the C library's API
# when available rather than always using the external library.
ALL_DEPEND="
>=dev-libs/glib-2.0[static-libs(+)]
sys-libs/zlib[static-libs(+)]
python? ( ${PYTHON_DEPS} )
systemtap? ( dev-util/systemtap )
xattr? ( sys-apps/attr[static-libs(+)] )"
# Dependencies required for qemu tools (qemu-nbd, qemu-img, qemu-io, ...)
# softmmu targets (qemu-system-*).
SOFTMMU_TOOLS_DEPEND="
dev-libs/libxml2[static-libs(+)]
xkb? ( x11-libs/libxkbcommon[static-libs(+)] )
>=x11-libs/pixman-0.28.0[static-libs(+)]
accessibility? (
app-accessibility/brltty[api]
app-accessibility/brltty[static-libs(+)]
)
aio? ( dev-libs/libaio[static-libs(+)] )
alsa? ( >=media-libs/alsa-lib-1.0.13 )
bzip2? ( app-arch/bzip2[static-libs(+)] )
capstone? ( dev-libs/capstone:= )
caps? ( sys-libs/libcap-ng[static-libs(+)] )
curl? ( >=net-misc/curl-7.15.4[static-libs(+)] )
fdt? ( >=sys-apps/dtc-1.5.0[static-libs(+)] )
glusterfs? ( >=sys-cluster/glusterfs-3.4.0[static-libs(+)] )
gnutls? (
dev-libs/nettle:=[static-libs(+)]
>=net-libs/gnutls-3.0:=[static-libs(+)]
)
gtk? (
x11-libs/gtk+:3
vte? ( x11-libs/vte:2.91 )
)
infiniband? (
sys-fabric/libibumad:=[static-libs(+)]
sys-fabric/libibverbs:=[static-libs(+)]
sys-fabric/librdmacm:=[static-libs(+)]
)
iscsi? ( net-libs/libiscsi )
io-uring? ( sys-libs/liburing:=[static-libs(+)] )
jack? ( virtual/jack )
jemalloc? ( dev-libs/jemalloc )
jpeg? ( virtual/jpeg:0=[static-libs(+)] )
lzo? ( dev-libs/lzo:2[static-libs(+)] )
multipath? ( sys-fs/multipath-tools )
ncurses? (
sys-libs/ncurses:0=[unicode]
sys-libs/ncurses:0=[static-libs(+)]
)
nfs? ( >=net-fs/libnfs-1.9.3:=[static-libs(+)] )
numa? ( sys-process/numactl[static-libs(+)] )
opengl? (
virtual/opengl
media-libs/libepoxy[static-libs(+)]
media-libs/mesa[static-libs(+)]
media-libs/mesa[egl,gbm]
)
png? ( media-libs/libpng:0=[static-libs(+)] )
pulseaudio? ( media-sound/pulseaudio )
rbd? ( sys-cluster/ceph )
sasl? ( dev-libs/cyrus-sasl[static-libs(+)] )
sdl? (
media-libs/libsdl2[video]
media-libs/libsdl2[static-libs(+)]
)
sdl-image? ( media-libs/sdl2-image[static-libs(+)] )
seccomp? ( >=sys-libs/libseccomp-2.1.0[static-libs(+)] )
slirp? ( net-libs/libslirp[static-libs(+)] )
smartcard? ( >=app-emulation/libcacard-2.5.0[static-libs(+)] )
snappy? ( app-arch/snappy:= )
spice? (
>=app-emulation/spice-protocol-0.12.3
>=app-emulation/spice-0.12.0[static-libs(+)]
)
ssh? ( >=net-libs/libssh-0.8.6[static-libs(+)] )
usb? ( >=virtual/libusb-1-r2[static-libs(+)] )
usbredir? ( >=sys-apps/usbredir-0.6[static-libs(+)] )
vde? ( net-misc/vde[static-libs(+)] )
virgl? ( media-libs/virglrenderer[static-libs(+)] )
virtfs? ( sys-libs/libcap )
xen? ( app-emulation/xen-tools:= )
xfs? ( sys-fs/xfsprogs[static-libs(+)] )
zstd? ( >=app-arch/zstd-1.4.0[static-libs(+)] )
"
X86_FIRMWARE_DEPEND="
pin-upstream-blobs? (
~sys-firmware/edk2-ovmf-201905[binary]
~sys-firmware/ipxe-1.0.0_p20190728[binary]
~sys-firmware/seabios-1.12.0[binary,seavgabios]
~sys-firmware/sgabios-0.1_pre8[binary]
)
!pin-upstream-blobs? (
sys-firmware/edk2-ovmf
sys-firmware/ipxe
>=sys-firmware/seabios-1.10.2[seavgabios]
sys-firmware/sgabios
)"
PPC64_FIRMWARE_DEPEND="
pin-upstream-blobs? (
~sys-firmware/seabios-1.12.0[binary,seavgabios]
)
!pin-upstream-blobs? (
>=sys-firmware/seabios-1.10.2[seavgabios]
)
"
BDEPEND="
$(python_gen_impl_dep)
dev-lang/perl
sys-apps/texinfo
virtual/pkgconfig
doc? ( dev-python/sphinx )
gtk? ( nls? ( sys-devel/gettext ) )
test? (
dev-libs/glib[utils]
sys-devel/bc
)
"
CDEPEND="
!static? (
${ALL_DEPEND//\[static-libs(+)]}
${SOFTMMU_TOOLS_DEPEND//\[static-libs(+)]}
)
qemu_softmmu_targets_i386? ( ${X86_FIRMWARE_DEPEND} )
qemu_softmmu_targets_x86_64? ( ${X86_FIRMWARE_DEPEND} )
qemu_softmmu_targets_ppc64? ( ${PPC64_FIRMWARE_DEPEND} )
"
DEPEND="${CDEPEND}
kernel_linux? ( >=sys-kernel/linux-headers-2.6.35 )
static? (
${ALL_DEPEND}
${SOFTMMU_TOOLS_DEPEND}
)
static-user? ( ${ALL_DEPEND} )"
RDEPEND="${CDEPEND}
acct-group/kvm
selinux? ( sec-policy/selinux-qemu )"
PATCHES=(
"${FILESDIR}"/${PN}-2.11.1-capstone_include_path.patch
"${FILESDIR}"/${PN}-4.0.0-mkdir_systemtap.patch #684902
"${FILESDIR}"/${PN}-4.2.0-cflags.patch
"${FILESDIR}"/${PN}-5.1.0-pixman-for-vhost-user-gpu.patch
"${FILESDIR}"/${PN}-5.1.0-usb-oob-CVE-2020-14364.patch #743649
"${FILESDIR}"/${PN}-5.1.0-usb-host-workaround-libusb-bug.patch #753305
)
QA_PREBUILT="
usr/share/qemu/hppa-firmware.img
usr/share/qemu/openbios-ppc
usr/share/qemu/openbios-sparc64
usr/share/qemu/openbios-sparc32
usr/share/qemu/palcode-clipper
usr/share/qemu/s390-ccw.img
usr/share/qemu/s390-netboot.img
usr/share/qemu/u-boot.e500"
QA_WX_LOAD="usr/bin/qemu-i386
usr/bin/qemu-x86_64
usr/bin/qemu-alpha
usr/bin/qemu-arm
usr/bin/qemu-cris
usr/bin/qemu-m68k
usr/bin/qemu-microblaze
usr/bin/qemu-microblazeel
usr/bin/qemu-mips
usr/bin/qemu-mipsel
usr/bin/qemu-or1k
usr/bin/qemu-ppc
usr/bin/qemu-ppc64
usr/bin/qemu-ppc64abi32
usr/bin/qemu-sh4
usr/bin/qemu-sh4eb
usr/bin/qemu-sparc
usr/bin/qemu-sparc64
usr/bin/qemu-armeb
usr/bin/qemu-sparc32plus
usr/bin/qemu-s390x
usr/bin/qemu-unicore32"
DOC_CONTENTS="If you don't have kvm compiled into the kernel, make sure you have the
kernel module loaded before running kvm. The easiest way to ensure that the
kernel module is loaded is to load it on boot.
For AMD CPUs the module is called 'kvm-amd'.
For Intel CPUs the module is called 'kvm-intel'.
Please review /etc/conf.d/modules for how to load these.
Make sure your user is in the 'kvm' group. Just run
$ gpasswd -a <USER> kvm
then have <USER> re-login.
For brand new installs, the default permissions on /dev/kvm might not let
you access it. You can tell udev to reset ownership/perms:
$ udevadm trigger -c add /dev/kvm
If you want to register binfmt handlers for qemu user targets:
For openrc:
# rc-update add qemu-binfmt
For systemd:
# ln -s /usr/share/qemu/binfmt.d/qemu.conf /etc/binfmt.d/qemu.conf"
pkg_pretend() {
if use kernel_linux && kernel_is lt 2 6 25; then
eerror "This version of KVM requires a host kernel of 2.6.25 or higher."
elif use kernel_linux; then
if ! linux_config_exists; then
eerror "Unable to check your kernel for KVM support"
else
CONFIG_CHECK="~KVM ~TUN ~BRIDGE"
ERROR_KVM="You must enable KVM in your kernel to continue"
ERROR_KVM_AMD="If you have an AMD CPU, you must enable KVM_AMD in"
ERROR_KVM_AMD+=" your kernel configuration."
ERROR_KVM_INTEL="If you have an Intel CPU, you must enable"
ERROR_KVM_INTEL+=" KVM_INTEL in your kernel configuration."
ERROR_TUN="You will need the Universal TUN/TAP driver compiled"
ERROR_TUN+=" into your kernel or loaded as a module to use the"
ERROR_TUN+=" virtual network device if using -net tap."
ERROR_BRIDGE="You will also need support for 802.1d"
ERROR_BRIDGE+=" Ethernet Bridging for some network configurations."
use vhost-net && CONFIG_CHECK+=" ~VHOST_NET"
ERROR_VHOST_NET="You must enable VHOST_NET to have vhost-net"
ERROR_VHOST_NET+=" support"
if use amd64 || use x86 || use amd64-linux || use x86-linux; then
if grep -q AuthenticAMD /proc/cpuinfo; then
CONFIG_CHECK+=" ~KVM_AMD"
elif grep -q GenuineIntel /proc/cpuinfo; then
CONFIG_CHECK+=" ~KVM_INTEL"
fi
fi
use python && CONFIG_CHECK+=" ~DEBUG_FS"
ERROR_DEBUG_FS="debugFS support required for kvm_stat"
# Now do the actual checks setup above
check_extra_config
fi
fi
if grep -qs '/usr/bin/qemu-kvm' "${EROOT}"/etc/libvirt/qemu/*.xml; then
eerror "The kvm/qemu-kvm wrappers no longer exist, but your libvirt"
eerror "instances are still pointing to it. Please update your"
eerror "configs in /etc/libvirt/qemu/ to use the -enable-kvm flag"
eerror "and the right system binary (e.g. qemu-system-x86_64)."
die "update your virt configs to not use qemu-kvm"
fi
}
# Sanity check to make sure target lists are kept up-to-date.
check_targets() {
local var=$1 mak=$2
local detected sorted
pushd "${S}"/default-configs >/dev/null || die
# Force C locale until glibc is updated. #564936
detected=$(echo $(printf '%s\n' *-${mak}.mak | sed "s:-${mak}.mak::" | LC_COLLATE=C sort -u))
sorted=$(echo $(printf '%s\n' ${!var} | LC_COLLATE=C sort -u))
if [[ ${sorted} != "${detected}" ]] ; then
eerror "The ebuild needs to be kept in sync."
eerror "${var}: ${sorted}"
eerror "$(printf '%-*s' ${#var} configure): ${detected}"
die "sync ${var} to the list of targets"
fi
popd >/dev/null
}
handle_locales() {
# Make sure locale list is kept up-to-date.
local detected sorted
detected=$(echo $(cd po && printf '%s\n' *.po | grep -v messages.po | sed 's:.po$::' | sort -u))
sorted=$(echo $(printf '%s\n' ${PLOCALES} | sort -u))
if [[ ${sorted} != "${detected}" ]] ; then
eerror "The ebuild needs to be kept in sync."
eerror "PLOCALES: ${sorted}"
eerror " po/*.po: ${detected}"
die "sync PLOCALES"
fi
# Deal with selective install of locales.
if use nls ; then
# Delete locales the user does not want. #577814
rm_loc() { rm po/$1.po || die; }
l10n_for_each_disabled_locale_do rm_loc
else
# Cheap hack to disable gettext .mo generation.
rm -f po/*.po
fi
}
src_prepare() {
check_targets IUSE_SOFTMMU_TARGETS softmmu
check_targets IUSE_USER_TARGETS linux-user
default
# Use correct toolchain to fix cross-compiling
tc-export AR AS LD NM OBJCOPY PKG_CONFIG RANLIB
export WINDRES=${CHOST}-windres
# Verbose builds
MAKEOPTS+=" V=1"
# Run after we've applied all patches.
handle_locales
# Remove bundled copy of libfdt
rm -r dtc || die
}
##
# configures qemu based on the build directory and the build type
# we are using.
#
qemu_src_configure() {
debug-print-function ${FUNCNAME} "$@"
local buildtype=$1
local builddir="${S}/${buildtype}-build"
mkdir "${builddir}"
local conf_opts=(
--prefix=/usr
--sysconfdir=/etc
--bindir=/usr/bin
--libdir=/usr/$(get_libdir)
--datadir=/usr/share
--docdir=/usr/share/doc/${PF}/html
--mandir=/usr/share/man
--with-confsuffix=/qemu
--localstatedir=/var
--disable-bsd-user
--disable-containers # bug #732972
--disable-guest-agent
--disable-strip
# bug #746752: TCG interpreter has a few limitations:
# - it does not support FPU
# - it's generally slower on non-self-modifying code
# It's advantage is support for host architectures
# where native codegeneration is not implemented.
# Gentoo has qemu keyworded only on targets with
# native code generation available. Avoid the interpreter.
--disable-tcg-interpreter
--disable-werror
# We support gnutls/nettle for crypto operations. It is possible
# to use gcrypt when gnutls/nettle are disabled (but not when they
# are enabled), but it's not really worth the hassle. Disable it
# all the time to avoid automatically detecting it. #568856
--disable-gcrypt
--python="${PYTHON}"
--cc="$(tc-getCC)"
--cxx="$(tc-getCXX)"
--host-cc="$(tc-getBUILD_CC)"
$(use_enable debug debug-info)
$(use_enable debug debug-tcg)
$(use_enable doc docs)
$(use_enable plugins)
$(use_enable xattr attr)
)
# Disable options not used by user targets. This simplifies building
# static user targets (USE=static-user) considerably.
conf_notuser() {
if [[ ${buildtype} == "user" ]] ; then
echo "--disable-${2:-$1}"
else
use_enable "$@"
fi
}
conf_opts+=(
$(conf_notuser accessibility brlapi)
$(conf_notuser aio linux-aio)
$(conf_notuser bzip2)
$(conf_notuser capstone)
$(conf_notuser caps cap-ng)
$(conf_notuser curl)
$(conf_notuser fdt)
$(conf_notuser glusterfs)
$(conf_notuser gnutls)
$(conf_notuser gnutls nettle)
$(conf_notuser gtk)
$(conf_notuser infiniband rdma)
$(conf_notuser iscsi libiscsi)
$(conf_notuser io-uring linux-io-uring)
$(conf_notuser jemalloc jemalloc)
$(conf_notuser jpeg vnc-jpeg)
$(conf_notuser kernel_linux kvm)
$(conf_notuser lzo)
$(conf_notuser multipath mpath)
$(conf_notuser ncurses curses)
$(conf_notuser nfs libnfs)
$(conf_notuser numa)
$(conf_notuser opengl)
$(conf_notuser png vnc-png)
$(conf_notuser rbd)
$(conf_notuser sasl vnc-sasl)
$(conf_notuser sdl)
$(conf_notuser sdl-image)
$(conf_notuser seccomp)
$(conf_notuser slirp slirp system)
$(conf_notuser smartcard)
$(conf_notuser snappy)
$(conf_notuser spice)
$(conf_notuser ssh libssh)
$(conf_notuser usb libusb)
$(conf_notuser usbredir usb-redir)
$(conf_notuser vde)
$(conf_notuser vhost-net)
$(conf_notuser vhost-user-fs)
$(conf_notuser virgl virglrenderer)
$(conf_notuser virtfs)
$(conf_notuser vnc)
$(conf_notuser vte)
$(conf_notuser xen)
$(conf_notuser xen xen-pci-passthrough)
$(conf_notuser xfs xfsctl)
$(conf_notuser xkb xkbcommon)
$(conf_notuser zstd)
)
if [[ ${buildtype} == "user" ]] ; then
conf_opts+=( --disable-libxml2 )
else
conf_opts+=( --enable-libxml2 )
fi
if [[ ! ${buildtype} == "user" ]] ; then
# audio options
local audio_opts=(
# Note: backend order matters here: #716202
# We iterate from higher-level to lower level.
$(usex pulseaudio pa "")
$(usev jack)
$(usev sdl)
$(usev alsa)
$(usev oss)
)
conf_opts+=(
--audio-drv-list=$(printf "%s," "${audio_opts[@]}")
)
fi
case ${buildtype} in
user)
conf_opts+=(
--enable-linux-user
--disable-system
--disable-blobs
--disable-tools
)
local static_flag="static-user"
;;
softmmu)
conf_opts+=(
--disable-linux-user
--enable-system
--disable-tools
)
local static_flag="static"
;;
tools)
conf_opts+=(
--disable-linux-user
--disable-system
--disable-blobs
--enable-tools
)
local static_flag="static"
;;
esac
local targets="${buildtype}_targets"
[[ -n ${targets} ]] && conf_opts+=( --target-list="${!targets}" )
# Add support for SystemTAP
use systemtap && conf_opts+=( --enable-trace-backend=dtrace )
# We always want to attempt to build with PIE support as it results
# in a more secure binary. But it doesn't work with static or if
# the current GCC doesn't have PIE support.
if use ${static_flag}; then
conf_opts+=( --static --disable-pie )
else
tc-enables-pie && conf_opts+=( --enable-pie )
fi
# Plumb through equivalent of EXTRA_ECONF to allow experiments
# like bug #747928.
conf_opts+=( ${EXTRA_CONF_QEMU} )
echo "../configure ${conf_opts[*]}"
cd "${builddir}"
../configure "${conf_opts[@]}" || die "configure failed"
# FreeBSD's kernel does not support QEMU assigning/grabbing
# host USB devices yet
use kernel_FreeBSD && \
sed -i -E -e "s|^(HOST_USB=)bsd|\1stub|" "${S}"/config-host.mak
}
src_configure() {
local target
python_setup
softmmu_targets= softmmu_bins=()
user_targets= user_bins=()
for target in ${IUSE_SOFTMMU_TARGETS} ; do
if use "qemu_softmmu_targets_${target}"; then
softmmu_targets+=",${target}-softmmu"
softmmu_bins+=( "qemu-system-${target}" )
fi
done
for target in ${IUSE_USER_TARGETS} ; do
if use "qemu_user_targets_${target}"; then
user_targets+=",${target}-linux-user"
user_bins+=( "qemu-${target}" )
fi
done
softmmu_targets=${softmmu_targets#,}
user_targets=${user_targets#,}
[[ -n ${softmmu_targets} ]] && qemu_src_configure "softmmu"
[[ -n ${user_targets} ]] && qemu_src_configure "user"
qemu_src_configure "tools"
}
src_compile() {
if [[ -n ${user_targets} ]]; then
cd "${S}/user-build"
default
fi
if [[ -n ${softmmu_targets} ]]; then
cd "${S}/softmmu-build"
default
fi
cd "${S}/tools-build"
default
}
src_test() {
if [[ -n ${softmmu_targets} ]]; then
cd "${S}/softmmu-build"
pax-mark m */qemu-system-* #515550
emake check
fi
}
qemu_python_install() {
python_domodule "${S}/python/qemu"
python_doscript "${S}/scripts/kvm/vmxcap"
python_doscript "${S}/scripts/qmp/qmp-shell"
python_doscript "${S}/scripts/qmp/qemu-ga-client"
}
# Generate binfmt support files.
# - /etc/init.d/qemu-binfmt script which registers the user handlers (openrc)
# - /usr/share/qemu/binfmt.d/qemu.conf (for use with systemd-binfmt)
generate_initd() {
local out="${T}/qemu-binfmt"
local out_systemd="${T}/qemu.conf"
local d="${T}/binfmt.d"
einfo "Generating qemu binfmt scripts and configuration files"
# Generate the debian fragments first.
mkdir -p "${d}"
"${S}"/scripts/qemu-binfmt-conf.sh \
--debian \
--exportdir "${d}" \
--qemu-path "${EPREFIX}/usr/bin" \
|| die
# Then turn the fragments into a shell script we can source.
sed -E -i \
-e 's:^([^ ]+) (.*)$:\1="\2":' \
"${d}"/* || die
# Generate the init.d script by assembling the fragments from above.
local f qcpu package interpreter magic mask
cat "${FILESDIR}"/qemu-binfmt.initd.head >"${out}" || die
for f in "${d}"/qemu-* ; do
source "${f}"
# Normalize the cpu logic like we do in the init.d for the native cpu.
qcpu=${package#qemu-}
case ${qcpu} in
arm*) qcpu="arm";;
mips*) qcpu="mips";;
ppc*) qcpu="ppc";;
s390*) qcpu="s390";;
sh*) qcpu="sh";;
sparc*) qcpu="sparc";;
esac
# we use 'printf' here to be portable across 'sh'
# implementations: #679168
cat <<EOF >>"${out}"
if [ "\${cpu}" != "${qcpu}" -a -x "${interpreter}" ] ; then
printf '%s\n' ':${package}:M::${magic}:${mask}:${interpreter}:'"\${QEMU_BINFMT_FLAGS}" >/proc/sys/fs/binfmt_misc/register
fi
EOF
echo ":${package}:M::${magic}:${mask}:${interpreter}:OC" >>"${out_systemd}"
done
cat "${FILESDIR}"/qemu-binfmt.initd.tail >>"${out}" || die
}
src_install() {
if [[ -n ${user_targets} ]]; then
cd "${S}/user-build"
emake DESTDIR="${ED}" install
# Install binfmt handler init script for user targets.
generate_initd
doinitd "${T}/qemu-binfmt"
# Install binfmt/qemu.conf.
insinto "/usr/share/qemu/binfmt.d"
doins "${T}/qemu.conf"
fi
if [[ -n ${softmmu_targets} ]]; then
cd "${S}/softmmu-build"
emake DESTDIR="${ED}" install
# This might not exist if the test failed. #512010
[[ -e check-report.html ]] && dodoc check-report.html
if use kernel_linux; then
udev_newrules "${FILESDIR}"/65-kvm.rules-r1 65-kvm.rules
fi
if use python; then
python_foreach_impl qemu_python_install
fi
fi
cd "${S}/tools-build"
emake DESTDIR="${ED}" install
# Disable mprotect on the qemu binaries as they use JITs to be fast #459348
pushd "${ED}"/usr/bin >/dev/null
pax-mark mr "${softmmu_bins[@]}" "${user_bins[@]}" # bug 575594
popd >/dev/null
# Install config file example for qemu-bridge-helper
insinto "/etc/qemu"
doins "${FILESDIR}/bridge.conf"
cd "${S}"
dodoc Changelog MAINTAINERS docs/specs/pci-ids.txt
newdoc pc-bios/README README.pc-bios
# Disallow stripping of prebuilt firmware files.
dostrip -x ${QA_PREBUILT}
if [[ -n ${softmmu_targets} ]]; then
# Remove SeaBIOS since we're using the SeaBIOS packaged one
rm "${ED}/usr/share/qemu/bios.bin"
rm "${ED}/usr/share/qemu/bios-256k.bin"
if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
dosym ../seabios/bios.bin /usr/share/qemu/bios.bin
dosym ../seabios/bios-256k.bin /usr/share/qemu/bios-256k.bin
fi
# Remove vgabios since we're using the seavgabios packaged one
rm "${ED}/usr/share/qemu/vgabios.bin"
rm "${ED}/usr/share/qemu/vgabios-cirrus.bin"
rm "${ED}/usr/share/qemu/vgabios-qxl.bin"
rm "${ED}/usr/share/qemu/vgabios-stdvga.bin"
rm "${ED}/usr/share/qemu/vgabios-virtio.bin"
rm "${ED}/usr/share/qemu/vgabios-vmware.bin"
# PPC64 loads vgabios-stdvga
if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386 || use qemu_softmmu_targets_ppc64; then
dosym ../seavgabios/vgabios-isavga.bin /usr/share/qemu/vgabios.bin
dosym ../seavgabios/vgabios-cirrus.bin /usr/share/qemu/vgabios-cirrus.bin
dosym ../seavgabios/vgabios-qxl.bin /usr/share/qemu/vgabios-qxl.bin
dosym ../seavgabios/vgabios-stdvga.bin /usr/share/qemu/vgabios-stdvga.bin
dosym ../seavgabios/vgabios-virtio.bin /usr/share/qemu/vgabios-virtio.bin
dosym ../seavgabios/vgabios-vmware.bin /usr/share/qemu/vgabios-vmware.bin
fi
# Remove sgabios since we're using the sgabios packaged one
rm "${ED}/usr/share/qemu/sgabios.bin"
if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
dosym ../sgabios/sgabios.bin /usr/share/qemu/sgabios.bin
fi
# Remove iPXE since we're using the iPXE packaged one
rm "${ED}"/usr/share/qemu/pxe-*.rom
if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
dosym ../ipxe/8086100e.rom /usr/share/qemu/pxe-e1000.rom
dosym ../ipxe/80861209.rom /usr/share/qemu/pxe-eepro100.rom
dosym ../ipxe/10500940.rom /usr/share/qemu/pxe-ne2k_pci.rom
dosym ../ipxe/10222000.rom /usr/share/qemu/pxe-pcnet.rom
dosym ../ipxe/10ec8139.rom /usr/share/qemu/pxe-rtl8139.rom
dosym ../ipxe/1af41000.rom /usr/share/qemu/pxe-virtio.rom
fi
fi
DISABLE_AUTOFORMATTING=true
readme.gentoo_create_doc
}
firmware_abi_change() {
local pv
for pv in ${REPLACING_VERSIONS}; do
if ver_test $pv -lt ${FIRMWARE_ABI_VERSION}; then
return 0
fi
done
return 1
}
pkg_postinst() {
if [[ -n ${softmmu_targets} ]] && use kernel_linux; then
udev_reload
fi
xdg_icon_cache_update
[[ -z ${EPREFIX} ]] && [[ -f ${EROOT}/usr/libexec/qemu-bridge-helper ]] && \
fcaps cap_net_admin ${EROOT}/usr/libexec/qemu-bridge-helper
DISABLE_AUTOFORMATTING=true
readme.gentoo_print_elog
if use pin-upstream-blobs && firmware_abi_change; then
ewarn "This version of qemu pins new versions of firmware blobs:"
ewarn " $(best_version sys-firmware/edk2-ovmf)"
ewarn " $(best_version sys-firmware/ipxe)"
ewarn " $(best_version sys-firmware/seabios)"
ewarn " $(best_version sys-firmware/sgabios)"
ewarn "This might break resume of hibernated guests (started with a different"
ewarn "firmware version) and live migration to/from qemu versions with different"
ewarn "firmware. Please (cold) restart all running guests. For functional"
ewarn "guest migration ensure that all"
ewarn "hosts run at least"
ewarn " app-emulation/qemu-${FIRMWARE_ABI_VERSION}."
fi
}
pkg_info() {
echo "Using:"
echo " $(best_version app-emulation/spice-protocol)"
echo " $(best_version sys-firmware/edk2-ovmf)"
if has_version 'sys-firmware/edk2-ovmf[binary]'; then
echo " USE=binary"
else
echo " USE=''"
fi
echo " $(best_version sys-firmware/ipxe)"
echo " $(best_version sys-firmware/seabios)"
if has_version 'sys-firmware/seabios[binary]'; then
echo " USE=binary"
else
echo " USE=''"
fi
echo " $(best_version sys-firmware/sgabios)"
}
pkg_postrm() {
xdg_icon_cache_update
}

Binary file not shown.

@ -3,8 +3,10 @@ AUX sleuthkit-4.6.4-default-jar-location-fix.patch 1768 BLAKE2B d9a0675223506649
DIST SparseBitSet-1.1.jar 23706 BLAKE2B 8623a723f11f97386a108c775fefddd324997b68bea7f7ade0581ec5800bfa8d32f699ab903ad66c631b7b5c69ba1ef377243653f5044f39234dac07543eb129 SHA512 cf75431c5f705961800ce5cbca2acb9b2459eaf98ec37b5ee21c5a90d204ffb466fa25457b0560fbb024489777efbea0276201024c7b1b2853124930ac490983
DIST commons-validator-1.6.jar 186077 BLAKE2B 39080bebfde71d87847b65f212d47a51bab9567cb0aaf7122359a67a8eb817877a6cc80495a15aefb12936d0e36532ed771dc0a2dff8401fc301f658ed38ef88 SHA512 aded530d3b79ead6ba5c44668c6d6964d7721f9617249f6aaa1c8f558ad4b3d3c1b6d78b639a4cb8dd27a671879b662fdbba0502fd04e131f3286169507df30c
DIST gson-2.8.5.jar 241622 BLAKE2B b13887177b5d5f2a11b2dde1fdbaa3a95b55bb7b5500624c7eb0745e861c897ed1e27868bad19d30a1670c90f3068a8fd40e1b81e5e25e96819fa5c371a5e1af SHA512 5dd7214c542a7b93aab3eab0ba13e4ac3d6ddb05c795fb6d3992e21925a98dce87cb186ac67b4d3ad146f96e14d38b3892837eca57a27b4e845aca6d4e4f708a
DIST sleuthkit-4.10.1.tar.gz 3524246 BLAKE2B ddea16693730a993032868ea60423d4bfcf3cba470010854c7bd36ab0a033325d906a0e4760501d59fdda4f37e12052f8672d33e4e374d1a6cdb03e22d0de367 SHA512 3ee335ba98bbb16985207ad50bc15a607ea2bcf550bba392be1cace8982c893a29e9de64e6598d02f41f9f745dc720f829317ed31f068e6cb1f6c230699e47bf
DIST sleuthkit-4.9.0.tar.gz 3473764 BLAKE2B 3950e586595f53a81c845b3b1fbaf4939a84ee3d81e8141cabf41c9fbee1b1f5cf1b8bd6cab95b157d60364541736f750c8ada61c76da89e663721b9a67330ef SHA512 1db8b9f825aa551fe5bdf01285832b903fb4f2d6a8fd9a57a5cd5c9005dfdbec22d3dd49d394616d838e2a2111110018e787f2ed467a1c27a500fc75bed0dd0b
DIST sleuthkit-libewf_64bit-20130416.tar.gz 23818247 BLAKE2B 23be933ed8a74e4834ee6571a28d81ba16e98e4e4e27b5b1b3b655d1d92a6eadcba35aadf96aa404e6e0a225b27f3f5daff2836879b87fe58440a3ad5645de44 SHA512 611cbb57de17600caee0330bbe9917c4481d7711a35dba8c072fd49cd3e1714e0a3ce30fd8fcac9981db848e80870bf5d215326c56808bb6f5b4c8dcc1e5a3c9
DIST sqlite-jdbc-3.25.2.jar 7064881 BLAKE2B 3917da6127137bab710a9e61f326f59320ce94654ebb8ae5e694b05aed6b9b1bd367ade2f08ce5bb52c3ac296992240ad949969f5eff712615d07a18588c6a17 SHA512 efd1ea26d7f4f9bc66bf0d5f80234a0c535829bd498e4c5a0cab42873b58ac69133497d8c45689a1d3a39e657a2d0474d6b930c7bc415dd623801ee4a7354ffb
EBUILD sleuthkit-4.10.1.ebuild 8409 BLAKE2B fc63cb95ff816f8f8ca12e6312a9480e3f290b50c26d7e748447f1c5b8ce5fd9c8358a005ea5bfb0d68f1683a036cb105ad78d9a9c95d4f8b5842df0aead1455 SHA512 a51782ecc88ed7271ce4942d6d188fcb1240c37603eab13820d263c4b23dc144a8e4594a91398e49fe8c3421b5fd4ca97a7d78a3b10cc08f92f1f8e77f16821a
EBUILD sleuthkit-4.9.0.ebuild 8264 BLAKE2B 879a179c1cd7bd6f7f26325a9788bd1f34645c1f1ee71a73da65dd0e3bcdc720fe3f51623710abddfd5897e1ca5bbb4e6c82a8da4443e2d3f90f6a8920bc4cc2 SHA512 37ef66d26c09e7df2e47ef2dbef0d40d06c5232f3f7fa32106966f260d83c758729bcde1633a19da7fbbd3c3b27ef33e2da48fa347457e97a5a02f5ece42076e
MISC metadata.xml 607 BLAKE2B 2c651da1253ec986eb766b6949ea9a9059d76351081e805aba5f795971bb3b9368987cc9d39fc335c1e65c12de9347471686984e2753487cafab431488762064 SHA512 2dbce141f133a9172c6ba61924a9fac2674394096063b899be5a90111a9741789e2a09aa06cc49e17a253d088d20c1ddad1c748b6e09f650131ec0f91116ae08

@ -0,0 +1,304 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
JAVA_PKG_BSFIX_NAME="build.xml build-unix.xml"
inherit autotools java-pkg-opt-2 java-ant-2
DESCRIPTION="A collection of file system and media management forensic analysis tools"
HOMEPAGE="https://www.sleuthkit.org/sleuthkit/"
# TODO: sqlite-jdbc does not exist in the tree, we bundle it for now
# See: https://bugs.gentoo.org/690010
# TODO: SparseBitSet does not exist in the tree, we bundle it for now
# See: https://bugs.gentoo.org/690012
# TODO: Upstream uses a very specific version of libewf which is not in
# the tree anymore. So we statically compile and link to sleuthkit.
# Hopefully upstream will figure something out in the future.
# See: https://bugs.gentoo.org/689752
# TODO: gson-2.8.5 does not exist in the tree. Building it seems to
# require Java 9. We have Java 11 in the tree but I don't see a
# way to use it as a gentoo-vm in order to build gson. Sleuthkit
# upstream still uses Java 8.
# See: https://bugs.gentoo.org/706274
# TODO: commons-validator-1.6 does not exist in the tree. The latest version
# as of writing this ebuild is 1.4.1, for which the build fails. As
# per #711930, this is a security sensitive bump. We're gonna fetch
# the jar file here and file a bug request for a bump as well:
# https://bugs.gentoo.org/721020
SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.gz
java? (
https://repo1.maven.org/maven2/com/google/code/gson/gson/2.8.5/gson-2.8.5.jar
http://repo1.maven.org/maven2/org/xerial/sqlite-jdbc/3.25.2/sqlite-jdbc-3.25.2.jar
http://repo1.maven.org/maven2/com/zaxxer/SparseBitSet/1.1/SparseBitSet-1.1.jar
https://repo1.maven.org/maven2/commons-validator/commons-validator/1.6/commons-validator-1.6.jar
)
ewf? ( https://github.com/sleuthkit/libewf_64bit/archive/VisualStudio_2010.tar.gz -> sleuthkit-libewf_64bit-20130416.tar.gz )"
LICENSE="BSD CPL-1.0 GPL-2+ IBM java? ( Apache-2.0 )"
SLOT="0/19" # subslot = major soname version
KEYWORDS="~amd64 ~hppa ~ppc ~x86"
IUSE="aff doc ewf java static-libs test +threads zlib"
RESTRICT="!test? ( test )"
DEPEND="
dev-db/sqlite:3
dev-lang/perl:*
aff? ( app-forensics/afflib )
ewf? ( sys-libs/zlib )
java? (
>=dev-java/c3p0-0.9.5:0
dev-java/commons-lang:3.1
dev-java/guava:20
>=dev-java/jdbc-postgresql-9.4:0
>=dev-java/joda-time-2.4:0
)
zlib? ( sys-libs/zlib )
"
# TODO: add support for not-in-tree libraries libvhdi and libvmdk
# libvhdi: https://github.com/libyal/libvhdi
# libvmdk: https://github.com/libyal/libvmdk
# DEPEND="${DEPEND}
# vhdi? ( dev-libs/libvhdi )
# vmdk? ( dev-libs/libvmdk )
# "
RDEPEND="${DEPEND}
java? (
|| (
virtual/jre:1.8
virtual/jdk:1.8
)
)
"
DEPEND="${DEPEND}
java? ( virtual/jdk:1.8 )
doc? ( app-doc/doxygen )
test? ( >=dev-util/cppunit-1.2.1 )
"
PATCHES=(
"${FILESDIR}"/${PN}-4.1.0-tools-shared-libs.patch
"${FILESDIR}"/${PN}-4.6.4-default-jar-location-fix.patch
)
src_unpack() {
local f
unpack ${P}.tar.gz
if use ewf; then
pushd "${T}" &>/dev/null || die
unpack sleuthkit-libewf_64bit-20130416.tar.gz
export TSK_LIBEWF_SRCDIR="${T}"/libewf_64bit-VisualStudio_2010
popd &>/dev/null || die
fi
# Copy the jar files that don't exist in the tree yet
if use java; then
TSK_JAR_DIR="${T}/lib"
mkdir "${TSK_JAR_DIR}" || die
for f in ${A}; do
if [[ ${f} =~ .jar$ ]]; then
cp "${DISTDIR}"/"${f}" "${TSK_JAR_DIR}" || die
fi
done
export TSK_JAR_DIR
fi
}
tsk_prepare_libewf() {
# Inlining breaks the compilation, disable it
sed -e 's/LIBUNA_INLINE inline/LIBUNA_INLINE/' \
-i "${TSK_LIBEWF_SRCDIR}"/libuna/libuna_inline.h || die
}
src_prepare() {
use ewf && tsk_prepare_libewf
# Do not pass '-Werror'. This is overkill for user builds.
sed -e '/AM_CXXFLAGS/ s/-Werror//g' \
-i tsk/util/Makefile.am \
-i tsk/pool/Makefile.am || die
# Remove -static from LDFLAGS because it doesn't actually create
# a static binary. It confuses libtool, who then inserts rpath
sed -e '/LDFLAGS/ s/-static//' \
-i tools/pooltools/Makefile.am || die
if use java; then
pushd "${S}"/bindings/java &>/dev/null || die
# Prevent "make install" from installing
# jar files under /usr/share/java
# We'll use the java eclasses for this
# See: https://github.com/sleuthkit/sleuthkit/pull/1379
sed -e '/^jar_DATA/ d;' -i Makefile.am || die
java-pkg-opt-2_src_prepare
popd &>/dev/null || die
fi
# Override the doxygen output directories
if use doc; then
sed -e "/^OUTPUT_DIRECTORY/ s|=.*$|= ${T}/doc|" \
-i tsk/docs/Doxyfile \
-i bindings/java/doxygen/Doxyfile || die
fi
# It's safe to call this even after java-pkg-opt-2_src_prepare
# because future calls to eapply_user do nothing and return 0
default
eautoreconf
}
tsk_compile_libewf() {
local myeconfargs=(
--prefix=/
--libdir=/lib
--enable-static
--disable-shared
--disable-winapi
--without-libbfio
--with-zlib
--without-bzip2
--without-libhmac
--without-openssl
--without-libuuid
--without-libfuse
--with-libcstring=no
--with-libcerror=no
--with-libcdata=no
--with-libclocale=no
--with-libcnotify=no
--with-libcsplit=no
--with-libuna=no
--with-libcfile=no
--with-libcpath=no
--with-libbfio=no
--with-libfcache=no
--with-libfvalue=no
)
# We want to contain our build flags
local CFLAGS="${CFLAGS}"
local LDFLAGS="${LDFLAGS}"
pushd "${TSK_LIBEWF_SRCDIR}" &>/dev/null || die
# Produce relocatable code
CFLAGS+=" -fPIC"
LDFLAGS+=" -fPIC"
econf "${myeconfargs[@]}"
# Do not waste CPU cycles on building ewftools
sed -e '/ewftools/ d' -i Makefile || die
emake
# Only install the headers and the library
emake -C libewf DESTDIR="${T}"/image install
emake -C include DESTDIR="${T}"/image install
find "${T}"/image -name '*.la' -delete || die
popd &>/dev/null || die
}
src_configure() {
local myeconfargs=(
--enable-offline="${TSK_JAR_DIR}"
$(use_enable java)
$(use_enable static-libs static)
$(use_enable threads multithreading)
$(use_with aff afflib)
$(use_with zlib)
)
# TODO: add support for non-existing libraries libvhdi and libvmdk
# myeconfargs+=(
# $(use_with vhdi libvhdi)
# $(use_with vmdk libvmdk)
# )
myeconfargs+=(
--without-libvhdi
--without-libvmdk
)
use ewf && tsk_compile_libewf
myeconfargs+=( $(use_with ewf libewf "${T}"/image) )
if use java; then
pushd "${S}"/bindings/java &>/dev/null || die
java-ant-2_src_configure
popd &>/dev/null || die
fi
econf "${myeconfargs[@]}"
}
src_compile() {
# Give it an existing bogus ivy home #672220
local -x IVY_HOME="${T}"
# Create symlinks of jars for the required dependencies
if use java; then
java-pkg_jar-from --into "${TSK_JAR_DIR}" c3p0
java-pkg_jar-from --into "${TSK_JAR_DIR}" commons-lang:3.1
java-pkg_jar-from --into "${TSK_JAR_DIR}" guava:20
java-pkg_jar-from --into "${TSK_JAR_DIR}" jdbc-postgresql
java-pkg_jar-from --into "${TSK_JAR_DIR}" joda-time
# case-uco needs gson and expects it under case-uco/java/lib
# symlink it to the jar dir we create for java bindings
ln -s "${TSK_JAR_DIR}" "${S}"/case-uco/java/lib || die
fi
# Create the doc output dirs if requested
if use doc; then
mkdir -p "${T}"/doc/{api-docs,jni-docs} || die
fi
emake all $(usex doc api-docs "")
}
src_install() {
local f
if use java; then
pushd "${S}"/bindings/java &>/dev/null || die
# Install case-uco
pushd "${S}"/case-uco/java &>/dev/null || die
java-pkg_newjar "dist/${PN}-caseuco-${PV}".jar "${PN}-caseuco.jar"
popd || die
# Install the bundled jar files as well as the
# sleuthkit jar installed here by case-uco
pushd "${TSK_JAR_DIR}" &>/dev/null || die
for f in *; do
# Skip the symlinks java-pkg_jar-from created
[[ -f ${f} ]] || continue
# Strip the version numbers as per eclass recommendation
[[ ${f} =~ -([0-9]+\.)+jar$ ]] || continue
java-pkg_newjar "${f}" "${f/${BASH_REMATCH[0]}/.jar}"
done
popd &>/dev/null || die
popd &>/dev/null || die
fi
default
# Default install target for case-uco installs the jar in the wrong place
rm -r "${ED}"/usr/share/java
# It unconditionally builds both api and jni docs
# We install conditionally based on the provided use flags
if use doc; then
dodoc -r "${T}"/doc/api-docs
use java && dodoc -r "${T}"/doc/jni-docs
fi
find "${D}" -name '*.la' -delete || die
}

Binary file not shown.

@ -1,5 +1,5 @@
DIST transifex-client-0.13.12.tar.gz 211369 BLAKE2B e536e2d1c33c9a64326cac9bab2a5d162fc554185127b2e8d3fc77e81cb4f19b8c2b66b5bd4502cf3129bbf1f0aa2c6649552392831b3d2b6ed322170de31952 SHA512 e4a5c78f3cdf589ad186a09b8ada09e06a725499234c03a037f8a8fb33447fb25edaf921a395ce8cb31c11c08a21dbb1b7b35cf54276995d255ddb2382e549c9
DIST transifex-client-0.13.9.tar.gz 197283 BLAKE2B 9fd6f63a54d09f190f7dd6701e4994e4fd67e23cf630dcb49641a3c7356e55f1146be7c2a590fb09a52cccfa99e709c48fffd7df416d1d4c10231c4f42919380 SHA512 3dc4a1e713a797ce1ea626c9e85dd353fec3034ba21ab04bc89e5b927e0298b4f6560a793eec50d1a99c7ab340462c33d18c1e159697c476001be868cb7f87fa
EBUILD transifex-client-0.13.12.ebuild 893 BLAKE2B a8df2ddeaf46601836217f3a5f0a5f1b7f1e116f6350ced90505ad3ca692189e79d5e7457121fd06e35ead95e4b16fa80efd382b4ae3af85fc9102018f9c44ce SHA512 3c5cb6db79d2f2f1729266435b5bf0cab2fe5b9847b38017a73d558804877ea24bfec10d91709757af21c0b92a6781d976708f115279d1686458c52b2784e093
DIST transifex-client-0.14.2.tar.gz 211398 BLAKE2B 4210a06da9fd09e689d28ae77a90c65f96cbba7b44a2cc506c2e385dc2f34659bfbda25eb81cef850442f4b3da22a859e19761798ec123888564b0327f0c6503 SHA512 5d7f8241d61621197df95cb42b2a8fb8088e77543f076c2401db14f7e44d67e49478d0b04cb525fc6281b37e5026edc8121f90cb7332e669d63be6112264044d
EBUILD transifex-client-0.13.9.ebuild 752 BLAKE2B 0ddbf4e4a08f2890dd3da509f2d3ae52a2235268a8f845960a7c92279aa3bb573adf6d3102219c8c7e399a080fb28d6f18ed689b01244f523bc0bc723eed7212 SHA512 7eb6b8ddfc035f0331b0bb4f0b0dde20131c54c4553429a486ef97b338e8b458083f642807e8834b1e30b727ed51982279d8648ae991fffb12c25671d73d0dc5
EBUILD transifex-client-0.14.2.ebuild 893 BLAKE2B a8df2ddeaf46601836217f3a5f0a5f1b7f1e116f6350ced90505ad3ca692189e79d5e7457121fd06e35ead95e4b16fa80efd382b4ae3af85fc9102018f9c44ce SHA512 3c5cb6db79d2f2f1729266435b5bf0cab2fe5b9847b38017a73d558804877ea24bfec10d91709757af21c0b92a6781d976708f115279d1686458c52b2784e093
MISC metadata.xml 511 BLAKE2B cb47fd7af2c99fe027060cd09a0ed4943faf219f1a9117be347e317c651d68f4a8d6967a51d899f6e125110138cfd47242b8818ef0bdf51f8b08d3989680ed79 SHA512 e1ff78568bc8bc8c80a48ffe569deb6fe36f431443ef10903a3fe03ea3f2b1452e0c145388c7225d0dfcac126b692276b27e8973a8875788234924a1d2cd8c31

Binary file not shown.

@ -1,3 +1,3 @@
DIST birthday-1.6.2.tar.bz2 85617 BLAKE2B bb922b4dbec35e967f5b0060a13b5429fe01478159ab930e2924dc0d397c47c265384f71dac63bb0f3bb609a0c98099529680c8d097b747d857086d885d9bb4b SHA512 5081cd9f875260758d209165803715d3eb19e2256344172cb3ea01f87f859215ce68e29174c22eec467bdb6eebc11627a71674321bb9b96db9562d13cdc80882
EBUILD birthday-1.6.2-r1.ebuild 698 BLAKE2B 220a91286514a2b206e5ed2d95c388b93871100d8cb95ca9dcf7d3117aaac1590bffaf7b157e0a5f26f881dcf04f1489037725737e0a15486e59a9f7e1b45fd1 SHA512 2f09d307d9bf11a212125ca7c302c86a90ab6c524ee1709bf2fbb669fecff090519fd917038ba6cd2f7d40a0d07fd8eb8de4d3edb4923d8d177b8cc8bb06f307
EBUILD birthday-1.6.2-r1.ebuild 703 BLAKE2B 6d59c1752f58aefa7b59e0f362a66aae703fa7bbfe6395e7eff7401beb894b0c8332fc38d0ed847a427c8237a5682411ecf3067e661987362bbf002e53a13813 SHA512 24d3e3604e3775c8d134fb6a8e3c30335e571b57b25f1ba7e922cc8d87dab74b5618cf4615c0d550a750a50df14dfea155f416dbfab717b6ef16397b0399787f
MISC metadata.xml 343 BLAKE2B da9301a517150bf8a7526d0561bae8de1f16658f751a3d64f471058877e832d3e625bd85440a1bd2c5fc015099170f2b2e34bd7084b8719f454280871317feae SHA512 1090fa6925bc056aba45841ccfdd8df241414eb187cb7a8d95379a65c3ef950849cf9e42d8f4dac1d44d2e7ae65f51d9498cee5e523a535ece88e553a75a1261

@ -1,4 +1,4 @@
# Copyright 1999-2017 Gentoo Foundation
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@ -16,10 +16,12 @@ KEYWORDS="amd64 ppc ppc64 sparc x86"
src_prepare() {
# Don't strip, install in correct share dir and respect CFLAGS
sed \
-e "s:install -s:install:g" -e "s:#SHARE:SHARE:g" -e "s:-O2:${CFLAGS}:g" \
-e "s@install -s@install@g" \
-e "s@#SHARE@SHARE@g" \
-e "s@-O2@${CFLAGS}@g" \
-i Makefile || die
sed \
-e 's:grep -v:grep --binary-files=text -v:g' \
-e 's@grep -v@grep --binary-files=text -v@g' \
-i runtest.sh || die
default

@ -1,5 +1,3 @@
DIST ondir-0.2.2.tar.gz 20138 BLAKE2B 3724b8d356cec16e1f60ec49574e2f688d4f7456f48f1d909402e8436f588d9617c827eda9a74c1b930d2538fe8c9d1372a1d222124d8f7b863bf8e895cfaa25 SHA512 5c2c53532934b25d2a170c619d067c369b6acf2ef3e0a87607619613dcc0bbfc570937fb91cdc5df3f22ae0453b5a5d00edd57cd1b852f7a076c15b96c45d4dd
DIST ondir-0.2.4.tar.gz 52860 BLAKE2B e9111f9a64d8d7393d9a8e48d5dc66d5814995ae1dbd2f577538a03021c1b1b92af43acbd0ab9cb24ab29ba16c50d5752a9442689effc62bd8c13b6fe11a4785 SHA512 f59a823807f86ce2992aaf5fb174ddea222b02ed18e1289ca450179bd090892f1467072dfcec97ce219e216c055781ea7a1a05bb9402276fb9404a57f42ddb52
EBUILD ondir-0.2.2-r2.ebuild 983 BLAKE2B 1ad1bf96ffea8060f6a676183d5c200165e928cbf46e5a4ddc2dfdd342e150c53bc9375a8413fae34a2a0af147a34ab1cac6caa19b3858e0ae33e85bbeb4e8b6 SHA512 4da1bcf80437796ea0c427f3be610c406880ff76e2d59c651078ab86917c3a06ad3e1b5b017836d499a7cd3ad1095ea9a5308def391764c78dc042063b1af7fe
EBUILD ondir-0.2.4.ebuild 1014 BLAKE2B 19916edbcffd21f4f80fc0df603a2c7f74b3590f44f133b94e29036bb7d25697eda3d0b421c1b44bbf7111238c4525e7cfce8f473a27ed5880b805d1f595ac8f SHA512 17974ea87fcc7ed018b2c150762b559f5167752fd8621a09ed63944efb65b408ddd6c9b150c70d633c7ed19c27a5457e0f3a5a387d04ff28ec7a157f5411083e
EBUILD ondir-0.2.4.ebuild 1011 BLAKE2B 1c3785050360fe927d6c0edb3aa377206587bb5714438977e9eadec0482a011ebb414703a928a2257cd125b82ca5aea34b7effde0ef49f83f9757a0df23c07fd SHA512 65064ec7e78c5e69f87831e10d00dc2bb348d82ac528d7a61b149a856b063594ab6c7076f6655a8ba30626ff99df91fef5eecd7d9c04d27ac90422dcbb5edb7e
MISC metadata.xml 265 BLAKE2B 75452ad720a31a08fc0dcd02eec704c18b11bc0660686f9a320b85fc879f55a564ce9c3b6a8c710781b74c5e8eb3d0544c02a042fb35a0b62a5e1491f675296a SHA512 176f814d8c555e8726f36e012367b698e8a19a0662982621029a7f9190beecc5e6798e43c51698dc149364966cdeff7061121e54fa9d4cf2a3559a6ce4904e25

@ -1,45 +0,0 @@
# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
inherit toolchain-funcs
DESCRIPTION="Automatically execute scripts as you traverse directories"
HOMEPAGE="http://swapoff.org/OnDir"
SRC_URI="http://swapoff.org/files/${PN}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
DEPEND="sys-apps/sed"
RDEPEND="${DEPEND}"
DOCS=( AUTHORS ChangeLog README INSTALL scripts.tcsh scripts.sh )
HTML_DOCS=( changelog.html ondir.1.html )
src_prepare() {
default
sed -i \
-e "s:\(/man/.*$\):/share\1:g" \
-e "s:-g:${CFLAGS}:" Makefile || die "sed Makefile failed"
}
src_compile() {
emake \
CC="$(tc-getCC)" \
PREFIX="${EPREFIX}/usr" \
CONF="${EPREFIX}/etc/ondirrc" \
LDFLAGS="${LDFLAGS}"
}
src_install() {
default
emake \
DESTDIR="${D}" \
PREFIX="${EPREFIX}/usr" \
CONF="${EPREFIX}/etc/ondirrc" \
install
newdoc ondirrc.eg ondirrc.example
}

@ -11,7 +11,7 @@ SRC_URI="http://swapoff.org/files/${PN}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
DEPEND="sys-apps/sed"
RDEPEND="${DEPEND}"

@ -1,5 +1,5 @@
DIST when-1.1.36.tar.gz 50926 BLAKE2B 339e50db6b3c7e4867569e2a400563e9d53966904cf904044b3e7f7deee8e60872582011d90e1a685d69c4a1a5b9ffe2a727470bb09c8d6e1ca7780c9d0abce7 SHA512 04b2efbcebae79325d8410a5aa5cdf59662fe42c06229ebc91f3b7163091d305a6ba91914a2a9117d86807d5ca0c875d48679dbc3545162a7263679bf605a52e
DIST when-1.1.37.tar.gz 51020 BLAKE2B 242d7833c91279bc7a73effc108a0f7d5edad9838006d8ff632c46215b7cd2a2187660075e2525a352a458a494abc648a9518945cdf18e2e7d58261e428efd8f SHA512 b1f0cb9cb797a5a32263ef2851498dfbf6a769d3e708b79ca1c5b37c7c877124194dd9b5ae78bfafebc0e73e82f306b3ae734a5ef7140fe3bf0e6b2cfcc4bb18
EBUILD when-1.1.36.ebuild 897 BLAKE2B 7afb73f40599a10363e5a59872b337ec44c794ff9be4646cb480ffb4aff23cf745da783c10fa6608bd7a5ab0635367fb9c03671931fb47a1ee836a7ed73b32c2 SHA512 3e7ffda7ef158f9ef86933f97e041cc99014897ca1cb56dc6ef8d34e3b628ca2d8a5bcefb30790b03713993d8d5cc66bcf736118f6c8b428e9872de4eccb2a96
EBUILD when-1.1.37.ebuild 900 BLAKE2B 70c62c2825ae71b966a08738f5eb1d03b9c300a488c67521c231503d637f8bc393040e4fe020d2d64cd90e2a78128f769095a563401c4a81ffcba6988c2d901c SHA512 1b70fb605f8e9df5670a0ca737672b1c61c64a73fa1189fe1c3f61442e6cdaba40ef5f0edd30f45bd3c724583a099c93878d409f8396dcec01bdf414ece65057
DIST when-1.1.40.tar.gz 55306 BLAKE2B 3d4bdc962ccff64b09f5dda7a2c7be1daa0fd5fed2039f784ea6279e9aac495823159098f6a05c281de40d7964cc244a76c6b3bda1c4227748c04c98effac54d SHA512 0d70f2c9c4d44bbd922dc0d6b1a4e1eb90561a81add3ad4f1e1fc467a6331ca856d66725361d4e5ea3f1ce9ea1ed59d91ad18178e022b029c04c0c15747ecbcd
EBUILD when-1.1.37.ebuild 894 BLAKE2B 4fc2e1ad788c903334cf7faf5b118d298f144ee50147585c99c2b957e97e37f708604a6541321bd44a83b578eda60e0459cdf58cab6ddf620afd98793149e5b2 SHA512 9751e3496d29e3c37ffad16d3c0e7b5a8985c77da54302a50f9020483604feccfb792617f4961c53ba81ef49a9ad751a44cc10b9cc3c55fbefdd9a221a44f26a
EBUILD when-1.1.40.ebuild 914 BLAKE2B 6bf8ae308ebc05f2d46adaa6387afb1ab70c2f69b61a494096cb4f96cde1154c6b60cc263670d672fe004e9e1cb10cb5c57316376a37fc3fb68dba39b09d9fa5 SHA512 090efa94d7b5e8f0dd5dd3e32aa2a836fca0b5fe5ef06e4a6a4e189e5387c21a87b357f90d7481ae5018b60a23a78a1daee4b5836100a71244c28d5b1055fe26
MISC metadata.xml 271 BLAKE2B 46146f4bf13e9f4d33435225ec1012dd9bb89b20812963dc50368cab2a60a3c542052cb72f8963cc72074b2c13a5b054c77152de1d108027752601a349bc4ef8 SHA512 3e98f5382cf789992bdfc0f32e6e36eba31944be654c03f2ed9bd00baf56c8b768c256c4f8778d5775d6df38da4afcf8e32b6e6495a1ecfc8e7982c7c8943b1b

@ -1,4 +1,4 @@
# Copyright 1999-2017 Gentoo Foundation
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@ -9,7 +9,7 @@ SRC_URI="http://www.lightandmatter.com/when/when.tar.gz -> ${P}.tar.gz"
LICENSE="Artistic"
SLOT="0"
KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
DEPEND="dev-lang/perl"
RDEPEND="${DEPEND}"

@ -1,7 +1,7 @@
# Copyright 1999-2017 Gentoo Foundation
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
EAPI=7
DESCRIPTION="Minimalistic personal calendar program"
HOMEPAGE="http://www.lightandmatter.com/when/when.html"
@ -9,7 +9,7 @@ SRC_URI="http://www.lightandmatter.com/when/when.tar.gz -> ${P}.tar.gz"
LICENSE="Artistic"
SLOT="0"
KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
DEPEND="dev-lang/perl"
RDEPEND="${DEPEND}"
@ -18,6 +18,8 @@ S="${WORKDIR}/when_dist"
DOCS=( README )
RESTRICT="test"
src_prepare() {
default

Binary file not shown.

@ -37,7 +37,7 @@ DIST libreoffice-help-7.0.3.1.tar.xz 110855688 BLAKE2B 3b0e845087fe0bd25ad3c06b8
DIST skia-m85-e684c6daef6bfb774a325a069eda1f76ca6ac26c.tar.xz 8375536 BLAKE2B 8e3849123ce426a4dc43705537b176df82c6039a23911d75b7b3b26ca44f4a600c96c67c5f4d935a8d6a5064362f7f2167231b2aafbc44533c07299a8980aafe SHA512 4aeba56400d20e5fe234c7927b3d196233e19513a3202e074a88fad0d14d168221574a5a72b8dd9398cf3a9453c46eba4e4ed23d8d2031522b6cb11bc8bb43c1
EBUILD libreoffice-6.4.6.2-r2.ebuild 17744 BLAKE2B f4024ee09916c9568d25dc39170bf9d0a0426934b8ada515c9295ad426b0993c5787bf7687987fdcfe31ae3fec07eaf1a90cfcbd4b87714cd8e0861d1daae035 SHA512 4f2c0a7993d457698e6ea30bb2cd4fc32582167a652ee54788a5785c8baa32dfab924c67413c4cbedd92f411d348762e19b89458166c194a0077b480a117db0d
EBUILD libreoffice-6.4.7.2.ebuild 17758 BLAKE2B b7ab4b5999623779e9a76787cde54424f2c3d7ef112c5e9af544cbcab500402ad12e82b91433236c68916ed5cd0f2106197bb92854d264c9d39055663bac3f40 SHA512 91c4e17ef404caf7c3ee97a7ae613b7e758cd7acddaa8da56f80adfc07bd960aac0045a9f185067bcf331dc2025f08e09869b630a5f74b26ed99c1c9d78c797f
EBUILD libreoffice-7.0.3.1.ebuild 19560 BLAKE2B 4cb054a34795f32113d3b3d36f3ae84c00710bd619a67d7fd8a4812ebd6222307e7191da3a265ef6f31ca2afc55fc29ced8ff3845741aa82d625974da8e15abf SHA512 47d11bc2f37d137a63dc3146db4c3b7f922e5e432b5fcb42359fd502f9912bae5c5de862b1021b4cc5f7632d5d2b8f7766b1f99bf843faddd3ba6ad40dc68fbf
EBUILD libreoffice-7.0.9999.ebuild 19460 BLAKE2B 2f23b3d10495adb605c172554eaea8d05f5f9cd0f8e0bb995416f4e05272c1e1f99b3ff24360c60ae0e60bcef41099607a22f3241d615fbd6b9d3015962a541c SHA512 ddf3b5c0e3ff635e23e3b0da48291734192219efc9e5e4100d51475b0ec0829161d11b5a5037d584889ab041188bfa275d362b14f8b1de20b73cf9cde5dfb5c0
EBUILD libreoffice-9999.ebuild 19466 BLAKE2B c7a4ee18d7eeb728449652cf392164daf6faab6ca9d27dfa2b3b0fb3a1dcef36323454b72197419548e71ea103094b563b5d13c468fea3ca12d2070c816836f9 SHA512 d6896a2326392c6ec6dc7bba1b14d0b291e46faaf624341cc42158380a76be654a0943ba766fa379e1b9cab734cf17b916aa3cc541c12769f5be22ac57b01935
EBUILD libreoffice-7.0.3.1.ebuild 19568 BLAKE2B ece6e822dee5dbb506dc7f5c3384f4ef7bc31b61e17db96168736d7b429e3475f006b0224a88eaa64790d26b89d591160ec11e1d4ba95594e58caa16b7e319d7 SHA512 7110e26e3bafe2a093d9213172a28b1c6ff1e5f4c708d836c930cf3209a3e6018d4bccb65106f9de999408d49ce4fbac5234548ee440124bb18756d830398ffe
EBUILD libreoffice-7.0.9999.ebuild 19468 BLAKE2B 2b8743e26af363888aae618a8e362b3e0d78665821b1dc51de892cadb67d5040926c18e6fb771a5652cf8a717b14312ae486ee7bb38fa1227c69f2dbce201f3e SHA512 96b5ae90f387b9af31a354b1994e1affdd4fc86d78878e1219b6ae2216e5053a27fce6933e2b451bb939921574f4df19136da5d97794d2f9ab39c8bcb137e163
EBUILD libreoffice-9999.ebuild 19474 BLAKE2B 34cd4cb51f1c6f27126b4a5d6b67eb16dd4fbbd1e43b33c9de580007b0d34d2e054ca8a1aa55763234847b14266df6a6b5ea03c1198c2a0c577958053c3ee13f SHA512 658a596b44569fdfe505943a35673937a8576f3c39993c5708e86c5f04b7f908d64ba5c2255b399ca7076bcc734c3195e5adfd8fc82702c4138e64a4ee94b12a
MISC metadata.xml 1221 BLAKE2B 2cc713dbc6d112ac21f8846f9dad48c09972c0d6846a253773280564cf9370934ec798a1579d894d7679c591045542cf2c8cb8a308bf097ce5eac64f40fda3f0 SHA512 c1ab6a23d6fa4ed6b2d77b08c895f653890998a8ed7fb2fa69251adacc9a96e32c0d1298a2b7c287efe85d37a2707e740b6b036174b7b6e39d37a25e3866e957

@ -125,7 +125,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
app-text/liblangtag
>=app-text/libmspub-0.1.0
>=app-text/libmwaw-0.3.1
app-text/libnumbertext
>=app-text/libnumbertext-1.0.6
>=app-text/libodfgen-0.1.0
app-text/libqxp
app-text/libstaroffice

@ -125,7 +125,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
app-text/liblangtag
>=app-text/libmspub-0.1.0
>=app-text/libmwaw-0.3.1
app-text/libnumbertext
>=app-text/libnumbertext-1.0.6
>=app-text/libodfgen-0.1.0
app-text/libqxp
app-text/libstaroffice

@ -125,7 +125,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
app-text/liblangtag
>=app-text/libmspub-0.1.0
>=app-text/libmwaw-0.3.1
app-text/libnumbertext
>=app-text/libnumbertext-1.0.6
>=app-text/libodfgen-0.1.0
app-text/libqxp
app-text/libstaroffice

@ -1,3 +1,3 @@
DIST skrooge-2.23.0.tar.xz 22403128 BLAKE2B e8b4e33e80f307f2c7e6c984199c116aee1d7cabe0ac4ee9461ba10289adc0a15ba5e5d8efb93d49ec8f22104462d572a8ee52b08df84d0379fa77ce56a4ddc9 SHA512 4592deb159aa310f36f8950cf0a65d811624b40dc8b05cdefc271b95885bc6db5ac15f7b4c5299b1468ac92b7e560636bf95ddd6d31340993d9184ba0b150a76
EBUILD skrooge-2.23.0.ebuild 2670 BLAKE2B 6989d2ce2c3f0b2b51e0d7513ff55053e7969c8f8d8e664e3574d7d4c65cf3934815be7084a5a70a07e855819a31f9eb10a466f10c10e01f035c6944e6771d93 SHA512 a6830004fe3327c8e9570e884130e1f8e25fd6a18b94727dd49d94ec86c55ff4c16eda9f8f838d786dd38116e28a2edc686ebc8d54b06be3a6964adf966669a7
MISC metadata.xml 400 BLAKE2B b0f7a87e2c2fda05271f731d2c3a6d9a490cf94dd7a742ed60e21aa44964a50bad1218c6ebd9ad16d87a8814f34b70792f7d80bd1e03d80845bd9f1c9292a95c SHA512 50120cec8f5798f6b104c6e1fd05b831f2f280e2f3bab8aa66667a3da1bb351a955b671d16cf4e30b44b0738625424fe4a32bb8a677947d147031964e108dcb0
EBUILD skrooge-2.23.0-r1.ebuild 2554 BLAKE2B d12e835335e7055926b9504fa2f56fb47852e6c5adc28003e98cdc30a43dab36a0e8923bcb6a3dcd6e6ce7465480df6e4bc8263cd8171968a0fe99b187f6f7b3 SHA512 964146d58dfac917526962b0e3112d5cd159450fdffafe17e767606e12d28e01bc2b5293f5ff9bb1c9cafcde9c39d06be4707f03f40780408772fbb0a2aa5a73
MISC metadata.xml 324 BLAKE2B ffd83d73c861eb5aa5281a859162ba693bd9ac642f7475b28419aa92c512e6caeef1fcecf56faade8b9c6573f9b09c9023dbc7f1a153f59aeea9e4c7dfa30571 SHA512 a5af84ff6c29117ec87f605e4d565a133656a05a9669a6fb2190f6c8706c4cee56c40df024c0160d391ca5e74be7a3d45244a86039cd403b0f60bc0334977a7c

@ -7,6 +7,5 @@
</maintainer>
<use>
<flag name="activities">Enable kactivities support</flag>
<flag name="designer">Build plugins for <pkg>dev-qt/designer</pkg></flag>
</use>
</pkgmetadata>

@ -5,8 +5,8 @@ EAPI=7
ECM_HANDBOOK="optional"
ECM_TEST="forceoptional"
KFMIN=5.60.0
QTMIN=5.12.3
KFMIN=5.74.0
QTMIN=5.15.1
VIRTUALX_REQUIRED="test"
inherit ecm kde.org
@ -20,16 +20,14 @@ fi
LICENSE="GPL-2"
SLOT="5"
IUSE="activities designer kde ofx"
REQUIRED_USE="test? ( designer )"
IUSE="activities kde ofx"
BDEPEND="
dev-libs/libxslt
virtual/pkgconfig
"
COMMON_DEPEND="
app-crypt/qca:2[qt5(+)]
>=app-crypt/qca-2.3.0:2
dev-db/sqlcipher
dev-libs/grantlee:5
>=dev-qt/qtconcurrent-${QTMIN}:5
@ -71,23 +69,19 @@ DEPEND="${COMMON_DEPEND}
>=kde-frameworks/kguiaddons-${KFMIN}:5
>=kde-frameworks/kjobwidgets-${KFMIN}:5
>=kde-frameworks/kwindowsystem-${KFMIN}:5
designer? (
>=dev-qt/designer-${QTMIN}:5
>=kde-frameworks/kdesignerplugin-${KFMIN}:5
)
"
RDEPEND="${COMMON_DEPEND}
>=dev-qt/qtquickcontrols-${QTMIN}:5
"
# hangs + installs files
# hangs + installs files (also requires KF5DesignerPlugin)
RESTRICT+=" test"
src_configure() {
local mycmakeargs=(
-DSKG_WEBENGINE=ON
-DSKG_DESIGNER=OFF
$(cmake_use_find_package activities KF5Activities)
-DSKG_DESIGNER=$(usex designer)
$(cmake_use_find_package kde KF5Runner)
$(cmake_use_find_package ofx LibOfx)
-DSKG_BUILD_TEST=$(usex test)

Binary file not shown.

@ -1,5 +1,5 @@
DIST euses-2.5.9.tar.bz2 44281 BLAKE2B 2da1309f8eeb5b4999212ddb0b2fb59a8fbd17c49f2c8e7bbfa64bba5c7831f84289ef833d9787506ed735ea1be92dc1f0ab765501b30f123a7f2f168da42c60 SHA512 afbacdcb73bc10548b32050bc38f71e9ac8613277d2cd961f2f96e32e7fa1827c5a208e68a6994efdcaa9e4a64a581138daadab2296a5e60c5e29677dbbd9ef8
DIST euses-2.6.0.tar.bz2 44315 BLAKE2B 90db468c60f439366c7a4bf1a111af48a67f6bc0a10a391563e79db926be34da423fcd5bf667359a9b6426882e95a240742555fe62de71fcca8fa92fa307df8d SHA512 b7f81b171380b2abd6d4b00f4294f7d6ef86e5b0ba8dc5b735bc389deed4b24c3d6cd45ec70f5a01e37182ca09e5798385a93afff413d4fd71841dc12ea3e86c
EBUILD euses-2.5.9.ebuild 446 BLAKE2B b7bdf544a2276e443e781ca6df7854ca903eeb4f8107e074c3b8e48da1fd1bc2209ddbafad18fa88319fc513070fb1c45cff8f226df58c114e9f102964d95ada SHA512 e9e25eb55a81e9831d6849ad2b1e5fd999808cd22c1bc725096cc21d6ba351c7c6bbcd9a3622ad18c85618c5d985fa43cc587d58079080a584778599e284cc83
EBUILD euses-2.6.0.ebuild 439 BLAKE2B a3c3bc8f480687555c4a60a57716fc20b479e23aa4778a78259985c10f8a864819063956af7182df811772f020e7d550667110dfe4f567df33043e753575daba SHA512 0a82ba632ed98c71a9765c250b8ede79d1d22a8c07c786640b643b1421184eeec2f9a67729b6e3787f633454db564ca3e7e23203926dc4c9272f82ffcbaa22e5
EBUILD euses-2.6.0.ebuild 438 BLAKE2B 130470275d4faa62ac0cd15e6db84db781f40b953277d646d30bc12ed113c7731e17a8005148b021b46b3bc20c7b29da0b3f46e2b207df185c0bddfc3ffa06ea SHA512 c72ae37d202f9c7dc07fa5aeb9f40defa0e0046a39bbed830dc47675c2d5b3679454dc984decc85fdcd88671bcbe7e067d8d3b4a8969126cb2adfdef6e8e898d
MISC metadata.xml 262 BLAKE2B 5ecdb193490386a32e496b12b58ec88a4557902c81c4b19567cc25774f3e72c44411ac1c6d3a3662b1dc67b90ef890835f9e79509cdedd145a9eeb2d5755e1c6 SHA512 0f8f14b073223cc19e179dc08fa5cbb938ab8876cf23b14758c83b0efaa6baae4a8eed912d981816e31fa67fef95ba03188146e2206e2fad7e45e4b907c6aaae

@ -9,7 +9,7 @@ SRC_URI="https://www.xs4all.nl/~rooversj/gentoo/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~alpha ~amd64 arm ~arm64 hppa ppc ppc64 sparc x86"
KEYWORDS="~alpha amd64 arm ~arm64 hppa ppc ppc64 sparc x86"
S=${WORKDIR}

@ -4,7 +4,7 @@ DIST portage-utils-0.90.1.tar.xz 1779252 BLAKE2B 27c94694cab84970c0c92e835b9039d
DIST portage-utils-0.90.tar.xz 1776636 BLAKE2B bbacc05aa97c77705ae4fbdb5efde5f1d49a99ac8ed259e026c9a997f43a86551b3a10a397e0c5f1da161d2c0d88afe88e22870705ca39d911c4a98ad13f4928 SHA512 2077061dd7dfd444d4ad38faf5a87aa44392d7747f71d7283b5e2775ce3d714773cd642ea085aea3dd34a715f2c446d42fd64ba42fa99e716e8d843aae3d9682
EBUILD portage-utils-0.87.ebuild 2171 BLAKE2B 5561831e035a2139060704c67366bb4b68a4a737fa405b22203696716bc8383177f740f4594de2d08be6622b702da68cbb18bffe047bac792db574c6fa3a5d57 SHA512 a73d4d44e24f616ee965f5663ce60df0287bd35d250470389889a5fa373471d2dc37c3eec1f1df7d9d2e6efe0d59ead2b683bce240a001e8b07ee809ff8c2629
EBUILD portage-utils-0.89.ebuild 1806 BLAKE2B aa1b8f6e780d3939433ef354cc9bd57f131bb40668ce150f84ecfef4a46bcff7dbfb3a4a2e453a3d671498152a6cc9b75f180a09841aba5fdeb754d96712ef95 SHA512 2ddc921350fc44bedae040a9521d90745d768c1292ca50fc4eb486c31a50963c129d16b6dc149183d47793629e11a2b4b35043e7a2115021880881dc4b4f166f
EBUILD portage-utils-0.90.1.ebuild 1802 BLAKE2B 44d5388c42b625e397c2ed145d9106f34fcca46fc746e09923e3b3782acbfcd71ffa72408121e36ca1343114354d9181cf6f903f4a650269fbbec98bda16c9be SHA512 b685c17235447206a15f22164bfe38035bb8cca8f5651fec330ee49450f94f56034c61ba009d597652681eb1c0ea4f42cffbded507478df241710c32e019dfd5
EBUILD portage-utils-0.90.1.ebuild 1801 BLAKE2B 5ce439c1b34f92c225b8005dd93fa1aedc354863d4eddb9abd2028beec95c49fca444d3f9e97ad8dad42a1a933dbe8aa2cc0d8e536ac6619f8e73d4a01cc0f15 SHA512 3a937b7b424c3a614247328f94a83d0176788fb414adfafc446d5f31d6eb5df7fb49ede9c985e25b800e7ac732dba09089b4b3162c42e120f08ab124d92b8d2e
EBUILD portage-utils-0.90.ebuild 1802 BLAKE2B 94d66c92f2154e0f7f46079a30324af1182e80f13836e78a4f266cdf4967186a3072faba1af708bbd336271faeaf3bf003d61eb60a94d61d0456f36b081e3b6c SHA512 44ac88fea2d1ca8e32f65c5c3f84c1470d3e59195761938a2bae6acd6dabadc482960445ed13aa95f0057fed74e6a4d0ebd25b9d9d17463627227961bb51f3cd
EBUILD portage-utils-9999.ebuild 1806 BLAKE2B aa1b8f6e780d3939433ef354cc9bd57f131bb40668ce150f84ecfef4a46bcff7dbfb3a4a2e453a3d671498152a6cc9b75f180a09841aba5fdeb754d96712ef95 SHA512 2ddc921350fc44bedae040a9521d90745d768c1292ca50fc4eb486c31a50963c129d16b6dc149183d47793629e11a2b4b35043e7a2115021880881dc4b4f166f
MISC metadata.xml 573 BLAKE2B 7c24e5d74a38a20b0c79c228ca131ee5073cbf0fdccfc2b42221521ae684566b4bf7474743c0a9cd1273b59eb94e2eef63b1db70f0ffed7d688073bb3679e007 SHA512 85f32bcd860ab711ade03cdb4a241722efbba47396b736e302fa2282e363bc8e445daf9316996b1cedb420d2cb102fd416962f05e15a57c51b514d776ac7cd84

@ -15,7 +15,7 @@ if [[ ${PV} == *9999 ]]; then
EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/portage-utils.git"
else
SRC_URI="https://dev.gentoo.org/~grobian/distfiles/${P}.tar.xz"
KEYWORDS="~alpha ~amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
KEYWORDS="~alpha ~amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~riscv ~s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
RDEPEND="

Binary file not shown.

@ -10,5 +10,5 @@ DIST tcsh-6.22.02.tar.gz 1006405 BLAKE2B f18b2c48958b4d38a0f55b0df8563564b2a3b34
DIST tcsh-gentoo-patches-r1.9.tar.bz2 2488 BLAKE2B 58924e623c75068cdc686be61755bdbcf8d0949a2141ac532ac089f80ff083b2c9f6767038b9fc52171a00ed82c558b83216327c87b41f51c3648343869cd5b6 SHA512 9903e9c3e2279abcac09a3235f3c5db9f42156c18137eb651ede195ca2b069f0b5bc6105fed33666b69796c4ebf03e4efe63cd9beba1898bac7297a2f74bfd3d
EBUILD tcsh-6.20.00.ebuild 2644 BLAKE2B 2b5ad0097df223dacfd66b9b8c099fe7ef994d76e51fef471683af55806ddc2363afa6956fa0f28f0bf951704b22da223513a3c3fd4ba64ad9d14251b2e976ac SHA512 40396ddd6f0b25df42624d3cf1d9147574f76ac7a9ba43b6a33ad87359f4a55c385713e844f2849d97c895f360357f3186cda02f8a84606aa9fc1896e28c39fd
EBUILD tcsh-6.21.00-r1.ebuild 2749 BLAKE2B 2cfc425298008d6cae273ad61608c19bd5ee1a31c0fb2a322df27ebd829f323adca1c7ec7076f310fd6d162180f1b6a7aec9161585bc7a9ffdf26db5c99922bd SHA512 63cc36b2b6b5facf87c577facca0e8b2a2dc57345a79da8375217363046fc5a0409e606367f6e3e369fb85ceb93b20d994ca7a659d008c128e37eefdb3743b95
EBUILD tcsh-6.22.02.ebuild 2874 BLAKE2B 47ac0279686214938aa382c09ebce27dc400dadb874f7c6c169ffdb30afea7991209ec7504b65aac4ddbb2b91ab8db26ed54e622eddd0cf913fdffbb70b7ce2d SHA512 89effc5ed52b2e1f01754d2b6fc4a64deec78ecf5a34c577fdfdd80135e386a4c4e72d06ce4ce56ab5b099b8a4147afd3220a847f46fed11b3f8943d4d9efa07
EBUILD tcsh-6.22.02.ebuild 2868 BLAKE2B 6131385aa936fe96f504d20dba69547f36773408474f108c7897ef7a7baff1b378b0c51a6759687b24199c859f7476db3b24f8dfc4b9d0db7ac29e20e3bd8f3a SHA512 90a072d37910bab1ade9918a9bd8089bc55d5362e0d291c45a7469c49d31e81684192ed77bc59fa65f24ff15d5eeb1f692c7bc61dc709d5778ef33f3e70c6c25
MISC metadata.xml 645 BLAKE2B 6a9d41c4ca043c899c0bfd8c5140958799c4eaf988f301551e8b8302995c81b0968981a2fda9247189965fc28887841eb30e1f3433262a58c843c0f890f857e5 SHA512 0f36e708c427083603b31df4bd4d808147333ff2711addff30936178e72b10f1020534046cb15ef1fecafee656c37d357ad3b5922320980ee15fddda11912f22

@ -15,7 +15,7 @@ SRC_URI="
LICENSE="BSD"
SLOT="0"
KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="nls doc"
RESTRICT="test"

Binary file not shown.

@ -1,5 +1,3 @@
DIST ansifilter-2.16.tar.bz2 441932 BLAKE2B 7a6af4e4b78cd4c26551791b4661a6f41c397a65abe19667f049bd393af0c5e1453a3f7f5f56c7d321c41c2cf36acc05575bb866f5dbf04184de1069d6c64a20 SHA512 ef621087e6d522e08423802d223f826f2fd6fe3b2efd8ed26e09f64e666202cdcdf68d19ebe5ac4b858a4339a8aa4d5f2ba309efa310837808381e09e39d4f90
DIST ansifilter-2.17.tar.bz2 436116 BLAKE2B 94a1788cffa66343643f48a18748d5359b090803cde723a02bc38f908c262631f1cd2eb150b6a743d66caa04983ea444ba150cf34ce07bdb456979e19631582f SHA512 ab9d590189482f2a27affd62b456c96b947b04d8c8b1214f1ea967971c8ed7df8a7c15d1079f957164d01916d144dcd5dc4b0ac05b452f9f4b8095273d3d3162
EBUILD ansifilter-2.16.ebuild 1016 BLAKE2B 8889822a7d5f469e114971fd0aad097e64ac3b237528d2abec01b36621899220cc015b8193d4eb32cc87e8a049d7cf3c523c0733513b4ce2c978f0aec2c68b78 SHA512 83548025ab5e6384bbbaa3d88bf1a2377b64b17ea9a5bf000a3dda8ba33370f5834210c39a4bad0a93b0bfcd536d9c714b585f15541f838c6c0a962b389e0c56
EBUILD ansifilter-2.17.ebuild 1102 BLAKE2B 6432c3d646564274ed88c32fb9a1f9eab9185754f3bb60ee5c928a5f1ace7b0e92404346096ddba9d3f2e63521cf647c9c673a83a27fbabea30fb0ece8b444e4 SHA512 1a552b1e6433a722f84afddb993b0217a5f553f8737791501563b335661cae25d805ce9ce19fc115175e5182dd3f9dc18fc736ec966e8db763449b58406fa4c7
EBUILD ansifilter-2.17.ebuild 1099 BLAKE2B daaf8270898a8c343a1efdee689d8f4449619ed22739a0a12fdc45dd369c4c6520de5dd0b3b5973916f1a80b1a59f9bd244661eb05780106229839a3fd6ab860 SHA512 99579a1b84facba0b5ab905fb1ab643d4c7657179eafeb379c75440d6c7e995954c8b7f11f6d5280171ee60cc8f4df77a2a81e6ba1771a843d6fa48e57bb0c3c
MISC metadata.xml 221 BLAKE2B 6d597a7a853603bd878e86c6552cb68211e81f627cdb673ae99dc6c6133f50f617101e43f4b4631b45b5969ee6ec42849b156a62594f939d00c112ce51d769e1 SHA512 e50d6cad26239ebf4260f0cf4bdf4e29ef2038e999039adf94f49b184b5993f02bb0d4cdb3de6c7b5cda99890db42dcd2b65c5342256be50dc19e6aab2406353

@ -1,57 +0,0 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
inherit toolchain-funcs qmake-utils
DESCRIPTION="Handles text files containing ANSI terminal escape codes"
HOMEPAGE="http://www.andre-simon.de/"
SRC_URI="http://www.andre-simon.de/zip/${P}.tar.bz2"
LICENSE="GPL-3+"
SLOT="0"
KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
IUSE="qt5"
RDEPEND="
qt5? (
dev-qt/qtcore:5
dev-qt/qtgui:5
dev-qt/qtwidgets:5
)"
DEPEND="${RDEPEND}"
src_prepare() {
default
# bug 431452
rm src/qt-gui/moc_mydialog.cpp || die
}
src_configure() {
if use qt5 ; then
pushd src/qt-gui > /dev/null || die
eqmake5
popd > /dev/null || die
fi
}
src_compile() {
emake -f makefile CC="$(tc-getCXX)" CXXFLAGS="${CXXFLAGS} -DNDEBUG -std=c++11"
if use qt5 ; then
pushd src/qt-gui > /dev/null || die
emake
popd > /dev/null || die
fi
}
src_install() {
dobin src/${PN}
use qt5 && dobin src/qt-gui/${PN}-gui
gunzip man/${PN}.1.gz
doman man/${PN}.1
einstalldocs
}

@ -11,7 +11,7 @@ SRC_URI="http://www.andre-simon.de/zip/${P}.tar.bz2"
LICENSE="GPL-3+"
SLOT="0"
KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
KEYWORDS="amd64 ~arm ~arm64 ppc64 x86"
IUSE="qt5"
RDEPEND="

@ -1,3 +1,3 @@
DIST libgepub-0.6.0.tar.xz 26092 BLAKE2B e578ce1085f35ef56ae32e7c32dcd5aa3b54c4d4b2c3d3826a91984b220bed90e185e724fac338f8a95cf4bbdd7969ca19298be7f9a80ecfeddfcb113149c7df SHA512 90c8df55c2465ab3c44092a772d568b412cea60f20d0f32d33b124d70ece1655dcf53d87c5effa2c494bf103c2e51d31192edf0ad71b46fa61471f94b5768c99
EBUILD libgepub-0.6.0.ebuild 656 BLAKE2B bce73f4d29808099a908ca02be9fd0b43ccd4eeb82997d2ae733129f011d620555a1600def6ea000548e579e3907db7e2b161192e8aa0a4324476f730e028e3e SHA512 95981fe19d9a32fcf5710ec7f6269b62993f80b71e3b98868c98731843ea591c0d4af8f5b589e58daef3b01cbb5f787e65e99936bf880dafb0f2260772d4c4e1
EBUILD libgepub-0.6.0.ebuild 663 BLAKE2B b82a2b55a892c18655ca728a0aa081520cb0cb668053e7923a1c465373ef2919764231d98bc94842e7bbeb4329471285c8d8c295394d6e1cffaa2d42dea41cff SHA512 f0c3b5c9b5584bcdc6cca2c0595457304f65d913fc6261ab614e569128d4e5facaefbaa507207213f7993967566d3bcca88dfb14de9d4eabd4027268d0cdfe55
MISC metadata.xml 259 BLAKE2B 32f8c5208a55a1dda504b7df969127393a2c70e672aba383fcdc870de8fe778366d3dde3c3313bd043068d2e7831d1e18bad6fb428e82266fc2a630104e0a193 SHA512 fbef629394690b3a5608abc6344816f6acf1e8e2663f29949fd14a662c628f16fee77a1ec1641066806d143fb94c1571bc5b46b829dc53620af6956377fe15cc

@ -10,7 +10,7 @@ HOMEPAGE="https://git.gnome.org/browse/libgepub"
LICENSE="LGPL-2+"
SLOT="0"
KEYWORDS="amd64 ~arm ~arm64 x86"
KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
IUSE="+introspection"
RDEPEND="

@ -1,5 +1,5 @@
DIST poppler-data-0.4.10.tar.gz 4497684 BLAKE2B 2c262223a971fe49b7f9848e424ba78a6d96e193d18b0bbad4eb343deea7808a6d9e234ebbb252c5becd40840221ba86d2b87ad36595fe982546b32ea6201f0b SHA512 4bebad0791b55b5e2805cf864393d1f777a7996c962398fc178211d2abbf110f75ef2fa6699e275b126aca0540eabb89542a672e0587248db9414e357a32bfd3
DIST poppler-data-0.4.9.tar.gz 4196919 BLAKE2B a986dcff2c2295eeb952adbb4bfc59ccbc53c27668ecc44fcf862bbe3d65062ccdb9302ebdd9b530d9d0ed155666922086b368c81c0772bdab284e323e6ac436 SHA512 45afd378d0bb415c5e1bc9718025328058712c0bde6d529d2c7a4813b12f600be46ecd2ed2454b3f83fb9f8cad157b75d11d8c5d1ca849f347c310b58132ff7a
EBUILD poppler-data-0.4.10.ebuild 762 BLAKE2B d57655b9ca16412e3f916067a3945e4320cc968cfa58666ad70e47d349e3c72709da56da776dce0b212d4614b7859de79cb64b2707921782c75cbe61cf0327c3 SHA512 c9ae12e003711794be1d9071d21840a18d59fe8bf158a5394ad0b0b176423cc8338a35e56773040c2f0838971309ba8785d15c7610a4e7c0ac6585b37f173892
EBUILD poppler-data-0.4.10.ebuild 760 BLAKE2B cb29bd60394719ef71edbebb0640f59ca53de60441bd0b75e4abb3c80030470b4243007b7f2613bf4e0efb6e725bfddc0b768e7e1499bc9dbd323c40b8988109 SHA512 d2919f63e27d4e86b560ef915b42d578c6fbd863f4048fb15fb15b4b93074921ca9196bb9c156bb420ee6e9380b796c1109a62f2696487ecc33df1b4de44a195
EBUILD poppler-data-0.4.9.ebuild 760 BLAKE2B 38b06c1797185f673aa67e77fd75c9c50abc2470db7134707c29f5adcabbf9f0c48875e3348ff1bc14ca257f508535bb5250aa3f75e6f189647a4f713de434cc SHA512 9eac446d1d0c52b90f6f4ac4c9978a71beffa0f522ffac8b143fb563b15a3c213400cd8a61a078079f7a9cf7182dddeac8d718afd6afbe27644c407b93ace307
MISC metadata.xml 255 BLAKE2B 06f078acf8e4416705c8bad8b4802a44592eb962c08c050e11332bfa97564fafdf08754ab056eb813f6baeaa6cdfaf5d71672455d77e74045f86098c221d5136 SHA512 c6c5f966cfbe396fde1b15334442de9e0004b44c4b48775588b0b25a058ad1751252761370c9c254280e97561fa6306f5aa0cc7959c675d4ee11f7f95d777a36

@ -8,7 +8,7 @@ HOMEPAGE="https://poppler.freedesktop.org/"
SRC_URI="https://poppler.freedesktop.org/${P}.tar.gz"
LICENSE="BSD GPL-2 MIT"
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
SLOT="0"
IUSE=""

@ -2,11 +2,8 @@ AUX poppler-0.28.1-fix-multilib-configuration.patch 813 BLAKE2B 74133e82a1969d80
AUX poppler-0.57.0-disable-internal-jpx.patch 892 BLAKE2B 811ce3bbeb3b3c0720902a2a57463d352d102a2d6faef209723558eb93d638f35108f83674e29314632ebcf5fae521bcd8893eb1f77b931c7348b9d7446dae76 SHA512 aca1738fa33fcb5efcc8b0f5062abca2f32d329d3e2e1609386f15cce33d2e7aeae3e36b41dae292d3dceea7bde62210d2527b2552047d33d57ea4f44dabc1ee
AUX poppler-0.60.1-qt5-dependencies.patch 934 BLAKE2B 5af7f7adfb802905737abc22003d00dda6f25bc992d73c01570a560938e5aef166905c519ea7e4968f8e637b2dc47c61bb1c49cd5ab14fb2076e2a1e38545499 SHA512 fc2e3297da9dbbb6ba9377958c08626db44790ec6ba3acdbc1c348d3e909bd7b061fa64995d584d89a42d1bc9cb278827590b303bd1ff57c0557f2bae450b81c
AUX poppler-0.61.0-respect-cflags.patch 3012 BLAKE2B 24ac0b8067f1f8aea6e1b328b27ff9a5be0fa457354a251bb5066e6a63ffbf953c2d761e53e5d78e1b8593dbd5740420cffaa7f4a01f1366b712b12fbfad2cf9 SHA512 b680ac77711d845a93586084d1a4523860af33c2d494cbf16ea42f799612548b96fbdaadf53100dc74e933e0d09ba98ce3aa49b7ba6655907aad01e09561fa6d
AUX poppler-0.82.0-respect-cflags.patch 2324 BLAKE2B 435986b347ffa1ac657a4fa2ebac232bb0d0bfe1d55fa9085c6e2819e4a37e54680a95e69d2b3cf49bdb5cb3c18eeede8ca58bf1426e8c9bd47ea79eddcd0860 SHA512 37d3700ac4d4774fefabc88fdc3a9b0031e91d8a7aae6f8229e87acd61710652f9a64f8ac97006131ab7cea479e1e6268c7992818017cf7473b45743a3796440
AUX poppler-20.11.0-respect-cflags.patch 2797 BLAKE2B 8c37ed086fa823eac8d04e47c04f79afc76c0e6caa6d921b21bb5d99928be9c9bc683126e42e249aa8ccd96470d7ecf9eb1b0d8e749bd85bf4a455bb5d513e01 SHA512 421760c08f351449b7c899e4a04c3d93a26cf914326c58427031d4398f7cd4d2ed68d5ab42f930d663aa4f918fa11534e310ae6a9c005bdb3c9a191a497e6386
DIST poppler-0.90.1.tar.xz 1633804 BLAKE2B 5c7256bca74af6cc2732fb6c413bec10ea579f28fe623ccb5d4863c62d39329a4264c240ee0e395a78de577a960a5156ba20f957990c0cde91efcee72dbc2fef SHA512 c0a38c3c40196f8b847f0737152d0cbb40656870a8ceb766134ee22ec7c21bc979a13f56b7596a13ae2f08f1a9a2c396ba7f5ff176d02c262af7e863c2afde34
DIST poppler-20.11.0.tar.xz 1648432 BLAKE2B 373464ba60ed84863b40eca2e4f99ebc1625ea06f68a1621165675cf46e70713b649f90630049d15c5c2bc59bd0befb437a4039b47e17509d4fcc4fed8586d53 SHA512 c8237e931ef20d939656e2600453fffb12a2beeafb273782b2069aec6e5915d8cc85136982b7eaf5956af30ce00da2faf84d86ffab47f725447dfbb9d6ffe335
EBUILD poppler-0.90.1.ebuild 3374 BLAKE2B cbf9b5bcb9d888c7ed553519305dda004948e931573266564ac46c550e77bd8a52e8e93270d0c4f2ba1241d6a9ae2112b6c21ee10c0c1f8a472a8abfe6322c19 SHA512 2e9832d3fd0f7b81796364cbf532d6a212c6b3b0f5211f23f501cb93daadf838e2aff6797675f496d27b95e1199839f441240b1eab37acb8317523d64fdec219
EBUILD poppler-20.11.0.ebuild 3377 BLAKE2B 1b88e70fc206d47af2be254537eff97cfa6cbf4b9a722d392ff2fab78f1fcd2340e7e9a3427d6cbd097c9e37a840621e9c7339780be39bad884ccb6bd1921901 SHA512 e898f3bdd6b3914f66f6538b66f44a6bc7554fc9a9ea95b4dce5217a302e242f342f35fd91a6fc436693de41fa636949582837b8909e178a0dc4e01b2a3cf621
EBUILD poppler-20.11.0.ebuild 3375 BLAKE2B 0b355ab38e00f5f0ce9fbbb95463ef4b990534e4f60f9923a8d21b5d6e0fa30e40520861ca6681a5fae3986ab0c358400170cb159b5ddc8e87a3cb6a4684156f SHA512 d96627f44264078a1d95325ffa3fe71f8d6819d809ebeea608080dc1e9b73019d3c30c32b216797b4a5a72bcf3c3c69830df75e367ea72a70311fbeb1b324be0
EBUILD poppler-9999.ebuild 3384 BLAKE2B 53af7b182a6b978219cc2d198956d881c59e9471f1d4696331b78a49b5057717728fd903a27ee38ed3c3a2bf91f4186e6765a6affa09f3c0fc36eca2bd3012c9 SHA512 b2b89c68eb89f4414ce6f2c560519803d2c43c5492b9362e3c972699c4726f12a6b273e3e2e3a5aa868c61e78908f6a008a56b42bc9622ffbe5da62f06b22e6e
MISC metadata.xml 995 BLAKE2B 0d99fda69e6b020fd1b6fa879a0c3af278b92111be31d97cabe88703f06b4af56ce64ce9e0fc556d2b056c6770e547ae3b88dcc82da9cc26e15e2d1d0b5f685b SHA512 ae813761c5ab4dab475b737085f14f5874655b31f247f26495c43d8fcc47805dfceb2a8cd23ead39a3f8ee75ac820edc7c2554e573c338c09e5ec8b9d383417c

@ -1,49 +0,0 @@
--- poppler-0.82.0/cmake/modules/PopplerMacros.cmake
+++ poppler-0.82.0/cmake/modules/PopplerMacros.cmake
@@ -145,46 +145,6 @@
endif(GCC_HAS_AS_NEEDED)
endif (CMAKE_COMPILER_IS_GNUCXX)
-if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
-# set the default compile warnings
- set(_warn "-Wall -Wextra -Wpedantic")
- set(_warn "${_warn} -Wno-unused-parameter")
- set(_warn "${_warn} -Wcast-align")
- set(_warn "${_warn} -Wformat-security")
- set(_warn "${_warn} -Wframe-larger-than=65536")
- set(_warn "${_warn} -Wmissing-format-attribute")
- set(_warn "${_warn} -Wnon-virtual-dtor")
- set(_warn "${_warn} -Woverloaded-virtual")
- set(_warn "${_warn} -Wmissing-declarations")
- set(_warn "${_warn} -Wundef")
- set(_warn "${_warn} -Wzero-as-null-pointer-constant")
- set(_warn "${_warn} -Wshadow")
-
- # set extra warnings
- set(_warnx "${_warnx} -Wconversion")
-
- set(DEFAULT_COMPILE_WARNINGS "${_warn}")
- set(DEFAULT_COMPILE_WARNINGS_EXTRA "${_warn} ${_warnx}")
-
- set(_save_cxxflags "${CMAKE_CXX_FLAGS}")
- set(CMAKE_CXX_FLAGS "-fno-exceptions -fno-check-new -fno-common -D_DEFAULT_SOURCE")
- set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g ${_save_cxxflags}")
- set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG ${_save_cxxflags}")
- # clang does not support -fno-reorder-blocks -fno-schedule-insns, so do not use -O2
- set(CMAKE_CXX_FLAGS_DEBUG "-g ${_save_cxxflags}")
- set(CMAKE_CXX_FLAGS_DEBUGFULL "-g3 -fno-inline ${_save_cxxflags}")
- set(CMAKE_CXX_FLAGS_PROFILE "-g3 -fno-inline -ftest-coverage -fprofile-arcs ${_save_cxxflags}")
- set(_save_cflags "${CMAKE_C_FLAGS}")
- set(CMAKE_C_FLAGS "-std=c99 -D_DEFAULT_SOURCE")
- set(CMAKE_C_FLAGS_RELWITHDEBINFO "-O2 -g ${_save_cflags}")
- set(CMAKE_C_FLAGS_RELEASE "-O2 -DNDEBUG ${_save_cflags}")
- # clang does not support -fno-reorder-blocks -fno-schedule-insns, so do not use -O2
- set(CMAKE_C_FLAGS_DEBUG "-g ${_save_cflags}")
- set(CMAKE_C_FLAGS_DEBUGFULL "-g3 -fno-inline ${_save_cflags}")
- set(CMAKE_C_FLAGS_PROFILE "-g3 -fno-inline -ftest-coverage -fprofile-arcs ${_save_cflags}")
-
-endif()
-
if(CMAKE_C_COMPILER MATCHES "icc")
set(_save_cxxflags "${CMAKE_CXX_FLAGS}")
set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g ${_save_cxxflags}")

@ -1,124 +0,0 @@
# Copyright 2005-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
inherit cmake toolchain-funcs xdg-utils
if [[ ${PV} == *9999* ]] ; then
inherit git-r3
EGIT_REPO_URI="https://anongit.freedesktop.org/git/poppler/poppler.git"
SLOT="0/9999"
else
SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz"
KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
SLOT="0/101" # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
fi
DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
HOMEPAGE="https://poppler.freedesktop.org/"
LICENSE="GPL-2"
IUSE="cairo cjk curl +cxx debug doc +introspection +jpeg +jpeg2k +lcms nss png qt5 tiff +utils"
# No test data provided
RESTRICT="test"
BDEPEND="
dev-util/glib-utils
virtual/pkgconfig
"
DEPEND="
media-libs/fontconfig
media-libs/freetype
sys-libs/zlib
cairo? (
dev-libs/glib:2
x11-libs/cairo
introspection? ( dev-libs/gobject-introspection:= )
)
curl? ( net-misc/curl )
jpeg? ( virtual/jpeg:0 )
jpeg2k? ( >=media-libs/openjpeg-2.3.0-r1:2= )
lcms? ( media-libs/lcms:2 )
nss? ( >=dev-libs/nss-3.19:0 )
png? ( media-libs/libpng:0= )
qt5? (
dev-qt/qtcore:5
dev-qt/qtgui:5
dev-qt/qtxml:5
)
tiff? ( media-libs/tiff:0 )
"
RDEPEND="${DEPEND}
cjk? ( app-text/poppler-data )
"
DOCS=( AUTHORS NEWS README.md README-XPDF )
PATCHES=(
"${FILESDIR}/${PN}-0.60.1-qt5-dependencies.patch"
"${FILESDIR}/${PN}-0.28.1-fix-multilib-configuration.patch"
"${FILESDIR}/${PN}-0.82.0-respect-cflags.patch"
"${FILESDIR}/${PN}-0.61.0-respect-cflags.patch"
"${FILESDIR}/${PN}-0.57.0-disable-internal-jpx.patch"
)
src_prepare() {
cmake_src_prepare
# Clang doesn't grok this flag, the configure nicely tests that, but
# cmake just uses it, so remove it if we use clang
if [[ ${CC} == clang ]] ; then
sed -e 's/-fno-check-new//' -i cmake/modules/PopplerMacros.cmake || die
fi
if ! grep -Fq 'cmake_policy(SET CMP0002 OLD)' CMakeLists.txt ; then
sed -e '/^cmake_minimum_required/acmake_policy(SET CMP0002 OLD)' \
-i CMakeLists.txt || die
else
einfo "policy(SET CMP0002 OLD) - workaround can be removed"
fi
}
src_configure() {
xdg_environment_reset
local mycmakeargs=(
-DBUILD_GTK_TESTS=OFF
-DBUILD_QT5_TESTS=OFF
-DBUILD_CPP_TESTS=OFF
-DRUN_GPERF_IF_PRESENT=OFF
-DENABLE_SPLASH=ON
-DENABLE_ZLIB=ON
-DENABLE_ZLIB_UNCOMPRESS=OFF
-DENABLE_UNSTABLE_API_ABI_HEADERS=ON
-DUSE_FLOAT=OFF
-DWITH_Cairo=$(usex cairo)
-DENABLE_LIBCURL=$(usex curl)
-DENABLE_CPP=$(usex cxx)
-DWITH_JPEG=$(usex jpeg)
-DENABLE_DCTDECODER=$(usex jpeg libjpeg none)
-DENABLE_LIBOPENJPEG=$(usex jpeg2k openjpeg2 none)
-DENABLE_CMS=$(usex lcms lcms2 none)
-DWITH_NSS3=$(usex nss)
-DWITH_PNG=$(usex png)
$(cmake_use_find_package qt5 Qt5Core)
-DWITH_TIFF=$(usex tiff)
-DENABLE_UTILS=$(usex utils)
-DENABLE_QT6=OFF
)
use cairo && mycmakeargs+=( -DWITH_GObjectIntrospection=$(usex introspection) )
cmake_src_configure
}
src_install() {
cmake_src_install
# live version doesn't provide html documentation
if use cairo && use doc && [[ ${PV} != *9999* ]]; then
# For now install gtk-doc there
insinto /usr/share/gtk-doc/html/poppler
doins -r "${S}"/glib/reference/html/*
fi
}

@ -11,7 +11,7 @@ if [[ ${PV} == *9999* ]] ; then
SLOT="0/9999"
else
SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz"
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
SLOT="0/104" # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
fi

@ -1,7 +1,9 @@
DIST qpdf-10.0.1.tar.gz 18399985 BLAKE2B 5e113790e7c2b48987c18aa7f562ff18f0efb544c48be8c36ba201ba1420168a7f32ebfe2e5754e8af679557df29093e0fd550c991b5201e4246be827952b3d3 SHA512 b73c0839b08905052d90ed78645cc9fb4fda4a0fa803db7b46f3d77a2c2f7e8cec52173834b1e1f008f3a3475a7d913362d22e1ebece11187a90c9035b81de94
DIST qpdf-10.0.4.tar.gz 18465085 BLAKE2B 3b9edc38069d58d43d26b131da755b7921b7add905ed652e3abb48d9b2e140d0c3b38f0250dbd3dca1c4b3dadf76c636606c6fa802b1ebe2dda77444badd828e SHA512 0a8c243928a3273d78b4a898e17a619f1565ec5e9b6f637800a2937749fb8006d0438fee2e623d2f8dc715bfb478ee818e86e9da7c7e0fcf14af496464b79a07
DIST qpdf-9.0.2.tar.gz 18168977 BLAKE2B 46b397f0e6a97804c5e8dcbfc9fd2278960d5afd459430c1790bb8f9080062cf661cf186ab386721ed7560dbd4abbea43e4d31914c0636502c5c11096c250fe2 SHA512 275ca81603d53601e4389cb34eaebea1c5d52b310ef28f3375fbeee255a28edf9375f03f31649f580dbc3df73b851a2c8498feb3dd7b30067955571b05c9e69c
DIST qpdf-9.1.1.tar.gz 18312457 BLAKE2B 0bbfaa782e46a911b20440bcf122d2745dde62de16423307cb02f7f3cd9a4976c79c7f6371322f793abfd8eaf9d5cc4f49b6854e58039595b5a488a2fec98d88 SHA512 008a11fef663a57ca173631f2053988023babea6c333cfe01db0ef955c8cd36d387ed9f2039f55bd5f9ca94c7a8e400461a09a15c5f89e03bc0817fdd0d3d585
EBUILD qpdf-10.0.1-r1.ebuild 1344 BLAKE2B 90fedf92ea6fea520b7eea282a05cd2d8c98c00331fc34af6a1720bc66c98f54f732d9ff607e7279c2b9e609d2bfbf1d460b1489f71b7e732c0e299cd3dd71c0 SHA512 8d5484d57c7f8f0987ac3044951a8a7387f082f3a24920820dfbf350320d12219b2870fbeb83eb916281e494ad14ad5d80a1d60c1999a9e39718a407d7638f76
EBUILD qpdf-9.0.2.ebuild 1275 BLAKE2B 734241fc7d46a3340ea6b5561b5a5bdeaeedcbc27df2cdbe1a56314ac3da57b8cd450ff0dc5413bc9eb05349d52382838b77fcdc37c675da84eae0318bdc4359 SHA512 d17952de2eed88b93d3236e80328c4816a30add65ff0bf3f6588530ec25d0d1e2e84724ff400216cce537a1e1013a243c5c54deea7d1ec6332aad763d6d161a1
EBUILD qpdf-9.1.1-r1.ebuild 1209 BLAKE2B a41341bc00ad325e8fc52b7bb72cc93d9fa615a82452c436518cc26310678f3fa1148a72f1ea26c50da5a2b366d69d53327c3138eff72370d06ab6be9ccfa673 SHA512 e94d36930a5c3ed832630ada53181acd18d487ed81e387dcbb0ea1fc9b46d99ec1e336dc9e352888f10e3661c9e0a01469e6d2fef2fc83b5896f8b276305d747
EBUILD qpdf-10.0.1-r2.ebuild 1347 BLAKE2B cf0992aa1050c973626473a84654f718c119ab6400d9c9b26e73909c47033ac6efa647c49c1d286d919cbfbf6ad4a989df0aa2e4a0a0e7bfa71e35c0b0400eb1 SHA512 5bed37858577a8c440ed8f0b5ca03a126c142e0af31b82184466705ac2275d8cd4c0393abd10b1c3a5b46db4abfc3137e08f76fa453b420ae5e4bf8153058b05
EBUILD qpdf-10.0.4.ebuild 1324 BLAKE2B 829dec1a35fb315fb838f8fdd956d013ca6e1219d291528db6fca90eac4d681f431fd6dab2d72eabb394bda4b50aa46dad122dd1e98d2a8f6df7aff475a839ab SHA512 a1e994d3b83566e8b048474e1ecf249289018c8d31836fa97e9cc52992617e35199e8a6a3185513994b2cd819d91a28426162d9a6fa29e7c5a8812070772cf46
EBUILD qpdf-9.0.2-r1.ebuild 1278 BLAKE2B a7ddc49812f5307f62c51df2175eea83baa3e029d7f77c049a0533426dc3b81f27bb5ae10d1d8ae19dab1ddc80819db986bf803b2d218355195c71dfeda65360 SHA512 1bcf863d03efb215fe98517fe099e04f464cc14dcd49bd23eede86dc55d38e0428c32b90e654b9412aa899695b7422f1a936ed49d4f8e1d6eb8d552bf9c9d12f
EBUILD qpdf-9.1.1-r2.ebuild 1212 BLAKE2B 267f67e4b5115ef494996ad283d10f952bf78d405b860bb8c72cb39227236cccff3e122d8addeee35eeb1f285d564faf6cc90e014fa93ff20070b17a8fb5f7e9 SHA512 24c72250383f4bc98e1e7778f04dada81a26c0192166251f0e5a6cd76d7cf46440e62a4454dc3ed69add76d303f6fed21faf24f345edc939b6c30a803ffae7e7
MISC metadata.xml 499 BLAKE2B 9f6462a9606763352f0c823f877d1a39ffa207a8354e800d64bdb4d7686de8391309e08296adf23ca6b6e5d6fc2150d72ca9b0fed36cd4574e51ae6d04e48341 SHA512 77915adba55eb2b0fa68af06fa30b84c50af0a4a26a3ee6fafa71f9c7a7a307451ab76291dfc87f90479f6a208cb29c8a6c8c7fd0d574455faa15c87f8ea8de7

@ -30,7 +30,7 @@ DEPEND="${RDEPEND}
test? (
sys-apps/diffutils
media-libs/tiff
app-text/ghostscript-gpl[tiff]
app-text/ghostscript-gpl[tiff(+)]
)
"

@ -0,0 +1,57 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
DESCRIPTION="Command-line tool for structural, content-preserving transformation of PDF files"
HOMEPAGE="http://qpdf.sourceforge.net/"
SRC_URI="mirror://sourceforge/qpdf/${P}.tar.gz"
LICENSE="|| ( Apache-2.0 Artistic-2 )"
# subslot = libqpdf soname version
SLOT="0/28"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~m68k-mint ~sparc-solaris"
IUSE="doc examples libressl ssl test"
RESTRICT="!test? ( test )"
RDEPEND="
net-libs/gnutls:0=
sys-libs/zlib
virtual/jpeg:0=
ssl? (
!libressl? ( dev-libs/openssl:0= )
libressl? ( dev-libs/libressl:0= )
)
"
DEPEND="${RDEPEND}
test? (
app-text/ghostscript-gpl[tiff(+)]
media-libs/tiff
sys-apps/diffutils
)
"
DOCS=( ChangeLog README.md TODO )
src_configure() {
local myeconfargs=(
--disable-implicit-crypto
--enable-crypto-gnutls
--enable-crypto-native
--with-default-crypto=gnutls
--disable-static
$(use_enable ssl crypto-openssl)
$(use_enable test test-compare-images)
)
CONFIG_SHELL="${BROOT}/bin/bash" econf "${myeconfargs[@]}"
}
src_install() {
default
if use examples ; then
dobin examples/build/.libs/*
fi
find "${ED}" -type f -name '*.la' -delete || die
}

@ -25,7 +25,7 @@ DEPEND="${CDEPEND}
test? (
sys-apps/diffutils
media-libs/tiff
app-text/ghostscript-gpl[tiff]
app-text/ghostscript-gpl[tiff(+)]
)
"
# Only need perl for the installed tools.

@ -26,7 +26,7 @@ DEPEND="${RDEPEND}
test? (
sys-apps/diffutils
media-libs/tiff
app-text/ghostscript-gpl[tiff]
app-text/ghostscript-gpl[tiff(+)]
)
"

Binary file not shown.

@ -1,6 +1,8 @@
AUX prometheus-cpp-0.9.0-core-Skip-serialization-test-if-locale-is-not-availa.patch 2180 BLAKE2B cd864a68def30f4bf64eb56afc2666ebe7e56a645da1df7e143d7874ae36ea8ecc82a2d5f8aeba5939866b67baeb6a457937355d275375c3bd93b1340bf00ac7 SHA512 3f1dbd41a953e897a1e18a97ef239b73ee1a00475d210406ada3b17686ebd52698c125670a217bb2fd75bf43437640426d48d1c5216ed313c2aceee6bc9fed68
DIST prometheus-cpp-0.10.0.tar.gz 49694 BLAKE2B f14232e1dad0376ea8e90c89079c4a6d8f2e9f5661a399d38d6f5001506db6c628cb42a934b40139cbb0d904a63c4b4483e6ed92452f5393365ed4209a236247 SHA512 18938b30143ed29985ee56943fd69e0a221f9d25f04fc611554050ee2786e96d968f7db251cccefcbd0017b61bcd8a7ea05af8f217c8aacd9f0694a4702ddcff
DIST prometheus-cpp-0.11.0.tar.gz 51126 BLAKE2B 8c2126bcba405748fa398d9b8aed472ca5ade45049817995836fbdb1a09fc29e4176a17ecafa6b9a26f8fb7b62cb00037815ba300123fa3c7f39faac54e160e8 SHA512 4ab286c49403d09f182038cda9cb3bd1b9dbf7061493ff5355afef6ec4ac6ef109c875306e76ed3776b07d640ad7034538cfbc00474106108500994242b4cde2
DIST prometheus-cpp-0.9.0.tar.gz 43924 BLAKE2B e2b26b257e44c63ae5bc2a703d0ee9247fd8f093ef58a3b00dec022af9cb56b18d20b74ccdb91899e2385b036c332b62d9959b9258082ca420fecf48926139d5 SHA512 d9d5fbbd8c8aad5dd6a5e872275324d689a0c57199e4158d74e13ea62b286fa71dee01bb4197b906b79792bf1ca4e67a46b5c04621d7070241ac32876f6de891
EBUILD prometheus-cpp-0.10.0.ebuild 769 BLAKE2B fe1d2756ee9c375fe0962b27be13ade4ea83be5770e93cbc3f4bd3bc7f3645899467b92a4ccc61b5dfc8cfd3e362a4ee62604e16eb8ac05ea9b64c3b7df36492 SHA512 381fb21b7317337fadfdce1b9fe4c4842bf6f5a0b663eb90cb770c1ecc7fae10bf6e62afd0f6984eb8c95da03e07f164449bfb3a45b674534775db92350064f8
EBUILD prometheus-cpp-0.11.0.ebuild 750 BLAKE2B f837d8b48c2464c0d5eeb3b4e02403ecc0f3f3a31533dd77a6b660da3a26804c1c493a8c6981f66c8853518d325ed32fc4e42bec886e06871c99b0f36bce8c16 SHA512 f31c5398456ed9c069ac83bb215c20850b46f9f090b3e461ceb34a1c13f66ac42ff5fe15c0593590811caf8788442f24d5de268b91f9199cd16e4d9d9a1e2b7f
EBUILD prometheus-cpp-0.9.0.ebuild 861 BLAKE2B 5646744ffc35576379efda8660d4766dd5a31f34688e1e1ae8ed203c78741c2a3081ac17d08ecd42bb470c473494f382fd7be520ec7fb272f0eab8fa0b86fd8a SHA512 173615b28f1d1d73f871b22c6fbc8d787cecce06529ce39a5e9bb03dc4ca9672d74ec2a71666b627b445fd104606ef7d2c5e5fc187e645fc227525f58c98e876
MISC metadata.xml 957 BLAKE2B e5ad4d542af4a50bfe542f810c937f79065d7a77f5733bd9e3ce356da4dac599eacf980ad5650e91da3a64c9a050f08dfd24acead0538884fbe01253cb008130 SHA512 06444b55464c8301512b2f6c25f8d0e0071cab367cca4111bd21891b66ab7432b7e637f4ed46803c189cc657677ed35a8c351a11e440f8f1ccd48c9a5d636626

@ -0,0 +1,38 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
inherit cmake
DESCRIPTION="Prometheus Client Library for Modern C++"
HOMEPAGE="https://github.com/jupp0r/prometheus-cpp"
SRC_URI="https://github.com/jupp0r/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="test zlib"
RESTRICT="!test? ( test )"
RDEPEND="
net-misc/curl
sys-libs/zlib
www-servers/civetweb[cxx]"
DEPEND="${RDEPEND}
test? (
dev-cpp/benchmark
dev-cpp/gtest
)"
src_configure() {
local mycmakeargs=(
-DENABLE_PULL=yes
-DENABLE_PUSH=yes
-DENABLE_COMPRESSION=$(usex zlib)
-DENABLE_TESTING=$(usex test)
-DUSE_THIRDPARTY_LIBRARIES=OFF
)
cmake_src_configure
}

@ -1,3 +1,7 @@
AUX 0.11.0-gcc10.patch 5360 BLAKE2B 2b679699a6c98004322caa0cc3334a898010263afff7ee870576855993f9cca8887066306d154ca63f53af224e2601e998deed0eff8c48f93c4b1b91d8bc0e77 SHA512 081032ea9f458f0d3bdc5931e89cab49ae32d4e0cf5a8a5a7ebbc7fd0e103469c78822d5f1ccba75b0425fa8c9b8b9057069a786a6f4fdb229b94a583172cbf7
AUX 0.11.0-no-werror.patch 1543 BLAKE2B 31a87abcfbfd23d1f585053befaa869a7299c74d903028b4c2c4b19194787cc325f6dda2dc5d9255d6aa38ce3b4b3182e9b9a133fa61d24569c56ac344cde643 SHA512 8ddc6073e1386cb667e66e5496d2566b60bc64f9670bd94d3d66582a43db66466e4f57995c68bf1ceca500c07f8f7feccfaeeb1c0cf9fafa14de5a81482eca5c
DIST range-v3-0.10.0.tar.gz 525765 BLAKE2B 7dd3aed9b35920e058fe43bccd364831a52ad8d50179d1057ab7a37cdef82df021bb09a9913018ae78982fe136c855ba4101e31d35cfc21747af994d0103b95e SHA512 4db089dcbf638eb30fa20dcf6785dd460c5a074a8912984a484592753cfee9f5b9a0e2c56b5bc5921d1b6120877aa2c83ac0a6fe428088ef2854033a635e9723
DIST range-v3-0.11.0.tar.gz 533136 BLAKE2B d325b14a9d812cb7a600a947126bcecf9384bec987edbad42eec38560415d075815ab92e3f92dad291029fc3e1b1afa1ceaf54443b4a536078047fd32d344394 SHA512 9d6cdcbc1e50104206ba731c3bdc9aab3acfcf69cd83f0e0b4de18b88df2a9e73d64e55638421768d4433c542b6619f6e5af6b17cccd3090cf8b4d4efe9863e4
EBUILD range-v3-0.10.0-r1.ebuild 854 BLAKE2B 17533e47f71866b1b7be5b7323e7179513dad88287a61506bb1fb145004927a64a2809682b91c548cc89f544238ee3cbbc2ec42159a3686f5a5c8cc4d63a9f0c SHA512 9d326cb93b3bc3fd32adf43ee6229ea672d56be1c711afe0724cd012451d570ac4ea9404992bee1faa64c4cdffacfef78193192953626a771780bb17939cd5cc
EBUILD range-v3-0.11.0.ebuild 1161 BLAKE2B f001f5d4a642692e9c6399421fc3baf89e07a28dcbc1e3652a593c3cdbc691f83d9f406fa27f08dc5bd9cce5be46ee8980618332f1bd016c0e7841bc08f02472 SHA512 b345ec01463b82499681c2604453df2f9305be3ef5ccfbbff8a0aa5bc4e4b6298b254ab805d950e065ba8cef5cea2092f70b2cdc6c0cc381d72d334699e3ce8a
MISC metadata.xml 251 BLAKE2B e9e9d48943645d8b737bc1f7ab0efb05db0f8eddad759c9bb40d07dc008fbfb8f5cca2020de71a9ff6945f5d66292ac02355773545010cd49c77fe6dd5ab7b40 SHA512 1b6a6955118c1a74cc89a77d6de9be8f4ff9c7137c186753462670a5b93457dfd034ad5d1f4d2507ac95cc149c2a042fa5324220b58702a56b09d91de40151c9

@ -0,0 +1,133 @@
From a91f0e1be27a31c446452a753001d4518ef83a6b Mon Sep 17 00:00:00 2001
From: Eric Niebler <eniebler@boost.org>
Date: Mon, 17 Aug 2020 17:48:09 -0700
Subject: [PATCH] work around premature instantiation problem on gcc; fixes
#1545
---
include/range/v3/view/chunk.hpp | 6 +++---
include/range/v3/view/split.hpp | 26 +++++++++++++-------------
2 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/include/range/v3/view/chunk.hpp b/include/range/v3/view/chunk.hpp
index 0c03cf1eb..b8df13303 100644
--- a/include/range/v3/view/chunk.hpp
+++ b/include/range/v3/view/chunk.hpp
@@ -313,8 +313,8 @@ namespace ranges
public:
inner_view() = default;
- constexpr explicit inner_view(chunk_view_ & view) noexcept
- : rng_{&view}
+ constexpr explicit inner_view(chunk_view_ * view) noexcept
+ : rng_{view}
{}
CPP_auto_member
constexpr auto CPP_fun(size)()(
@@ -338,7 +338,7 @@ namespace ranges
constexpr inner_view read() const
{
RANGES_EXPECT(!done());
- return inner_view{*rng_};
+ return inner_view{rng_};
}
constexpr bool done() const
{
diff --git a/include/range/v3/view/split.hpp b/include/range/v3/view/split.hpp
index facf1b37f..496220e4a 100644
--- a/include/range/v3/view/split.hpp
+++ b/include/range/v3/view/split.hpp
@@ -389,19 +389,19 @@ namespace ranges
split_outer_iterator() = default;
CPP_member
- constexpr explicit CPP_ctor(split_outer_iterator)(Parent & parent)(
+ constexpr explicit CPP_ctor(split_outer_iterator)(Parent * parent)(
/// \pre
requires (!forward_range<Base>))
- : parent_(&parent)
+ : parent_(parent)
{}
CPP_member
- constexpr CPP_ctor(split_outer_iterator)(Parent & parent,
+ constexpr CPP_ctor(split_outer_iterator)(Parent * parent,
iterator_t<Base> current)(
/// \pre
requires forward_range<Base>)
: Current{std::move(current)}
- , parent_(&parent)
+ , parent_(parent)
{}
template(bool Other)(
@@ -519,7 +519,7 @@ namespace ranges
ranges::equal_to> &&
(forward_range<V> || detail::tiny_range<Pattern>)
#endif
- struct RANGES_EMPTY_BASES split_view
+ struct RANGES_EMPTY_BASES split_view
: view_interface<split_view<V, Pattern>, is_finite<V>::value ? finite : unknown>
, private detail::split_view_base<iterator_t<V>>
{
@@ -537,17 +537,17 @@ namespace ranges
#if RANGES_CXX_IF_CONSTEXPR < RANGES_CXX_IF_CONSTEXPR_17
outer_iterator<simple_view<V>()> begin_(std::true_type)
{
- return outer_iterator<simple_view<V>()>{*this, ranges::begin(base_)};
+ return outer_iterator<simple_view<V>()>{this, ranges::begin(base_)};
}
outer_iterator<false> begin_(std::false_type)
{
this->curr_ = ranges::begin(base_);
- return outer_iterator<false>{*this};
+ return outer_iterator<false>{this};
}
outer_iterator<simple_view<V>()> end_(std::true_type) const
{
- return outer_iterator<true>{*this, ranges::end(base_)};
+ return outer_iterator<true>{this, ranges::end(base_)};
}
default_sentinel_t end_(std::false_type) const
{
@@ -580,11 +580,11 @@ namespace ranges
{
#if RANGES_CXX_IF_CONSTEXPR >= RANGES_CXX_IF_CONSTEXPR_17
if constexpr(forward_range<V>)
- return outer_iterator<simple_view<V>()>{*this, ranges::begin(base_)};
+ return outer_iterator<simple_view<V>()>{this, ranges::begin(base_)};
else
{
this->curr_ = ranges::begin(base_);
- return outer_iterator<false>{*this};
+ return outer_iterator<false>{this};
}
#else
return begin_(meta::bool_<forward_range<V>>{});
@@ -596,7 +596,7 @@ namespace ranges
/// \pre
requires forward_range<V> && forward_range<const V>)
{
- return {*this, ranges::begin(base_)};
+ return {this, ranges::begin(base_)};
}
CPP_member
constexpr auto end() //
@@ -604,14 +604,14 @@ namespace ranges
/// \pre
requires forward_range<V> && common_range<V>)
{
- return outer_iterator<simple_view<V>()>{*this, ranges::end(base_)};
+ return outer_iterator<simple_view<V>()>{this, ranges::end(base_)};
}
constexpr auto end() const
{
#if RANGES_CXX_IF_CONSTEXPR >= RANGES_CXX_IF_CONSTEXPR_17
if constexpr(forward_range<V> && forward_range<const V> &&
common_range<const V>)
- return outer_iterator<true>{*this, ranges::end(base_)};
+ return outer_iterator<true>{this, ranges::end(base_)};
else
return default_sentinel;
#else

@ -0,0 +1,39 @@
From 66e847d4e14be3a369b7e26a03a172b20e62c003 Mon Sep 17 00:00:00 2001
From: eksi <eksi@eksi.eksi>
Date: Wed, 4 Nov 2020 20:37:01 +0300
Subject: [PATCH] Add an option to disable -Werror. Fixes #1528
---
cmake/ranges_flags.cmake | 4 +++-
cmake/ranges_options.cmake | 3 +++
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/cmake/ranges_flags.cmake b/cmake/ranges_flags.cmake
index 76d893043..9b09ddcb8 100644
--- a/cmake/ranges_flags.cmake
+++ b/cmake/ranges_flags.cmake
@@ -88,7 +88,9 @@ else()
# Enable "normal" warnings and make them errors:
ranges_append_flag(RANGES_HAS_WALL -Wall)
ranges_append_flag(RANGES_HAS_WEXTRA -Wextra)
- ranges_append_flag(RANGES_HAS_WERROR -Werror)
+ if (RANGES_ENABLE_WERROR)
+ ranges_append_flag(RANGES_HAS_WERROR -Werror)
+ endif()
endif()
if (RANGES_ENV_LINUX AND RANGES_CXX_COMPILER_CLANG)
diff --git a/cmake/ranges_options.cmake b/cmake/ranges_options.cmake
index 4ec39c7f0..8455af306 100644
--- a/cmake/ranges_options.cmake
+++ b/cmake/ranges_options.cmake
@@ -16,6 +16,9 @@ option(RANGES_MODULES "Enables use of Clang modules (experimental)." OFF)
option(RANGES_NATIVE "Enables -march/-mtune=native." ON)
option(RANGES_VERBOSE_BUILD "Enables debug output from CMake." OFF)
option(RANGES_LLVM_POLLY "Enables LLVM Polly." OFF)
+option(RANGES_ENABLE_WERROR
+ "Enables -Werror. Only effective if compiler is not clang-cl or MSVC. ON by default"
+ ON)
option(RANGES_PREFER_REAL_CONCEPTS
"Use real concepts instead of emulation if the compiler supports it"
ON)

@ -0,0 +1,46 @@
# Copyright 2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
inherit cmake
DESCRIPTION="Range library for C++14/17/20, basis for C++20's std::ranges"
HOMEPAGE="https://github.com/ericniebler/range-v3"
SRC_URI="https://github.com/ericniebler/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="Boost-1.0"
SLOT="0"
KEYWORDS="~amd64 ~ppc64"
IUSE="test"
RESTRICT="!test? ( test )"
PATCHES=(
"${FILESDIR}/0.11.0-no-werror.patch"
"${FILESDIR}/0.11.0-gcc10.patch"
)
src_prepare() {
# header-only libraries go to arch-independent dirs
sed -i -e 's@lib/cmake@share/cmake@g' CMakeLists.txt || die
rm include/module.modulemap || die # https://bugs.gentoo.org/755740
cmake_src_prepare
}
src_configure() {
mycmakeargs=(
-DRANGES_BUILD_CALENDAR_EXAMPLE=OFF
-DRANGES_NATIVE=OFF
-DRANGES_DEBUG_INFO=OFF
-DRANGES_NATIVE=OFF
-DRANGES_ENABLE_WERROR=OFF
-DRANGES_VERBOSE_BUILD=ON
-DRANGE_V3_EXAMPLES=OFF
-DRANGE_V3_PERF=OFF
-DRANGE_V3_DOCS=OFF
-DRANGE_V3_HEADER_CHECKS="$(usex test ON OFF)"
-DRANGE_V3_TESTS=$(usex test ON OFF)
#TODO: clang support + -DRANGES_MODULES=yes
)
cmake_src_configure
}

Binary file not shown.

Some files were not shown because too many files have changed in this diff Show More

Loading…
Cancel
Save