parent
e250b8b70d
commit
538ebc51f9
@ -1,23 +1,23 @@
|
||||
-----BEGIN PGP SIGNED MESSAGE-----
|
||||
Hash: SHA512
|
||||
|
||||
MANIFEST Manifest.files.gz 29297 BLAKE2B f7be25a3c3595c342284a81dd051337ce3367c804324cf6439316d42c67ccfa07de629191c7d3049e523ec87efb724d5a747f999eb8526e69b1157477acc4186 SHA512 a05f96cba90c7e52b0c41d79c127f59aa198e3a63230a9acb47ac2553037fe9753ed952c9c10dce68840fdbdc152b8757b068f661f8be1a39c0c04bdc9d35231
|
||||
TIMESTAMP 2021-04-30T12:38:34Z
|
||||
MANIFEST Manifest.files.gz 29278 BLAKE2B c9bc96c3aeccd1cdef60bb9e8c811ccdbc5b71cff35b7437b9716a5f0ade2b39cb3a49047d20969b91e1da0eae22ef68fc21b9677e3d27b65cb9069c57fbf643 SHA512 a9b3215bc346df8244204b44db91573ccb7d53dfd241533eca441c8dfbf1f3f8f381b35f2ab6df42a863496506f8793cfaa27000ba265b0966d2189e33058863
|
||||
TIMESTAMP 2021-04-30T17:08:36Z
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
|
||||
iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmCL+kpfFIAAAAAALgAo
|
||||
iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmCMOZRfFIAAAAAALgAo
|
||||
aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
|
||||
RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
|
||||
klAxiQ//Tt0VEQk3MSdZ4yPQZ92ZyKQATTGoIgkjta7kgTLeNZRgomfrlHofIUAd
|
||||
FA6blBEduNnZxsfy2ji0px1W/0Ywwhru7uepsfnVVP7qM/prDpexs1jDCx5DDfUX
|
||||
8rvn4tsAuu3FIpm7zLlK10o+b8XCSiFloWrkN+8gmiQ1UMgqzPunS4n310NYwUy1
|
||||
nT3T7La9B9qcvf9DGQOcpIyZ4n/oI/lq3zjNT1SL++eD+wyIB64sZ+u4bN34RZ9P
|
||||
neykk0JoLBDg7hwaGUAT0VMlVNpXfD06XNj7sVqMesvV/iWOGQrWYpd7XFQWi1aO
|
||||
wBW/cMUZB9Do9Ey6G59+6O4wlYQTRDRJsoUkJUtvkz4eT00JGZcM0fQETo+XvP+h
|
||||
ltSr3xDCd13Gkv7wB7Vlc1RKZgyDSRMbWEdyiYIac6d+MdX9iFP/AonL4TY0ZKlf
|
||||
a8coqNHFNN9IeOhJ1mAomGxGfhIw/2om+xhPGKX4Trd4xvzA82dmBXEFU4sNDmOb
|
||||
UwTOsIoY3ToxFi68duG5G95rmPotjPgLqXDMqVnUMAKWp+4sasXl04HvRyDtkgZW
|
||||
dz6rRAJtzSludRC+oUf/KNWXMiBb57uAoL6YWSs+4NFCEAiarkjQajkGGtr0W8D/
|
||||
gmwokMZWn+w7lvVymHnA6mtZ38zYYh2WkCuF3FpmUfeidIBt4OM=
|
||||
=r491
|
||||
klB+Qg//QS7iNghnE/TTlyU1DcgQ+dJeMnhA5ENop8IzoRntLDVlWK+1D/KoVq17
|
||||
1dxMRTGHFDdHqbAnhqd/0BUhushH3eCp0lcECVc2ADluQAwMR3Kaq5JPcM5S37wZ
|
||||
f1D4ab202AUGwPpyS0XPrddeSZ9hwAKXvPFK4oCkGsO/3OnKLwgyTY+e4PVxQR+J
|
||||
qR/4h3dlsAi3t9y3yI8FCYTX67Eve2YMMI54eZiPlPLcVvVLOZSsN0xmV7QGtqry
|
||||
pkFGjaLVBfDjuWFUCZp6fG9lb/s8EGpcaQq/i1YHgSA11zDoFpxHFYch5OK3yDIG
|
||||
SkzoT1/sPnyqffQjLyg6tWvZ161zrWsIdKJuMxLjVTyhdnvjVu52gNefW9zlXw4U
|
||||
sQRtQvc70aT2yizibqOid0Ui1lWGs0wPo9lqSN2oTjS54baOEWhZeTfPQbxJb0nl
|
||||
272nP5VbCvFBvRIEMDwS4ckZnS6qGoxr4ChihrLbxdLI+f8oPysm027tmLvM4MUx
|
||||
Ryz3SfuqekSqzm/ooQsWFbhiZo5IhoW3oyz+Hrobop+Maf52At41j1jd1BaIbwnx
|
||||
rd4NSy4CLt7eSYW278rtnDjkT++g8LfdJqXgt15A/0l5F+JxeIgbYInsnDFuiyuI
|
||||
dUbXIuNnk0seGyYfFr1Y14JKn2cDmeANZhj+Y6q+p8tMspzxyqA=
|
||||
=cjkV
|
||||
-----END PGP SIGNATURE-----
|
||||
|
||||
Binary file not shown.
Binary file not shown.
@ -1,5 +1,5 @@
|
||||
DIST entr-4.6.tar.gz 24909 BLAKE2B e6c1eb5da1a3b94d593297f9975c36ea98d88c5b6ac17c34934c8d4678fb1c247699b8ff3d481a3972a67fd0abba75687b11489258be98990713e2041a12c2d0 SHA512 41e8c2311c7833a778193b13d1e0b1bb18ece54f5e20b8b5b0b4a2308ba1cc1a8b8378700dbac83ee68822b5f847a3fa9c47822d22a22d45da792d2408f48378
|
||||
DIST entr-4.8.tar.gz 25408 BLAKE2B 82367e2d7c933d881ed35147656f9b3c521103a636eecc603ed7d3e17eb59929e872ecb865f8d733f867383a3e1021fd3564f8e5fd27d094dfac9789d6651251 SHA512 fc99a257fe9a30a9b08f0b6283f9ee3b65c38362744842dd976a4ac7749df7f6ff630235443af17f664f9cbf2a197dbb8c1114fe491e675921745294b4fa4d8f
|
||||
EBUILD entr-4.6.ebuild 586 BLAKE2B 342fd92b72d67e5f97bc39cdeb24f2454370dbe7c56bde889b3271b2a1829c7d917a046282543dbef589b86a0f33601faef9adc688fbdfe8d7d2c52d4ad6cfb0 SHA512 25958a209870781211efe04357b4cffcfa728e543820d3342c2471d3d2c58876b5e18a47d48d8b7cde96a19898d55f5a493b70d1df2d0db35baf3fdfe97e5cf4
|
||||
EBUILD entr-4.8.ebuild 590 BLAKE2B 10bd6604fc9be627bd3e5b779a35b2d4048f014f84274c9107672fdf9d9db1770639eef33773eac72bfd73b3eac34d8d92092803c318767aa8c9f9bc4077149a SHA512 8006118f9c58f97f26108a1e9d322f60c5dcc65656780d5e99d6b97efcf37e2fe30b71ea3864f6bb754ca463ecd10b9d22745f8ceb3a634a8b48a8dde26e68bc
|
||||
EBUILD entr-4.8.ebuild 589 BLAKE2B 447fb8d9b3f6305d0bc81f88d487e1c5ccda2e65929b10e9fec913ad2c055df2405d765a996b5e8c19ff825055a590193d5a1e98b9b4777423b2adfbd0974919 SHA512 f71ffd3ead77beeba3e51205e4e75c5640369932b2bea8c9f48cf5e565ad5ccd1ab2e9daf19648f7bb7e458f5347112be970a49de31bad4f05c6a1df5cb27ecf
|
||||
MISC metadata.xml 377 BLAKE2B 377ae6a1620e09bf5a309a212ed7b4db5516e51b9e955373502252ab4fa5bdd9520d5c145905634d76e3884a3a993a6fb2cbe37e730e177081ea5f0c65b3c1ec SHA512 7db7620ce42324e2a551b2fa5898aab491c868b5d28b938e163ea1bf24aed66913fff8d611e95c634e65aa5372bed9314a55b278d62157929d6873cea7994bd6
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
AUX passwordsafe-1.06_beta-system-gtest.patch 2962 BLAKE2B 1ef77391d355364e55da568c2686c1988916da9eadc312c37d01016df3449535b88b503dfd3aeac2bf3c8e613141552bb1d97f5f5a733becc33f3c565a610940 SHA512 2fc6745b84ad810a550c2b221aca4cd10f87d4bc77282cb31b3d3070b61a3958c126ce0d3da4eaf550d80be470ca4c5aefaeb863caaf2f9fb285bf844f5705bb
|
||||
DIST passwordsafe-1.12.0.tar.gz 14937705 BLAKE2B 523e4496ffb99f8a53e62252117d43b771af867b3505f3a5b8c8f1119e8365f0661090e410a832abca89e2ce35816d2046d4bff0ba1e0f06c52c01eaac9051b2 SHA512 c20cb754a2174e3b3ab61edf99f2a31c333144550103fac50cc26cea89669fa3574db3bdd59996fcd87b83c7bf6dd1e9d2b087c17615183cd7111f151be5a94a
|
||||
DIST passwordsafe-1.13.0.tar.gz 15022877 BLAKE2B 353976c22365fc98c034eac339f067061ee659043ab8507bbec174483414619b8442ba4fd7671e888127b83e9865d21587529c7821bd706a55da951c300425d4 SHA512 eb8ae46e9f3e8287b2ad781ed6d6e13026096a35fadc1fd1da1116e5e6b65e16e76090d8e7d1c64be387229ccd1053dcc820acbe7ee97914e46c311ee8ff03b8
|
||||
EBUILD passwordsafe-1.12.0-r1.ebuild 1952 BLAKE2B ca0b8d7112408f3bb6ddbae81f910f22454246f8442b858e4f51108f9cb8b372c9d34d2375c60e102d5a811dd467b0b92faa8198401e961ca7a1c7775b8cec02 SHA512 3c830d1f384651b2f6153594bb589f954c0261a285f1df5c9ee7cff4e7c26904b7b246478761e7bd38ad395e0d542f66ef48974174406b486d75a8c28cf2ac85
|
||||
EBUILD passwordsafe-1.12.0-r1.ebuild 1892 BLAKE2B 2943644c3546e9d31c29bda97d0292d31db902074452c025df2eaaf0f0128524974e8b933d018b84a66c1b6b5f39f4dac8be29d966870d1f497d17d661867115 SHA512 f6b29dc2a68f06ef500b8fcb2a8b5e14bdd89e93d074703c695c93749d9af283a118879c250b65e88b90d3b272d30e6f35d5323951449af67302d6242da84e02
|
||||
EBUILD passwordsafe-1.13.0.ebuild 1888 BLAKE2B 8e10bb42fb03ef98e3d946d2498b1265d142852c75f36ea1d3bce634991a618159edf9fba455cb56e730f8c28369f175108d731986c3e4e3a6bd158ee39c0e75 SHA512 712f86d94751e859a14281a5b3741e175c7f9a1002938ad31a374687a16463006c482d56f2096241f164f2954d556a63cf2a67fc78d865f6e98be9938de9e349
|
||||
MISC metadata.xml 713 BLAKE2B 7f98705703812e2a7148f5943d8b0c8e7a2f51f2bced2d27badbad478f87411c5dc3d7b37a1dffc7d21cabafa4b61650ca745b8d0bcdfafc7f15c46d363540da SHA512 31cacdb2b25093ee853a43200c498177d207027302a6542dfa095377e1f6834d1c40c28088241939ebe3022f122c0125a94e248f135c084a4a234b2510741148
|
||||
|
||||
Binary file not shown.
@ -1,5 +1,5 @@
|
||||
AUX libu2f-server-1.1.0-disable-help2man-gengetopt-checks.patch 1137 BLAKE2B fc1d8287d590acf1385747091195e4401f9c3cba2ad6c0911f2ca549504569250567ef5e1b64124b5545460ba53e7e61354c4393051c275212b40c5a70764dd9 SHA512 cae13f6c9738be740055d0d26a7913f84bee0edf3df06d8a4e3da39dbcd7dd24ca19af638c1f00c3e45d68389e9ae842ab2a92ccd690a04af610646705edd498
|
||||
AUX libu2f-server-1.1.0-jsonc014.patch 1137 BLAKE2B 84d26d1439662ee15e72aae0f8789be6326d2fc4eb987d1ab961ce3200750414d9e5173c1f6ec16d210ce0a9d7aa4fd274d84967cef611e1638a1f2404da1e38 SHA512 eaeea076939f52f0c28a24825b56c67fb05be4d1c392f1cadf10452cc465edc5c711c998ef836cabf81886b89641492f9df7c9fe9ae03fe2f05bfcda2f65bdac
|
||||
DIST libu2f-server-1.1.0.tar.xz 269128 BLAKE2B 084b177a878e8216f2ee5af9eeee11e691edcd12b7ed1b1c57f74bcc45f0418a0d44a9e72423c41b4104aa9f69807a0289172d08d21d168c6be5b36ee8c70bc3 SHA512 ebdb7c8c20727f37f4e31d8f16df7966603374f78478ada723a7b9bec1b0b0622caf6d12a65067ac8651f6088aaad61b2ad6ed51b9d6ef0dc45f031c974d8ff9
|
||||
EBUILD libu2f-server-1.1.0.ebuild 1253 BLAKE2B ea8d8530aa01e1f411280be1bd82c92e7a5659b4982ee3f5b7829140db0c69021a7d37636a374bf42140f2d1898e24fb6691e10490d6a97a8ed8a33809760e25 SHA512 44d37de15b2435b9330121cd0146aeae6495d5bf1f1dd49a7991307fe24ce5dd2c9b094bc090474c7ccef0785191380a20214ebeab1b47d8a4191cec7de43976
|
||||
EBUILD libu2f-server-1.1.0.ebuild 1174 BLAKE2B 577b4354eb5750d937cf09d0fec86e377efe7723af597e72aa86086e8caba0c3ad24e928b87a755d817f6fe7bafe9c185bbef20d827d6e39e6fea8e89061a0a2 SHA512 3424fa86980abad63a16de3577a951b65bd8973f9df261701cc8c3c5a6634561f77db7f580b146e3e15240369bc0350aff90f3b1ea2e2faff60e6908ab293c9c
|
||||
MISC metadata.xml 351 BLAKE2B 9b08643cd9cfab47436281dd57bca31e713980d3cb0b5d20fcd9a915bc5adbcf589ac4df9f03929a8f57e7a11393602afe05d025d10bb04d425bacc1f4765324 SHA512 6a1aeb9117473d5c2ea5de3a3043de7926bb70e2cc00ac8c13b4d3a27b7fd3c7ca6611bc4f4ed9faeb611f228f5a8ffc657e924fdf800133d62a70b48e408f22
|
||||
|
||||
Binary file not shown.
Binary file not shown.
@ -0,0 +1,60 @@
|
||||
# Copyright 1999-2021 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI="7"
|
||||
|
||||
inherit autotools libtool flag-o-matic
|
||||
|
||||
DESCRIPTION="C++ API interface to the MySQL database"
|
||||
HOMEPAGE="https://tangentsoft.net/mysql++/"
|
||||
SRC_URI="https://www.tangentsoft.net/mysqlpp/releases/${P}.tar.gz"
|
||||
|
||||
LICENSE="LGPL-2"
|
||||
SLOT="0/3"
|
||||
KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos"
|
||||
IUSE="doc"
|
||||
|
||||
RDEPEND="|| ( dev-db/mysql-connector-c dev-db/mariadb-connector-c )"
|
||||
DEPEND="${RDEPEND}"
|
||||
DOCS=( CREDITS.txt CONTRIBUTING.md doc/ssqls-pretty )
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/${PN}-3.2.1-gold.patch
|
||||
"${FILESDIR}"/${PN}-3.2.4-only-unit-tests.patch
|
||||
)
|
||||
|
||||
src_prepare() {
|
||||
# Bug filed upstream about deprecated std::auto_ptr
|
||||
append-cxxflags $(test-flags-CXX -Wno-deprecated-declarations)
|
||||
# Bad symlink for libtool in the archive
|
||||
rm "${S}/ltmain.sh" || die
|
||||
|
||||
default
|
||||
|
||||
# we don't use eautoreconf to avoid dev-util/bakefile
|
||||
_elibtoolize --auto-ltdl --install --copy --force
|
||||
elibtoolize
|
||||
|
||||
# Current MySQL libraries are always with threads and slowly being removed
|
||||
sed -i -e "s/mysqlclient_r/mysqlclient/" "${S}/configure" || die
|
||||
rm "${S}/doc/"README-*-RPM.txt || die
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local myconf=(
|
||||
--enable-thread-check
|
||||
--with-mysql="${EPREFIX}/usr"
|
||||
--with-mysql-lib="${EPREFIX}$(mysql_config --variable=pkglibdir)"
|
||||
--with-mysql-include="${EPREFIX}$(mysql_config --variable=pkgincludedir)"
|
||||
)
|
||||
econf "${myconf[@]}"
|
||||
}
|
||||
|
||||
src_test() {
|
||||
ONLY_UNIT_TESTS=1 "${S}"/dtest || die
|
||||
}
|
||||
|
||||
src_install() {
|
||||
default
|
||||
# install the docs and HTML pages
|
||||
use doc && dodoc -r doc/pdf/ doc/refman/ doc/userman/ doc/html/
|
||||
}
|
||||
@ -0,0 +1,51 @@
|
||||
# Copyright 1999-2021 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI="7"
|
||||
|
||||
inherit perl-module
|
||||
|
||||
DESCRIPTION="Advanced command-line tools to perform a variety of MySQL and system tasks"
|
||||
HOMEPAGE="https://www.percona.com/software/mysql-tools/percona-toolkit"
|
||||
SRC_URI="https://www.percona.com/downloads/${PN}/${PV}/source/tarball/${P}.tar.gz"
|
||||
|
||||
LICENSE="|| ( GPL-2 Artistic )"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
|
||||
# Package warrants IUSE doc
|
||||
IUSE=""
|
||||
|
||||
COMMON_DEPEND="dev-perl/DBI
|
||||
dev-perl/DBD-mysql
|
||||
virtual/perl-Time-HiRes"
|
||||
RDEPEND="${COMMON_DEPEND}
|
||||
dev-perl/JSON
|
||||
dev-perl/libwww-perl
|
||||
dev-perl/Role-Tiny
|
||||
virtual/perl-File-Path
|
||||
virtual/perl-Getopt-Long
|
||||
virtual/perl-Time-Local
|
||||
virtual/perl-Digest-MD5
|
||||
virtual/perl-IO-Compress
|
||||
virtual/perl-File-Temp
|
||||
virtual/perl-File-Spec
|
||||
virtual/perl-Scalar-List-Utils
|
||||
dev-perl/TermReadKey"
|
||||
DEPEND="${COMMON_DEPEND}
|
||||
virtual/perl-ExtUtils-MakeMaker"
|
||||
|
||||
# Bug #501904 - CVE-2014-2029
|
||||
# sed -i -e '/^=item --\[no\]version-check/,/^default: yes/{/^default: yes/d}' bin/*
|
||||
# ^ is *-no-versioncheck.patch
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/${PN}-3.0.7-no-versioncheck.patch
|
||||
"${FILESDIR}"/${PN}-3.0.10-slave-delay-fix.patch
|
||||
)
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
|
||||
sed -i \
|
||||
-e "s/=> 'percona-toolkit',/=> 'Percona::Toolkit',/g" \
|
||||
Makefile.PL || die
|
||||
}
|
||||
Binary file not shown.
Binary file not shown.
@ -1,3 +1,4 @@
|
||||
DIST htmlcleaner-2.13-src.zip 346998 BLAKE2B 883a2550b9ddc0f56d88b1a412b2d9f809e0bb53d56827104aad99f15b4fc5c7f6c88b37cd10dbea5d05e27bc650d93f038142c66ea97ab0bb1bcea810bb40c5 SHA512 bf9cc014688ebb20b0bafba82fc710f25c1db8c173dd3e9f742c31c64f127c3c89b29b151e64a3368b04d278733cce8828831f297834ca9b872a60951e0a2d47
|
||||
EBUILD htmlcleaner-2.13.ebuild 1597 BLAKE2B 0f63cbc475912060956ad1dfbebbc639be55caf89a0cf59424c4ba86b25b798e3efd675fe2ac71fcb6b518461f10e530bb0d1e3a2531954abaf4694545357af0 SHA512 c6a686dde0292fe2a2eff15c11a51f6d11dae268af0e5a5e75b0e53668fff3dfc53c924862220753d6acf588203cf4516d7d2eb2c74f40631b02fa44d5b543ef
|
||||
AUX htmlcleaner-2.24-fix-tests.patch 1351 BLAKE2B 995c788b1e33d1997ee9e0f72f417d8d3c69e2f9b4e71ee666b62db40b0207c816af50a7af833974a22bebd6c4624723e5b3de9e13716043049737987b304499 SHA512 071f7f30a12e0d7a9f7e50b1412852efb030e6a076816606711935e2f79b9df0ce48a8197f1c0b4d294378de4af055f9cd829b28a6cf243524bfc9983a96dce0
|
||||
DIST htmlcleaner-2.24-src.zip 413806 BLAKE2B 26ac6d150607c3ee00a8afcf58fed313ac570178f84c52a0fe43b0d324e3b32bb60f63db9ae5f171e7a6a7517799c633f85abfeb64e3f7421d655842bb5a5610 SHA512 beb16e383b6d43d0dfd4697b919a30c1a74eea824976521475c458bdda6c5f0eb22f299eddae033cb190a2af4fafde7e7f2c8ab1378bd82f15842a3ca8ebaaff
|
||||
EBUILD htmlcleaner-2.24.ebuild 1671 BLAKE2B 150e6f7606158b72df11ab119df62d4760bb291807360df18bef0c5314d75262fb5c213a961f6d1e0b18e12e39d12a03657ffd1370c00165b316b0781777cfff SHA512 56aec335f34b873113c5c5547eb551b376bdce7b6d12100692980f74b59b0ef0dde6099453ec7523ab0e43c722cc702dc6559551ddc599bd26e26236323268bf
|
||||
MISC metadata.xml 956 BLAKE2B e9aac65fc4b7ea06f1151cf3f09d1d9363770332ee2d3c711099591edb6d4ee09bd385fadefdd95512ef84f3a870407fae0e2e69bbabd16b24980341095ff7cc SHA512 def5b0f8710cfbd49e0c25f8a5623f0ef7a8e37fab31d4324540d9eeee257423767dd947475fab51f4b84100428c556aa0457c6a8b92076b9f267f35ee9475f0
|
||||
|
||||
@ -0,0 +1,26 @@
|
||||
diff --git a/src/test/java/org/htmlcleaner/DomSerializerTest.java b/src/test/java/org/htmlcleaner/DomSerializerTest.java
|
||||
index b09c6d6..f4e83f0 100644
|
||||
--- a/src/test/java/org/htmlcleaner/DomSerializerTest.java
|
||||
+++ b/src/test/java/org/htmlcleaner/DomSerializerTest.java
|
||||
@@ -132,7 +132,7 @@ public class DomSerializerTest extends AbstractHtmlCleanerTest {
|
||||
+ "</html>";
|
||||
|
||||
final String expectedOutput =
|
||||
- "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\n"
|
||||
+ "<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
|
||||
+ "<html>\n" +
|
||||
" <head/>\n" +
|
||||
" <body>\n" +
|
||||
diff --git a/src/test/java/org/htmlcleaner/TraversalDomSerializerTest.java b/src/test/java/org/htmlcleaner/TraversalDomSerializerTest.java
|
||||
index 3e1d1e9..d406c40 100644
|
||||
--- a/src/test/java/org/htmlcleaner/TraversalDomSerializerTest.java
|
||||
+++ b/src/test/java/org/htmlcleaner/TraversalDomSerializerTest.java
|
||||
@@ -143,7 +143,7 @@ public class TraversalDomSerializerTest extends AbstractHtmlCleanerTest {
|
||||
+ "</html>";
|
||||
|
||||
final String expectedOutput =
|
||||
- "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\n"
|
||||
+ "<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
|
||||
+ "<html>\n" +
|
||||
" <head/>\n" +
|
||||
" <body>\n" +
|
||||
@ -1,3 +1,3 @@
|
||||
DIST bndlib-2.1.0.tar.gz 123217291 BLAKE2B ab8e6876b13db538746f77aa1fe7800e5a3b5e539e1980da78f69c64344f4964bf0a21f2329f7684b055d0de39a10c8df36e030922e9933b29fccb9a35aa669a SHA512 6965143ced45c15fc2316716de32e80506cc411d52309b24313fff37e0713a45ad200d5b3701f0d47a131a3163ec266ed8acb4544884cd1c59c9716c7a2b285e
|
||||
EBUILD libg-2.1.0-r1.ebuild 1369 BLAKE2B 7703fc056c22d0c5417a7cdced6851f71836c4fb4bd52e635c40ede56f6aac2c94ad2937d5aa152ab2fd3ae4ba4f2e7e30fe53639cc3ab6e60dcf561872019c1 SHA512 286f20fec71db18023e3301d737bc178cfbb77c7712befb922b09807af6c8137d9aaadf97533bb943b596c5b95ee3bef5f0c4c44694990ed153196b2b6494ad7
|
||||
EBUILD libg-2.1.0-r2.ebuild 1376 BLAKE2B 53aeda061084ec9e78ed47f28cfcec3ea62edc88de2e151df4ab6256add9599364d5aed18062822e1e90f7e0fa4f409b8d2567e8780c18a2c79afac9cb507894 SHA512 08eaa56bd92176b705d6551485c2f36070f2e18053f72131f819b311946cddb58012a99b7b49f8261b3c3ead4afa4109ce7ec889f82391fec3b0a9700dffde2c
|
||||
MISC metadata.xml 323 BLAKE2B b7a6a3bf3330da14a229f4b8e178c7f5da2bdab8d7249b92daa4a6d414471b001d21441465852b21f9abbbb6bdff229a8c7dbe162e4ae820d5feccf2684c19f8 SHA512 b9affc0513759478d6db10968d574cc820ac19476a539d27e279884314805f663f0807abd01ce8107154fae445ad3e4fd37f485004130f04aa890c0607f85fcf
|
||||
|
||||
@ -1,159 +0,0 @@
|
||||
# Copyright 1999-2021 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI="5"
|
||||
|
||||
inherit epatch flag-o-matic java-pkg-2 java-ant-2 toolchain-funcs java-osgi
|
||||
|
||||
MY_PV="${PV/_rc/RC}"
|
||||
MY_DMF="http://archive.eclipse.org/eclipse/downloads/drops4/R-${MY_PV}-201206081400"
|
||||
MY_P="${PN}-${MY_PV}"
|
||||
|
||||
DESCRIPTION="GTK based SWT Library"
|
||||
HOMEPAGE="http://www.eclipse.org/"
|
||||
SRC_URI="
|
||||
amd64? ( ${MY_DMF}/${MY_P}-gtk-linux-x86_64.zip )
|
||||
ppc? ( ${MY_DMF}/${MY_P}-gtk-linux-x86.zip )
|
||||
ppc64? ( ${MY_DMF}/${MY_P}-gtk-linux-ppc64.zip )
|
||||
x86? ( ${MY_DMF}/${MY_P}-gtk-linux-x86.zip )
|
||||
x86-fbsd? ( ${MY_DMF}/${MY_P}-gtk-linux-x86.zip )"
|
||||
|
||||
LICENSE="CPL-1.0 LGPL-2.1 MPL-1.1"
|
||||
SLOT="4.2"
|
||||
KEYWORDS="~amd64 ~ppc64 ~x86"
|
||||
IUSE="cairo opengl"
|
||||
|
||||
COMMON_DEPEND="
|
||||
>=dev-libs/atk-1.10.2
|
||||
>=dev-libs/glib-2.32
|
||||
>=x11-libs/gtk+-2.6.8:2
|
||||
x11-libs/libXtst
|
||||
cairo? ( >=x11-libs/cairo-1.4.14 )
|
||||
opengl? (
|
||||
virtual/glu
|
||||
virtual/opengl
|
||||
)"
|
||||
DEPEND="${COMMON_DEPEND}
|
||||
app-arch/unzip
|
||||
virtual/jdk:1.8
|
||||
virtual/pkgconfig
|
||||
x11-base/xorg-proto
|
||||
x11-libs/libX11
|
||||
x11-libs/libXrender
|
||||
x11-libs/libXt
|
||||
>=x11-libs/libXtst-1.1.0"
|
||||
RDEPEND="${COMMON_DEPEND}
|
||||
>=virtual/jre-1.4"
|
||||
|
||||
S="${WORKDIR}"
|
||||
|
||||
# JNI libraries don't need SONAME, bug #253756
|
||||
QA_SONAME="usr/$(get_libdir)/libswt-.*.so"
|
||||
|
||||
src_unpack() {
|
||||
local DISTFILE=${A}
|
||||
unzip -jq "${DISTDIR}"/${DISTFILE} "*src.zip" || die "Unable to extract distfile"
|
||||
unpack "./src.zip"
|
||||
|
||||
# Cleanup the redirtied directory structure
|
||||
rm -rf about_files/ || die
|
||||
}
|
||||
|
||||
java_prepare() {
|
||||
# Replace the build.xml to allow compilation without Eclipse tasks
|
||||
cp "${FILESDIR}/build.xml" "${S}/build.xml" || die "Unable to update build.xml"
|
||||
mkdir "${S}/src" && mv "${S}/org" "${S}/src" || die "Unable to restructure SWT sources"
|
||||
|
||||
# Fix Makefiles to respect flags and work with --as-needed
|
||||
epatch "${FILESDIR}"/${P}-as-needed-and-flag-fixes.patch
|
||||
|
||||
# Define missing g_thread_supported() to be 0.
|
||||
sed -i '1s/^/#define g_thread_supported() 0\n\n/' "${S}"/os_custom.h || die
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
# Drop jikes support as it seems to be unfriendly with SWT
|
||||
java-pkg_filter-compiler jikes
|
||||
|
||||
local AWT_ARCH
|
||||
local JAWTSO="libjawt.so"
|
||||
if [[ $(tc-arch) == 'x86' ]] ; then
|
||||
AWT_ARCH="i386"
|
||||
elif [[ $(tc-arch) == 'ppc' ]] ; then
|
||||
AWT_ARCH="ppc"
|
||||
elif [[ $(tc-arch) == 'ppc64' ]] ; then
|
||||
AWT_ARCH="ppc64"
|
||||
else
|
||||
AWT_ARCH="amd64"
|
||||
fi
|
||||
if [[ -f "${JAVA_HOME}/jre/lib/${AWT_ARCH}/${JAWTSO}" ]]; then
|
||||
export AWT_LIB_PATH="${JAVA_HOME}/jre/lib/${AWT_ARCH}"
|
||||
elif [[ -f "${JAVA_HOME}/jre/bin/${JAWTSO}" ]]; then
|
||||
export AWT_LIB_PATH="${JAVA_HOME}/jre/bin"
|
||||
elif [[ -f "${JAVA_HOME}/$(get_libdir)/${JAWTSO}" ]] ; then
|
||||
export AWT_LIB_PATH="${JAVA_HOME}/$(get_libdir)"
|
||||
else
|
||||
eerror "${JAWTSO} not found in the JDK being used for compilation!"
|
||||
die "cannot build AWT library"
|
||||
fi
|
||||
|
||||
# Fix the pointer size for AMD64
|
||||
[[ ${ARCH} == "amd64" || ${ARCH} == "ppc64" ]] && export SWT_PTR_CFLAGS=-DJNI64
|
||||
|
||||
local platform="linux"
|
||||
|
||||
use elibc_FreeBSD && platform="freebsd"
|
||||
|
||||
# Bug #461784, g_thread_init is deprecated since glib-2.32.
|
||||
append-cflags -DNO__1g_1thread_1init
|
||||
|
||||
local make="emake -f make_${platform}.mak NO_STRIP=y CC=$(tc-getCC) CXX=$(tc-getCXX)"
|
||||
|
||||
einfo "Building AWT library"
|
||||
${make} make_awt
|
||||
|
||||
einfo "Building SWT library"
|
||||
${make} make_swt
|
||||
|
||||
einfo "Building JAVA-AT-SPI bridge"
|
||||
${make} make_atk
|
||||
|
||||
if use cairo ; then
|
||||
einfo "Building CAIRO support"
|
||||
${make} make_cairo
|
||||
fi
|
||||
|
||||
if use opengl ; then
|
||||
einfo "Building OpenGL component"
|
||||
${make} make_glx
|
||||
fi
|
||||
|
||||
einfo "Building JNI libraries"
|
||||
eant compile
|
||||
|
||||
einfo "Copying missing files"
|
||||
cp -i "${S}/version.txt" "${S}/build/version.txt"
|
||||
cp -i "${S}/src/org/eclipse/swt/internal/SWTMessages.properties" \
|
||||
"${S}/build/org/eclipse/swt/internal/" || die
|
||||
|
||||
einfo "Packing JNI libraries"
|
||||
eant jar
|
||||
}
|
||||
|
||||
src_install() {
|
||||
swtArch=${ARCH}
|
||||
use amd64 && swtArch=x86_64
|
||||
use x86-fbsd && swtArch=x86
|
||||
|
||||
sed "s/SWT_ARCH/${swtArch}/" "${FILESDIR}/${PN}-${SLOT}-manifest" > "MANIFEST_TMP.MF" || die
|
||||
use cairo || sed -i -e "/ org.eclipse.swt.internal.cairo; x-internal:=true,/d" "MANIFEST_TMP.MF"
|
||||
sed -i -e "/ org.eclipse.swt.internal.gnome; x-internal:=true,/d" "MANIFEST_TMP.MF"
|
||||
use opengl || sed -i -e "/ org.eclipse.swt.internal.opengl.glx; x-internal:=true,/d" "MANIFEST_TMP.MF"
|
||||
sed -i -e "/ org.eclipse.swt.internal.webkit; x-internal:=true,/d" "MANIFEST_TMP.MF"
|
||||
java-osgi_newjar-fromfile "swt.jar" "MANIFEST_TMP.MF" "Standard Widget Toolkit for GTK 2.0"
|
||||
|
||||
java-pkg_sointo /usr/$(get_libdir)
|
||||
java-pkg_doso *.so
|
||||
|
||||
dohtml about.html
|
||||
}
|
||||
@ -1,5 +1,5 @@
|
||||
DIST validation-api-1.0.0.GA-sources.jar 65220 BLAKE2B cee01d9979671bc2d64a22f21d608d50ddf6eca730a7c0d1fee3c4c05fab0af200153a48491b8d54a5a29b84a220f841c85264446117e25e89bd306bdd764843 SHA512 88bcde2fc9446b09cb24e73137cd16ed54953a6d93f33e8500ca196e4cec07ac03ebc446f4629291e6437d2f3757802236e56974cd3023bb25886e69e2330fc0
|
||||
DIST validation-api-1.1.0.jar 94671 BLAKE2B c28f6b2ca52094f33e82d2e7c71e52ef57c503c5d50f34646ee28a9f61ea7e4da7f494f41b5f8a34ce6108ca1b75fa2d0f08eb9aab15cf033e825afc2eefdf19 SHA512 aa15184ff004357f1cdee693008587a3aa180a8f24392847258672c4a2e5a537cf189049ef95febb1a87968a42223f7736e22e00fe9307678c117f7ab6b944a8
|
||||
EBUILD validation-api-1.0.0.ebuild 583 BLAKE2B 04bce00b1bf1ce957a655b9cc6cf3db960ed79356dea5962f60fcfaca832ff4af16a2ad841e0d625739a208b0833a9d83a0fe38a45041bc495d214c44f36e20b SHA512 87b346c5454661c46a9966d0b91d165397e25c344eee2b955267cf951663786e1f92845b7c91497d21d16fe896865dba54f4ccda5a59048e5895cf3b38569654
|
||||
EBUILD validation-api-1.0.0-r1.ebuild 587 BLAKE2B 1ed179648b714bbe5ff08da42f4765ae7815fdc8e3740f3d510ba60c4b659144fd02808f76baf62797c129433ba2db948d73b0d369b6c149867cd7c87669ed55 SHA512 bf0acfb024e931bcc07e1076a91d40736f36be26bb8910be28856f0964ee4a1e99fa9f7d2725c6d6e0165bb9e5bea102022883cb319182b3cb942662f690300e
|
||||
EBUILD validation-api-1.1.0-r1.ebuild 563 BLAKE2B f530bb1707a6b29d347a68cb9160493e9d5afea2bb60c19dcf3c5e25fab42e539bec572472981c11741663063d16114fc0bc9faa81ee5234a423491b726ab338 SHA512 323466c2e62862decf9d77285433b066fb0599585e5db2818d54345b8f7cbe2c4bf53aa82764abe6c52b7af924375b24b5c0b0733b73b4424676f3b0cbd63786
|
||||
MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
|
||||
|
||||
Binary file not shown.
@ -0,0 +1,753 @@
|
||||
# Copyright 1999-2021 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI="7"
|
||||
|
||||
WANT_AUTOMAKE="none"
|
||||
|
||||
inherit flag-o-matic systemd autotools
|
||||
|
||||
MY_PV=${PV/_rc/RC}
|
||||
DESCRIPTION="The PHP language runtime engine"
|
||||
HOMEPAGE="https://www.php.net/"
|
||||
SRC_URI="https://www.php.net/distributions/${P}.tar.xz"
|
||||
|
||||
LICENSE="PHP-3.01
|
||||
BSD
|
||||
Zend-2.0
|
||||
bcmath? ( LGPL-2.1+ )
|
||||
fpm? ( BSD-2 )
|
||||
gd? ( gd )
|
||||
unicode? ( BSD-2 LGPL-2.1 )"
|
||||
|
||||
SLOT="$(ver_cut 1-2)"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
|
||||
|
||||
S="${WORKDIR}/${PN}-${MY_PV}"
|
||||
|
||||
# We can build the following SAPIs in the given order
|
||||
SAPIS="embed cli cgi fpm apache2 phpdbg"
|
||||
|
||||
# SAPIs and SAPI-specific USE flags (cli SAPI is default on):
|
||||
IUSE="${IUSE}
|
||||
${SAPIS/cli/+cli}
|
||||
threads"
|
||||
|
||||
IUSE="${IUSE} acl argon2 bcmath berkdb bzip2 calendar cdb cjk
|
||||
coverage +ctype curl debug
|
||||
enchant exif ffi +fileinfo +filter firebird
|
||||
+flatfile ftp gd gdbm gmp +iconv imap inifile
|
||||
intl iodbc ipv6 +jit +json kerberos ldap ldap-sasl libedit libressl lmdb
|
||||
mhash mssql mysql mysqli nls
|
||||
oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm
|
||||
readline selinux +session session-mm sharedmem
|
||||
+simplexml snmp soap sockets sodium spell sqlite ssl
|
||||
sysvipc systemd test tidy +tokenizer tokyocabinet truetype unicode webp
|
||||
+xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib"
|
||||
|
||||
# Without USE=readline or libedit, the interactive "php -a" CLI will hang.
|
||||
# The Oracle instant client provides its own incompatible ldap library.
|
||||
REQUIRED_USE="
|
||||
|| ( cli cgi fpm apache2 embed phpdbg )
|
||||
cli? ( ^^ ( readline libedit ) )
|
||||
!cli? ( ?? ( readline libedit ) )
|
||||
truetype? ( gd zlib )
|
||||
webp? ( gd zlib )
|
||||
cjk? ( gd zlib )
|
||||
exif? ( gd zlib )
|
||||
xpm? ( gd zlib )
|
||||
gd? ( zlib )
|
||||
simplexml? ( xml )
|
||||
soap? ( xml )
|
||||
xmlrpc? ( xml iconv )
|
||||
xmlreader? ( xml )
|
||||
xmlwriter? ( xml )
|
||||
xslt? ( xml )
|
||||
ldap-sasl? ( ldap )
|
||||
oci8-instant-client? ( !ldap )
|
||||
qdbm? ( !gdbm )
|
||||
session-mm? ( session !threads )
|
||||
mysql? ( || ( mysqli pdo ) )
|
||||
firebird? ( pdo )
|
||||
mssql? ( pdo )
|
||||
"
|
||||
|
||||
RESTRICT="!test? ( test )"
|
||||
|
||||
# The supported (that is, autodetected) versions of BDB are listed in
|
||||
# the ./configure script. Other versions *work*, but we need to stick to
|
||||
# the ones that can be detected to avoid a repeat of bug #564824.
|
||||
COMMON_DEPEND="
|
||||
>=app-eselect/eselect-php-0.9.1[apache2?,fpm?]
|
||||
>=dev-libs/libpcre2-10.30[jit?,unicode]
|
||||
fpm? ( acl? ( sys-apps/acl ) )
|
||||
apache2? ( www-servers/apache[apache2_modules_unixd(+),threads=] )
|
||||
argon2? ( app-crypt/argon2:= )
|
||||
berkdb? ( || ( sys-libs/db:5.3
|
||||
sys-libs/db:5.1
|
||||
sys-libs/db:4.8
|
||||
sys-libs/db:4.7
|
||||
sys-libs/db:4.6
|
||||
sys-libs/db:4.5 ) )
|
||||
bzip2? ( app-arch/bzip2:0= )
|
||||
cdb? ( || ( dev-db/cdb dev-db/tinycdb ) )
|
||||
coverage? ( dev-util/lcov )
|
||||
curl? ( >=net-misc/curl-7.10.5 )
|
||||
enchant? ( <app-text/enchant-2.0:0 )
|
||||
ffi? ( >=dev-libs/libffi-3.0.11 )
|
||||
firebird? ( dev-db/firebird )
|
||||
gd? ( >=virtual/jpeg-0-r3:0 media-libs/libpng:0= )
|
||||
gdbm? ( >=sys-libs/gdbm-1.8.0:0= )
|
||||
gmp? ( dev-libs/gmp:0= )
|
||||
iconv? ( virtual/libiconv )
|
||||
imap? ( >=virtual/imap-c-client-2[kerberos=,ssl=] )
|
||||
intl? ( dev-libs/icu:= )
|
||||
kerberos? ( virtual/krb5 )
|
||||
ldap? ( >=net-nds/openldap-1.2.11 )
|
||||
ldap-sasl? ( dev-libs/cyrus-sasl )
|
||||
libedit? ( dev-libs/libedit )
|
||||
lmdb? ( dev-db/lmdb:= )
|
||||
mssql? ( dev-db/freetds[mssql] )
|
||||
nls? ( sys-devel/gettext )
|
||||
oci8-instant-client? ( dev-db/oracle-instantclient[sdk] )
|
||||
odbc? ( iodbc? ( dev-db/libiodbc ) !iodbc? ( >=dev-db/unixODBC-1.8.13 ) )
|
||||
postgres? ( dev-db/postgresql:* )
|
||||
qdbm? ( dev-db/qdbm )
|
||||
readline? ( sys-libs/readline:0= )
|
||||
session-mm? ( dev-libs/mm )
|
||||
snmp? ( >=net-analyzer/net-snmp-5.2 )
|
||||
sodium? ( dev-libs/libsodium:= )
|
||||
spell? ( >=app-text/aspell-0.50 )
|
||||
sqlite? ( >=dev-db/sqlite-3.7.6.3 )
|
||||
ssl? (
|
||||
!libressl? ( >=dev-libs/openssl-1.0.1:0= )
|
||||
libressl? ( dev-libs/libressl:0= )
|
||||
)
|
||||
tidy? ( || ( app-text/tidy-html5 app-text/htmltidy ) )
|
||||
tokyocabinet? ( dev-db/tokyocabinet )
|
||||
truetype? ( =media-libs/freetype-2* )
|
||||
unicode? ( dev-libs/oniguruma:= )
|
||||
webp? ( media-libs/libwebp:0= )
|
||||
xml? ( >=dev-libs/libxml2-2.7.6 )
|
||||
xpm? ( x11-libs/libXpm )
|
||||
xslt? ( dev-libs/libxslt )
|
||||
zip? ( >=dev-libs/libzip-1.2.0:= )
|
||||
zlib? ( >=sys-libs/zlib-1.2.0.4:0= )
|
||||
"
|
||||
|
||||
RDEPEND="${COMMON_DEPEND}
|
||||
virtual/mta
|
||||
fpm? (
|
||||
selinux? ( sec-policy/selinux-phpfpm )
|
||||
systemd? ( sys-apps/systemd ) )"
|
||||
|
||||
# Bison isn't actually needed when building from a release tarball
|
||||
# However, the configure script will warn if it's absent or if you
|
||||
# have an incompatible version installed. See bug 593278.
|
||||
DEPEND="${COMMON_DEPEND}
|
||||
app-arch/xz-utils
|
||||
>=sys-devel/bison-3.0.1"
|
||||
|
||||
BDEPEND="virtual/pkgconfig"
|
||||
|
||||
PHP_MV="$(ver_cut 1)"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/php-iodbc-header-location.patch
|
||||
)
|
||||
|
||||
php_install_ini() {
|
||||
local phpsapi="${1}"
|
||||
|
||||
# work out where we are installing the ini file
|
||||
php_set_ini_dir "${phpsapi}"
|
||||
|
||||
# Always install the production INI file, bug 611214.
|
||||
local phpinisrc="php.ini-production-${phpsapi}"
|
||||
cp php.ini-production "${phpinisrc}" || die
|
||||
|
||||
# default to /tmp for save_path, bug #282768
|
||||
sed -e 's|^;session.save_path .*$|session.save_path = "'"${EPREFIX}"'/tmp"|g' -i "${phpinisrc}" || die
|
||||
|
||||
# Set the extension dir
|
||||
sed -e "s|^extension_dir .*$|extension_dir = ${extension_dir}|g" \
|
||||
-i "${phpinisrc}" || die
|
||||
|
||||
# Set the include path to point to where we want to find PEAR packages
|
||||
sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:'"${EPREFIX}"'/usr/share/php'${PHP_MV}':'"${EPREFIX}"'/usr/share/php"|' -i "${phpinisrc}" || die
|
||||
|
||||
insinto "${PHP_INI_DIR#${EPREFIX}}"
|
||||
newins "${phpinisrc}" php.ini
|
||||
|
||||
elog "Installing php.ini for ${phpsapi} into ${PHP_INI_DIR#${EPREFIX}}"
|
||||
elog
|
||||
|
||||
dodir "${PHP_EXT_INI_DIR#${EPREFIX}}"
|
||||
dodir "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}"
|
||||
|
||||
if use opcache; then
|
||||
elog "Adding opcache to $PHP_EXT_INI_DIR"
|
||||
echo "zend_extension=${PHP_DESTDIR}/$(get_libdir)/opcache.so" >> \
|
||||
"${D}/${PHP_EXT_INI_DIR}"/opcache.ini
|
||||
dosym "../ext/opcache.ini" \
|
||||
"${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}/opcache.ini"
|
||||
fi
|
||||
|
||||
# SAPI-specific handling
|
||||
if [[ "${sapi}" == "fpm" ]] ; then
|
||||
einfo "Installing FPM config files php-fpm.conf and www.conf"
|
||||
insinto "${PHP_INI_DIR#${EPREFIX}}"
|
||||
doins sapi/fpm/php-fpm.conf
|
||||
insinto "${PHP_INI_DIR#${EPREFIX}}/fpm.d"
|
||||
doins sapi/fpm/www.conf
|
||||
fi
|
||||
|
||||
dodoc php.ini-{development,production}
|
||||
}
|
||||
|
||||
php_set_ini_dir() {
|
||||
PHP_INI_DIR="${EPREFIX}/etc/php/${1}-php${SLOT}"
|
||||
PHP_EXT_INI_DIR="${PHP_INI_DIR}/ext"
|
||||
PHP_EXT_INI_DIR_ACTIVE="${PHP_INI_DIR}/ext-active"
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
|
||||
# In php-7.x, the FPM pool configuration files have been split off
|
||||
# of the main config. By default the pool config files go in
|
||||
# e.g. /etc/php-fpm.d, which isn't slotted. So here we move the
|
||||
# include directory to a subdirectory "fpm.d" of $PHP_INI_DIR. Later
|
||||
# we'll install the pool configuration file "www.conf" there.
|
||||
php_set_ini_dir fpm
|
||||
sed -i "s~^include=.*$~include=${PHP_INI_DIR}/fpm.d/*.conf~" \
|
||||
sapi/fpm/php-fpm.conf.in \
|
||||
|| die 'failed to move the include directory in php-fpm.conf'
|
||||
|
||||
# Emulate buildconf to support cross-compilation
|
||||
rm -fr aclocal.m4 autom4te.cache config.cache \
|
||||
configure main/php_config.h.in || die
|
||||
eautoconf --force
|
||||
eautoheader
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
addpredict /usr/share/snmp/mibs/.index #nowarn
|
||||
addpredict /var/lib/net-snmp/mib_indexes #nowarn
|
||||
|
||||
PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}"
|
||||
|
||||
# The php-fpm config file wants localstatedir to be ${EPREFIX}/var
|
||||
# and not the Gentoo default ${EPREFIX}/var/lib. See bug 572002.
|
||||
local our_conf=(
|
||||
--prefix="${PHP_DESTDIR}"
|
||||
--mandir="${PHP_DESTDIR}/man"
|
||||
--infodir="${PHP_DESTDIR}/info"
|
||||
--libdir="${PHP_DESTDIR}/lib"
|
||||
--with-libdir="$(get_libdir)"
|
||||
--localstatedir="${EPREFIX}/var"
|
||||
--without-pear
|
||||
$(use_enable threads maintainer-zts)
|
||||
)
|
||||
|
||||
our_conf+=(
|
||||
$(use_with argon2 password-argon2 "${EPREFIX}/usr")
|
||||
$(use_enable bcmath)
|
||||
$(use_with bzip2 bz2 "${EPREFIX}/usr")
|
||||
$(use_enable calendar)
|
||||
$(use_enable coverage gcov)
|
||||
$(use_enable ctype)
|
||||
$(use_with curl)
|
||||
$(use_enable xml dom)
|
||||
$(use_with enchant)
|
||||
$(use_enable exif)
|
||||
$(use_with ffi)
|
||||
$(use_enable fileinfo)
|
||||
$(use_enable filter)
|
||||
$(use_enable ftp)
|
||||
$(use_with nls gettext "${EPREFIX}/usr")
|
||||
$(use_with gmp gmp "${EPREFIX}/usr")
|
||||
$(use_with mhash mhash "${EPREFIX}/usr")
|
||||
$(use_with iconv iconv \
|
||||
$(use elibc_glibc || use elibc_musl || use elibc_FreeBSD || echo "${EPREFIX}/usr"))
|
||||
$(use_enable intl)
|
||||
$(use_enable ipv6)
|
||||
$(use_enable json)
|
||||
$(use_with kerberos)
|
||||
$(use_with xml libxml)
|
||||
$(use_enable unicode mbstring)
|
||||
$(use_with ssl openssl)
|
||||
$(use_enable pcntl)
|
||||
$(use_enable phar)
|
||||
$(use_enable pdo)
|
||||
$(use_enable opcache)
|
||||
$(use_with postgres pgsql "${EPREFIX}/usr")
|
||||
$(use_enable posix)
|
||||
$(use_with spell pspell "${EPREFIX}/usr")
|
||||
$(use_enable simplexml)
|
||||
$(use_enable sharedmem shmop)
|
||||
$(use_with snmp snmp "${EPREFIX}/usr")
|
||||
$(use_enable soap)
|
||||
$(use_enable sockets)
|
||||
$(use_with sodium)
|
||||
$(use_with sqlite sqlite3)
|
||||
$(use_enable sysvipc sysvmsg)
|
||||
$(use_enable sysvipc sysvsem)
|
||||
$(use_enable sysvipc sysvshm)
|
||||
$(use_with tidy tidy "${EPREFIX}/usr")
|
||||
$(use_enable tokenizer)
|
||||
$(use_enable xml)
|
||||
$(use_enable xmlreader)
|
||||
$(use_enable xmlwriter)
|
||||
$(use_with xmlrpc)
|
||||
$(use_with xslt xsl)
|
||||
$(use_with zip)
|
||||
$(use_with zlib zlib "${EPREFIX}/usr")
|
||||
$(use_enable debug)
|
||||
)
|
||||
|
||||
# DBA support
|
||||
if use cdb || use berkdb || use flatfile || use gdbm || use inifile \
|
||||
|| use qdbm || use lmdb || use tokyocabinet ; then
|
||||
our_conf+=( "--enable-dba" )
|
||||
fi
|
||||
|
||||
# DBA drivers support
|
||||
our_conf+=(
|
||||
$(use_with cdb)
|
||||
$(use_with berkdb db4 "${EPREFIX}/usr")
|
||||
$(use_enable flatfile)
|
||||
$(use_with gdbm gdbm "${EPREFIX}/usr")
|
||||
$(use_enable inifile)
|
||||
$(use_with qdbm qdbm "${EPREFIX}/usr")
|
||||
$(use_with tokyocabinet tcadb "${EPREFIX}/usr")
|
||||
$(use_with lmdb lmdb "${EPREFIX}/usr")
|
||||
)
|
||||
|
||||
# Support for the GD graphics library
|
||||
our_conf+=(
|
||||
$(use_with truetype freetype)
|
||||
$(use_enable cjk gd-jis-conv)
|
||||
$(use_with gd jpeg)
|
||||
$(use_with xpm)
|
||||
$(use_with webp)
|
||||
)
|
||||
# enable gd last, so configure can pick up the previous settings
|
||||
our_conf+=( $(use_enable gd) )
|
||||
|
||||
# IMAP support
|
||||
if use imap ; then
|
||||
our_conf+=(
|
||||
$(use_with imap imap "${EPREFIX}/usr")
|
||||
$(use_with ssl imap-ssl "${EPREFIX}/usr")
|
||||
)
|
||||
fi
|
||||
|
||||
# LDAP support
|
||||
if use ldap ; then
|
||||
our_conf+=(
|
||||
$(use_with ldap ldap "${EPREFIX}/usr")
|
||||
$(use_with ldap-sasl)
|
||||
)
|
||||
fi
|
||||
|
||||
# MySQL support
|
||||
local mysqllib="mysqlnd"
|
||||
local mysqlilib="mysqlnd"
|
||||
|
||||
our_conf+=( $(use_with mysqli mysqli "${mysqlilib}") )
|
||||
|
||||
local mysqlsock="${EPREFIX}/var/run/mysqld/mysqld.sock"
|
||||
if use mysql || use mysqli ; then
|
||||
our_conf+=( $(use_with mysql mysql-sock "${mysqlsock}") )
|
||||
fi
|
||||
|
||||
# ODBC support
|
||||
if use odbc && use iodbc ; then
|
||||
our_conf+=(
|
||||
--without-unixODBC
|
||||
--with-iodbc
|
||||
$(use_with pdo pdo-odbc "iODBC,${EPREFIX}/usr")
|
||||
)
|
||||
elif use odbc ; then
|
||||
our_conf+=(
|
||||
--with-unixODBC="${EPREFIX}/usr"
|
||||
--without-iodbc
|
||||
$(use_with pdo pdo-odbc "unixODBC,${EPREFIX}/usr")
|
||||
)
|
||||
else
|
||||
our_conf+=(
|
||||
--without-unixODBC
|
||||
--without-iodbc
|
||||
--without-pdo-odbc
|
||||
)
|
||||
fi
|
||||
|
||||
# Oracle support
|
||||
our_conf+=( $(use_with oci8-instant-client oci8) )
|
||||
|
||||
# PDO support
|
||||
if use pdo ; then
|
||||
our_conf+=(
|
||||
$(use_with mssql pdo-dblib "${EPREFIX}/usr")
|
||||
$(use_with mysql pdo-mysql "${mysqllib}")
|
||||
$(use_with postgres pdo-pgsql)
|
||||
$(use_with sqlite pdo-sqlite)
|
||||
$(use_with firebird pdo-firebird "${EPREFIX}/usr")
|
||||
$(use_with oci8-instant-client pdo-oci)
|
||||
)
|
||||
fi
|
||||
|
||||
# readline/libedit support
|
||||
our_conf+=(
|
||||
$(use_with readline readline "${EPREFIX}/usr")
|
||||
$(use_with libedit)
|
||||
)
|
||||
|
||||
# Session support
|
||||
if use session ; then
|
||||
our_conf+=( $(use_with session-mm mm "${EPREFIX}/usr") )
|
||||
else
|
||||
our_conf+=( $(use_enable session) )
|
||||
fi
|
||||
|
||||
# Use pic for shared modules such as apache2's mod_php
|
||||
our_conf+=( --with-pic )
|
||||
|
||||
# we use the system copy of pcre
|
||||
# --with-external-pcre affects ext/pcre
|
||||
our_conf+=(
|
||||
--with-external-pcre
|
||||
$(use_with jit pcre-jit)
|
||||
)
|
||||
|
||||
# Catch CFLAGS problems
|
||||
# Fixes bug #14067.
|
||||
# Changed order to run it in reverse for bug #32022 and #12021.
|
||||
replace-cpu-flags "k6*" "i586"
|
||||
|
||||
# Cache the ./configure test results between SAPIs.
|
||||
our_conf+=( --cache-file="${T}/config.cache" )
|
||||
|
||||
# Support user-passed configuration parameters
|
||||
our_conf+=( ${EXTRA_ECONF:-} )
|
||||
|
||||
# Support the Apache2 extras, they must be set globally for all
|
||||
# SAPIs to work correctly, especially for external PHP extensions
|
||||
|
||||
local one_sapi
|
||||
local sapi
|
||||
mkdir -p "${WORKDIR}/sapis-build" || die
|
||||
for one_sapi in $SAPIS ; do
|
||||
use "${one_sapi}" || continue
|
||||
php_set_ini_dir "${one_sapi}"
|
||||
|
||||
# The BUILD_DIR variable is used to determine where to output
|
||||
# the files that autotools creates. This was all originally
|
||||
# based on the autotools-utils eclass.
|
||||
BUILD_DIR="${WORKDIR}/sapis-build/${one_sapi}"
|
||||
cp -a "${S}" "${BUILD_DIR}" || die
|
||||
cd "${BUILD_DIR}" || die
|
||||
|
||||
local sapi_conf=(
|
||||
--with-config-file-path="${PHP_INI_DIR}"
|
||||
--with-config-file-scan-dir="${PHP_EXT_INI_DIR_ACTIVE}"
|
||||
)
|
||||
|
||||
for sapi in $SAPIS ; do
|
||||
case "$sapi" in
|
||||
cli|cgi|embed|fpm|phpdbg)
|
||||
if [[ "${one_sapi}" == "${sapi}" ]] ; then
|
||||
sapi_conf+=( "--enable-${sapi}" )
|
||||
if [[ "fpm" == "${sapi}" ]] ; then
|
||||
sapi_conf+=(
|
||||
$(use_with acl fpm-acl)
|
||||
$(use_with systemd fpm-systemd)
|
||||
)
|
||||
fi
|
||||
else
|
||||
sapi_conf+=( "--disable-${sapi}" )
|
||||
fi
|
||||
;;
|
||||
|
||||
apache2)
|
||||
if [[ "${one_sapi}" == "${sapi}" ]] ; then
|
||||
sapi_conf+=( --with-apxs2="${EPREFIX}/usr/bin/apxs" )
|
||||
else
|
||||
sapi_conf+=( --without-apxs2 )
|
||||
fi
|
||||
;;
|
||||
esac
|
||||
done
|
||||
|
||||
# Construct the $myeconfargs array by concatenating $our_conf
|
||||
# (the common args) and $sapi_conf (the SAPI-specific args).
|
||||
local myeconfargs=( "${our_conf[@]}" )
|
||||
myeconfargs+=( "${sapi_conf[@]}" )
|
||||
|
||||
pushd "${BUILD_DIR}" > /dev/null || die
|
||||
econf "${myeconfargs[@]}"
|
||||
popd > /dev/null || die
|
||||
done
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
# snmp seems to run during src_compile, too (bug #324739)
|
||||
addpredict /usr/share/snmp/mibs/.index #nowarn
|
||||
addpredict /var/lib/net-snmp/mib_indexes #nowarn
|
||||
|
||||
local sapi
|
||||
for sapi in ${SAPIS} ; do
|
||||
if use "${sapi}"; then
|
||||
cd "${WORKDIR}/sapis-build/$sapi" || \
|
||||
die "Failed to change dir to ${WORKDIR}/sapis-build/$1"
|
||||
emake
|
||||
fi
|
||||
done
|
||||
}
|
||||
|
||||
src_install() {
|
||||
# see bug #324739 for what happens when we don't have that
|
||||
addpredict /usr/share/snmp/mibs/.index #nowarn
|
||||
|
||||
# grab the first SAPI that got built and install common files from there
|
||||
local first_sapi="", sapi=""
|
||||
for sapi in $SAPIS ; do
|
||||
if use $sapi ; then
|
||||
first_sapi=$sapi
|
||||
break
|
||||
fi
|
||||
done
|
||||
|
||||
# Makefile forgets to create this before trying to write to it...
|
||||
dodir "${PHP_DESTDIR#${EPREFIX}}/bin"
|
||||
|
||||
# Install php environment (without any sapis)
|
||||
cd "${WORKDIR}/sapis-build/$first_sapi" || die
|
||||
emake INSTALL_ROOT="${D}" \
|
||||
install-build install-headers install-programs
|
||||
|
||||
local extension_dir="$("${ED}/${PHP_DESTDIR#${EPREFIX}}/bin/php-config" --extension-dir)"
|
||||
|
||||
# Create the directory where we'll put version-specific php scripts
|
||||
keepdir "/usr/share/php${PHP_MV}"
|
||||
|
||||
local file=""
|
||||
local sapi_list=""
|
||||
|
||||
for sapi in ${SAPIS}; do
|
||||
if use "${sapi}" ; then
|
||||
einfo "Installing SAPI: ${sapi}"
|
||||
cd "${WORKDIR}/sapis-build/${sapi}" || die
|
||||
|
||||
if [[ "${sapi}" == "apache2" ]] ; then
|
||||
# We're specifically not using emake install-sapi as libtool
|
||||
# may cause unnecessary relink failures (see bug #351266)
|
||||
insinto "${PHP_DESTDIR#${EPREFIX}}/apache2/"
|
||||
newins ".libs/libphp${PHP_MV}$(get_libname)" \
|
||||
"libphp${PHP_MV}$(get_libname)"
|
||||
keepdir "/usr/$(get_libdir)/apache2/modules"
|
||||
else
|
||||
# needed each time, php_install_ini would reset it
|
||||
local dest="${PHP_DESTDIR#${EPREFIX}}"
|
||||
into "${dest}"
|
||||
case "$sapi" in
|
||||
cli)
|
||||
source="sapi/cli/php"
|
||||
# Install the "phar" archive utility.
|
||||
if use phar ; then
|
||||
emake INSTALL_ROOT="${D}" install-pharcmd
|
||||
dosym "..${dest#/usr}/bin/phar" "/usr/bin/phar${SLOT}"
|
||||
fi
|
||||
;;
|
||||
cgi)
|
||||
source="sapi/cgi/php-cgi"
|
||||
;;
|
||||
fpm)
|
||||
source="sapi/fpm/php-fpm"
|
||||
;;
|
||||
embed)
|
||||
source="libs/libphp${PHP_MV}$(get_libname)"
|
||||
;;
|
||||
phpdbg)
|
||||
source="sapi/phpdbg/phpdbg"
|
||||
;;
|
||||
*)
|
||||
die "unhandled sapi in src_install"
|
||||
;;
|
||||
esac
|
||||
|
||||
if [[ "${source}" == *"$(get_libname)" ]]; then
|
||||
dolib.so "${source}"
|
||||
else
|
||||
dobin "${source}"
|
||||
local name="$(basename ${source})"
|
||||
dosym "..${dest#/usr}/bin/${name}" "/usr/bin/${name}${SLOT}"
|
||||
fi
|
||||
fi
|
||||
|
||||
php_install_ini "${sapi}"
|
||||
|
||||
# construct correct SAPI string for php-config
|
||||
# thanks to ferringb for the bash voodoo
|
||||
if [[ "${sapi}" == "apache2" ]]; then
|
||||
sapi_list="${sapi_list:+${sapi_list} }apache2handler"
|
||||
else
|
||||
sapi_list="${sapi_list:+${sapi_list} }${sapi}"
|
||||
fi
|
||||
fi
|
||||
done
|
||||
|
||||
# Installing opcache module
|
||||
if use opcache ; then
|
||||
into "${PHP_DESTDIR#${EPREFIX}}"
|
||||
dolib.so "modules/opcache$(get_libname)"
|
||||
fi
|
||||
|
||||
# Install env.d files
|
||||
newenvd "${FILESDIR}/20php5-envd" "20php${SLOT}"
|
||||
sed -e "s|/lib/|/$(get_libdir)/|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
|
||||
sed -e "s|php5|php${SLOT}|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
|
||||
|
||||
# set php-config variable correctly (bug #278439)
|
||||
sed -e "s:^\(php_sapis=\)\".*\"$:\1\"${sapi_list}\":" -i \
|
||||
"${ED}/usr/$(get_libdir)/php${SLOT}/bin/php-config" || die
|
||||
|
||||
if use fpm ; then
|
||||
if use systemd; then
|
||||
systemd_newunit "${FILESDIR}/php-fpm_at.service" \
|
||||
"php-fpm@${SLOT}.service"
|
||||
else
|
||||
systemd_newunit "${FILESDIR}/php-fpm_at-simple.service" \
|
||||
"php-fpm@${SLOT}.service"
|
||||
fi
|
||||
fi
|
||||
}
|
||||
|
||||
src_test() {
|
||||
echo ">>> Test phase [test]: ${CATEGORY}/${PF}"
|
||||
PHP_BIN="${WORKDIR}/sapis-build/cli/sapi/cli/php"
|
||||
if [[ ! -x "${PHP_BIN}" ]] ; then
|
||||
ewarn "Test phase requires USE=cli, skipping"
|
||||
return
|
||||
else
|
||||
export TEST_PHP_EXECUTABLE="${PHP_BIN}"
|
||||
fi
|
||||
|
||||
if [[ -x "${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi" ]] ; then
|
||||
export TEST_PHP_CGI_EXECUTABLE="${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi"
|
||||
fi
|
||||
|
||||
if [[ -x "${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg" ]] ; then
|
||||
export TEST_PHPDBG_EXECUTABLE="${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg"
|
||||
fi
|
||||
|
||||
REPORT_EXIT_STATUS=1 "${TEST_PHP_EXECUTABLE}" -n -d \
|
||||
"session.save_path=${T}" \
|
||||
"${WORKDIR}/sapis-build/cli/run-tests.php" -n -q -d \
|
||||
"session.save_path=${T}"
|
||||
|
||||
for name in ${EXPECTED_TEST_FAILURES}; do
|
||||
mv "${name}.out" "${name}.out.orig" 2>/dev/null || die
|
||||
done
|
||||
|
||||
local failed="$(find -name '*.out')"
|
||||
if [[ ${failed} != "" ]] ; then
|
||||
ewarn "The following test cases failed unexpectedly:"
|
||||
for name in ${failed}; do
|
||||
ewarn " ${name/.out/}"
|
||||
done
|
||||
else
|
||||
einfo "No unexpected test failures, all fine"
|
||||
fi
|
||||
|
||||
if [[ ${PHP_SHOW_UNEXPECTED_TEST_PASS} == "1" ]] ; then
|
||||
local passed=""
|
||||
for name in ${EXPECTED_TEST_FAILURES}; do
|
||||
[[ -f "${name}.diff" ]] && continue
|
||||
passed="${passed} ${name}"
|
||||
done
|
||||
if [[ ${passed} != "" ]] ; then
|
||||
einfo "The following test cases passed unexpectedly:"
|
||||
for name in ${passed}; do
|
||||
ewarn " ${passed}"
|
||||
done
|
||||
else
|
||||
einfo "None of the known-to-fail tests passed, all fine"
|
||||
fi
|
||||
fi
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
# Output some general info to the user
|
||||
if use apache2 ; then
|
||||
elog
|
||||
elog "To enable PHP in apache, you will need to add \"-D PHP\" to"
|
||||
elog "your apache2 command. OpenRC users can append that string to"
|
||||
elog "APACHE2_OPTS in /etc/conf.d/apache2."
|
||||
elog
|
||||
elog "The apache module configuration file 70_mod_php.conf is"
|
||||
elog "provided (and maintained) by eselect-php."
|
||||
elog
|
||||
fi
|
||||
|
||||
# Create the symlinks for php
|
||||
local m
|
||||
for m in ${SAPIS}; do
|
||||
[[ ${m} == 'embed' ]] && continue;
|
||||
if use $m ; then
|
||||
local ci=$(eselect php show $m)
|
||||
if [[ -z $ci ]]; then
|
||||
eselect php set $m php${SLOT} || die
|
||||
einfo "Switched ${m} to use php:${SLOT}"
|
||||
einfo
|
||||
elif [[ $ci != "php${SLOT}" ]] ; then
|
||||
elog "To switch $m to use php:${SLOT}, run"
|
||||
elog " eselect php set $m php${SLOT}"
|
||||
elog
|
||||
fi
|
||||
fi
|
||||
done
|
||||
|
||||
# Remove dead symlinks for SAPIs that were just disabled. For
|
||||
# example, if the user has the cgi SAPI enabled, then he has an
|
||||
# eselect-php symlink for it. If he later reinstalls PHP with
|
||||
# USE="-cgi", that symlink will break. This call to eselect is
|
||||
# supposed to remove that dead link per bug 572436.
|
||||
eselect php cleanup || die
|
||||
|
||||
if ! has "php${SLOT/./-}" ${PHP_TARGETS}; then
|
||||
elog "To build extensions for this version of PHP, you will need to"
|
||||
elog "add php${SLOT/./-} to your PHP_TARGETS USE_EXPAND variable."
|
||||
elog
|
||||
fi
|
||||
|
||||
# Warn about the removal of PHP_INI_VERSION if the user has it set.
|
||||
if [[ -n "${PHP_INI_VERSION}" ]]; then
|
||||
ewarn 'The PHP_INI_VERSION variable has been phased out. You may'
|
||||
ewarn 'remove it from your configuration at your convenience. See'
|
||||
ewarn
|
||||
ewarn ' https://bugs.gentoo.org/611214'
|
||||
ewarn
|
||||
ewarn 'for more information.'
|
||||
fi
|
||||
|
||||
elog "For details on how version slotting works, please see"
|
||||
elog "the wiki:"
|
||||
elog
|
||||
elog " https://wiki.gentoo.org/wiki/PHP"
|
||||
elog
|
||||
}
|
||||
|
||||
pkg_postrm() {
|
||||
# This serves two purposes. First, if we have just removed the last
|
||||
# installed version of PHP, then this will remove any dead symlinks
|
||||
# belonging to eselect-php. Second, if a user upgrades slots from
|
||||
# (say) 5.6 to 7.0 and depcleans the old slot, then this will update
|
||||
# his existing symlinks to point to the new 7.0 installation. The
|
||||
# latter is bug 432962.
|
||||
#
|
||||
# Note: the eselect-php package may not be installed at this point,
|
||||
# so we can't die() if this command fails.
|
||||
eselect php cleanup
|
||||
}
|
||||
Binary file not shown.
@ -1,5 +1,4 @@
|
||||
AUX opensc.module 390 BLAKE2B 4c5ea159ed2038af51c9ca3e903b23db1acdfa8a6c79be7f922f8a03602f15e3b1a98570be0a1f3f2db922c9083976eeb164d011b981c8709a9b1459e959634f SHA512 52a0a47963d0938a3a644dedcd913bb22ea6d5e3d539b759872c4175085491cc11a3958bb308029eb4942ea20e0f7890865c21cb063e335e38a154957a64ed58
|
||||
DIST opensc-0.21.0.tar.gz 2210878 BLAKE2B 22b63ca59cb721cdbbda755fa90f5b46fd9e5b6d7768cddbfeaffd58d68adcb145d6d604b334cf778608be9ee5fc98109f98d131d2536e61f79705aa3dbafa6c SHA512 3511b0a04a96e62011c48667e3fd36a1611fe67a89f7626ff056c9c3614f8cabc91c9924a6ca7a8ea50076a128e3967277a0dd624b4fa27c62cefee9fab22646
|
||||
EBUILD opensc-0.21.0-r1.ebuild 1708 BLAKE2B b57663a827cbfe31df245625fc43d30963abe463b00b905e7a2bcd8d85a633a710fe20f564511b7e1180ce3df3f4b313e28642452dee1f1712b6cfccec4214e8 SHA512 dd4c4b912dc7465357ffee5c74d6e56ecef4323df10f27d237b8f54303bbaebe74ba3f830b45ac9b072ab8e668fa9a566f35828ce70389202bb0a2c072821752
|
||||
EBUILD opensc-0.21.0.ebuild 1644 BLAKE2B da7e509d5adef201397ce549151289f690621c85a4e6b0d93b7f62b3994a251f397a3853d71197dfab103e2e5538924ccce0ac1e99964ccac5d453a46f9fd85a SHA512 3e6da8d3d5eabab456f0033e761d7d017170301551c68c3e4b24520feb24f2624e5725a7b077c61335939b207624f26f554f149b6402f0a9ef304beeda6be938
|
||||
EBUILD opensc-0.21.0-r1.ebuild 1636 BLAKE2B 42b0aabc469e8c7036f13b591d9e491fe0af5a521ebdac15fe2f402ec37538e041d4bf7a442663bf64eea4e886bc56c34eae859b319ae62834b5080c84958538 SHA512 637e2ac00c90dd88621d5af24ba0469944c2e55a4bb4b0af4ebacd9d23184ea02f10d81b2b5ae1bc5415d8e56370b94ee6777bf5990567962e1270d625cc299b
|
||||
MISC metadata.xml 1221 BLAKE2B aa9934df0dd5e4e1a6ae184f3570a98bde999d745c5f722f3e7bf922510d11129dd54fc385f64814e17dde1d8d3b427b5632574b128d768ef66d8f4be28778c6 SHA512 5acccb40f140614c9c6f79f13449174fc76ba0028bfd3ed099d1ed633e601a9972cdc2167e9ba2e5aab3827847942a43c98d1b6c404af34375305dd96830b3bd
|
||||
|
||||
@ -1,66 +0,0 @@
|
||||
# Copyright 1999-2021 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
inherit bash-completion-r1 libtool
|
||||
|
||||
DESCRIPTION="Libraries and applications to access smartcards"
|
||||
HOMEPAGE="https://github.com/OpenSC/OpenSC/wiki"
|
||||
SRC_URI="https://github.com/OpenSC/OpenSC/releases/download/${PV}/${P}.tar.gz"
|
||||
|
||||
LICENSE="LGPL-2.1"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ppc ppc64 ~s390 ~sparc x86"
|
||||
IUSE="ctapi doc libressl openct notify +pcsc-lite readline secure-messaging ssl test zlib"
|
||||
RESTRICT="!test? ( test )"
|
||||
|
||||
RDEPEND="zlib? ( sys-libs/zlib )
|
||||
readline? ( sys-libs/readline:0= )
|
||||
ssl? (
|
||||
!libressl? ( dev-libs/openssl:0= )
|
||||
libressl? ( >=dev-libs/libressl-3.1.0:0= )
|
||||
)
|
||||
openct? ( >=dev-libs/openct-0.5.0 )
|
||||
pcsc-lite? ( >=sys-apps/pcsc-lite-1.3.0 )
|
||||
notify? ( dev-libs/glib:2 )"
|
||||
DEPEND="${RDEPEND}
|
||||
app-text/docbook-xsl-stylesheets
|
||||
dev-libs/libxslt
|
||||
test? ( dev-util/cmocka )"
|
||||
BDEPEND="virtual/pkgconfig"
|
||||
|
||||
REQUIRED_USE="
|
||||
pcsc-lite? ( !openct !ctapi )
|
||||
openct? ( !pcsc-lite !ctapi )
|
||||
ctapi? ( !pcsc-lite !openct )
|
||||
|| ( pcsc-lite openct ctapi )"
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
elibtoolize
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
econf \
|
||||
--with-completiondir="$(get_bashcompdir)" \
|
||||
--disable-openpace \
|
||||
--disable-static \
|
||||
--disable-strict \
|
||||
--enable-man \
|
||||
$(use_enable ctapi) \
|
||||
$(use_enable doc) \
|
||||
$(use_enable notify ) \
|
||||
$(use_enable openct) \
|
||||
$(use_enable pcsc-lite pcsc) \
|
||||
$(use_enable readline) \
|
||||
$(use_enable secure-messaging sm) \
|
||||
$(use_enable ssl openssl) \
|
||||
$(use_enable test cmocka) \
|
||||
$(use_enable zlib)
|
||||
}
|
||||
|
||||
src_install() {
|
||||
default
|
||||
find "${D}" -name '*.la' -delete || die
|
||||
}
|
||||
@ -1,36 +0,0 @@
|
||||
# Copyright 1999-2021 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
PYTHON_COMPAT=( pypy3 python3_{7..9} )
|
||||
PYTHON_REQ_USE="threads(+)"
|
||||
DISTUTILS_USE_SETUPTOOLS=rdepend
|
||||
|
||||
inherit distutils-r1
|
||||
|
||||
DESCRIPTION="Collection of tools for internationalizing Python applications"
|
||||
HOMEPAGE="https://babel.pocoo.org/ https://pypi.org/project/Babel/"
|
||||
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
|
||||
|
||||
LICENSE="BSD"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
|
||||
|
||||
RDEPEND="dev-python/pytz[${PYTHON_USEDEP}]
|
||||
dev-python/setuptools[${PYTHON_USEDEP}]"
|
||||
DEPEND="${DEPEND}
|
||||
test? ( dev-python/freezegun[${PYTHON_USEDEP}] )"
|
||||
|
||||
distutils_enable_sphinx docs
|
||||
distutils_enable_tests pytest
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/Babel-2.8.0-py39.patch
|
||||
"${FILESDIR}"/Babel-2.9.0-pypy3.patch
|
||||
)
|
||||
|
||||
src_test() {
|
||||
local -x TZ=UTC
|
||||
distutils-r1_src_test
|
||||
}
|
||||
@ -1,37 +0,0 @@
|
||||
# Copyright 1999-2021 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
PYTHON_COMPAT=( pypy3 python3_{7..9} )
|
||||
PYTHON_REQ_USE="threads(+)"
|
||||
DISTUTILS_USE_SETUPTOOLS=rdepend
|
||||
|
||||
inherit distutils-r1
|
||||
|
||||
DESCRIPTION="Collection of tools for internationalizing Python applications"
|
||||
HOMEPAGE="https://babel.pocoo.org/ https://pypi.org/project/Babel/"
|
||||
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
|
||||
|
||||
LICENSE="BSD"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
|
||||
|
||||
RDEPEND="dev-python/pytz[${PYTHON_USEDEP}]
|
||||
$(python_gen_cond_dep '
|
||||
dev-python/backports-zoneinfo[${PYTHON_USEDEP}]
|
||||
' python3_{6..8} pypy3)"
|
||||
DEPEND="${DEPEND}
|
||||
test? ( dev-python/freezegun[${PYTHON_USEDEP}] )"
|
||||
|
||||
distutils_enable_sphinx docs
|
||||
distutils_enable_tests pytest
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/Babel-2.9.0-pypy3.patch
|
||||
)
|
||||
|
||||
src_test() {
|
||||
local -x TZ=UTC
|
||||
distutils-r1_src_test
|
||||
}
|
||||
@ -1,9 +1,3 @@
|
||||
AUX Babel-2.8.0-py39.patch 7421 BLAKE2B 94a9b55504214b4c422cab61651dcc4c9192f438635e0ec6aa77ea1b53fefb782dd4a1d13ba89500fc2c2e13bebfc616529aaf74c18a55304fd23c2c53fb77cc SHA512 8d738bb0140c80bb2db8a2180c563f61500df42de1b69f0b2a36dea23aad889fe59451fca993161f6ca6a2f6006d98ce94ab139eb5be4a1a25f43e922e3fc9de
|
||||
AUX Babel-2.9.0-pypy3.patch 1130 BLAKE2B 23abff434e982c8d8f8350c599b3b94ee07775e7244ce26f9bdd1d91b00ca0f25c03ee2b52b466b42de10036ad2004b6bfc53a1abf10bc328f5ad98a48604078 SHA512 8cae713129f7fb87d22b7cd5f5eb196a2f8990f83141bc9617f79b3e9c56e1873e1d74adaec79b4bacf0c6a7d721fb9ce5cd747fef355a55a1e518b94536d978
|
||||
DIST Babel-2.8.1.tar.gz 8471453 BLAKE2B bc2e66a3c1c77e5b190cdb3f53d149268b6f49adde3040cbe6a3dd8eb98f6caffb3988232e76083e606186a87b9ee6b2b5352de89b7bc43d4f72905f1f594127 SHA512 ed39ad01b873d40d0bc611739761d412ff442b2df3d4c2363ec24501547da678cb752f640a02470c8513073a76c468c27fc16248820c779ef7adbe14d0f07199
|
||||
DIST Babel-2.9.0.tar.gz 8682986 BLAKE2B 0e1e8fe647fdd27230ee9c97f0994772bd5877f262f9cd00eb450445c5780b278249f87d50f98c5ca3fa5eca287c6b4fc74c5e082c522c250d640912f0ebc581 SHA512 250d1a19741eb0d1bda9d6b862f2d4779b6c67f10b8e045f450a271a16587e30f26f35ccccfea8ca13bb519582d2ef83569fa4381d0590fb9b61bf3ebf67e5f6
|
||||
DIST Babel-2.9.1.tar.gz 8683505 BLAKE2B e4c6fe7284f03cd9e3e712156d87a520a437316955679f765aa68ca941bf668c544c96598486f3dad1bbb1f1d9a0719ccd527f23a2b1fb0274e453bdba557bd7 SHA512 89a2ce18301b522907bb66ec5453cbcd4c6b2d494d6928c9c62dc07bd8b6983982db571a85e251a1ea413b6f76fbd515f65c67c9bccf5441c62d351a57f2f4d0
|
||||
EBUILD Babel-2.8.1.ebuild 967 BLAKE2B 477668d4aed90f8e92a2b7130e37816f046d2a530174b40945ca480a9401c76e5a97c50047265c51ae9b3866b6e93982af4427200fed6f138ba4600eb0db1fc5 SHA512 892e023892b84836dbdc35cc4d59f1a9ded0593804addf757829a7434c3312aa8b04d4a4365b78cc8dc51fe6f1175324c99f89eb8d514c05317dbfc911ca5a48
|
||||
EBUILD Babel-2.9.0.ebuild 934 BLAKE2B 18ff81f0510d7b348566e8b8e41e7463ec7700cb8a1b6a9614d0334a7e2a7e859df426451a9fe05aa62766e1b4d9781e63dd957f31781d4f2bb2bec49b1a1d11 SHA512 844edc216546b31a8573795b135e751bd819782a453efe178c2551f170d95791286bcb4fedcd1901ec4b87fb8d4e2653b6f03b1006a5f66556542b25f10553ec
|
||||
EBUILD Babel-2.9.1.ebuild 1051 BLAKE2B f139549c37a9db5a0d7e2023811a5b43a445b728eee13563443cd36f5ace7f6b8393f0dbf4ba5272a2b1480a386b5bec255287f303718a485c7238908dd8e3d0 SHA512 2d6045dd50dc3fb422e17f4ce49c825c874cd47e097371a0085cecbf40f3d647f8872eda0ac0b3ffc70ae049c96213da8c639ed0df23e59c211f17cf398e18db
|
||||
EBUILD Babel-2.9.1.ebuild 1043 BLAKE2B b781e3c932b3121e68021087f77f984867f0284999c05f19cee7779bfe4ff2a0b322b0697e696b68d7fcef61cab666e0b6e8ab73fddc6ce467b530d757775c6e SHA512 5630aa39aa17bbe79d63a5eaf2535f6caa6cbb095b232e7833a7dba97e30589d9f06bcd40034974ecaa5acdbdaeb21eb22baa9c6fa12747b07527b843f425755
|
||||
MISC metadata.xml 839 BLAKE2B d9916ce88ce8436bb28d15300e78013e1c9e0f88f385a369c0ad6840f0fe81ad136052a3c257cef50a2fd86500bcde2b652ad0ed664f95d6affa4ccc8770445b SHA512 3688c1488c552b84c685d0aeb6251aea4f9d41be3db3aeb226291655107e1332df13445545b3742587e133de7468a40f22ca53fa67fd8d2e0db570069498654f
|
||||
|
||||
@ -1,169 +0,0 @@
|
||||
From 167b71421f113e2210e4deefef5020402492e5be Mon Sep 17 00:00:00 2001
|
||||
From: Felix Schwarz <felix.schwarz@oss.schwarz.eu>
|
||||
Date: Tue, 5 May 2020 09:58:01 +0200
|
||||
Subject: [PATCH] stop using deprecated ElementTree methods "getchildren()" and
|
||||
"getiterator()"
|
||||
|
||||
Both methods were removed in Python 3.9 as mentioned in the release notes:
|
||||
|
||||
> Methods getchildren() and getiterator() of classes ElementTree and Element in
|
||||
> the ElementTree module have been removed. They were deprecated in Python 3.2.
|
||||
> Use iter(x) or list(x) instead of x.getchildren() and x.iter() or
|
||||
> list(x.iter()) instead of x.getiterator().
|
||||
---
|
||||
scripts/import_cldr.py | 18 +++++++++---------
|
||||
1 file changed, 9 insertions(+), 9 deletions(-)
|
||||
|
||||
diff --git a/scripts/import_cldr.py b/scripts/import_cldr.py
|
||||
index 8993b68e..2ed3af91 100755
|
||||
--- a/scripts/import_cldr.py
|
||||
+++ b/scripts/import_cldr.py
|
||||
@@ -598,7 +598,7 @@ def parse_calendar_months(data, calendar):
|
||||
for width in ctxt.findall('monthWidth'):
|
||||
width_type = width.attrib['type']
|
||||
widths = ctxts.setdefault(width_type, {})
|
||||
- for elem in width.getiterator():
|
||||
+ for elem in width.iter():
|
||||
if elem.tag == 'month':
|
||||
_import_type_text(widths, elem, int(elem.attrib['type']))
|
||||
elif elem.tag == 'alias':
|
||||
@@ -616,7 +616,7 @@ def parse_calendar_days(data, calendar):
|
||||
for width in ctxt.findall('dayWidth'):
|
||||
width_type = width.attrib['type']
|
||||
widths = ctxts.setdefault(width_type, {})
|
||||
- for elem in width.getiterator():
|
||||
+ for elem in width.iter():
|
||||
if elem.tag == 'day':
|
||||
_import_type_text(widths, elem, weekdays[elem.attrib['type']])
|
||||
elif elem.tag == 'alias':
|
||||
@@ -634,7 +634,7 @@ def parse_calendar_quarters(data, calendar):
|
||||
for width in ctxt.findall('quarterWidth'):
|
||||
width_type = width.attrib['type']
|
||||
widths = ctxts.setdefault(width_type, {})
|
||||
- for elem in width.getiterator():
|
||||
+ for elem in width.iter():
|
||||
if elem.tag == 'quarter':
|
||||
_import_type_text(widths, elem, int(elem.attrib['type']))
|
||||
elif elem.tag == 'alias':
|
||||
@@ -649,7 +649,7 @@ def parse_calendar_eras(data, calendar):
|
||||
for width in calendar.findall('eras/*'):
|
||||
width_type = NAME_MAP[width.tag]
|
||||
widths = eras.setdefault(width_type, {})
|
||||
- for elem in width.getiterator():
|
||||
+ for elem in width.iter():
|
||||
if elem.tag == 'era':
|
||||
_import_type_text(widths, elem, type=int(elem.attrib.get('type')))
|
||||
elif elem.tag == 'alias':
|
||||
@@ -676,7 +676,7 @@ def parse_calendar_periods(data, calendar):
|
||||
def parse_calendar_date_formats(data, calendar):
|
||||
date_formats = data.setdefault('date_formats', {})
|
||||
for format in calendar.findall('dateFormats'):
|
||||
- for elem in format.getiterator():
|
||||
+ for elem in format.iter():
|
||||
if elem.tag == 'dateFormatLength':
|
||||
type = elem.attrib.get('type')
|
||||
if _should_skip_elem(elem, type, date_formats):
|
||||
@@ -696,7 +696,7 @@ def parse_calendar_date_formats(data, calendar):
|
||||
def parse_calendar_time_formats(data, calendar):
|
||||
time_formats = data.setdefault('time_formats', {})
|
||||
for format in calendar.findall('timeFormats'):
|
||||
- for elem in format.getiterator():
|
||||
+ for elem in format.iter():
|
||||
if elem.tag == 'timeFormatLength':
|
||||
type = elem.attrib.get('type')
|
||||
if _should_skip_elem(elem, type, time_formats):
|
||||
@@ -717,7 +717,7 @@ def parse_calendar_datetime_skeletons(data, calendar):
|
||||
datetime_formats = data.setdefault('datetime_formats', {})
|
||||
datetime_skeletons = data.setdefault('datetime_skeletons', {})
|
||||
for format in calendar.findall('dateTimeFormats'):
|
||||
- for elem in format.getiterator():
|
||||
+ for elem in format.iter():
|
||||
if elem.tag == 'dateTimeFormatLength':
|
||||
type = elem.attrib.get('type')
|
||||
if _should_skip_elem(elem, type, datetime_formats):
|
||||
@@ -880,7 +880,7 @@ def parse_interval_formats(data, tree):
|
||||
interval_formats[None] = elem.text
|
||||
elif elem.tag == "intervalFormatItem":
|
||||
skel_data = interval_formats.setdefault(elem.attrib["id"], {})
|
||||
- for item_sub in elem.getchildren():
|
||||
+ for item_sub in elem:
|
||||
if item_sub.tag == "greatestDifference":
|
||||
skel_data[item_sub.attrib["id"]] = split_interval_pattern(item_sub.text)
|
||||
else:
|
||||
@@ -903,7 +903,7 @@ def parse_currency_formats(data, tree):
|
||||
type = '%s:%s' % (type, curr_length_type)
|
||||
if _should_skip_elem(elem, type, currency_formats):
|
||||
continue
|
||||
- for child in elem.getiterator():
|
||||
+ for child in elem.iter():
|
||||
if child.tag == 'alias':
|
||||
currency_formats[type] = Alias(
|
||||
_translate_alias(['currency_formats', elem.attrib['type']],
|
||||
From 7bdaa28a55e8d8228d5434effa4b1473ab7b3669 Mon Sep 17 00:00:00 2001
|
||||
From: Felix Schwarz <felix.schwarz@oss.schwarz.eu>
|
||||
Date: Tue, 5 May 2020 08:05:56 +0000
|
||||
Subject: [PATCH] fix tests when using Python 3.9a6
|
||||
|
||||
In Python 3.9a6 integer values for future flags were changed to prevent
|
||||
collision with compiler flags. We need to retrieve these at runtime so
|
||||
the test suite works with Python <= 3.8 as well as Python 3.9.
|
||||
---
|
||||
tests/test_util.py | 17 ++++++++++++-----
|
||||
1 file changed, 12 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/tests/test_util.py b/tests/test_util.py
|
||||
index a6a4450c..b9343aaa 100644
|
||||
--- a/tests/test_util.py
|
||||
+++ b/tests/test_util.py
|
||||
@@ -11,6 +11,7 @@
|
||||
# individuals. For the exact contribution history, see the revision
|
||||
# history and logs, available at http://babel.edgewall.org/log/.
|
||||
|
||||
+import __future__
|
||||
import unittest
|
||||
|
||||
import pytest
|
||||
@@ -20,6 +21,12 @@
|
||||
from babel.util import parse_future_flags
|
||||
|
||||
|
||||
+class _FF:
|
||||
+ division = __future__.division.compiler_flag
|
||||
+ print_function = __future__.print_function.compiler_flag
|
||||
+ with_statement = __future__.with_statement.compiler_flag
|
||||
+ unicode_literals = __future__.unicode_literals.compiler_flag
|
||||
+
|
||||
def test_distinct():
|
||||
assert list(util.distinct([1, 2, 1, 3, 4, 4])) == [1, 2, 3, 4]
|
||||
assert list(util.distinct('foobar')) == ['f', 'o', 'b', 'a', 'r']
|
||||
@@ -70,25 +77,25 @@ def test_parse_encoding_non_ascii():
|
||||
from __future__ import print_function,
|
||||
division, with_statement,
|
||||
unicode_literals
|
||||
-''', 0x10000 | 0x2000 | 0x8000 | 0x20000),
|
||||
+''', _FF.print_function | _FF.division | _FF.with_statement | _FF.unicode_literals),
|
||||
('''
|
||||
from __future__ import print_function, division
|
||||
print('hello')
|
||||
-''', 0x10000 | 0x2000),
|
||||
+''', _FF.print_function | _FF.division),
|
||||
('''
|
||||
from __future__ import print_function, division, unknown,,,,,
|
||||
print 'hello'
|
||||
-''', 0x10000 | 0x2000),
|
||||
+''', _FF.print_function | _FF.division),
|
||||
('''
|
||||
from __future__ import (
|
||||
print_function,
|
||||
division)
|
||||
-''', 0x10000 | 0x2000),
|
||||
+''', _FF.print_function | _FF.division),
|
||||
('''
|
||||
from __future__ import \\
|
||||
print_function, \\
|
||||
division
|
||||
-''', 0x10000 | 0x2000),
|
||||
+''', _FF.print_function | _FF.division),
|
||||
])
|
||||
def test_parse_future(source, result):
|
||||
fp = BytesIO(source.encode('latin-1'))
|
||||
@ -1,33 +0,0 @@
|
||||
From a291ee5da29fb9767ce8dc5f94e3fa19908f2596 Mon Sep 17 00:00:00 2001
|
||||
From: Keri Volans <keri.volans@gmail.com>
|
||||
Date: Sun, 10 May 2020 18:43:58 +0100
|
||||
Subject: [PATCH] tests/test_dates.py: Fix broken test
|
||||
|
||||
datetime was being incorrectly patched, so the unittest was failing
|
||||
|
||||
Closes https://github.com/python-babel/babel/issues/675
|
||||
---
|
||||
tests/test_dates.py | 3 +--
|
||||
1 file changed, 1 insertion(+), 2 deletions(-)
|
||||
|
||||
diff --git a/tests/test_dates.py b/tests/test_dates.py
|
||||
index 5be0d16a..3cd70d3e 100644
|
||||
--- a/tests/test_dates.py
|
||||
+++ b/tests/test_dates.py
|
||||
@@ -761,7 +761,6 @@ def test_zh_TW_format():
|
||||
|
||||
|
||||
def test_format_current_moment(monkeypatch):
|
||||
- import datetime as datetime_module
|
||||
frozen_instant = datetime.utcnow()
|
||||
|
||||
class frozen_datetime(datetime):
|
||||
@@ -771,7 +770,7 @@ def utcnow(cls):
|
||||
return frozen_instant
|
||||
|
||||
# Freeze time! Well, some of it anyway.
|
||||
- monkeypatch.setattr(datetime_module, "datetime", frozen_datetime)
|
||||
+ monkeypatch.setattr(dates, "datetime_", frozen_datetime)
|
||||
assert dates.format_datetime(locale="en_US") == dates.format_datetime(frozen_instant, locale="en_US")
|
||||
|
||||
|
||||
Binary file not shown.
@ -1,6 +1,8 @@
|
||||
AUX line_profiler-3.0.2-python3_9.patch 1058 BLAKE2B 0d0bb5c9e845d8d30ebec532108fdd0241710494ac22e675f36f1ffed2ef2736d3adf35b32f9efabe1f6e70d986a332507283ba22dede99182573ce158809082 SHA512 448d629790b934f3edc7a3e40d18d880f289d77fe9530cbe252b8b01e8473effd75eaf3ae1c0c26427c27c7193176932e83a69fbc64c2d6107366a5ba974dc87
|
||||
DIST line_profiler-3.0.2.tar.gz 45185 BLAKE2B 04e617cc7b6c9686192281ab1cdfdef2cfc6ce3c7aa6b9962ed2369620618af8835b93bafe89f8d1288b45d4120d71f728ec577d5c5d035699c2d7a49d6be7c1 SHA512 9a5d1821c02fc063081854ba98a17eca21af65d5aecf4ce32c67806d31bf0c936291a30409845ce6f94211cdaaaf0859ab5e2b437e1a086fd4f60fc2a0fd2742
|
||||
DIST line_profiler-3.2.1.gh.tar.gz 54639 BLAKE2B 8840ac41397aa5d5c0cb94dec5f673a021a9bad18a7d67d73a2d90bf59745c5e35f205d67d28edd3ceade075320c6fe00426d5cf536b9b2953fbbf90539a5e9a SHA512 6e4e0fcb44df6a4eeafa66e8254e511ef0a0c616e9c2bb4bac6bc29df5efa1849f9e75e998770ec6fbe62916a22b17465cdc6eeee6c61ffa52658a9bdb773490
|
||||
DIST line_profiler-3.2.2.gh.tar.gz 50780 BLAKE2B 79c5f7f73adaf940e34f96ef799faf08e7a6218cd9346dc3aa86211d04f0cdfe309de23d11f43292aaca121e78df27d0d07ec3efd129e1cc6778b6f8ae83cbbf SHA512 a7279db406adfdae08d375fa18869fdc2276fe360ffb791aa65b13a028470504cd45acfbaa7ccb1c44fb1a5622d9400c5a889f13230514b9d392f09b439af0fd
|
||||
EBUILD line_profiler-3.0.2.ebuild 1200 BLAKE2B 1949ae0c2051ece27545485b1a4386c21e60e777bc857f7ca6bfa7a222b5a39759ccfc0e3d73bf7cdc8b2d14800e3cea7317f321902814913371e68f46eedb11 SHA512 86e3c9df28b8715539d3a6e2de1c79657fbc754a5831f25bcba5280f302092c799c82ec1114d82460b636a74983d7d85d18f57a937a4c7b0ff9e06c3a030eeea
|
||||
EBUILD line_profiler-3.2.1.ebuild 1104 BLAKE2B 1fa42fc95ce52fddf76ba7a15f63803d2ce9eb714579427b3ed60dcdfb2be4feff5f7f85a2ec8b4fe486a410a5acad59033bf6324dfbe14823afc0e887d46dd2 SHA512 8e0d41543752019d7191132cb720ec2d0cf5a230a44946da26143bb4b7131b8070f6409170f154196784e8cbe6bc0913dbf604438bdeae28d099ce2983b57489
|
||||
EBUILD line_profiler-3.2.2.ebuild 1071 BLAKE2B d4cc5cffdd0d64f465aefddd130acab191b63d65fd2566d8ff087ec74a5b00f1afc21ebc80a5506659dcedcbb5a0a7f3c59c6e7372c0fbf6c513c86baf2111e7 SHA512 fae924d3b42a9c53070d5da48f190ad00d9a97d03008dd567d8bb1ed429ccf632e81ef9d235bffae04a82a396e49bb1af15d97fc026faa75733f82a1801c619f
|
||||
MISC metadata.xml 774 BLAKE2B b6b3a12e779bb827902f69c9ffad89290888d7b446489dc54f22bfe8d21547e730b694ec552b9a9004c764db543b39a8daca8cc0a28f84a5800c8555f4809033 SHA512 c63fbfbf0e20463e78bb8ae15cb9241b1122a80d7a909ed3fefaba1063325a564139f2556a09b0d394cb8fdc32ce34c5020b807c22ad38e5cd8008525fe38a5b
|
||||
|
||||
@ -0,0 +1,49 @@
|
||||
# Copyright 1999-2021 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
PYTHON_COMPAT=( python3_{7..9} )
|
||||
# force it to match scikit-build
|
||||
CMAKE_MAKEFILE_GENERATOR=ninja
|
||||
|
||||
inherit cmake distutils-r1
|
||||
|
||||
DESCRIPTION="Line-by-line profiler"
|
||||
HOMEPAGE="https://github.com/pyutils/line_profiler/"
|
||||
SRC_URI="
|
||||
https://github.com/pyutils/line_profiler/archive/${PV}.tar.gz
|
||||
-> ${P}.gh.tar.gz"
|
||||
|
||||
SLOT="0"
|
||||
LICENSE="BSD"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
|
||||
RDEPEND="dev-python/ipython[${PYTHON_USEDEP}]"
|
||||
# technically, the package claims to support non-scikit-build build
|
||||
# but it's clearly unmaintained and broken at the moment
|
||||
BDEPEND="
|
||||
dev-python/cython[${PYTHON_USEDEP}]
|
||||
dev-python/scikit-build[${PYTHON_USEDEP}]
|
||||
test? (
|
||||
dev-python/coverage[${PYTHON_USEDEP}]
|
||||
dev-python/ubelt[${PYTHON_USEDEP}]
|
||||
)"
|
||||
|
||||
distutils_enable_tests --install pytest
|
||||
|
||||
src_prepare() {
|
||||
cmake_src_prepare
|
||||
distutils-r1_src_prepare
|
||||
}
|
||||
|
||||
python_test() {
|
||||
distutils_install_for_testing
|
||||
cd tests || die
|
||||
epytest
|
||||
}
|
||||
|
||||
python_install() {
|
||||
distutils-r1_python_install
|
||||
python_optimize
|
||||
}
|
||||
@ -1,9 +1,3 @@
|
||||
DIST python-dotenv-0.15.0.tar.gz 30008 BLAKE2B 1a406145f0d0497aa037dc95b80fb04854b2889ba4014e4689a24b142d5d71c49d24ac60406f8b2dc873e661c19e36604ef58eb03c7bc9f890f6d4561be199a6 SHA512 f1f16d2688041259027b12920ac5f47c2d1d96cfc3ec8a362a05ddfb13fee2cf4926c20ad38eda521fcafb6eef8d7895d86dedadef1b1ea2ecd7e33734b07cbe
|
||||
DIST python-dotenv-0.16.0.tar.gz 30903 BLAKE2B 10a737d819bbede558ef87e79b64c4347d05e3dc2bcf76877daf2f3a7afe80230dc95bd2667a7ab6adaad3507d3e55d061b1b43f09f1710778683e79c5aef928 SHA512 8025e3c1e3c2eb5276b13716f3f2f002151c699fa9837d61762fb8bc8b5fe9b58498905ff1689bc62c49612b8d81066e80e0a289164451f5b757bdc6bc0c46eb
|
||||
DIST python-dotenv-0.17.0.tar.gz 31388 BLAKE2B 1b87a0e1cee4444c6bb929e6f3d859aa032da6105666fd48627987295730e1ffbb233197bdd339996a6ab4259ec313bfa76683c7bbcfc82e39ef02556ff45119 SHA512 77e260c2f39c4f6e7cf030ff2617045a50961d031918e11e1c1711693ab41243de9b14657b3f9e8c76799326af51911da4b034728c5011be7784ebf968f08108
|
||||
DIST python-dotenv-0.17.1.tar.gz 31608 BLAKE2B fdddfa1c39282ceec03fc1569d9a7d038e91a046a1248dd27af011dc60361f06f5324504d623a6109d783bb3b5ccac7cae758d918b17f5b0c65a1085bda627ea SHA512 42cdca1356ac2ad80884a5bf3ed419d1202d6a54746f7a21dc9c1bc7579383ac5c72e8b708bc33dfea3904228125fe7b3b2190bfe53e8b4767f5223d59050417
|
||||
EBUILD python-dotenv-0.15.0.ebuild 840 BLAKE2B ee90c8e55e253dcf006b65bcb4763e4c1f1e1fbcca15465732660cde676a9008aac026c39850a61bc6a0d6d03cacdb4035bfbe9427ba3178ea61ff6c665fd20d SHA512 8bdaa927abd5844ddcb9848bfbdd73c43b7f88fc10f73d21a3694c8b3143008d77880991305d5e8e7b4c9cd1fa3f4ec69812f77de28bff6ef3ac5ba73cfd1ef6
|
||||
EBUILD python-dotenv-0.16.0.ebuild 648 BLAKE2B 30cbe7f35a2b663acb18f6d3e4b0388c6089460c8243c78f57ab2a5706a77ca43c5280e13e566a9cf22fef47a841a784db118ecccddc037926d8a55b349d93c0 SHA512 8c264bd3a7691a596e824b6ec39d312ad2a87328c511e3b349fdbe1cdf478d907e187f2cf3c5a31e88bbc56af4cbd85da65eaa1bd3cc5ba849c72176b0d82d73
|
||||
EBUILD python-dotenv-0.17.0.ebuild 648 BLAKE2B 30cbe7f35a2b663acb18f6d3e4b0388c6089460c8243c78f57ab2a5706a77ca43c5280e13e566a9cf22fef47a841a784db118ecccddc037926d8a55b349d93c0 SHA512 8c264bd3a7691a596e824b6ec39d312ad2a87328c511e3b349fdbe1cdf478d907e187f2cf3c5a31e88bbc56af4cbd85da65eaa1bd3cc5ba849c72176b0d82d73
|
||||
EBUILD python-dotenv-0.17.1.ebuild 648 BLAKE2B 30cbe7f35a2b663acb18f6d3e4b0388c6089460c8243c78f57ab2a5706a77ca43c5280e13e566a9cf22fef47a841a784db118ecccddc037926d8a55b349d93c0 SHA512 8c264bd3a7691a596e824b6ec39d312ad2a87328c511e3b349fdbe1cdf478d907e187f2cf3c5a31e88bbc56af4cbd85da65eaa1bd3cc5ba849c72176b0d82d73
|
||||
EBUILD python-dotenv-0.17.1.ebuild 646 BLAKE2B 0e4950e71cd59d59eff46c85803b7ffd4efc0d8d699a94382dd4d773d16e79fa75da78ff9c51b00bce4222846f3452177d3df94f0078ae1cfb1d323601116b99 SHA512 009b59c6b98f3feaabbbe652e4ebb0158b718f984d861872f3250c413003a70cc739032deadd4511c5c44ce81aa7f4a20aeb2b6bfa0381463537635e20076bd4
|
||||
MISC metadata.xml 465 BLAKE2B 9b67c317b80cf8956d86e3482f9bd4b8824013c758e13c53865c4c8b428127a39188b23776176e038b4e58f8eb4e28b6ff7030df75a300bb647f969ef979a551 SHA512 f4bbf11566f50c90aeb7684755651f9112d3ce12dbfc425aa209eeff7c5a2636688a9236bd5227961cc334c07c82f49da0f4f27c3189bb7a0a8f76b517e9036f
|
||||
|
||||
@ -1,36 +0,0 @@
|
||||
# Copyright 1999-2021 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
PYTHON_COMPAT=( python3_{7,8,9} )
|
||||
DISTUTILS_USE_SETUPTOOLS=rdepend
|
||||
|
||||
inherit distutils-r1
|
||||
|
||||
DESCRIPTION="Manage .env files"
|
||||
HOMEPAGE="https://github.com/theskumar/python-dotenv"
|
||||
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
|
||||
|
||||
LICENSE="BSD"
|
||||
SLOT="0"
|
||||
KEYWORDS="amd64 arm64 ~x86"
|
||||
IUSE="test"
|
||||
|
||||
DEPEND="test? (
|
||||
>=dev-python/click-5[${PYTHON_USEDEP}]
|
||||
dev-python/ipython[${PYTHON_USEDEP}]
|
||||
dev-python/mock[${PYTHON_USEDEP}]
|
||||
>=dev-python/sh-1.09[${PYTHON_USEDEP}]
|
||||
)"
|
||||
|
||||
DOCS=( CHANGELOG.md README.md )
|
||||
|
||||
distutils_enable_tests pytest
|
||||
|
||||
python_test() {
|
||||
# Tests call the "dotenv" command which needs to be in PATH
|
||||
# https://bugs.gentoo.org/743784
|
||||
distutils_install_for_testing
|
||||
pytest -vv || die "Tests fail with ${EPYTHON}"
|
||||
}
|
||||
@ -1,29 +0,0 @@
|
||||
# Copyright 1999-2021 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
PYTHON_COMPAT=( python3_{7..9} )
|
||||
DISTUTILS_USE_SETUPTOOLS=rdepend
|
||||
|
||||
inherit distutils-r1
|
||||
|
||||
DESCRIPTION="Manage .env files"
|
||||
HOMEPAGE="https://github.com/theskumar/python-dotenv"
|
||||
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
|
||||
|
||||
LICENSE="BSD"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~arm64 ~x86"
|
||||
|
||||
DEPEND="
|
||||
test? (
|
||||
>=dev-python/click-5[${PYTHON_USEDEP}]
|
||||
dev-python/ipython[${PYTHON_USEDEP}]
|
||||
dev-python/mock[${PYTHON_USEDEP}]
|
||||
>=dev-python/sh-1.09[${PYTHON_USEDEP}]
|
||||
)"
|
||||
|
||||
DOCS=( CHANGELOG.md README.md )
|
||||
|
||||
distutils_enable_tests --install pytest
|
||||
@ -1,29 +0,0 @@
|
||||
# Copyright 1999-2021 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
PYTHON_COMPAT=( python3_{7..9} )
|
||||
DISTUTILS_USE_SETUPTOOLS=rdepend
|
||||
|
||||
inherit distutils-r1
|
||||
|
||||
DESCRIPTION="Manage .env files"
|
||||
HOMEPAGE="https://github.com/theskumar/python-dotenv"
|
||||
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
|
||||
|
||||
LICENSE="BSD"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~arm64 ~x86"
|
||||
|
||||
DEPEND="
|
||||
test? (
|
||||
>=dev-python/click-5[${PYTHON_USEDEP}]
|
||||
dev-python/ipython[${PYTHON_USEDEP}]
|
||||
dev-python/mock[${PYTHON_USEDEP}]
|
||||
>=dev-python/sh-1.09[${PYTHON_USEDEP}]
|
||||
)"
|
||||
|
||||
DOCS=( CHANGELOG.md README.md )
|
||||
|
||||
distutils_enable_tests --install pytest
|
||||
Binary file not shown.
Binary file not shown.
@ -1,5 +1,7 @@
|
||||
DIST gnome-builder-3.38.2.tar.xz 12078024 BLAKE2B 9cf8a74be5a48b73c21ce247a07fcb1441482edab8fd118a2d773429f68efcd50f4a8a1ef826cf90a9f76e482f25d9a092ca1700504178051fcf903abe9eb1ae SHA512 6f9d284a9c915562fe55a863ddcc385ca9278b4ee201f4b97272f425937066d630c35c0b337bdf94ce4b12226080a9020eb5dc253ccfb25bc6cdbf8e50779569
|
||||
DIST gnome-builder-3.40.0.tar.xz 12088472 BLAKE2B ae392efb375e562b1a2820004a23f6170d78e0cd724924ddd334af7d87ab90e85b0e1996ba593e283a9f8d6e4ae9b5bb9a9d15f61e8ab2f620351ec45434d68b SHA512 9346a42371bd2529a146f81fe5a1b333495c1895978780bcb3748ef7b46e68a08241b261055b855e1d9dca47c1449fbcddc64e8bcfb7e6d780eedea214280fdc
|
||||
DIST gnome-builder-3.40.1.tar.xz 12083836 BLAKE2B 3e4dc4e3e2e1356ee3e52c8898d387875cadd9a866d03d409560d6a5322e2d59883115d7cbb7de16f7d51b5afdf0062982e7bf458614db903077ae114e13532b SHA512 aa53a883286a56c5548f30521b5c0c6980d7d53b4c43771da6049e2605ef8f802a1a0079c4347c03dd85545a69d225cf49c162bf2669bb56307f3543597e9083
|
||||
EBUILD gnome-builder-3.38.2.ebuild 6819 BLAKE2B da4de776fd37f346f2cd346b0e1e41825106ffdc1b2dacfff145bae47e799d83958ff019adb0ab9c9f12f1ba3e4a055e85cf7897eaa0dde1321d8a4d90aae5bb SHA512 7dd08896e752c1060fa2e82525bd096203cc56fcbf0be2de94432f74a10ceadeec4ef1eca3a8a39f6e5905e8dcfff25eaa9b4c520f4a992f5fc3453d794de83b
|
||||
EBUILD gnome-builder-3.40.0.ebuild 7006 BLAKE2B ad8748872d3e8accd07aeb11d4d2f1e67d9e54d5ef41eb810fc64a0c1611d5e918b2c2e6d52ce64e9fe09b506044dbd54133f38854776c13e7d12597b696a950 SHA512 99bf6501c32491a02ce60880e861462b5f7b1606e87e59057a473d8b9e8de820d8d02de2d08c105b35a9ef7f020cc13dc35e734b1c589f7b741954cd4ade0565
|
||||
EBUILD gnome-builder-3.40.1.ebuild 7006 BLAKE2B ad8748872d3e8accd07aeb11d4d2f1e67d9e54d5ef41eb810fc64a0c1611d5e918b2c2e6d52ce64e9fe09b506044dbd54133f38854776c13e7d12597b696a950 SHA512 99bf6501c32491a02ce60880e861462b5f7b1606e87e59057a473d8b9e8de820d8d02de2d08c105b35a9ef7f020cc13dc35e734b1c589f7b741954cd4ade0565
|
||||
MISC metadata.xml 976 BLAKE2B 088592bf7fc4c650b17862e771d3283aced4d7a5003f66938dd5830c4a8b88884fb46362e50745b09f9903347dad3233b1ba8339bdaa66c7ea9f70024071a3b8 SHA512 136ec6b271c0084e86f8b7e309f46cd89d382e96d815269f50f0dae33795084d17790daf360fb760a17a2d4885a4a5aae5f8563449160ebec49bf4c9f69438a8
|
||||
|
||||
@ -0,0 +1,183 @@
|
||||
# Copyright 1999-2021 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
PYTHON_COMPAT=( python3_{7..9} )
|
||||
DISABLE_AUTOFORMATTING=1
|
||||
FORCE_PRINT_ELOG=1
|
||||
|
||||
inherit gnome.org gnome2-utils llvm meson optfeature python-single-r1 readme.gentoo-r1 virtualx xdg
|
||||
|
||||
DESCRIPTION="An IDE for writing GNOME-based software"
|
||||
HOMEPAGE="https://wiki.gnome.org/Apps/Builder"
|
||||
|
||||
# FIXME: Review licenses at some point
|
||||
LICENSE="GPL-3+ GPL-2+ LGPL-3+ LGPL-2+ MIT CC-BY-SA-3.0 CC0-1.0"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE="clang +devhelp doc +git +glade gtk-doc spell sysprof test"
|
||||
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
|
||||
|
||||
# When bumping, pay attention to all the included plugins/*/meson.build (and other) build files and the requirements within.
|
||||
# `grep -rI dependency * --include='meson.build'` can give a good initial idea for external deps and their double checking.
|
||||
# The listed RDEPEND order shold roughly match that output as well, with toplevel one first then sorted by file path.
|
||||
# Most plugins have no extra requirements and default to enabled; we need to handle the ones with extra requirements. Many of
|
||||
# them have optional runtime dependencies, for which we try to at least notify the user via DOC_CONTENTS (but not all small
|
||||
# things); `grep -rI -e 'command-pattern.*=' -e 'push_arg'` can give a (spammy) idea, plus python imports in try/except.
|
||||
|
||||
# FIXME: plugin_flatpak needs flatpak.pc >=0.8.0, ostree-1, libsoup-2.4.pc >=2.52.0 and git plugin enabled
|
||||
# Editorconfig needs old pcre, with vte migrating away, might want it optional or ported to pcre2?
|
||||
# An introspection USE flag of a dep is required if any introspection based language plugin wants to use it (grep for gi.repository). Last full check at 3.28.4
|
||||
|
||||
# TODO: Handle llvm slots via llvm.eclass; see plugins/clang/meson.build
|
||||
# TODO: automagic libportal dep
|
||||
# TODO: automagic sysprof dep for tracing paths from toplevel meson.build
|
||||
RDEPEND="
|
||||
>=dev-libs/libdazzle-3.37.0[introspection]
|
||||
>=dev-libs/glib-2.67.4:2
|
||||
>=x11-libs/gtk+-3.22.26:3[introspection]
|
||||
>=x11-libs/gtksourceview-4.0.0:4[introspection]
|
||||
>=dev-libs/json-glib-1.2.0
|
||||
>=dev-libs/jsonrpc-glib-3.19.91
|
||||
>=x11-libs/pango-1.38.0
|
||||
>=dev-libs/libpeas-1.22.0[python,${PYTHON_SINGLE_USEDEP}]
|
||||
>=dev-libs/template-glib-3.28.0[introspection]
|
||||
>=x11-libs/vte-0.40.2:2.91[introspection]
|
||||
>=net-libs/webkit-gtk-2.26:4=[introspection]
|
||||
>=dev-libs/libxml2-2.9.0
|
||||
git? ( dev-libs/libgit2:=[ssh,threads]
|
||||
>=dev-libs/libgit2-glib-0.28.0.1[ssh]
|
||||
)
|
||||
dev-libs/libpcre:3
|
||||
dev-libs/libpcre2
|
||||
|
||||
>=dev-libs/gobject-introspection-1.54.0:=
|
||||
$(python_gen_cond_dep '
|
||||
>=dev-python/pygobject-3.22.0:3[${PYTHON_USEDEP}]
|
||||
')
|
||||
${PYTHON_DEPS}
|
||||
clang? ( sys-devel/clang:= )
|
||||
devhelp? ( >=dev-util/devhelp-3.25.1:= )
|
||||
glade? ( >=dev-util/glade-3.22.0:3.10= )
|
||||
spell? ( >=app-text/gspell-1.8:0=
|
||||
app-text/enchant:2 )
|
||||
sysprof? ( >=dev-util/sysprof-3.37.1:0/4[gtk] )
|
||||
"
|
||||
DEPEND="${RDEPEND}"
|
||||
# TODO: runtime ctags path finding..
|
||||
|
||||
# desktop-file-utils required for tests, but we have it in deptree for xdg update-desktop-database anyway, so be explicit and unconditional
|
||||
# appstream-glib needed for validation with appstream-util with FEATURES=test
|
||||
BDEPEND="
|
||||
doc? ( $(python_gen_cond_dep '
|
||||
dev-python/sphinx[${PYTHON_USEDEP}]
|
||||
dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
|
||||
') )
|
||||
gtk-doc? ( dev-util/gtk-doc
|
||||
app-text/docbook-xml-dtd:4.3 )
|
||||
test? (
|
||||
dev-libs/appstream-glib
|
||||
sys-apps/dbus )
|
||||
dev-util/desktop-file-utils
|
||||
dev-util/glib-utils
|
||||
>=dev-util/meson-0.49.2
|
||||
>=sys-devel/gettext-0.19.8
|
||||
virtual/pkgconfig
|
||||
"
|
||||
|
||||
DOC_CONTENTS='gnome-builder can use various other dependencies on runtime to provide
|
||||
extra capabilities beyond these expressed via USE flags. Some of these
|
||||
that are currently available with packages include:
|
||||
|
||||
* dev-util/uncrustify and dev-python/autopep8 for various Code Beautifier
|
||||
plugin out of the box functionality.
|
||||
* dev-util/ctags with exuberant-ctags selected via "eselect ctags" for
|
||||
C, C++, Python, JavaScript, CSS, HTML and Ruby autocompletion, semantic
|
||||
highlighting and symbol resolving support.
|
||||
* dev-python/jedi and dev-python/lxml for more accurate Python
|
||||
autocompletion support.
|
||||
* dev-util/valgrind for integration with valgrind.
|
||||
* dev-util/meson for integration with the Meson build system.
|
||||
* dev-util/cargo for integration with the Rust Cargo build system.
|
||||
* dev-util/cmake for integration with the CMake build system.
|
||||
* net-libs/nodejs[npm] for integration with the NPM package system.
|
||||
'
|
||||
# FIXME: Package codespell and mention here
|
||||
# FIXME: Package gnome-code-assistance and mention here, or maybe USE flag and default enable because it's rather important
|
||||
# eslint for additional diagnostics in JavaScript files (what package has this? At least something via NPM..)
|
||||
# jhbuild support
|
||||
# rust support via rust-analyzer (rls plugin now disabled by default); Go via go-langserver
|
||||
# autotools stuff for autotools plugin; gtkmm/autoconf-archive for C++ template
|
||||
# gjs/gettext/mono/PHPize stuff, but most of these are probably installed for other reasons anyways, when needed inside IDE
|
||||
# stylelint for stylesheet (CSS and co) linting
|
||||
# gvls for vala language-server integration
|
||||
|
||||
llvm_check_deps() {
|
||||
has_version "sys-devel/clang:${LLVM_SLOT}"
|
||||
}
|
||||
|
||||
pkg_setup() {
|
||||
python-single-r1_pkg_setup
|
||||
use clang && llvm_pkg_setup
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local emesonargs=(
|
||||
-Dtracing=false
|
||||
-Dprofiling=false # not passing -pg to CFLAGS
|
||||
-Dtcmalloc=false
|
||||
-Dchannel=other
|
||||
|
||||
$(meson_use doc help)
|
||||
$(meson_use gtk-doc docs)
|
||||
|
||||
-Dnetwork_tests=false
|
||||
$(meson_use clang plugin_clang)
|
||||
-Dplugin_color_picker=false # needs libportal
|
||||
$(meson_use devhelp plugin_devhelp)
|
||||
-Dplugin_deviced=false
|
||||
-Dplugin_editorconfig=true # needs libpcre
|
||||
-Dplugin_flatpak=false
|
||||
$(meson_use git plugin_git)
|
||||
$(meson_use glade plugin_glade)
|
||||
-Dplugin_podman=false
|
||||
$(meson_use spell plugin_spellcheck)
|
||||
$(meson_use sysprof plugin_sysprof)
|
||||
-Dplugin_update_manager=false
|
||||
)
|
||||
meson_src_configure
|
||||
}
|
||||
|
||||
src_install() {
|
||||
meson_src_install
|
||||
python_optimize
|
||||
if use doc; then
|
||||
rm "${ED}"/usr/share/doc/gnome-builder/en/.buildinfo || die
|
||||
rm "${ED}"/usr/share/doc/gnome-builder/en/objects.inv || die
|
||||
# custom docdir in build system, blocked by https://github.com/mesonbuild/meson/issues/825
|
||||
mv "${ED}"/usr/share/doc/gnome-builder/en "${ED}"/usr/share/doc/${PF}/html || die
|
||||
# _sources subdir left in on purpose, as HTML links to the rst files as "View page source". Additionally default docompress exclusion of /html/ already ensures they aren't compressed, thus linkable as-is.
|
||||
rmdir "${ED}"/usr/share/doc/gnome-builder/ || die
|
||||
fi
|
||||
readme.gentoo_create_doc
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
xdg_pkg_postinst
|
||||
gnome2_schemas_update
|
||||
readme.gentoo_print_elog
|
||||
|
||||
optfeature_header "Code beautifiers"
|
||||
optfeature "Python" dev-python/autopep8
|
||||
optfeature "C/C++/Java" dev-util/uncrustify
|
||||
}
|
||||
|
||||
pkg_postrm() {
|
||||
xdg_pkg_postrm
|
||||
gnome2_schemas_update
|
||||
}
|
||||
|
||||
src_test() {
|
||||
# FIXME: can't run meson_src_test together with virtx or dbus-run-session
|
||||
virtx dbus-run-session meson test -C "${BUILD_DIR}"
|
||||
}
|
||||
Binary file not shown.
@ -1,3 +1,4 @@
|
||||
AUX burgerspace-1.9.2-gcc11.patch 6742 BLAKE2B b8ffc6fb60a9f8334c78cef12947815bfe09ee5168e7a3dc1a508bbd9e99d20636b2f5290eef619a9a4c7791ba2d04f15bb1ebee6307c3503fdc0e965bb4b00c SHA512 8357e5093d44c99b8f4c807c05bab9f3ae9cdcad01eb4d097e64ff32281056865e885f90f151854915628a594fd8d1b24fa2cbffc9cb386814f20763fa863322
|
||||
DIST burgerspace-1.9.2.tar.gz 505314 BLAKE2B 8a6de753e41de791fdc3a2ceb106f193da3de6c04c80c19b9f84cb03f569982ae8f3fe2e5541c1c389e16085d51867733d4911f04266497420eafd170d085095 SHA512 b2af53d6fcf1d52164870147aa8a5b08941ecb62f3d9bbce5c2872885923057481c21bc34f1e19b8aeb8a76acadd9a11c11fa7b6304438610e8a23e043b7deee
|
||||
EBUILD burgerspace-1.9.2-r1.ebuild 1072 BLAKE2B 6fe0998fa8432b88aabb3a678f1896663d04072ebba2898f004ba53367a69fe3fc07da253204b49ce26ff21ad180625e0969a5f3baa21b6399e4514dabb80b55 SHA512 0df0d428714509daeb313ba90170a84187df0a076ffb3e3453ff311d949a1a437860c20d6a8bd65be402196c9e23404b6e6cc3a735b48d06e1a1714bacb41a7d
|
||||
EBUILD burgerspace-1.9.2-r1.ebuild 1123 BLAKE2B ac407f2d58e7996b370c476d81cfed46fb41cecdebc33a73e2701ba5f36a59706b15f9508fdfe6796ed19e0ccd9c9f0ebdf32a07cb10f9daac9a31ef8616a710 SHA512 f2f669ac03bed4b3efb8b488c0074bb3324a64bdfbfe31dae5e25a4e9d17a72f1acbe37eeffd7400d5529e7b3ef007323c7bf33d3cbcac7cceb58719729145a6
|
||||
MISC metadata.xml 335 BLAKE2B 5b9037f7c7ada3f92d51b965d65b0f47af853b60c4409d1e04522485eeb3a3783f58c4e6e5cb1dfb759d27d09254fae5593f0d12947ae3eb286d7867a6b7ca99 SHA512 78b9833542c259f024f8041b1e26710f42ab792919970e8d5e73c8da539c74e62bec318f5ee18d09b26baee3c17bc49f14f3e70a1032da46acd587c934407cd4
|
||||
|
||||
@ -0,0 +1,202 @@
|
||||
--- a/src/BurgerSpaceClient.cpp
|
||||
+++ b/src/BurgerSpaceClient.cpp
|
||||
@@ -209,7 +209,7 @@
|
||||
|
||||
|
||||
void
|
||||
-BurgerSpaceClient::loadPixmaps() throw(PixmapLoadError)
|
||||
+BurgerSpaceClient::loadPixmaps()
|
||||
{
|
||||
/* Tiles:
|
||||
*/
|
||||
--- a/src/BurgerSpaceClient.h
|
||||
+++ b/src/BurgerSpaceClient.h
|
||||
@@ -177,7 +177,7 @@
|
||||
|
||||
///////////////////////////////////////////////////////////////////////////
|
||||
|
||||
- void loadPixmaps() throw(flatzebra::PixmapLoadError);
|
||||
+ void loadPixmaps();
|
||||
void restoreBackground();
|
||||
void draw();
|
||||
void displayMessage(int row, const char *msg);
|
||||
--- a/src/BurgerSpaceServer.cpp
|
||||
+++ b/src/BurgerSpaceServer.cpp
|
||||
@@ -733,7 +733,7 @@
|
||||
|
||||
|
||||
BurgerSpaceServer::BurgerSpaceServer(int initLevelNumber,
|
||||
- bool _oldMotionMode) throw(int, string)
|
||||
+ bool _oldMotionMode)
|
||||
: theScreenSizeInPixels(SCREEN_WIDTH_IN_PIXELS, SCREEN_HEIGHT_IN_PIXELS),
|
||||
|
||||
initLevelNo(1),
|
||||
@@ -830,7 +830,7 @@
|
||||
|
||||
|
||||
void
|
||||
-BurgerSpaceServer::displayErrorMessage(const string &msg) throw()
|
||||
+BurgerSpaceServer::displayErrorMessage(const string &msg)
|
||||
{
|
||||
cerr << msg << endl;
|
||||
}
|
||||
@@ -871,7 +871,7 @@
|
||||
|
||||
|
||||
void
|
||||
-BurgerSpaceServer::initializeSprites() throw(PixmapLoadError)
|
||||
+BurgerSpaceServer::initializeSprites()
|
||||
/* Initializes the sprites that appear at the beginning of a level,
|
||||
like the ingredients.
|
||||
|
||||
@@ -930,7 +930,7 @@
|
||||
|
||||
|
||||
void
|
||||
-BurgerSpaceServer::initializeMisc() throw(string)
|
||||
+BurgerSpaceServer::initializeMisc()
|
||||
/* Initializes things that need to be initialized once, but not at the
|
||||
beginning of each level.
|
||||
|
||||
@@ -1160,7 +1160,7 @@
|
||||
|
||||
|
||||
void
|
||||
-BurgerSpaceServer::initNextLevel(int levelNo /*= 0*/) throw(int)
|
||||
+BurgerSpaceServer::initNextLevel(int levelNo /*= 0*/)
|
||||
/* Initialize the next level. Increments the current level number if
|
||||
levelNo is zero, or uses levelNo if it is positive.
|
||||
*/
|
||||
@@ -2118,7 +2118,7 @@
|
||||
if (numDirectionsAllowed == 0)
|
||||
{
|
||||
belowStructure = true;
|
||||
- allowedDirections[UP]++;
|
||||
+ allowedDirections[UP] = true;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2643,7 +2643,7 @@
|
||||
static void
|
||||
loadPixmap(const char **xpmData,
|
||||
SDL_Surface *&pixmap,
|
||||
- Couple &pixmapSize) throw(PixmapLoadError)
|
||||
+ Couple &pixmapSize)
|
||||
{
|
||||
pixmapSize.zero();
|
||||
|
||||
@@ -2661,7 +2661,6 @@
|
||||
|
||||
static void
|
||||
loadPixmap(const char **xpmData, PixmapArray &pa, size_t index)
|
||||
- throw(PixmapLoadError)
|
||||
{
|
||||
// Masks are not be relevant with SDL.
|
||||
|
||||
@@ -2674,7 +2673,7 @@
|
||||
|
||||
|
||||
void
|
||||
-BurgerSpaceServer::loadPixmaps() throw(PixmapLoadError)
|
||||
+BurgerSpaceServer::loadPixmaps()
|
||||
{
|
||||
/* Load the player pixmaps:
|
||||
|
||||
@@ -2813,7 +2812,7 @@
|
||||
|
||||
|
||||
void
|
||||
-BurgerSpaceServer::loadLevel(int levelNo) throw(string)
|
||||
+BurgerSpaceServer::loadLevel(int levelNo)
|
||||
/* Affects the data member 'theCurrentLevel', which must already be
|
||||
initialized to defined values.
|
||||
'levelNo' may exceed NUM_LEVELS.
|
||||
--- a/src/BurgerSpaceServer.h
|
||||
+++ b/src/BurgerSpaceServer.h
|
||||
@@ -72,7 +72,7 @@
|
||||
{
|
||||
public:
|
||||
|
||||
- BurgerSpaceServer(int initLevelNumber, bool _oldMotionMode) throw(int, std::string);
|
||||
+ BurgerSpaceServer(int initLevelNumber, bool _oldMotionMode);
|
||||
|
||||
void finishInit(); // must be called after constructor -- calls virtual functions
|
||||
|
||||
@@ -355,7 +355,7 @@
|
||||
void putSprite(const flatzebra::Sprite &s);
|
||||
void showInstructions();
|
||||
void initGameParameters();
|
||||
- void initNextLevel(int levelNo = 0) throw(int);
|
||||
+ void initNextLevel(int levelNo = 0);
|
||||
void resetPlay();
|
||||
int isPositionAtSideOfStructure(flatzebra::Couple pos) const;
|
||||
void animateTemporarySprites(flatzebra::SpriteList &slist) const;
|
||||
@@ -369,11 +369,11 @@
|
||||
bool ingredientGroupCollidesWithSprite(
|
||||
const flatzebra::Couple groupPos, const flatzebra::Couple groupSize,
|
||||
const flatzebra::Sprite &s) const;
|
||||
- void loadLevel(int levelNo) throw(std::string);
|
||||
- void displayErrorMessage(const std::string &msg) throw();
|
||||
+ void loadLevel(int levelNo);
|
||||
+ void displayErrorMessage(const std::string &msg);
|
||||
void createPlayerSprite();
|
||||
- void initializeSprites() throw(flatzebra::PixmapLoadError);
|
||||
- void initializeMisc() throw(std::string);
|
||||
+ void initializeSprites();
|
||||
+ void initializeMisc();
|
||||
void deleteSprite(flatzebra::Sprite *s) const;
|
||||
void deleteSprites(flatzebra::SpriteList &sl) const;
|
||||
void deleteSprites(IngredientSprite::List &isl) const;
|
||||
@@ -386,7 +386,7 @@
|
||||
size_t carryEnemiesInList(IngredientGroup &g, flatzebra::SpriteList &slist);
|
||||
size_t releaseCarriedEnemies(IngredientGroup &g);
|
||||
void createScoreSprites(long n, flatzebra::Couple center);
|
||||
- void loadPixmaps() throw(flatzebra::PixmapLoadError);
|
||||
+ void loadPixmaps();
|
||||
void moveEnemyList(flatzebra::SpriteList &slist, int speedFactor);
|
||||
flatzebra::Couple getDistanceToPerfectPos(const flatzebra::Sprite &s) const;
|
||||
bool isSpriteOnFloor(const flatzebra::Sprite &s) const;
|
||||
--- a/src/EnemySprite.cpp
|
||||
+++ b/src/EnemySprite.cpp
|
||||
@@ -29,7 +29,7 @@
|
||||
|
||||
EnemySprite::EnemySprite(const PixmapArray &pa,
|
||||
Couple pos, Couple speed,
|
||||
- Couple collBoxPos, Couple collBosSize) throw(int)
|
||||
+ Couple collBoxPos, Couple collBosSize)
|
||||
: Sprite(pa, pos, speed, Couple(0, 0), collBoxPos, collBosSize),
|
||||
carryingGroup(NULL),
|
||||
disappearanceTime(0),
|
||||
--- a/src/EnemySprite.h
|
||||
+++ b/src/EnemySprite.h
|
||||
@@ -45,7 +45,7 @@
|
||||
flatzebra::Couple pos,
|
||||
flatzebra::Couple speed,
|
||||
flatzebra::Couple collBoxPos,
|
||||
- flatzebra::Couple collBosSize) throw(int);
|
||||
+ flatzebra::Couple collBosSize);
|
||||
/* Calls Sprite constructor.
|
||||
*/
|
||||
|
||||
--- a/src/IngredientSprite.h
|
||||
+++ b/src/IngredientSprite.h
|
||||
@@ -42,7 +42,7 @@
|
||||
|
||||
IngredientSprite(const flatzebra::PixmapArray &pixmapArray,
|
||||
const flatzebra::Couple &pos,
|
||||
- IngredientGroup *ig) throw(int)
|
||||
+ IngredientGroup *ig)
|
||||
: flatzebra::Sprite(pixmapArray, pos,
|
||||
flatzebra::Couple(0, 0), flatzebra::Couple(0, 0),
|
||||
flatzebra::Couple(0, 5), flatzebra::Couple(24, 1)),
|
||||
--- a/src/server.cpp
|
||||
+++ b/src/server.cpp
|
||||
@@ -304,7 +304,7 @@
|
||||
{
|
||||
public:
|
||||
|
||||
- BurgerSpaceCommandLineServer(int _initLevelNumber, int _sock, Uint32 _minMSBetweenWrites) throw(int, std::string)
|
||||
+ BurgerSpaceCommandLineServer(int _initLevelNumber, int _sock, Uint32 _minMSBetweenWrites)
|
||||
: BurgerSpaceServer(_initLevelNumber, false),
|
||||
sock(_sock),
|
||||
minMSBetweenWrites(_minMSBetweenWrites),
|
||||
Binary file not shown.
@ -1,5 +1,7 @@
|
||||
DIST gnome-sudoku-3.36.0.tar.xz 357916 BLAKE2B fa56f8a1aaa87d7fac6c1df182ec8a3572aefe6a2693b3c2784afc0fd050a4085082b2ff6b0bfe8733d4b1d6e28e2e0927270b43a5708fd259d00f8803cb5e93 SHA512 617477b884d9ffb08571b25c76b52f2a418064f7af324673e32f43e8b3327c995ab4ace26feb5edeeadc79a1f7f1a0ef7d7fb39ef9397fc855e476bad29a50dc
|
||||
DIST gnome-sudoku-40.0.tar.xz 355580 BLAKE2B 9561e375fb9112c722317d1e85105e7efe2fa010f17756449f29d8d8fd292882c6f65706e412917166b841ba8618bfecbb8aa340657b61b7e6dba30076a33c49 SHA512 28b32179a038d692b0fe0cdc77971b20ede4865fb99e6b2761399ce554fdc1c8d11fdd96c2637cba44f534c2e84e1550daffc91180546683a13b417417125ca4
|
||||
DIST gnome-sudoku-40.1.tar.xz 358076 BLAKE2B 03a53827956a40a7ce54eef3dfa2d27c455d716cdd7f395c8c1e6b0e1f4e07cccad766b9a5cb23de81ef384b56296dfb117867672ade87fa5efffca740add1ef SHA512 29f97a0f9c7b990cffe66fe99c909822c1050c3c01c703e7967f9aa214824f153b6fba619e2c084dfa66aa66a3d3fd034659a8f0995ae69a9d2a85435e0e38d6
|
||||
EBUILD gnome-sudoku-3.36.0.ebuild 918 BLAKE2B 5710e04a013be7ea5231a035a9da54f825500bad59d9218a366b53cbd932954a47983bf9bc4943d87ff3990accd6fd7996e9983795a1d48cca2b7f6fee1ccb97 SHA512 8045e2ca7de7f188c703c143ba830f1d95d432bd4342248a2129968b1be5728ecbda8c4d83ad44160d92e6570ec7724df288aeef90fd7179fba1fd465c258670
|
||||
EBUILD gnome-sudoku-40.0.ebuild 1070 BLAKE2B d3a9ac318697373cb00943258c91994e94b37b261c41615e120768b10d07ade078c39996880d6df79adde0233bac70854716a994f30c67d5f603ed65ce8eca56 SHA512 cb859d7e677c51fd72d98167f9179e13c6fed24ea3ea5a813c50d48ebbec00f2c96087377a1d9e807c805197d33357569443de19c0159dd5e379eb5f955ad8b8
|
||||
EBUILD gnome-sudoku-40.1.ebuild 975 BLAKE2B 609b51ba12852b474ed5310bd4752c1ff5467541c3dd201c27f4cd622d025453f41a994eee204a777f773a9727ff9efc95a39cb8388cd2cab4ce422a5e618b89 SHA512 5924e72a909933ed1d4f7ea44a9fcaaf0282271eebd969ca138b42ca7c262963220391f87d2759700575722188d126c10f8b3f262c979fe3dc43bbdbbff287a5
|
||||
MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
|
||||
|
||||
@ -0,0 +1,49 @@
|
||||
# Copyright 1999-2021 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
PYTHON_COMPAT=( python3_{7..9} )
|
||||
VALA_MIN_API_VERSION="0.40"
|
||||
|
||||
inherit gnome.org gnome2-utils meson python-any-r1 vala xdg
|
||||
|
||||
DESCRIPTION="Test your logic skills in this number grid puzzle"
|
||||
HOMEPAGE="https://wiki.gnome.org/Apps/Sudoku"
|
||||
|
||||
LICENSE="GPL-3+ CC-BY-SA-3.0"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~arm ~arm64 ~x86"
|
||||
|
||||
RDEPEND="
|
||||
>=dev-libs/glib-2.40:2
|
||||
dev-libs/libgee:0.8=[introspection]
|
||||
>=x11-libs/gtk+-3.24.0:3[introspection]
|
||||
dev-libs/json-glib
|
||||
>=dev-libs/qqwing-1.3.4
|
||||
x11-libs/gdk-pixbuf:2[introspection]
|
||||
x11-libs/pango[introspection]
|
||||
"
|
||||
DEPEND="${RDEPEND}"
|
||||
BDEPEND="
|
||||
${PYTHON_DEPS}
|
||||
$(vala_depend)
|
||||
dev-libs/appstream-glib
|
||||
dev-util/itstool
|
||||
>=sys-devel/gettext-0.19.8
|
||||
virtual/pkgconfig
|
||||
"
|
||||
|
||||
src_prepare() {
|
||||
xdg_src_prepare
|
||||
vala_src_prepare
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
xdg_pkg_postinst
|
||||
gnome2_schemas_update
|
||||
}
|
||||
|
||||
pkg_postrm() {
|
||||
xdg_pkg_postrm
|
||||
gnome2_schemas_update
|
||||
}
|
||||
Binary file not shown.
@ -0,0 +1,211 @@
|
||||
https://gitlab.gnome.org/GNOME/gdm/-/merge_requests/113
|
||||
|
||||
From 462cc0f5346f5913cf7151044f1c232c5d21c1c3 Mon Sep 17 00:00:00 2001
|
||||
From: Dudemanguy <random342@airmail.cc>
|
||||
Date: Mon, 5 Oct 2020 18:41:55 -0500
|
||||
Subject: [PATCH] meson: allow building with elogind
|
||||
|
||||
Currently, the GDM meson build has a hard dependency on systemd.
|
||||
However, GDM can function just fine if one is using elogind. This allows
|
||||
a user to build GDM against libelogind and also disable the systemd
|
||||
system and user units.
|
||||
---
|
||||
common/meson.build | 2 +-
|
||||
data/meson.build | 62 ++++++++++++++----------
|
||||
data/pam-arch/gdm-launch-environment.pam | 1 +
|
||||
libgdm/meson.build | 2 +-
|
||||
meson.build | 36 +++++++++-----
|
||||
meson_options.txt | 5 +-
|
||||
6 files changed, 66 insertions(+), 42 deletions(-)
|
||||
|
||||
diff --git a/common/meson.build b/common/meson.build
|
||||
index 074dd92e1..bca58f7c4 100644
|
||||
--- a/common/meson.build
|
||||
+++ b/common/meson.build
|
||||
@@ -11,7 +11,7 @@ libgdmcommon_src = files(
|
||||
)
|
||||
|
||||
libgdmcommon_deps = [
|
||||
- libsystemd_dep,
|
||||
+ logind_dep,
|
||||
gobject_dep,
|
||||
gio_dep,
|
||||
gio_unix_dep,
|
||||
diff --git a/data/meson.build b/data/meson.build
|
||||
index 7c5222eaf..403336c31 100644
|
||||
--- a/data/meson.build
|
||||
+++ b/data/meson.build
|
||||
@@ -168,41 +168,53 @@ else
|
||||
service_config.set('PLYMOUTH_QUIT_SERVICE', '')
|
||||
endif
|
||||
|
||||
-if get_option('systemdsystemunitdir') != ''
|
||||
- systemd_systemunitdir = get_option('systemdsystemunitdir')
|
||||
-else
|
||||
- systemd_systemunitdir = systemd_dep.get_pkgconfig_variable('systemdsystemunitdir')
|
||||
+systemdsystemunitdir = get_option('systemdsystemunitdir')
|
||||
+if systemdsystemunitdir != 'no'
|
||||
+ assert(systemd_dep.found(), 'systemd required but not found, please provide a valid systemd system unit dir or disable it')
|
||||
+ if get_option('systemdsystemunitdir') != ''
|
||||
+ systemd_systemunitdir = get_option('systemdsystemunitdir')
|
||||
+ else
|
||||
+ systemd_systemunitdir = systemd_dep.get_pkgconfig_variable('systemdsystemunitdir')
|
||||
+ endif
|
||||
endif
|
||||
|
||||
-if get_option('systemduserunitdir') != ''
|
||||
- systemd_userunitdir = get_option('systemduserunitdir')
|
||||
-else
|
||||
- systemd_userunitdir = systemd_dep.get_pkgconfig_variable('systemduserunitdir',
|
||||
- define_variable: ['prefix', get_option('prefix')])
|
||||
+systemduserunitdir = get_option('systemduserunitdir')
|
||||
+if systemduserunitdir != 'no'
|
||||
+ assert(systemd_dep.found(), 'systemd required but not found, please provide a valid systemd user unit dir or disable it')
|
||||
+ if get_option('systemduserunitdir') != ''
|
||||
+ systemd_userunitdir = get_option('systemduserunitdir')
|
||||
+ else
|
||||
+ systemd_userunitdir = systemd_dep.get_pkgconfig_variable('systemduserunitdir',
|
||||
+ define_variable: ['prefix', get_option('prefix')])
|
||||
+ endif
|
||||
endif
|
||||
|
||||
-configure_file(
|
||||
- input: 'gdm.service.in',
|
||||
- output: '@BASENAME@',
|
||||
- configuration: service_config,
|
||||
- install_dir: systemd_systemunitdir,
|
||||
- format: 'cmake'
|
||||
-)
|
||||
+if systemdsystemunitdir != 'no'
|
||||
+ configure_file(
|
||||
+ input: 'gdm.service.in',
|
||||
+ output: '@BASENAME@',
|
||||
+ configuration: service_config,
|
||||
+ install_dir: systemd_systemunitdir,
|
||||
+ format: 'cmake'
|
||||
+ )
|
||||
+endif
|
||||
|
||||
gdm_gnome_session_wanted_targets = []
|
||||
foreach component: gdm_gnome_user_session_wanted_components
|
||||
gdm_gnome_session_wanted_targets += 'Wants=@0@.target'.format(component)
|
||||
endforeach
|
||||
|
||||
-configure_file(
|
||||
- input: 'session.conf.in',
|
||||
- output: 'session.conf',
|
||||
- configuration: {
|
||||
- 'requires_component': gdm_gnome_shell_component,
|
||||
- 'wants_required_components': '\n'.join(gdm_gnome_session_wanted_targets),
|
||||
- },
|
||||
- install_dir: systemd_userunitdir / 'gnome-session@gnome-login.target.d',
|
||||
-)
|
||||
+if systemduserunitdir != 'no'
|
||||
+ configure_file(
|
||||
+ input: 'session.conf.in',
|
||||
+ output: 'session.conf',
|
||||
+ configuration: {
|
||||
+ 'requires_component': gdm_gnome_shell_component,
|
||||
+ 'wants_required_components': '\n'.join(gdm_gnome_session_wanted_targets),
|
||||
+ },
|
||||
+ install_dir: systemd_userunitdir / 'gnome-session@gnome-login.target.d',
|
||||
+ )
|
||||
+endif
|
||||
|
||||
# XSession
|
||||
if get_option('gdm-xsession')
|
||||
diff --git a/libgdm/meson.build b/libgdm/meson.build
|
||||
index 3f8cafbb7..83e95151b 100644
|
||||
--- a/libgdm/meson.build
|
||||
+++ b/libgdm/meson.build
|
||||
@@ -56,7 +56,7 @@ libgdm_deps = [
|
||||
glib_dep,
|
||||
gio_dep,
|
||||
gio_unix_dep,
|
||||
- libsystemd_dep,
|
||||
+ logind_dep,
|
||||
libgdmcommon_dep,
|
||||
]
|
||||
|
||||
diff --git a/meson.build b/meson.build
|
||||
index e6fcf4b8b..a86a486b7 100644
|
||||
--- a/meson.build
|
||||
+++ b/meson.build
|
||||
@@ -92,21 +92,30 @@ xdmcp_dep = cc.find_library('Xdmcp', required: get_option('xdmcp'))
|
||||
if xdmcp_dep.found() and get_option('tcp-wrappers')
|
||||
libwrap_dep = cc.find_library('libwrap')
|
||||
endif
|
||||
-# systemd
|
||||
-systemd_dep = dependency('systemd')
|
||||
-libsystemd_dep = dependency('libsystemd')
|
||||
-if meson.version().version_compare('>= 0.53')
|
||||
- systemd_multiseat_x = find_program('systemd-multi-seat-x',
|
||||
- required: false,
|
||||
- dirs: [
|
||||
- systemd_dep.get_pkgconfig_variable('systemdutildir'),
|
||||
- '/lib/systemd',
|
||||
- '/usr/lib/systemd',
|
||||
- ])
|
||||
+
|
||||
+logind_provider = get_option('logind-provider')
|
||||
+systemd_dep = dependency('systemd', required: false)
|
||||
+if logind_provider == 'systemd'
|
||||
+ libsystemd_dep = dependency('libsystemd')
|
||||
+ logind_dep = libsystemd_dep
|
||||
+ if meson.version().version_compare('>= 0.53')
|
||||
+ systemd_multiseat_x = find_program('systemd-multi-seat-x',
|
||||
+ required: false,
|
||||
+ dirs: [
|
||||
+ systemd_dep.get_pkgconfig_variable('systemdutildir'),
|
||||
+ '/lib/systemd',
|
||||
+ '/usr/lib/systemd',
|
||||
+ ])
|
||||
+ else
|
||||
+ systemd_multiseat_x = find_program('systemd-multi-seat-x', required: false)
|
||||
+ endif
|
||||
+ systemd_x_server = systemd_multiseat_x.found()? systemd_multiseat_x.path() : '/lib/systemd/systemd-multi-seat-x'
|
||||
else
|
||||
- systemd_multiseat_x = find_program('systemd-multi-seat-x', required: false)
|
||||
+ elogind_dep = dependency('libelogind')
|
||||
+ logind_dep = elogind_dep
|
||||
+ systemd_x_server = 'disabled'
|
||||
endif
|
||||
-systemd_x_server = systemd_multiseat_x.found()? systemd_multiseat_x.path() : '/lib/systemd/systemd-multi-seat-x'
|
||||
+
|
||||
# Plymouth
|
||||
plymouth_dep = dependency('ply-boot-client', required: get_option('plymouth'))
|
||||
# Check for Solaris auditing API (ADT)
|
||||
@@ -313,6 +322,7 @@ summary({
|
||||
'PAM Syslog': have_pam_syslog,
|
||||
'Supports PAM Extensions': pam_extensions_supported,
|
||||
'SeLinux': libselinux_dep.found(),
|
||||
+ 'Logind Provider': get_option('logind-provider'),
|
||||
'Use GDM Xsession': get_option('gdm-xsession'),
|
||||
'Use UserDisplayServer': get_option('user-display-server'),
|
||||
'Use SystemdJournal': get_option('systemd-journal'),
|
||||
diff --git a/meson_options.txt b/meson_options.txt
|
||||
index 14e0b908b..5135d7d66 100644
|
||||
--- a/meson_options.txt
|
||||
+++ b/meson_options.txt
|
||||
@@ -12,6 +12,7 @@ option('initial-vt', type: 'integer', value: 1, description: 'Initial virtual te
|
||||
option('ipv6', type: 'boolean', value: false, description: 'Enables compilation of IPv6 code.')
|
||||
option('lang-file', type: 'string', value: '', description: 'File containing default language settings.')
|
||||
option('libaudit', type: 'feature', value: 'auto', description: 'Add Linux audit support.')
|
||||
+option('logind-provider', type: 'combo', choices: ['systemd', 'elogind'], value: 'systemd', description: 'Which logind library to use.')
|
||||
option('log-dir', type: 'string', value: '/var/log/gdm', description: 'Log directory.')
|
||||
option('pam-mod-dir', type: 'string', value: '', description: 'Directory to install PAM modules in.')
|
||||
option('pam-prefix', type: 'string', value: '', description: 'Specify where PAM files go.')
|
||||
@@ -27,8 +28,8 @@ option('solaris', type: 'boolean', value: false, description: 'Build for Solaris
|
||||
option('split-authentication', type: 'boolean', value: true, description: 'Enable multiple simultaneous PAM conversations during login.')
|
||||
option('sysconfsubdir', type: 'string', value: 'gdm', description: 'Directory name used under sysconfdir.')
|
||||
option('systemd-journal', type: 'boolean', value: true, description: 'Use journald support.')
|
||||
-option('systemdsystemunitdir', type: 'string', value: '', description: 'Directory for systemd service files.')
|
||||
-option('systemduserunitdir', type: 'string', value: '', description: 'Directory for systemd user service files.')
|
||||
+option('systemdsystemunitdir', type: 'string', value: '', description: 'Directory for systemd service files, or \'no\' to disable.')
|
||||
+option('systemduserunitdir', type: 'string', value: '', description: 'Directory for systemd user service files, or \'no\' to disable.')
|
||||
option('tcp-wrappers', type: 'boolean', value: false, description: 'Use TCP wrappers.')
|
||||
option('udev-dir', type: 'string', value: '', description: 'Directory for udev rules file.')
|
||||
option('user', type: 'string', value: 'gdm', description: 'GDM\'s username.')
|
||||
--
|
||||
GitLab
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in new issue