1 |
commit: e6afb012ba7b9e31d469d06c292937b4ca8329bb |
2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Jun 3 06:06:00 2022 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Jun 3 06:13:09 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e6afb012 |
7 |
|
8 |
app-text/poppler: add 22.06.0 (unkeyworded) |
9 |
|
10 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
11 |
|
12 |
app-text/poppler/Manifest | 2 ++ |
13 |
.../poppler/{poppler-9999.ebuild => poppler-22.06.0.ebuild} | 12 ++++++++++-- |
14 |
app-text/poppler/poppler-9999.ebuild | 12 ++++++++++-- |
15 |
3 files changed, 22 insertions(+), 4 deletions(-) |
16 |
|
17 |
diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest |
18 |
index e68fff1340a9..289d85ec8d84 100644 |
19 |
--- a/app-text/poppler/Manifest |
20 |
+++ b/app-text/poppler/Manifest |
21 |
@@ -1,2 +1,4 @@ |
22 |
DIST poppler-22.03.0.tar.xz 1809940 BLAKE2B 0307e9225645b289105fe5a55a712ab821a0961a5dd53467b7db41432d74ec763e9ab0494f6b4d1bed94f7b0c2a74cb849878ad5f0c877fa4df0888f97a10ef6 SHA512 f87bbff4f394f192095da0c00bdf8b5c70b7eb864941225aad2025e91283c3c42a0016a772e7e9ea73a86746251928fc64500f923e8fd841adae1c6e67d72569 |
23 |
DIST poppler-22.05.0.tar.xz 1828628 BLAKE2B d1757893c841d35cbdeda493afea92046c447dfa0d519ab9a872a75fdb7edbb06bbde78b2e7d41757f5bbff8d1f46c81f7314dff8386d4d686ded4d2cc85d65e SHA512 629098793050f7a901c2a2cf1efcad83c58d26164cf94f4aa3985465f016a8875c62be4fb8ab8005ca00ef061402962e6d6c14eb611ce29f2d71d3ae83f24737 |
24 |
+DIST poppler-22.06.0.tar.xz 1834980 BLAKE2B 6988480dc30f5fe67be0170f8f006bdb4d3e6b0e0ad8643aa6cbf4fe017d52d8747f108267a30aee5ec4567aa5d2fcc9ce9824fc4dac45a1d37291fa668c2dfe SHA512 79e1a1440a0903ea6238dcc7afc4ecdf1f8cc53af94ec5649f631fca568711d48a7ec4046fccb8520818420dc21e4ad1aaf602c22b13f9ce22f4d06edc83c8a3 |
25 |
+DIST poppler-22.06.0.tar.xz.sig 833 BLAKE2B e2a842fac83b5c42713aa45072d8ea1de5219cbbc35d04142a902f569fc7c558cbda9a2379fde6f9f933b701fabe98f93de71a0676837b2a21104f919a097bc8 SHA512 b61f706e52c57209bb180fbe5a65e366e2a841743ac2c24fc0828dc4bab8ae52da12330e4694e8dade1e1963112fc7b01c0c1b30141be2b7c8c0cf2aaab059c5 |
26 |
|
27 |
diff --git a/app-text/poppler/poppler-9999.ebuild b/app-text/poppler/poppler-22.06.0.ebuild |
28 |
similarity index 85% |
29 |
copy from app-text/poppler/poppler-9999.ebuild |
30 |
copy to app-text/poppler/poppler-22.06.0.ebuild |
31 |
index a5f3b33d9738..1e336c95ce57 100644 |
32 |
--- a/app-text/poppler/poppler-9999.ebuild |
33 |
+++ b/app-text/poppler/poppler-22.06.0.ebuild |
34 |
@@ -10,9 +10,13 @@ if [[ ${PV} == *9999* ]] ; then |
35 |
EGIT_REPO_URI="https://anongit.freedesktop.org/git/poppler/poppler.git" |
36 |
SLOT="0/9999" |
37 |
else |
38 |
+ VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/aacid.asc |
39 |
+ inherit verify-sig |
40 |
+ |
41 |
SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz" |
42 |
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
43 |
- SLOT="0/121" # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION |
44 |
+ SRC_URI+=" verify-sig? ( https://poppler.freedesktop.org/${P}.tar.xz.sig )" |
45 |
+ #KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
46 |
+ SLOT="0/122" # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION |
47 |
fi |
48 |
|
49 |
DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base" |
50 |
@@ -57,6 +61,10 @@ BDEPEND=" |
51 |
virtual/pkgconfig |
52 |
" |
53 |
|
54 |
+if [[ ${PV} != *9999* ]] ; then |
55 |
+ BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-aacid )" |
56 |
+fi |
57 |
+ |
58 |
DOCS=( AUTHORS NEWS README.md README-XPDF ) |
59 |
|
60 |
PATCHES=( |
61 |
|
62 |
diff --git a/app-text/poppler/poppler-9999.ebuild b/app-text/poppler/poppler-9999.ebuild |
63 |
index a5f3b33d9738..1e336c95ce57 100644 |
64 |
--- a/app-text/poppler/poppler-9999.ebuild |
65 |
+++ b/app-text/poppler/poppler-9999.ebuild |
66 |
@@ -10,9 +10,13 @@ if [[ ${PV} == *9999* ]] ; then |
67 |
EGIT_REPO_URI="https://anongit.freedesktop.org/git/poppler/poppler.git" |
68 |
SLOT="0/9999" |
69 |
else |
70 |
+ VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/aacid.asc |
71 |
+ inherit verify-sig |
72 |
+ |
73 |
SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz" |
74 |
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
75 |
- SLOT="0/121" # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION |
76 |
+ SRC_URI+=" verify-sig? ( https://poppler.freedesktop.org/${P}.tar.xz.sig )" |
77 |
+ #KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
78 |
+ SLOT="0/122" # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION |
79 |
fi |
80 |
|
81 |
DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base" |
82 |
@@ -57,6 +61,10 @@ BDEPEND=" |
83 |
virtual/pkgconfig |
84 |
" |
85 |
|
86 |
+if [[ ${PV} != *9999* ]] ; then |
87 |
+ BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-aacid )" |
88 |
+fi |
89 |
+ |
90 |
DOCS=( AUTHORS NEWS README.md README-XPDF ) |
91 |
|
92 |
PATCHES=( |