Sync with portage [Fri Aug 16 17:56:14 MSK 2019].

master
root 5 years ago
parent 6fb2f3de92
commit 084eb716d7

@ -1,23 +1,23 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512
MANIFEST Manifest.files.gz 29637 BLAKE2B 934f621a272eb64a52f8c9fbb7135eaec7472a52285043a0807ae823d0cb585f3954cdd7843c053883944135653421e31e61170a2d9fda00540fbe0ec0ef5848 SHA512 8110ab046ed258a50e6dde0707b250426accfd6eee42f2a77fe0316ee6cbed2b4784766dc985aec60a79b1e428e3ddf44cfea393a57d680651c155c512def444
TIMESTAMP 2019-08-14T20:08:58Z
MANIFEST Manifest.files.gz 29612 BLAKE2B 1fd73909b709fd1cf3cd6a5edd4c6416f739d2a448397c313f7f5ca27346252f1015b4f375fcc8768752f6a6c33154e29d2b272936b8f2d8124d7d1b253b57c3 SHA512 34858bf5d274acc977bebad5a68eac0f4dd85f5f00a0d65340341b48f7264f46f85c87468799052c67b56317b59fbef7789b818057d436377692dc83fe91ba29
TIMESTAMP 2019-08-16T14:08:58Z
-----BEGIN PGP SIGNATURE-----
iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAl1UalpfFIAAAAAALgAo
iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAl1WuPpfFIAAAAAALgAo
aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
klA0kQ/+O4gFIA/I2pWOaCSeltahfjdYxU6Fua1w7G8CikroRo9VuqtY2JBSawAF
+7oRqaZnfP3L7Zdw4s38dZiZHEyMiHP6jn1UpmdHxyNOfJVAioodO+iNqpSDu7nH
Eu7SxXy6E8tnRh+qrIdVd7TzVQWs9yTt0ldldVWRwQxaBLxhxmbuqb6JfBct32tG
NaIchAdIKfVMGZGCzFUg/kPC+xS5eU4P3P54YpDRvotK354cH/09lUcgbpSjvsdY
GK+PmVcj++M1i4ZDiOFsP7vTYGw3ThVKTWghKJgfZIhYwbueGan/1K6SJDtstCM6
cwrHSSxZVrtXgrP1+0STVXaj4S7aD8PPGKfGrG7SSzCE8AGGFMbQOpdLTSvO/25h
lSp6957nMj2glAyXxtI7IitRKLE1TSyAjjHqM1a3VP+XgcKGRTokIX2LNORvD9Ar
lOd4YXSd/D7wuzBptho7JzM+KhJyuk9Ky+rBpGy+4hLRYIl04FslyeEdtA2F5pg6
DggxsCT0B3wOZJwX4trE7dpnr8Q+yjzfEC+cifxciyENbBxBWsC2cwz+w00K1A0V
F2wbijeZwMAGpuuv9Tpy2Mv6ZyhZkVhwBJEvq3nX8iZDcszd+PJ+RnOYS3raUmT5
Q5OLR5uUTop7uFN8srX6JppSHFM5q0SVy/4SA0M6D+btHuTYLtI=
=TJUR
klA1vQ/8DSoH4QKnrghiqXCJHoUYaOzbwurSxemYoW2DzSGDP4WDnHonsEeh0WUJ
QZAX59aomJswi948IQNVXsmelLiqGZEt5XSnmg7QeJJlxX9gmKu7DF3RL2Pacuxb
WcLJY3sAGr1CMtFvx0pn04Ke/1BEk+66fE3be/QCkBOw7IDB157Vp5HXh37v6wgG
e1RLzCbZsl6nGNfbOJ4kgGQqQHQAzo20LuQAPIPvoRCUPafOJqUkJKvvam0WpVVS
sVbewmHoykaSCvgUfFNVpokPamaY7igr61RFqp6k30jCPG3bSQwm4CRM8+QJXHWp
DIDdnsXX1u88eSUWbbtCdcKZLzl4T2P9u82KBQoLgiY/+cCBK05KTYCWXw+OMT38
q+uDTerkhz5s1PXTd2zwSnYhPko9EYPRKM86cdNp1KTsbHcvCbg+JBY3QwJnlHhU
kvN3bSdPScQhd6v7wseCUl43QXELR1m3E+4XEcwFIN/1h6J/wDx2wqJYCDSHZIKj
Z+DAigWISWY9LUiVK+WjE0lm1v5KD82xUM6AD1qAa86OLj+4GuqBaOqEUJWDo1hE
Hitlu3YfUrfz62Tsxf7IjaeLBfLV+41P08Y/iTDR6PnQTf8Nn4/+T3IuO+SDGCUx
96Oc3isHmzYB6be0W5VVwmra6DPbLdZLNjHbSm4yaqg5WW57Eag=
=X3ry
-----END PGP SIGNATURE-----

Binary file not shown.

Binary file not shown.

@ -1,2 +1,2 @@
EBUILD man-0.ebuild 315 BLAKE2B 83b2ab48678b8cbbe5dece08ba710c216cd0426dfec48f0ea66f660b5964817157aa4a7be71c66f6024903172bdc69396f63a47d9988b05a4ad1a31ead04f40f SHA512 a89d170704e24e8072d103e7643a76c063eee1c00de97eef2a77fe380d80a893b9966414f75325919e2b8bf7221e651e96347dbac8b9d1139836a949c10362f7
EBUILD man-1.ebuild 188 BLAKE2B bff1136e774e0b333c972c616783247bb9013a53cdf42972aecc7b3e2e9293477ff9c3f6ad5236868cf1b49897a9b1569d2535f06da76007a35e96aad15375ab SHA512 4fd6cf3b680a2035b38c9ee720ecccff4cdca492f662355db825ab0ec61d76222d6f6e96424dd3f8b0adc478c7a807c273f6fb12573d6c0437f5246f3026ccad
MISC metadata.xml 227 BLAKE2B d43cca7ce4cd9d8143208b114d9a6f629c56d4148f1afbf5c6d850479f126b7a71baaec1f1eef609aa8d29d66e85abb83fa25e765ca2c920a44eeb773cd05ddc SHA512 59254a8f45c8f9b74b0f85c0aff39a6b425fb46e06328f1140c14ae7d2be524aaaf24993b89c0aa782abec962f107f24e4fcc3b374863a50227cc83a86e7ae36

@ -5,11 +5,7 @@ EAPI=7
inherit acct-user
DESCRIPTION="user for man page viewer"
ACCT_USER_ID=13
ACCT_USER_HOME=/usr/share/man
ACCT_USER_HOME_OWNER=root:root
ACCT_USER_GROUPS=( man )
ACCT_USER_SHELL=/bin/false
acct-user_add_deps

Binary file not shown.

@ -5,5 +5,5 @@ DIST httpd-2.4.39.tar.bz2 7030539 BLAKE2B 1e378833efb9bbdd6fdc277a779620a08752d0
DIST httpd-2.4.41.tar.bz2 7072373 BLAKE2B 88a2390736209d5ef04bffcb867bc8d6019302885e6f3cc63d18123336d4d0657252105a3bfebf4e91b8daa02119d4a61f4c0a9702244858a3193ec6cf681c0f SHA512 350cc7dcd2c439e0590338fa6da3f44df44f9bb885c381e91f91b14c2f48597f6f0bbac0ea118a8a67eaa70ae7edbb769beace368643ed73f6daee44c307b335
EBUILD apache-tools-2.2.34.ebuild 1977 BLAKE2B 792d6ea010621c815a13fa89db289cdb7d2f02cd4aecca6d032e21c2bd64af7c35a66ebe3b8102eb441d12a4b6b2ca6197e16f8479d72c82606b088b97dfc24a SHA512 4a71266da0e171579c5d9da9ed681ed5600d2d94ffb15761bbd7f28b60332158959156a65b27ac295869f647f624fe598bdf2e74aa3c7f8b16fef7cbb2dc9a52
EBUILD apache-tools-2.4.39.ebuild 2578 BLAKE2B 3567f7dc0cd337d498cfea3d950d8548fa515c7ae4f4fd03810e8ceec7e821f4673b119eadee5f568ef90a7aa5bb58e58b564ebef115e36bd7881dd2164d74ae SHA512 265e2abc71c36124c977bc79002b88d672e558f17537839d7de6bb158fc476c96fa5a615af2ce6a27b6dee6fbbb36a675840351525ec0f472bc0f87830326b1e
EBUILD apache-tools-2.4.41.ebuild 2588 BLAKE2B 2336180bcca2116c008a5e034a2bfdbd678ff903458d73b03873e43705cb0eec587e704cb8d32ec21c5c2201ff2a73c2811b091b8d8a7f10458eed3b4a6e2059 SHA512 cf000269ad5f3ca8723d9204676361c1fbc31a5c81dae9b0e17dcd03ce5b418d4b9dc0e7a5c9368e7211152a0158495c24a927b574578ef90b0f597e7648e4c1
EBUILD apache-tools-2.4.41.ebuild 2586 BLAKE2B c852139a491949dfd2fb999fa346f222c98af36339a77fe7bb5e4c48650f52c295267671c5088f4d5031f730c944fd9f79837da0266a5c7cd92eee7c2e99450d SHA512 86fe1ac69d4f4a60361e1118217bff99f815acfa7def1efae6ce25d63feb4ec47ec8dde872bdd42b9c0a1297a33466ea76bd5c3d86bcb58d26ea5eac2f47e5bb
MISC metadata.xml 580 BLAKE2B 013a1f5cecbfa1086e720d341855be076e98b313f03ad99147bc692a5988fc6e0006545104cfe245798f88ab617c6e2c84928d0a73d127715dcb8ba352e8aa94 SHA512 611ed7b76b150a829902110a843a5a97622d2ec645850b6988c578496d716019e511830767a0c3dc300c69f02b5b933c806ea5598f6938b5d6b9d14b58985122

@ -10,7 +10,7 @@ SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc64-solaris ~x64-solaris"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc64-solaris ~x64-solaris"
IUSE="libressl ssl"
RESTRICT="test"

@ -1,4 +1,4 @@
DIST cli53-0.8.14.tar.gz 9263235 BLAKE2B 2df06c3de9372e5f3adb2fabdfa74525a880d41f9d28d356fda291baf576525b42ea3e42f354b9dd91b063485752d936710823d5a5c777cc1a4972dcdd382140 SHA512 b2e97ffea855ad1ac06ceb76b5cdffcd890d237a67abb0f3e9be035ca4438af0b0ccdfd86e7dc7e485ebd5ee12783c6e24c818757c29e80c8c4d6b67ed9f77cf
EBUILD cli53-0.8.14.ebuild 670 BLAKE2B ed344931c1d9fe73415e9d20ba2ba7d5a305de1275bb4be8e12a4c1de822b134847381bca90ca4db115db7c38f057c42c65d4639191d076414e7059f14b7d8de SHA512 01ab31c86c3847fde8b04eaeec28e536edf6fd12deb21c4851438b3290ec21e148ad68e5748383e5723797f78dd79379578c64ff70add428f5f255996e80b9c9
DIST cli53-0.8.15.tar.gz 9263514 BLAKE2B 9fd9342510146119e5b566f92a13d65fed3fec27017607e690c9fa14f7751e16cd2ee87e1d22f6c062257e6ed6e998d574a754af4ae5206bc128c24d72edb904 SHA512 849e7f1e868591e23b1a834b49afad08681ca367bce163bb2382c775eeb79a7db4d6212ad3140ba69b8d4a13fcf53a31f7d5f061e7f68cba1a933e35e7562e2d
EBUILD cli53-0.8.15.ebuild 670 BLAKE2B ed344931c1d9fe73415e9d20ba2ba7d5a305de1275bb4be8e12a4c1de822b134847381bca90ca4db115db7c38f057c42c65d4639191d076414e7059f14b7d8de SHA512 01ab31c86c3847fde8b04eaeec28e536edf6fd12deb21c4851438b3290ec21e148ad68e5748383e5723797f78dd79379578c64ff70add428f5f255996e80b9c9
EBUILD cli53-9999.ebuild 670 BLAKE2B ed344931c1d9fe73415e9d20ba2ba7d5a305de1275bb4be8e12a4c1de822b134847381bca90ca4db115db7c38f057c42c65d4639191d076414e7059f14b7d8de SHA512 01ab31c86c3847fde8b04eaeec28e536edf6fd12deb21c4851438b3290ec21e148ad68e5748383e5723797f78dd79379578c64ff70add428f5f255996e80b9c9
MISC metadata.xml 325 BLAKE2B 30e300a3cb064a2eaf04123f7e2943924e91515325d5b30c2a7aa2cc58b69f73ffb92c7da37a87eaf4e0925374234c7d6e1ea56634702879a8286b295fe64b74 SHA512 febb62ce8c56413c541726fdf6c61942a075b7c21d52ca24bb519fea2a271abc9034cc283f300fbf0458f73c6e5a4729308a3676899d0e5d3915d45939e88ad6

@ -1,7 +1,3 @@
DIST kpcli-3.0.pl 181841 BLAKE2B f55db76dc9036ccd2031a7f5f379e18aad8b52758fa7567547f79e0d1c0ae9f97b60d9a68f0587fe4d38d97dde2d89d9ea768ad14fbf4a398422befd00455c9d SHA512 fb1243ed81408507090ce6e7b06e958f923ac9c64e6994b104605bb85deb08e1b63b28fdb2c5a4eb24e128734b65ecb0209000f08ec9a7644f3d6a8fbb781587
DIST kpcli-3.1.pl 193792 BLAKE2B 6574916b020885443e68d2daa111e376847c6e0c5d5f4273293cc591bb5e31b8b1a2a43f984e22d2b959f71ed952936a00ea7cbf17fb047929004bce193b3d9e SHA512 2bcfaa4535fd35d7bbf512e704392e207237efa669bf5d6845d1657e44511f04b80fddd4404f3a8d409f330f8bfbb5cf9f1e09fb8a425685b3d7309a8040df5e
DIST kpcli-3.2.pl 197369 BLAKE2B 17a449c1727e8c9e79a5c45327debec1391e58012b2f94979a9431dfc45a0909b23f2e61717aaa2ea18153f420d8d8eba9fd4a5afa860b8478d58e044049322a SHA512 72374da627075a2a0a18932f0f4d48c77e23a8a3ac13599d7cebb6b3b685c2d1678bf8035651adeb471538b4da3825443a9e2a9a393e85be175637b0bfa611b9
EBUILD kpcli-3.0.ebuild 881 BLAKE2B 6badb5ef50f5c3324aa13cc6f1a3fe858dcd85a6b6a7cfaa8a103de303c50c546ae69797872be7f326020f8e34f98323714d3895dd7ae3cf806e07e01e03c670 SHA512 db94cfba8b4ab9ea55a405d95cf2bec7836ee563c2ca1599850b422b20c81984c345798b20c94471466ed1c25dfd083309c89a1573621dfea8ba3e91018aee7c
EBUILD kpcli-3.1.ebuild 933 BLAKE2B 948ea48b0e27fc2304b97b0de3ec5ffc96ce45f9780df71e3d8580c6f990faff3fd8d05466d9847c80d12275ae3f1d6e9e0dc7444913f392ef2091228bff945b SHA512 7aed92ec74ae4f429de373b0a2246c84fd1e31a08077890f08e5e6c7cbb199f15a985e64976aec26d5fc627b34031e8e48252d3304fcc97458d839735cb84743
EBUILD kpcli-3.2.ebuild 933 BLAKE2B e9a6198c62dcbe4a4c26aa6ae2421dfae0b0b149bb2d8c0c6cd802d4d432df699e8dc64baa415be77a530f3e95df74fc5c967ced9ae014487f9756429d1af032 SHA512 b8d077b1369186be0fd3edd9120980e6169596a6d27ee2e92e9f256feb714e43eefb30133e82df525cda29acea81be86f26457f016cc81c44b16f6b1018a8edd
MISC metadata.xml 336 BLAKE2B 5716721c6343ab66c74fb4c86e8d9e46d333d918dd3cd99e037221ad55a3b5ae6b3b1edff21775cc602eaa84a1c8246fcea23ca2cfacbd56243aa0a013707397 SHA512 0d14658777d24fe70a871694ef722f49bd02b138658316470f4a8d5bf83c068d7c9ace11c34423a3a73aefdf590e43f2b56d2578a08c67cbac179ef3b59ca42b
MISC metadata.xml 451 BLAKE2B d9b725122049d496ec367292c1f84973f7ecbdc8034e12a7995efabea8fc0be5ac5877ac7111eb2dd124a4748c203f83e3926ba5faa936f94be01395020d663d SHA512 6601863c3d6754d7bb1eb59fa76d79c5c250a2bd67deb12cb67e12ea67b5a7a59802253f852d0dc887ad4ef4d143849069c026104939e110749f81572c532478

@ -1,43 +0,0 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
DESCRIPTION="A command line interface to KeePass database files"
HOMEPAGE="http://kpcli.sourceforge.net"
SRC_URI="http://downloads.sourceforge.net/project/kpcli/${P}.pl"
LICENSE="|| ( Artistic GPL-1+ )"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="X"
DEPEND=""
RDEPEND="
dev-lang/perl
dev-perl/Clone
dev-perl/Crypt-Rijndael
dev-perl/TermReadKey
dev-perl/Sort-Naturally
dev-perl/Term-ShellUI
>=dev-perl/File-KeePass-0.30.0
virtual/perl-File-Spec
virtual/perl-Getopt-Long
virtual/perl-Digest-MD5
virtual/perl-Digest-SHA
virtual/perl-Data-Dumper
virtual/perl-Term-ANSIColor
virtual/perl-Carp
X? ( dev-perl/Clipboard )
"
src_unpack() {
mkdir "${S}" || die
cp "${DISTDIR}/${P}.pl" "${S}/${PN}" || die
}
src_compile() { :; }
src_install() {
dobin kpcli
}

@ -1,47 +0,0 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
DESCRIPTION="A command line interface to KeePass database files"
HOMEPAGE="http://kpcli.sourceforge.net"
SRC_URI="http://downloads.sourceforge.net/project/kpcli/${P}.pl"
LICENSE="|| ( Artistic GPL-1+ )"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="X"
DEPEND=""
RDEPEND="
dev-lang/perl
dev-perl/Clone
dev-perl/Crypt-Rijndael
dev-perl/TermReadKey
dev-perl/Sort-Naturally
dev-perl/Term-ShellUI
>=dev-perl/File-KeePass-0.30.0
virtual/perl-File-Spec
virtual/perl-Getopt-Long
virtual/perl-Digest-MD5
virtual/perl-Digest-SHA
virtual/perl-Data-Dumper
virtual/perl-Term-ANSIColor
virtual/perl-Time-Piece
virtual/perl-Carp
X? (
dev-perl/Capture-Tiny
dev-perl/Clipboard
)
"
src_unpack() {
mkdir "${S}" || die
cp "${DISTDIR}/${P}.pl" "${S}/${PN}" || die
}
src_compile() { :; }
src_install() {
dobin kpcli
}

@ -1,6 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>juippis@gentoo.org</email>
<name>Joonas Niilola</name>
</maintainer>
<maintainer type="project">
<email>perl@gentoo.org</email>
<name>Gentoo Perl Project</name>

@ -1,6 +1,6 @@
AUX ras-mc-ctl.openrc 295 BLAKE2B 8f6da9d6d4e392e4255ac70a57ece6e665771fc0f91c64506af6fd2157a5a4c159921ac341e66d18176434c523b6060c0cb2cabee6f7ca003e1896c0b6b6a266 SHA512 be635afaf5182907b4ae085d8c15b7aa6ae07e19a277423fe180a5e0524fa33747ceba8fe991cc263341b6c15443d3aff8f6c6c0311a87194687e25fa8387f32
AUX ras-mc-ctl.openrc-r1 419 BLAKE2B 50239d64b95c1759a2fb88107b78875b9f6227c256c2a59628b33dfaf720c649e714afe24424f34e865d1fc46145daa8deda4e8612ef6c0d11ef1bf67b2c2e88 SHA512 f12c82432086bfdd0ee24a767b2c6dae9a50cb65038189bfdc2aff9447e5e734e1277d809ed3c7a55ac31034773983e1f46f466adabdd4e727b491c260c5c53e
AUX rasdaemon.confd 107 BLAKE2B a3c0b7c09b1f3f76be0186208702858ca6ddcc9a9e912a88357e79e7f3aabe92b5a99f95c7bbe5ea1443e2ba2f8fcb83834b32a68774439165c7da0fff1d27ff SHA512 bc89a1fb03289bed3a34e84f593f5bc3506553ac64810ae360393cd33f6109e0a469990a79f2c56fc07905671c3e2fe9a70a65ba180df3855fdc4113ae5d4da3
AUX rasdaemon.confd 109 BLAKE2B 20f78ff36701aa718e5dcb36b79949ea5f887ddc65219c335dddabc3440007d91bc5b53ffc499aa6ca018dd8108a2ea841b8ae111b10877be2005cc8c1aca299 SHA512 9e240c3a4c2dd741d2a77a0a9458e960da5480c40cd9b829546e5189d222b643b52c15252a6dc78aab8661d6e3c13b8d2288176c25cd8873b93b874b8d3c6c49
AUX rasdaemon.openrc 369 BLAKE2B 81768b9a6cdf4696d8598dc61675b86f617ae543cdfda8166f961d9ab470ba107165b72be32370f71f52b07503f3ea948cf9d7ad10c2899e2e9b79f1e06e96de SHA512 eb91a3c54033a136e5b35aa769b5c01a0810970e77efa3f9efbcda5cf088e5268fd7bd9fff953bc47b9233a41e5321094b4d2ef85500dc0175f5be6a64c03105
AUX rasdaemon.openrc-r1 484 BLAKE2B dd64b1b6164f74e887ebff43116bd23311b86a7bbdf7830beb4ba27ad3e2db33e2107c7083c23f14e50e781a339e49be8a69ee902cfbc98713de034daa5a82a1 SHA512 e27c08bc118edd95468dd466aea52764df5b400ce9acf2043bd035d2fadbaa3b953794869c1fdaa23320e9529960e97c9e47dd31e8d8f3f48a324090f784907d
AUX rasdaemon.openrc-r2 424 BLAKE2B d3be2b06631ec3dc60e464b5fb38a4778e92a93fc284455f53f6b7c43a05d182b79f478362ed93a706b421ca99f6a21afdd2cbd53d125711bbf1d0f267304ace SHA512 2e30602222443e519cefc1f138dc537f5e22109fde2f8ebb0f8962abd926721389defc46cfa8db667db8618d4dc4257d36e9855367c3c8f2b7d28cb8684a4adf

@ -1,2 +1,2 @@
# pass the -record option if sqlite is enabled and you wish store events in sqlite
#RASDAEMON_ARGS=-record
# pass the --record option if sqlite is enabled and you wish store events in sqlite
#RASDAEMON_ARGS=--record

@ -38,6 +38,6 @@ EBUILD syslog-ng-3.17.2.ebuild 4920 BLAKE2B 2ee995d29e470961d08a0ed8dfeba52eb3a0
EBUILD syslog-ng-3.18.1.ebuild 4897 BLAKE2B e6159007fb47bbe44110bfdda23250761901deb7a071430bd7a37df197375d5f079f8d038b064961eb07cfb6e6bbd044e5bc96c94809af2078652418b07f6da7 SHA512 c1b00c4cc864f145097533d0a6708e1daf3d840c1aea660c149e970fff099b0d3fc83eb5cc4b480c37e5a0325c97a3cca14d1a869f3a14a3eb2055f9127b9421
EBUILD syslog-ng-3.19.1.ebuild 4920 BLAKE2B ad9cb81bc112bdbb4ae9cf36e53cd11eaa7380e180d2f44f025f46291a8c41c11071ad275d77a063e03ce0472c88c2341d3400a312988ebecbbfa173ad6b76bd SHA512 c937db23ab18b175b5f622a95701531ee43d42b9ca480778608e05fa57bf91635a8517b4f1b86a967d93815b7d77e7f45bb800a6cdb04db9e734a1cf3b0700c2
EBUILD syslog-ng-3.20.1.ebuild 4951 BLAKE2B 45ad3ab6ebacbc0b0d2da1ce090d53e1ffc97d2c18648bf6763e6b7e4c0c9f8fa7bf6e746f85553aeeee144e3bf8997d6e0534357ee900fa26408b94ff815a7e SHA512 1164b8784d1061af518017698e71ce7ff48ecbc1a964eba9babe8436af141a2be119a9bd3553d1d3b90026df27f051c3a70dff23a1c7614752627f8583d1b028
EBUILD syslog-ng-3.22.1.ebuild 4952 BLAKE2B b8f27bc4194886aa27125332321831bd962aa7fd196f49aef4a0441d545630cf00bb90212dc598610b2f3e091c18c2d953dfb2d3501d5cf8a74588f63792fe05 SHA512 7bafd1fd3e214176a2d4aa33f75ea3acf897f4dcff5f7bd2b1010424fca50e29ce4ee6efd965ceab3ec20792635469ca93785a6f1153cc796ee847bce1db78ee
EBUILD syslog-ng-3.22.1.ebuild 4951 BLAKE2B 246f528243cadb3b07b48450df8b24f56edc73f481c0ed5fae0f2853c698f8e2690371e783d536a6279b7da2a5eecafd7332482493218c604622d892036b719c SHA512 fc497f0dd6e92f67d6d015e89ca6722dcb862ad40725abc3e1595e29af58432bf34ab606545219fb2eddb161acb0c649cc2de13f11d5c8f18dda159e3b094326
EBUILD syslog-ng-3.7.3.ebuild 3974 BLAKE2B caa4bbf5823b17ebd2a7409294508712c16927ae7211b364b0462edfbd954d97c83b223a84a0370b54daa819d6490c92c0d88d657948cd3ec6d11f0da011a59d SHA512 1d8cd3d4e81963d0edbfde50d8c137d70fc8cce664cb1696504111d50a355659d87e3ad5d85040b4b89c026a57931ad2184adffb3b7642319cc3f317fc63a158
MISC metadata.xml 1252 BLAKE2B 08f7e05955fc5e4690e2cbe78046c4aa3d298c2f20fe98b32eb49916c1fbb428febe7fee7cb3595b76190b90375eb2816b82379c4ceb690428bcc9b45cabad3f SHA512 a85893da037c9917697bd901825a304da4010208fcb5b0682a47d17bb0ce60677604955847d68c18792fa87cce42e19019aa08e8343e0a8799997894ee5f6158

@ -13,7 +13,7 @@ SRC_URI="https://github.com/balabit/syslog-ng/releases/download/${P}/${P}.tar.gz
LICENSE="GPL-2+ LGPL-2.1+"
SLOT="0"
KEYWORDS="alpha amd64 ~arm arm64 ~hppa ia64 ~mips ppc ppc64 ~riscv ~s390 ~sh sparc x86"
KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~mips ppc ppc64 ~riscv ~s390 ~sh sparc x86"
IUSE="amqp caps dbi geoip geoip2 http ipv6 json kafka libressl mongodb pacct python redis smtp snmp spoof-source systemd tcpd"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
# unit tests require https://github.com/Snaipe/Criterion with additional deps

@ -2,10 +2,12 @@ AUX sysstat-11.0.4-cron.patch 1609 BLAKE2B b190f9b6e47da5240ced4fed912bdcdb130d8
AUX sysstat-11.7.3-flags.patch 274 BLAKE2B 67abbdad7a4cf9f20af1baf16e0c73c63f49718cc0fb3c70bc681e8cdda29394ea5a75d871c76f658305b26d44d1034d09079f3b6306a4dd466cd0775b5514b2 SHA512 80dd658b06f2e1072a3a58bbe84770170f1cb6c3e2ae0d660713a007b0e9e59c45b710cc1484c94ec466759455ae18a7fbae237b6674ee9ddb43a7a4502cb0d5
AUX sysstat.init.d 378 BLAKE2B fe781f1a53e183023da2b46ecefb37881eedf8e8df2623927b24f33aa3344776b39db038d598ad050f1d48462d52300fb17731f29b0a8ab9c800fbe379efa249 SHA512 328ee3d40d45a0b1702c74fe0195ce4444cc8f63cb0fa68ba40ca20cfa183dd7acf4fc846cd76a4bcf426a3b4064316061dbbf26ca20047711528399e17b20b4
DIST sysstat-12.0.5.tar.gz 711967 BLAKE2B 96aa49d82e71407dbd99d840ca5f71af83f54ba6315c858fae71f97290e8cf9c4f5358ad6389c7489366a62667c35835151e3187382a56c98153d3a04bcc2b8d SHA512 c1061f1af35430e81e488e4b2f18b8588ec4f3c419ade004c49ca24baf60b5b76a6a59eb25f3b17b51a9f60c5833a914a514872d0235b2ca405341a2f4a32cb3
DIST sysstat-12.1.4.tar.gz 738031 BLAKE2B 6803a727bb67e5027400f684d9d93efa6ca22526a1363e04f8bce06a6cd300d4ebf7e02c8f9048fc25794974efa38117dacdf12831bee4bfd43fe40d0b34dbb6 SHA512 e60721408861045bcb1a52b170682df54631926bf4eef5a2709e25b1469c13377026bac3e51f5eeed11c7149b916c00bf5c06a2ff65d9c28063de1ae108b61c2
DIST sysstat-12.0.6.tar.gz 712148 BLAKE2B 1118ce071e06c2853ffdec2be1b8b3bf060571caf988e17e04ff62cbf43e7111c5951a131d176b49ad35e1da75d2b8936e23f1a385e1c83a013b802a0fc36003 SHA512 e8f542b26c2b0b7b3aadbf34dce640879d27f8f1659447f15ffb5a210987c74840418046409403da85a9eb4c01484615d230ddc700611b7c0088d72165bffe86
DIST sysstat-12.1.5.tar.gz 1032031 BLAKE2B 9fbc0c0d132983daa334345f1f83ac8a46092cf52f35bafd443febd8ce40e4ab11b5b9b05b92e4074ecf9feab682035b2e08094ce10f3287036821be57db0800 SHA512 9dbc44b0226efc2f219ff71d2f0b83c930263fe8d6d0b451ae8404b3056558de04c76c16f2e8ba62083cde3a37cabbcd466d9247bd61ba5921dbc2ab6a1f686b
DIST sysstat-12.1.6.tar.gz 1089333 BLAKE2B 3a3c3867b6b78ca1da7d5ef5838f5aad490e6d454aff3e8db266136ce7666112bcd1ad05b727c2455c16e53f6c84e0e75e32e8f4cc9318300aa9076921f68c1c SHA512 9c03e911fd6843b1719e080fce429e0d33f73f01619251f425dd4bbcc9d2764cd9beb8f8ebb4406b9540634d36c83303c10abcf682b079d35045454b1541984d
EBUILD sysstat-12.0.5.ebuild 1693 BLAKE2B 13fe90d234884fe0e164ac2e2e69643383b6e2dd6048d8886f2871d5fd5e77dd81bd4e9a2b83f0e2e2a604d71cbbf1cc44eb1f320ef7c4d7114da1b3359999f0 SHA512 b072840085d01d79dff0b65988f54425dc900f7c2d98c9e3ed20fc91ab3e886fc117ae6d0d3327d2fa3ec40c46ff1dd25bd6f9a9005e52c4b845dc1429d10d15
EBUILD sysstat-12.1.4.ebuild 1838 BLAKE2B caa28ea7a3eff2d9eb22a805485b31923ea3071757cc37af64ab55e412047eef1f4062d0df9f5c6cea958262190f466d2bd290187faae021fe44f06fdda1c1ed SHA512 a21db0825e71acba0c9ff658b9530f8ef00593a6d95dd5ce0c4ef8212af5f54bccda5f9a6ff2fee444245521c4eb50120f80dec434fdbfcf74696bf82e6661cf
EBUILD sysstat-12.0.6.ebuild 1694 BLAKE2B f17e881c4322bd2ac87ce15d19f3dab84dec949c7c5c6fb25d1760546a116ff7191dc6904f86fcb835fd92b08edac261ed8888eb37fb7519f6ba9f161dd6af44 SHA512 09e75c118e1557209e51191efa50af6269b50416d0f387d518a5a3916f3e0d1d522049dcd631ebcdc39a72861209b48e4715989d0b764bae9c9a630bcdc649ec
EBUILD sysstat-12.1.5.ebuild 1708 BLAKE2B 3ba833b6ff81e4a5599367e15bac6370ef91069ee909a05c22b339faee931c8f6b84cef9795585b3b1f94f09bbf7f99624047fbcb814ba3581176d4db48ba0d0 SHA512 960934a753749b6a82368da345402c434810e1e8eb98575ef3363b95f9f99a918e70b1882fda51bb9bc349dbffcdf53e55553318c85eec97484a62bc03dcbf93
EBUILD sysstat-999999.ebuild 1741 BLAKE2B 17d47e7c1a6f90d9930b1291d54f684889e7f617cd29030cdfecd4909c50c4008e5a35a860a2b1b165c432d7b444debf2fbd2f8aecafe51532ee3b35740f126e SHA512 450f00d7fdd18fff61eac06f2c4cb02aff1a540593812965aa8f29f3338da6c0950e89314eab5fe870a8d024e58126b7015f1b1c920b5a9012099c54a3394260
EBUILD sysstat-12.1.6.ebuild 1701 BLAKE2B 8158defd39b0bee0414fbf72509c687cac2138f06d5db309b0d4b52d729a66bff4f9f59048150eb69dd93377aaef9deb78d263a87e0d7a9eeea1c882d8ca98c5 SHA512 8b63f4400cbfd2ff99a9e73aa377a5fe01a5fd9e730839e4b1b2bc469d5400e772bc27e89dbb3387c25e23c665f6a8f7441e87df27433b6764b490646fdce7be
EBUILD sysstat-999999.ebuild 1597 BLAKE2B f7f0260cfa097d792c587b41148bc300c1ee20e0b2b91f3307e0bbae32f8eed00d2a3e925967b754d3e7f5492d56b604a7fe417d633252a573acd4c8244b720d SHA512 be8c3366fcb833b47dc82076616b6ea95e87592bb62377d0c07268ca0fe8651130eb843374c965f519bc1eddf3fe2a97c119c2a29c2de9e9e6384d3fc5765ba7
MISC metadata.xml 238 BLAKE2B 72d4053d28bbf82c9a08a88b354321a782501542b5d506fc6d9f4034839f302761124d59445c0414a0fd38b6401cd5fbe06670802abdb1f25c7cb60919ea5d2e SHA512 b0b981ef72f4d295f427f92dc9931553b4fb7a91c8ed63fa1f28bdbe8bc61d6f0943e1217eb7b61b8d85d9685cbe759db49f094a18a1461cb48429affe76d993

@ -1,8 +1,8 @@
# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
inherit eutils flag-o-matic multilib systemd toolchain-funcs
EAPI=7
inherit flag-o-matic systemd toolchain-funcs
DESCRIPTION="System performance tools for Linux"
HOMEPAGE="http://pagesperso-orange.fr/sebastien.godard/"
@ -30,8 +30,6 @@ PATCHES=(
"${FILESDIR}"/${PN}-11.7.3-flags.patch
)
SYSSTAT_FAKE_RC_DIR=Gentoo-does-not-use-rc.d
src_prepare() {
if use nls; then
strip-linguas -i nls/
@ -52,9 +50,8 @@ src_configure() {
tc-export AR
use static && append-ldflags -static
sa_lib_dir=/usr/$(get_libdir)/sa \
sa_lib_dir=/usr/lib/sa \
conf_dir=/etc \
rcdir=${SYSSTAT_FAKE_RC_DIR} \
econf \
$(use_enable debug debuginfo) \
$(use_enable lm_sensors sensors) \
@ -77,9 +74,8 @@ src_install() {
dodoc -r contrib/
rm -r "${D}/${SYSSTAT_FAKE_RC_DIR}" || die
newinitd "${FILESDIR}"/${PN}.init.d ${PN}
systemd_dounit ${PN}.service
rm -f "${D}"usr/share/doc/${PF}/COPYING
rm "${D}"/usr/share/doc/${PF}/COPYING || die
}

@ -0,0 +1,81 @@
# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
inherit flag-o-matic systemd toolchain-funcs
DESCRIPTION="System performance tools for Linux"
HOMEPAGE="http://pagesperso-orange.fr/sebastien.godard/"
SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
IUSE="debug nls lm_sensors selinux static"
CDEPEND="
nls? ( virtual/libintl )
lm_sensors? ( sys-apps/lm_sensors:= )
"
DEPEND="
${CDEPEND}
nls? ( sys-devel/gettext )
"
RDEPEND="
${CDEPEND}
selinux? ( sec-policy/selinux-sysstat )
"
PATCHES=(
"${FILESDIR}"/${PN}-11.0.4-cron.patch
"${FILESDIR}"/${PN}-11.7.3-flags.patch
)
src_prepare() {
if use nls; then
strip-linguas -i nls/
local lingua pofile
for pofile in nls/*.po; do
lingua=${pofile/nls\/}
lingua=${lingua/.po}
if ! has ${lingua} ${LINGUAS}; then
rm "nls/${lingua}.po" || die
fi
done
fi
default
}
src_configure() {
tc-export AR
use static && append-ldflags -static
sa_lib_dir=/usr/lib/sa \
conf_dir=/etc \
econf \
$(use_enable debug debuginfo) \
$(use_enable lm_sensors sensors) \
$(use_enable nls) \
--enable-copy-only \
--enable-documentation \
--enable-install-cron \
--with-systemdsystemunitdir=$(systemd_get_systemunitdir)
}
src_install() {
keepdir /var/log/sa
emake \
CHOWN=true \
DESTDIR="${D}" \
DOC_DIR=/usr/share/doc/${PF} \
MANGRPARG='' \
install
dodoc -r contrib/
newinitd "${FILESDIR}"/${PN}.init.d ${PN}
systemd_dounit ${PN}.service
rm "${D}"/usr/share/doc/${PF}/COPYING || die
}

@ -1,8 +1,8 @@
# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
inherit eutils flag-o-matic git-r3 multilib systemd toolchain-funcs
EAPI=7
inherit flag-o-matic git-r3 systemd toolchain-funcs
DESCRIPTION="System performance tools for Linux"
HOMEPAGE="http://pagesperso-orange.fr/sebastien.godard/"
@ -30,8 +30,6 @@ PATCHES=(
"${FILESDIR}"/${PN}-11.7.3-flags.patch
)
SYSSTAT_FAKE_RC_DIR=Gentoo-does-not-use-rc.d
src_prepare() {
if use nls; then
strip-linguas -i nls/
@ -52,9 +50,8 @@ src_configure() {
tc-export AR
use static && append-ldflags -static
sa_lib_dir=/usr/$(get_libdir)/sa \
sa_lib_dir=/usr/lib/sa \
conf_dir=/etc \
rcdir=${SYSSTAT_FAKE_RC_DIR} \
econf \
$(use_enable debug debuginfo) \
$(use_enable lm_sensors sensors) \
@ -77,9 +74,8 @@ src_install() {
dodoc -r contrib/
rm -r "${D}/${SYSSTAT_FAKE_RC_DIR}" || die
newinitd "${FILESDIR}"/${PN}.init.d ${PN}
systemd_dounit ${PN}.service
rm -f "${D}"usr/share/doc/${PF}/COPYING
rm "${D}"/usr/share/doc/${PF}/COPYING || die
}

Binary file not shown.

@ -1,10 +1,4 @@
AUX libarchive-3.3.1-libressl.patch 1069 BLAKE2B 0fb6c7c3d85b620387e76e6e2fb7b787effe8fb8c9bd911561e348eb7d0c7cbd504d8932ff5d7c2856649948c556b3807a0fc6019ef4d38fa37d873729275e17 SHA512 d82e3de1201168f6e187824e237f35a9581c34450043ce84478aca3ca74df7b00bbcba5bc462f354837e1720bcc135ce4864f81cfd499b398b1939b886b7fd3f
AUX libarchive-3.3.2-libressl.patch 1105 BLAKE2B 9b62a5b4029b8c0fd97d4c5012fac9a7dd25655e3b0d8adbcb839f05c1999eb77b902ef476841af8eb8b9de76ce9bad893d065084121434f06717d5f4db93b29 SHA512 ffcc66414f72ee2262544f4d59ca2d0b83ba2eca4f58261ec4694f5cd5d5d7975d9626a1f9ad8a1047d3e656d4dc98dd28d991ef3e6311959d8bf797ad6bc936
AUX libarchive-3.3.3-libressl.patch 458 BLAKE2B 883523792c0d3e964a2bf9ae40d25a0127e43a2d95e0187d566fd371aa7ecc0861d99ab21641e9f2d6800b36155e3b845c1099ec7b1d3dc0f3c0fe2b78c9e273 SHA512 0a8dfd7f30ca450cf253bd475d328a886957257e1c7c6a6c9eace4cacdefd9f1eaeb4de81ad00a2439bb75336a82b08278f98c6143803f6047159036e848aabe
DIST libarchive-3.3.1.tar.gz 6219943 BLAKE2B fc951a613098060d55c000436ccdc6997126be2e1eeb41f348ca20c1ae3e54936ae053404fdd3211de90a2a223b29f5a80c580a937878a37265401d55655fff1 SHA512 90702b393b6f0943f42438e277b257af45eee4fa82420431f6a4f5f48bb846f2a72c8ff084dc3ee9c87bdf8b57f4d8dddf7814870fe2604fe86c55d8d744c164
DIST libarchive-3.3.2.tar.gz 6236562 BLAKE2B da26474b4fd8111561c1e5ac12a6333a8ba8a23cce9e9cdce7b50647ab8dbae08609ea1bffbab60da74c6555ebf0815c456fe69c72129eb6071fb845141d0beb SHA512 1e538cd7d492f54b11c16c56f12c1632ba14302a3737ec0db786272aec0c8020f1e27616a7654d57e26737e5ed9bfc9a62f1fdda61a95c39eb726aa7c2f673e4
DIST libarchive-3.3.3.tar.gz 6535598 BLAKE2B 627949d24572b8345800e72a24d1e8d95cd0f19bb7fab70e2f36be011fee6f345eecfa9563640068b10888520aafdf30b1e3426b7e2743589cabd3ab5c270a22 SHA512 9d12b47d6976efa9f98e62c25d8b85fd745d4e9ca7b7e6d36bfe095dfe5c4db017d4e785d110f3758f5938dad6f1a1b009267fd7e82cb7212e93e1aea237bab7
EBUILD libarchive-3.3.1.ebuild 3438 BLAKE2B af5fa17a2a5ff850d88e81dbb88f2e275f4f601b1e61f7e067ff3c6806cb0bb115c307862ba5e74fb913aff9a7bda1399860e220e69c17826cae065e04a78d4a SHA512 31ae25cf9ec76a27098861dcec1a8a80fbfd132296febd7db47c10a8a34dc08a04657d41f66a3aacb0048e4154d740b8d346a287298e9067d555e8908b668194
EBUILD libarchive-3.3.2.ebuild 3509 BLAKE2B 7338b74ba0ba1b9a120ddae5a320a834e6ce8cef981a2ad59aa26c6973a26e1088094a30334b50a013c34986dec783b872d9c57b117bddd90a11d048c7ebda02 SHA512 6affef3f8d8613fa74dedbf4788eaa103ba4bda8107084197f1790ea6ebd78ce7699dd4ee2ed718ea6c776e4a8b1572e8c00710e994f48f419374cff8d2034f4
EBUILD libarchive-3.3.3.ebuild 3625 BLAKE2B 572ade5c05fa4a9951c6ffca4ccf5dfecbaa1a13538ec8f7589823b7dd90f3476722f92afa79d615236811f8838f852c2a68803ac74756022eb9167607de32df SHA512 e87384a803a6a4148517ce235f2be295f6b59c7e8e0bba6a9c0c2b1bc3be90d5eb41d1763efe70a30fce202c77bd3e56b71213135dec26aaf8a5540cc46f1c60
MISC metadata.xml 1447 BLAKE2B 342ab0c5aeb3fdae86b39228d4df3c98163b55c1fa23318b2b7a22f714303f1f0615d60d9c057b0a91f90e61e6a7357043096463ca3efe1e8d5cbcd2a5897ce9 SHA512 85b5c67f258ab07b14f15967024bd5d1f11a81bd203e67d40398b42b3728735e28cf2645a0db865c6b6ed81a64da6de470ce62c882d0f72dbceb5361f791b81d

@ -1,25 +0,0 @@
--- a/libarchive/archive_openssl_evp_private.h 2017-01-29 05:06:27.000000000 +0000
+++ b/libarchive/archive_openssl_evp_private.h 2018-04-19 04:00:14.061922747 +0000
@@ -28,7 +28,8 @@
#include <openssl/evp.h>
#include <openssl/opensslv.h>
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || \
+(defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L)
#include <stdlib.h> /* malloc, free */
#include <string.h> /* memset */
static inline EVP_MD_CTX *EVP_MD_CTX_new(void)
--- a/libarchive/archive_openssl_hmac_private.h 2017-01-29 05:06:27.000000000 +0000
+++ b/libarchive/archive_openssl_hmac_private.h 2018-04-19 04:02:18.309167446 +0000
@@ -28,7 +28,8 @@
#include <openssl/hmac.h>
#include <openssl/opensslv.h>
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || \
+(defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L)
#include <stdlib.h> /* malloc, free */
#include <string.h> /* memset */
static inline HMAC_CTX *HMAC_CTX_new(void)

@ -1,25 +0,0 @@
--- a/libarchive/archive_openssl_evp_private.h 2017-01-29 05:06:27.000000000 +0000
+++ b/libarchive/archive_openssl_evp_private.h 2018-04-19 04:00:14.061922747 +0000
@@ -28,7 +28,8 @@
#include <openssl/evp.h>
#include <openssl/opensslv.h>
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || \
+(defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L)
#include <stdlib.h> /* malloc, free */
#include <string.h> /* memset */
static inline EVP_MD_CTX *EVP_MD_CTX_new(void)
--- a/libarchive/archive_openssl_hmac_private.h 2017-01-29 05:06:27.000000000 +0000
+++ b/libarchive/archive_openssl_hmac_private.h 2018-04-19 04:02:18.309167446 +0000
@@ -28,7 +28,8 @@
#include <openssl/hmac.h>
#include <openssl/opensslv.h>
-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || \
+(defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L)
#include <stdlib.h> /* malloc, free */
#include <string.h> /* memset */
static inline HMAC_CTX *HMAC_CTX_new(void)

@ -1,122 +0,0 @@
# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
inherit eutils libtool multilib-minimal toolchain-funcs
DESCRIPTION="Multi-format archive and compression library"
HOMEPAGE="https://www.libarchive.org/"
SRC_URI="https://www.libarchive.org/downloads/${P}.tar.gz"
LICENSE="BSD BSD-2 BSD-4 public-domain"
SLOT="0/13"
KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="acl +bzip2 +e2fsprogs expat +iconv kernel_linux libressl lz4 +lzma lzo nettle static-libs +threads xattr +zlib"
RDEPEND="
acl? ( virtual/acl[${MULTILIB_USEDEP}] )
bzip2? ( app-arch/bzip2[${MULTILIB_USEDEP}] )
expat? ( dev-libs/expat[${MULTILIB_USEDEP}] )
!expat? ( dev-libs/libxml2[${MULTILIB_USEDEP}] )
iconv? ( virtual/libiconv[${MULTILIB_USEDEP}] )
kernel_linux? (
xattr? ( sys-apps/attr[${MULTILIB_USEDEP}] )
)
!libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
lz4? ( >=app-arch/lz4-0_p131:0=[${MULTILIB_USEDEP}] )
lzma? ( app-arch/xz-utils[threads=,${MULTILIB_USEDEP}] )
lzo? ( >=dev-libs/lzo-2[${MULTILIB_USEDEP}] )
nettle? ( dev-libs/nettle:0=[${MULTILIB_USEDEP}] )
zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )"
DEPEND="${RDEPEND}
kernel_linux? (
virtual/os-headers
e2fsprogs? ( sys-fs/e2fsprogs )
)"
PATCHES=(
"${FILESDIR}"/${PN}-3.3.1-libressl.patch
)
# Various test problems, starting with the fact that sandbox
# explodes on long paths. https://bugs.gentoo.org/598806
RESTRICT="test"
src_prepare() {
default
elibtoolize # is required for Solaris sol2_ld linker fix
}
multilib_src_configure() {
export ac_cv_header_ext2fs_ext2_fs_h=$(usex e2fsprogs) #354923
local myconf=()
myconf=(
$(use_enable acl)
$(use_enable static-libs static)
$(use_enable xattr)
$(use_with bzip2 bz2lib)
$(use_with expat)
$(use_with !expat xml2)
$(use_with iconv)
$(use_with lz4)
$(use_with lzma)
$(use_with lzo lzo2)
$(use_with nettle)
$(use_with zlib)
)
if multilib_is_native_abi ; then myconf+=(
--enable-bsdcat=$(tc-is-static-only && echo static || echo shared)
--enable-bsdcpio=$(tc-is-static-only && echo static || echo shared)
--enable-bsdtar=$(tc-is-static-only && echo static || echo shared)
); else myconf+=(
--disable-bsdcat
--disable-bsdcpio
--disable-bsdtar
); fi
ECONF_SOURCE="${S}" econf "${myconf[@]}"
}
multilib_src_compile() {
if multilib_is_native_abi ; then
emake
else
emake libarchive.la
fi
}
multilib_src_test() {
# Replace the default src_test so that it builds tests in parallel
multilib_is_native_abi && emake check
}
multilib_src_install() {
if multilib_is_native_abi ; then
emake DESTDIR="${D}" install
# Create symlinks for FreeBSD
if ! use prefix && [[ ${CHOST} == *-freebsd* ]]; then
# Exclude cat for the time being #589876
for bin in cpio tar; do
dosym bsd${bin} /usr/bin/${bin}
echo '.so bsd${bin}.1' > "${T}"/${bin}.1
doman "${T}"/${bin}.1
done
fi
else
emake DESTDIR="${D}" \
install-includeHEADERS \
install-libLTLIBRARIES \
install-pkgconfigDATA
fi
# Libs.private: should be used from libarchive.pc instead
prune_libtool_files
}
multilib_src_install_all() {
cd "${S}" || die
einstalldocs
}

@ -1,128 +0,0 @@
# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
inherit eutils libtool multilib-minimal toolchain-funcs
DESCRIPTION="Multi-format archive and compression library"
HOMEPAGE="https://www.libarchive.org/"
SRC_URI="https://www.libarchive.org/downloads/${P}.tar.gz"
LICENSE="BSD BSD-2 BSD-4 public-domain"
SLOT="0/13"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="acl +bzip2 +e2fsprogs expat +iconv kernel_linux libressl lz4 +lzma lzo nettle static-libs +threads xattr +zlib"
RDEPEND="
acl? ( virtual/acl[${MULTILIB_USEDEP}] )
bzip2? ( app-arch/bzip2[${MULTILIB_USEDEP}] )
expat? ( dev-libs/expat[${MULTILIB_USEDEP}] )
!expat? ( dev-libs/libxml2[${MULTILIB_USEDEP}] )
iconv? ( virtual/libiconv[${MULTILIB_USEDEP}] )
kernel_linux? (
xattr? ( sys-apps/attr[${MULTILIB_USEDEP}] )
)
!libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
lz4? ( >=app-arch/lz4-0_p131:0=[${MULTILIB_USEDEP}] )
lzma? ( app-arch/xz-utils[threads=,${MULTILIB_USEDEP}] )
lzo? ( >=dev-libs/lzo-2[${MULTILIB_USEDEP}] )
nettle? ( dev-libs/nettle:0=[${MULTILIB_USEDEP}] )
zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )"
DEPEND="${RDEPEND}
kernel_linux? (
virtual/os-headers
e2fsprogs? ( sys-fs/e2fsprogs )
)"
PATCHES=(
"${FILESDIR}"/${PN}-3.3.2-libressl.patch
)
# Various test problems, starting with the fact that sandbox
# explodes on long paths. https://bugs.gentoo.org/598806
RESTRICT="test"
src_prepare() {
default
elibtoolize # is required for Solaris sol2_ld linker fix
}
multilib_src_configure() {
export ac_cv_header_ext2fs_ext2_fs_h=$(usex e2fsprogs) #354923
local myconf=()
myconf=(
$(use_enable acl)
$(use_enable static-libs static)
$(use_enable xattr)
$(use_with bzip2 bz2lib)
$(use_with expat)
$(use_with !expat xml2)
$(use_with iconv)
$(use_with lz4)
$(use_with lzma)
$(use_with lzo lzo2)
$(use_with nettle)
$(use_with zlib)
)
if multilib_is_native_abi ; then
myconf+=(
--enable-bsdcat=$(tc-is-static-only && echo static || echo shared)
--enable-bsdcpio=$(tc-is-static-only && echo static || echo shared)
--enable-bsdtar=$(tc-is-static-only && echo static || echo shared)
)
else
myconf+=(
--disable-bsdcat
--disable-bsdcpio
--disable-bsdtar
)
fi
ECONF_SOURCE="${S}" econf "${myconf[@]}"
}
multilib_src_compile() {
if multilib_is_native_abi ; then
emake
else
emake libarchive.la
fi
}
multilib_src_test() {
# Replace the default src_test so that it builds tests in parallel
multilib_is_native_abi && emake check
}
multilib_src_install() {
if multilib_is_native_abi ; then
emake DESTDIR="${D}" install
# Create symlinks for FreeBSD
if ! use prefix && [[ ${CHOST} == *-freebsd* ]]; then
# Exclude cat for the time being #589876
for bin in cpio tar; do
dosym bsd${bin} /usr/bin/${bin}
echo '.so bsd${bin}.1' > "${T}"/${bin}.1
doman "${T}"/${bin}.1
done
fi
else
local install_targets=(
install-includeHEADERS
install-libLTLIBRARIES
install-pkgconfigDATA
)
emake DESTDIR="${D}" "${install_targets[@]}"
fi
# Libs.private: should be used from libarchive.pc instead
prune_libtool_files
}
multilib_src_install_all() {
cd "${S}" || die
einstalldocs
}

@ -1,3 +1,3 @@
DIST pigz-2.4.tar.gz 98234 BLAKE2B 763fe3975c6a83f46b94741d4e16b40a4edef20b7677e8d32b99856498f951edebd86634c227b0f212f0aff87fd3626e21348fdb3839a6abfb21a547bed88be6 SHA512 79b2357176f93b9f3e2bc07fee393fc4d79b7bd0041808f8ddfd23eafccde72e60ca95e97595bb624a4f732fe3612bf46d57c44541c36ae62f9aa6336abe16ba
EBUILD pigz-2.4.ebuild 938 BLAKE2B f9c25221d2c94f624905cac3e7da6fededa08879e5c381f9184851cdadab327f782c2064bda6405da255738a8fe4f3ae6d644ff06926e2fe19cb6fc8420b315d SHA512 8ad324443df24c0166caf1a9e46f474e6452a41772dbc2525eec738122a0366b8c5f59865c989d4bf1549ce74144c029167768c68840bbb9e9adc7cbb500ead3
EBUILD pigz-2.4.ebuild 962 BLAKE2B eae850ab8f99931694b69edb474996f531673049bd83ff7318e868f6da086c9106e6c98a87da2b78aba2106853c9ac609c6e50cd74496bf400c03a48d17e1b4c SHA512 6e321cd89df80d9386b7edb5cc72e4c5ac1c1d253ee74ccafcd3c8e529b9da5624216b216cd7a012269f06c731d8018b1b6dff124b2787cfe04fc8db04239d3f
MISC metadata.xml 499 BLAKE2B a3f4937154e9907d34d3779407b1bfc07e8de329cb34b0efe4b62f20b4c9f5b9eb09d22023496e4f5228f1cb64bb4829c30730fe6035128b14e759073ec83a82 SHA512 7c954984f01ee2bf1bb9b8f0840445fed7f47899188a884462c59a862bef568845c2cb81a966aa6d46222d45ab7a9fabfc24b1bb4d178f9f8fb1789554ca87fe

@ -1,4 +1,4 @@
# Copyright 1999-2018 Gentoo Foundation
# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@ -13,6 +13,7 @@ LICENSE="ZLIB"
SLOT="0"
KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~ppc-macos ~sparc64-solaris"
IUSE="static symlink test"
RESTRICT="!test? ( test )"
LIB_DEPEND="sys-libs/zlib[static-libs(+)]"
RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"

@ -1,4 +1,4 @@
DIST vimball-0.5.1.tar.gz 5246 BLAKE2B 8ce95bfe8872f69e501b4453e5a6644d8019367173f8675325775dee58e08618b9ec0908bca9df04839bc165b086d8e5195a0753827d6038d8ccd8adbab80c35 SHA512 f89ba7291e3f4146f2ada7934b0ca74524abc639e586da12e19882e9aebe3f14858a6145b830a32dc19b0deb61f652375d8a56dc7847fd0061d14a2d77208549
EBUILD vimball-0.5.1.ebuild 651 BLAKE2B f83423486466be61904bf00b08e7dd9dd44773f9a81703549a361a883b857260cec07ba1f806b099c048678e2bae585e4a6b7070364cd06f5bd30a10ad237b5c SHA512 b037210fe9ed5e1d87e2ed506e326d4dc13e42684bc270d1f5d781c99bca013207ddc7a24bc7184c6beead1c3579bf23d4bd31ac45827c88c434eebc653ebf94
EBUILD vimball-9999.ebuild 649 BLAKE2B 51ebe4c37ebd19274da33409d6db542fd4662a06dfa4d4082dd49f6e1170609e97701a962baf10f0addba1643c167a0ba7831138b726e3cad4f51b77040c3196 SHA512 eae5e949a63aa704b368723c07cdf072735c677c3bbd7a6fd1fa31569c716a86462db57c5c16f43b0b7a1eed12762f552b1123627f597685bedfb3aa7873e3ec
EBUILD vimball-0.5.1.ebuild 691 BLAKE2B 29527bfb7f6ea8a6af08ff2f935d3a4482b633548c8382e9e6b66934f6a9c158411c47e7be748f7ba280474ee9e885f7ace09c5dcd83f1d6c4bbe7fcbddefb6c SHA512 2c7965147ed6570b9617e58d1687ae090cf274546674f27dedeffbe3c3bcaf1a896c6432973c1a12a9444b98b5d9e36ccab9a264db23d94b69a5441f7e720981
EBUILD vimball-9999.ebuild 691 BLAKE2B 29527bfb7f6ea8a6af08ff2f935d3a4482b633548c8382e9e6b66934f6a9c158411c47e7be748f7ba280474ee9e885f7ace09c5dcd83f1d6c4bbe7fcbddefb6c SHA512 2c7965147ed6570b9617e58d1687ae090cf274546674f27dedeffbe3c3bcaf1a896c6432973c1a12a9444b98b5d9e36ccab9a264db23d94b69a5441f7e720981
MISC metadata.xml 385 BLAKE2B 5fa1db1263983a5d57031cb72bf9e2b7074faf2134bea6a8cc02d67f9e48ce198c2a8d4a478029d9e3303555c9d248f96e83e6e8071ea7b055f90bb25d38402c SHA512 7086cce11a9a20d93dd24741e060d289c90bbc3c20d5102452d4c987597921b00195badd68d916a64b03faa5dae1fa4adb68654bce5c70c2e1cfa5d8417b33c3

@ -1,8 +1,8 @@
# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
PYTHON_COMPAT=( python{3_5,3_6} )
EAPI=7
PYTHON_COMPAT=( python{3_5,3_6,3_7} )
inherit distutils-r1
if [[ ${PV} == *9999 ]] ; then
@ -19,10 +19,11 @@ HOMEPAGE="https://github.com/radhermit/vimball"
LICENSE="MIT"
SLOT="0"
IUSE="test"
RESTRICT="!test? ( test )"
RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
DEPEND="${RDEPEND}
test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
RDEPEND="${BDEPEND}"
DEPEND="test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
python_test() {
esetup.py test

@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=7
PYTHON_COMPAT=( python3_{6,7} )
PYTHON_COMPAT=( python{3_5,3_6,3_7} )
inherit distutils-r1
if [[ ${PV} == *9999 ]] ; then
@ -19,10 +19,11 @@ HOMEPAGE="https://github.com/radhermit/vimball"
LICENSE="MIT"
SLOT="0"
IUSE="test"
RESTRICT="!test? ( test )"
RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
DEPEND="${RDEPEND}
test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
RDEPEND="${BDEPEND}"
DEPEND="test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
python_test() {
esetup.py test

Binary file not shown.

@ -1,6 +1,6 @@
AUX Makefile.patch 348 BLAKE2B 016aba350938f561865925b5ac5aea0502b5db4a9799ecf72de26a51d1c522f37a7ddcd44a6d69d50f16bd179b185103514dabb10eb74e4dadc46ffe485af107 SHA512 e795a7f4179aee9a86d546845cb16c03770a93013c83186c46a9a759edff909c4d85a40ec2091d068496c289cb5bb015026796b060e6bdec44d72fa8e13c2518
AUX bonnie-2.0.6-includes.patch 336 BLAKE2B 438e8bbd08e98e30c74981b31c5896ab17efcea190394a260c0913a5d8e4289321d4550fa9d40072c8686629497ea1c09db50508251ec044e82489c270047674 SHA512 ed5cadebfabf1efb7e0b5289cfb67627262d83f4f9650d020755b1c47f19601b845193892c502d9947316d639b6423d52a862224f1943dcae182a151e0c72a39
AUX bonnie_man.patch 349 BLAKE2B 9251f607a2875912d9c27228f0e3889f44a4ac013616450f8ba7cc8424065a8220560a846841f199227e65c18e770bf3ef294c391bea2c96b9bc9fac2cc50998 SHA512 38d88dcba9ef17e2de843a6123a063203c8fa1c1b654109fba3c7bee54275e6fa0ebe1f3ce8986b07891fc5cbfca4b310f71d4bc4e564a20ec199ecafb58de64
DIST bonnie.tar.gz 7140 BLAKE2B dc0a216e1926de7630fbabdd80d2d1293fc9da404c3179f5515a9756942aec7c6870220e869d1d6c299dc39c2175b6c99b54778237a9af2778b7718aaf4280f3 SHA512 4cb431986870baf1d9e5f757970a4b489f89d4349f051cc2ae0aea035ce19a7962047920a3af1567e375b2c6f1e826309b044b8a8727400601203042a34ecb5f
EBUILD bonnie-2.0.6-r2.ebuild 648 BLAKE2B b38c96a6e08db06992a97e34485e9dbfb13d3622113ad1c8efe63660e6dfceaa2e366d7728f1c0aa2c3c8be61385476c4a939f5fd9d2aaec26e37628e6309f4a SHA512 bd6eb2a48f1e4af1183c331653765d6ee9bb6c93e6dd2c769c6b0d010bba55f56a0079412dafdb225a0ddb16942a5b7c864b55edaa13b1912d25ddb85e4fca40
DIST bonnie-2.0.6.tar.gz 7140 BLAKE2B dc0a216e1926de7630fbabdd80d2d1293fc9da404c3179f5515a9756942aec7c6870220e869d1d6c299dc39c2175b6c99b54778237a9af2778b7718aaf4280f3 SHA512 4cb431986870baf1d9e5f757970a4b489f89d4349f051cc2ae0aea035ce19a7962047920a3af1567e375b2c6f1e826309b044b8a8727400601203042a34ecb5f
EBUILD bonnie-2.0.6-r2.ebuild 660 BLAKE2B 8ec4c8e9344e0e572903ab6c731dbfad689df584f8f352161ca3c0a18b547cdecd828cf452dce9ed8bb283764ce57d4593ec8e4bc8b31fe945d7c9ea8ded8b7b SHA512 120ad7541cf82af3ea96632456170bb52ee6d7f34f0294a7f0293c1fdf289d19d483abba2f0826b8694295fdaa4fa8e0d57c28b5c54b2be680209e2aa4dcd4ec
MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84

@ -1,4 +1,4 @@
# Copyright 1999-2017 Gentoo Foundation
# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@ -7,7 +7,7 @@ inherit toolchain-funcs
DESCRIPTION="Performance Test of Filesystem I/O using standard C library calls"
HOMEPAGE="http://www.textuality.com/bonnie/"
SRC_URI="http://www.textuality.com/bonnie/bonnie.tar.gz"
SRC_URI="http://www.textuality.com/bonnie/bonnie.tar.gz -> ${P}.tar.gz"
LICENSE="bonnie"
SLOT="0"

Binary file not shown.

@ -1,4 +1,4 @@
AUX b5i2iso-0.2-segfault.patch 388 BLAKE2B 151e6f41afe5e241be181de2b0ce50a2ee0bff64ab1b04ff99501b2844705a1295cbfea28b85446d2aa899eb6e3a58b9f40e992c336965f8b07749e1698af53c SHA512 133fb1c4da9391e1465f0c820fea2038859c351dbf9b9a8de293294c66857a68f0f544bbca9b8a927a615cc3488a691db6a0bb532bea98362904876634966a5f
DIST b5i2iso.tar.bz2 7503 BLAKE2B a1ac74596213845c49dd007390445640ebe6226ae6273f4e05d567c58badb2ca2698c06951be7348c63c89920dd8034e376343d387665ae08ee13747efcf903b SHA512 2ec6ce30225370898aee9876937b70ee38ed68b6515bef13eb010f1ef1970894995461d5dc5f44ac24d2e7e682774e4fc3c6d2bdde8f744129a3f6103b50f9e4
EBUILD b5i2iso-0.2-r1.ebuild 581 BLAKE2B 88f162876dd3af073cd3af7c3a188cf998c3fd3ebac2e36880bd6379d9a6270ceea581d23c9f7bd30e9b83ed4fa62969a8ff408811becb12f0261684750e4496 SHA512 33048970e02ab8bd1d39a6a77be648e7e7e6bf20633b7ea10e5e274ab356dabac1b375a26442f699ca0324957b2dea62df7f013676e1f1470d6b9a12c4c5ca2a
DIST b5i2iso-0.2.tar.bz2 7503 BLAKE2B a1ac74596213845c49dd007390445640ebe6226ae6273f4e05d567c58badb2ca2698c06951be7348c63c89920dd8034e376343d387665ae08ee13747efcf903b SHA512 2ec6ce30225370898aee9876937b70ee38ed68b6515bef13eb010f1ef1970894995461d5dc5f44ac24d2e7e682774e4fc3c6d2bdde8f744129a3f6103b50f9e4
EBUILD b5i2iso-0.2-r1.ebuild 594 BLAKE2B 13e612d861460dd99e10fed0c159bbbc27913876d9726f5a6f996074775298a8f67494644d3ab9fd4ae737cdfe34a921e1126065dfdbe94a45562bf5c045a39a SHA512 e7f6fe6d7b5777679e8b17d72da69045d5924fbb0c8bdcd1cae7c867a4fe6e946bfc0ce06c2ac4021f5122692e57da174827f0ed71709e12caddd39a0cde1738
MISC metadata.xml 168 BLAKE2B 3e5971a4f8eec29fb98ca9e9e3e93e1ffb3ceecbc911e171844dee81b53f757ee37173d79fdeba5ceded1ae70f84cd00da36912efed91d3bbdfd09e339886166 SHA512 a0f46e63b4efc395be44cfec9bafd3f0067a239be0ac79de35b85c6ad14f6bb7dae7c4e82ce8d18fb4c089026426d6554ecbe2c54d4b0f8bdcd77cfee6467ec4

@ -1,4 +1,4 @@
# Copyright 1999-2018 Gentoo Foundation
# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
@ -6,7 +6,7 @@ inherit toolchain-funcs
DESCRIPTION="Convert CD images from b5i (BlindWrite) to iso"
HOMEPAGE="https://web.archive.org/web/20100116120705/b5i2iso.berlios.de"
SRC_URI="mirror://gentoo/${PN}.tar.bz2"
SRC_URI="mirror://gentoo/${PN}.tar.bz2 -> ${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"

Binary file not shown.

@ -1,6 +1,7 @@
AUX eid-sign-test-4.4.19.patch 8320 BLAKE2B c2295a64a5353f79ea44703b7256f667b5c6dc21eb74b0cfb6945572d0323d751ca8104ae981ae83759267081b6a16509cde3e8f5ad35b1a6613855461880c18 SHA512 01efa77441982a631e717a1bf720155bd38144cbe9e5b9cc192bdfa7ea3966b787e31a25a7e3c7d560fec30b19edeb662f6ab1db2d68b0a5b996af3c91342ec4
DIST eid-mw-4.4.1.tar.gz 7708697 BLAKE2B 7bdbaa37af1cdd5a8abd1519939f663c7c871cea49850932d97c391465de362885b061c024285ab2690473a4bb1ba57a70fdc12a720246b2a610ac9525f6395e SHA512 9de54858ac052eeff101070dd11c5cf60ab1d29b8dc8d946680745acf9aa6ba1044ca5451eca6066b5b467fbc32a2a23bbe7e8551ca7559e6003a4097a304cfc
DIST eid-mw-4.4.11.tar.gz 7975630 BLAKE2B e7b052736cba98c53e97e9de15ea8e54f508c28471a7a936c5d28539648f5d3454983d9c9a21cf5959a070849865de5ca58d5d29ad64eb08209afd40959c56ae SHA512 35273492abc0efa7146848c82770bcd5e4ce1b7c9971ce45686b4d3244332456011db6df05154ad6a204854fd13ac3dce8f7b8cd6112a2e60a7b8434f3c4a196
DIST eid-mw-4.4.19.tar.gz 7941144 BLAKE2B c02f975081eacf7803839461ae91e3c6a24c3e2fc60064a981cc71f629925679b0df997e8acbe2da2f1e58dcc665b8633e3c9bf28b07be90ac8cdd0448e80848 SHA512 21530111461302123be662dd60f3fbd56ffd8a0537cac88c99d5a6bcd9163a27bc34e05beaf7502dd5ada247ca324d21590a866907b5a7a02ce3d8d78fcac634
EBUILD eid-mw-4.4.1.ebuild 2106 BLAKE2B 07d74477ca6ff373abf1168f520dd33179984691ab192fedff4d9370a68addc4990dc7172be8b1e6d8813da8089c534ed8c577daedd0aa7d2bfae6011f8e0f2d SHA512 a86805eed173ea10bb088d2374f134d9841257c2a51d5ffb51c0316811e62794243129965bb1ed46bc45419826e6ae1c4781cc8a9addf62e98f5411bf4cdde3e
EBUILD eid-mw-4.4.11.ebuild 2151 BLAKE2B 3350790665454d681dc7513c33a8f3d1a74caebd5bd2f1683b02a32b4bbee85c64c5457ff50a4f14819ec421832fd0a372df7c60f313bc20a6d67229246e6b9e SHA512 b7c555ef7eb1ef96bc4a8df040648548698408fcf81f72c3fa5d37641287080101593d49f628de9ae9f8ddb42ebd45f55c40ec8c73aecf3b7ba8f954027d5cc2
EBUILD eid-mw-4.4.19.ebuild 2433 BLAKE2B 07aa37e8d8d8abd22d8d46c1efbdd908e8cd76452b2d7fa50765d22326ddffcd140c02614db5469547fd81e8efe6f3fca4df681148a8d09a799f7ffb46db221d SHA512 b809f8d26a9357e848b5e59e10dd2aa9a07fdf2b410f1fc4ad4f4c8f232c996977c37ac68151434f44037bfe4230b67507dca8fae39ad219fb4f565d044cfd75
EBUILD eid-mw-9999.ebuild 1832 BLAKE2B c6c9b0de69514b1d036e8e3566e8ecbcfdd6426bcc55bdbcfce15de389dca83d65a0cf50d3e9eb5b35fca7114e02e13cf3bfd3139e46298874ea5b872248b007 SHA512 1c4383bb1764fe4f8dbeabad9be447d682e2ee08e8174a7d7aa4a978c1243048cfcae54dc0d7b45e6acaa415b52cde1199aee6f94f5b9ef1f790f632dfbc28ee
MISC metadata.xml 1445 BLAKE2B f402be7a768b67e34a736cdfaafc0df9f29301ba2d4b50f4ff27b9b08085826a67e452bb239893ef79d10eebb8981488cc71ca7f7015152783ad939e64df6d85 SHA512 b3934c2c2be9adc2f4d4d8ab654b8b21056bcbf29a67751ead9c8f1be4339a651a6d315c6ee1c182c3e8a32ad630c73f0990bd4fce4d34afa948055f0447ea98

@ -1,9 +1,9 @@
# Copyright 1999-2018 Gentoo Authors
# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
EAPI=7
inherit autotools gnome2-utils
inherit autotools desktop gnome2-utils xdg-utils
DESCRIPTION="Electronic Identity Card middleware supplied by the Belgian Federal Government"
HOMEPAGE="https://eid.belgium.be"
@ -56,6 +56,14 @@ src_prepare() {
-e "s:get_lsb_info('c'):strdup(_(\"n/a\")):" \
plugins_tools/aboutmw/gtk/about-main.c || die
# Fix libdir for pkcs11_manifestdir
sed -i \
-e "/pkcs11_manifestdir/ s:prefix)/lib:libdir):" \
cardcomm/pkcs11/src/Makefile.am || die
# See bug #691308
eapply "${FILESDIR}/eid-sign-test-${PV}.patch"
eautoreconf
}
@ -81,13 +89,15 @@ src_install() {
pkg_postinst(){
if use gtk; then
gnome2_schemas_update
gnome2_icon_cache_update
xdg_desktop_database_update
xdg_icon_cache_update
fi
}
pkg_postrm(){
if use gtk; then
gnome2_schemas_update
gnome2_icon_cache_update
xdg_desktop_database_update
xdg_icon_cache_update
fi
}

@ -0,0 +1,272 @@
--- eid-mw-4.4.19/tests/unit/sign.c 2019-07-11 16:08:46.000000000 +0200
+++ eid-mw-git/tests/unit/sign.c 2019-08-04 17:40:08.683942928 +0200
@@ -19,10 +19,13 @@
**************************************************************************** */
#ifdef WIN32
#include <win32.h>
+#pragma pack(push, cryptoki, 1)
+#include "pkcs11.h"
+#pragma pack(pop, cryptoki)
#else
#include <unix.h>
-#endif
#include <pkcs11.h>
+#endif
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
@@ -33,66 +36,88 @@
#include <config.h>
#endif
+#include <stdbool.h>
+
#if HAVE_OPENSSL
-#include <openssl/rsa.h>
+#include <openssl/opensslv.h>
+#include <openssl/evp.h>
#include <openssl/engine.h>
-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-static int RSA_set0_key(RSA *r, BIGNUM *n, BIGNUM *e, BIGNUM *d) {
- if(!r || !n || !e) {
- return 0;
- }
- r->n = n;
- r->e = e;
- r->d = d;
- return 1;
-}
-#endif
-
-CK_BYTE digest_sha256[] = {
- 0x2c, 0x26, 0xb4, 0x6b,
- 0x68, 0xff, 0xc6, 0x8f,
- 0xf9, 0x9b, 0x45, 0x3c,
- 0x1d, 0x30, 0x41, 0x34,
- 0x13, 0x42, 0x2d, 0x70,
- 0x64, 0x83, 0xbf, 0xa0,
- 0xf9, 0x8a, 0x5e, 0x88,
- 0x62, 0x66, 0xe7, 0xae
-};
-
-int verify_sig(unsigned char* sig, CK_ULONG siglen, CK_BYTE_PTR modulus, CK_ULONG modlen, CK_BYTE_PTR exponent, CK_ULONG explen) {
- RSA* rsa = RSA_new();
- unsigned char* s = malloc(siglen);
- int ret;
-
- RSA_set0_key(rsa, BN_bin2bn(modulus, (int) modlen, NULL), BN_bin2bn(exponent, (int) explen, NULL), NULL);
-
- int v = RSA_verify(NID_sha256, digest_sha256, sizeof(digest_sha256), sig, siglen, rsa);
-
- printf("Signature verification returned: %d\n", v);
- if(!v) {
- unsigned long e = ERR_get_error();
- printf("error %ld: %s\n", e, ERR_error_string(e, NULL));
- ret = TEST_RV_FAIL;
- } else {
- ret = TEST_RV_OK;
+// These were copied from eid-test-ca:derencode.c
+int verify_sig(const unsigned char *sig_in, CK_ULONG siglen, const unsigned char *certificate, size_t certlen, bool is_rsa) {
+#if OPENSSL_VERSION_NUMBER > 0x10100000L
+ X509 *cert = NULL;
+ EVP_PKEY *pkey = NULL;
+ EVP_MD_CTX *mdctx;
+ EVP_PKEY_CTX *pctx;
+ const EVP_MD *md = EVP_get_digestbyname("sha256");
+ unsigned char *sig = (unsigned char*)sig_in;
+
+ if(d2i_X509(&cert, &certificate, certlen) == NULL) {
+ fprintf(stderr, "E: could not parse X509 certificate\n");
+ return TEST_RV_FAIL;
+ }
+ pkey = X509_get0_pubkey(cert);
+ if(pkey == NULL) {
+ fprintf(stderr, "E: could not find public key in certificate\n");
+ return TEST_RV_FAIL;
+ }
+ mdctx = EVP_MD_CTX_new();
+ if(EVP_DigestVerifyInit(mdctx, &pctx, md, NULL, pkey) != 1) {
+ fprintf(stderr, "E: initialization for signature validation failed!\n");
+ return TEST_RV_FAIL;
+ }
+ if(EVP_DigestVerifyUpdate(mdctx, (const unsigned char*)"foo", 3) != 1) {
+ fprintf(stderr, "E: hashing for signature failed!\n");
+ return TEST_RV_FAIL;
}
- free(s);
- RSA_free(rsa);
-
- return ret;
+ ECDSA_SIG* ec_sig;
+ if(!is_rsa) {
+ BIGNUM *r;
+ BIGNUM *s;
+ ec_sig = ECDSA_SIG_new();
+ if((r = BN_bin2bn(sig, siglen / 2, NULL)) == NULL) {
+ fprintf(stderr, "E: could not convert R part of ECDSA signature!\n");
+ return TEST_RV_FAIL;
+ }
+ if((s = BN_bin2bn(sig + (siglen / 2), siglen / 2, NULL)) == NULL) {
+ fprintf(stderr, "E: could not convert S part of ECDSA signature!\n");
+ return TEST_RV_FAIL;
+ }
+ if(ECDSA_SIG_set0(ec_sig, r, s) == 0) {
+ fprintf(stderr, "E: could not set ECDSA_SIG structure!\n");
+ return TEST_RV_FAIL;
+ }
+ siglen = i2d_ECDSA_SIG(ec_sig, NULL);
+ unsigned char *dersig = sig = malloc(siglen);
+ siglen = i2d_ECDSA_SIG(ec_sig, &dersig);
+ }
+ if(EVP_DigestVerifyFinal(mdctx, sig, siglen) != 1) {
+ fprintf(stderr, "E: signature fails validation!\n");
+ return TEST_RV_FAIL;
+ }
+ if(!is_rsa) {
+ free(sig);
+ }
+ printf("signature verified\n");
+ return TEST_RV_OK;
+#else
+ printf("OpenSSL too old for verification\n");
+#endif
}
-
#endif
-int test_key(char* label, CK_SESSION_HANDLE session, CK_SLOT_ID slot EIDT_UNUSED) {
+int test_key(char* label, CK_SESSION_HANDLE session, CK_SLOT_ID slot) {
CK_ATTRIBUTE attr[2];
CK_MECHANISM mech;
+ CK_MECHANISM_TYPE_PTR mechlist;
CK_BYTE data[] = { 'f', 'o', 'o' };
CK_BYTE_PTR sig, mod, exp;
CK_ULONG sig_len, type, count;
- CK_OBJECT_HANDLE privatekey, publickey;
+ CK_OBJECT_HANDLE privatekey, publickey, certificate;
+ bool is_rsa = false;
+ int i;
attr[0].type = CKA_CLASS;
attr[0].pValue = &type;
@@ -113,7 +138,22 @@
return TEST_RV_SKIP;
}
- mech.mechanism = CKM_SHA256_RSA_PKCS;
+ check_rv(C_GetMechanismList(slot, NULL_PTR, &count));
+ mechlist = malloc(sizeof(CK_MECHANISM_TYPE) * count);
+#undef CHECK_RV_DEALLOCATE
+#define CHECK_RV_DEALLOCATE free(mechlist)
+
+ check_rv(C_GetMechanismList(slot, mechlist, &count));
+
+ for(i=0; i<count; i++) {
+ if(mechlist[i] == CKM_SHA256_RSA_PKCS) {
+ mech.mechanism = mechlist[i];
+ i=count;
+ is_rsa = true;
+ break;
+ }
+ }
+
check_rv(C_SignInit(session, &mech, privatekey));
check_rv(C_Sign(session, data, sizeof(data), NULL, &sig_len));
@@ -124,42 +164,68 @@
hex_dump((char*)sig, sig_len);
- type = CKO_PUBLIC_KEY;
- check_rv(C_FindObjectsInit(session, attr, 2));
- check_rv(C_FindObjects(session, &publickey, 1, &count));
- verbose_assert(count == 1);
- check_rv(C_FindObjectsFinal(session));
+ if(is_rsa) {
+ type = CKO_PUBLIC_KEY;
+ check_rv(C_FindObjectsInit(session, attr, 2));
+ check_rv(C_FindObjects(session, &publickey, 1, &count));
+ verbose_assert(count == 1);
+ check_rv(C_FindObjectsFinal(session));
- attr[0].type = CKA_MODULUS;
- attr[0].pValue = NULL_PTR;
- attr[0].ulValueLen = 0;
+ attr[0].type = CKA_MODULUS;
+ attr[0].pValue = NULL_PTR;
+ attr[0].ulValueLen = 0;
- attr[1].type = CKA_PUBLIC_EXPONENT;
- attr[1].pValue = NULL_PTR;
- attr[1].ulValueLen = 0;
+ attr[1].type = CKA_PUBLIC_EXPONENT;
+ attr[1].pValue = NULL_PTR;
+ attr[1].ulValueLen = 0;
- check_rv(C_GetAttributeValue(session, publickey, attr, 2));
+ check_rv(C_GetAttributeValue(session, publickey, attr, 2));
- verbose_assert(attr[0].ulValueLen == sig_len);
+ verbose_assert(attr[0].ulValueLen == sig_len);
- mod = malloc(attr[0].ulValueLen);
- mod[0] = 0xde; mod[1] = 0xad; mod[2] = 0xbe; mod[3] = 0xef;
- exp = malloc(attr[1].ulValueLen);
- exp[0] = 0xde; exp[1] = 0xad; exp[2] = 0xbe; exp[3] = 0xef;
+ mod = malloc(attr[0].ulValueLen);
+ mod[0] = 0xde; mod[1] = 0xad; mod[2] = 0xbe; mod[3] = 0xef;
+ exp = malloc(attr[1].ulValueLen);
+ exp[0] = 0xde; exp[1] = 0xad; exp[2] = 0xbe; exp[3] = 0xef;
- attr[0].pValue = mod;
- attr[1].pValue = exp;
+ attr[0].pValue = mod;
+ attr[1].pValue = exp;
- check_rv(C_GetAttributeValue(session, publickey, attr, 2));
+ check_rv(C_GetAttributeValue(session, publickey, attr, 2));
- printf("Received key modulus with length %lu:\n", attr[0].ulValueLen);
- hex_dump((char*)mod, attr[0].ulValueLen);
+ printf("Received key modulus with length %lu:\n", attr[0].ulValueLen);
+ hex_dump((char*)mod, attr[0].ulValueLen);
- printf("Received public exponent of key with length %lu:\n", attr[1].ulValueLen);
- hex_dump((char*)exp, attr[1].ulValueLen);
+ printf("Received public exponent of key with length %lu:\n", attr[1].ulValueLen);
+ hex_dump((char*)exp, attr[1].ulValueLen);
+ }
-#if HAVE_OPENSSL
- return verify_sig(sig, sig_len, mod, attr[0].ulValueLen, exp, attr[1].ulValueLen);
+#if HAVE_OPENSSL && OPENSSL_VERSION_NUMBER > 0x10100000L
+ unsigned char cert[4096];
+ attr[0].type = CKA_CLASS;
+ attr[0].pValue = &type;
+ type = CKO_CERTIFICATE;
+ attr[0].ulValueLen = sizeof(CK_ULONG);
+
+ attr[1].type = CKA_LABEL;
+ attr[1].pValue = label;
+ attr[1].ulValueLen = strlen(label);
+
+ check_rv(C_FindObjectsInit(session, attr, 2));
+ check_rv(C_FindObjects(session, &certificate, 1, &count));
+ verbose_assert(count == 1);
+ check_rv(C_FindObjectsFinal(session));
+
+ attr[0].type = CKA_VALUE;
+ attr[0].pValue = cert;
+ attr[0].ulValueLen = sizeof(cert);
+
+ check_rv(C_GetAttributeValue(session, certificate, attr, 1));
+
+ printf("Received certificate with length %lu:\n", attr[0].ulValueLen);
+ hex_dump((char*)cert, attr[0].ulValueLen);
+
+ return verify_sig(sig, sig_len, cert, attr[0].ulValueLen, is_rsa);
#else
return TEST_RV_OK;
#endif

@ -1,3 +1,3 @@
DIST gifshuffle.tar.gz 21509 BLAKE2B a07490c2f6a29782d7d25219eefbf49393ccb06b1fbb260927dce741450934990673cc86168285ec9d0bc2ef258a64d98d623f143b464b48c9955b13a808822d SHA512 0a0521f924c508c80c11309203e64cbd948945ddd557f01008a39987602320be780c1710dfcaa8ec9886fff4e9745465f2f242919ede4cedb2af9f73e5cc54be
EBUILD gifshuffle-2.0-r1.ebuild 607 BLAKE2B 32b69f77ef8f1fe46ba7c42c694c7bd246a3055de550493b4ab63a263acce8af6d34bdb71d835444088c30fd9c98949dd49b3b22b1068a542c545f4e6eccccce SHA512 c177eb84a8386c33163d9d47b1952c86b1a9963dd4c8c347d2fc4df24408fd26254270331df80873a0f5af145fc6012e75feddeec0d98d21d3068a86424938da
DIST gifshuffle-2.0.tar.gz 21509 BLAKE2B a07490c2f6a29782d7d25219eefbf49393ccb06b1fbb260927dce741450934990673cc86168285ec9d0bc2ef258a64d98d623f143b464b48c9955b13a808822d SHA512 0a0521f924c508c80c11309203e64cbd948945ddd557f01008a39987602320be780c1710dfcaa8ec9886fff4e9745465f2f242919ede4cedb2af9f73e5cc54be
EBUILD gifshuffle-2.0-r1.ebuild 619 BLAKE2B f1d674630abb76d3432be5f8c80cb71ae9fef3319ea1bbbeb2c7ba8a63f50bc7e0c1d32dd0f7fdba8de9c41fc554b8d2a24a9aa4eb73f9e22c9c877d8e0d453e SHA512 4a6f9cda8dca0cd053b70f663db20d8be78bf5f1c0de4221849d73d26e081985177786050ef20ad2a982a57adb269f3b3a4b8550893fe8991a6d63fdea4f891a
MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84

@ -1,4 +1,4 @@
# Copyright 1999-2017 Gentoo Foundation
# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@ -7,7 +7,7 @@ inherit toolchain-funcs
DESCRIPTION="GIF colourmap steganography"
HOMEPAGE="http://www.darkside.com.au/gifshuffle/"
SRC_URI="http://www.darkside.com.au/gifshuffle/${PN}.tar.gz"
SRC_URI="http://www.darkside.com.au/gifshuffle/${PN}.tar.gz -> ${P}.tar.gz"
LICENSE="public-domain"
SLOT="0"

Binary file not shown.

@ -2,6 +2,8 @@ AUX gvim-completion 1219 BLAKE2B 8a8d8ac5b42be0103da00ecda3445f24993df0b2762310d
AUX gvimrc-r1 990 BLAKE2B 5fc0b805458aff22485e3e180ca8c32a62f2cfe49572edffa5725d2cfc4ed9a7bded20c1a5cd1f19f41e0849e3ca08be4798ff23edd66a92bcbb31aee16c433a SHA512 f6538550f1ecadcccf74a6bbd5a6a0b71d18a234a854d1a0179144125555c42280000df9523e7c3d5a8b449f421af7bafcca1034951f085279cee0dd1160808a
DIST vim-8.0.0938-gentoo-patches.tar.bz2 2316 BLAKE2B 05a87f32fc5cc65e7f5e4e5a87c654b2040ad39f1555ddde7e0e6f473dc8b520916a795406bb6bbeaf5e7ae8748aacebe7a9679461e48802e69417e945eea827 SHA512 a6062be5e6a5c5b437081312df5742353242b5171bf26da04aa6ca216d2b142b2411a88bc1edd460d28e00a59a210c8e1729e801fac6f1efd86bb2e437a56a2b
DIST vim-8.1.1486.tar.gz 14318109 BLAKE2B 6054df175a32e9ed36873802a4a669cc46e034bac879cb829e45ece53f9440e97cccad47e370ebdef8dc1bb963e8e8c84bd517a3a6561705786dcab7e2368d21 SHA512 0a521d74c60f2a32e8a11e16f256e2e99fb9c00f478cd8d7a9328315abbd445796153f03884ab2b240905260317809a33afb64627b9a71ac8d6db1cbd4026d20
DIST vim-8.1.1846.tar.gz 14415116 BLAKE2B 59c2864519e100f9bc2617dd7b31a8cc17ff20fc87a761eba653e91a70688c3b4a5f05c527acaf6d075830d23c7ef8842595b6558eac2ab5209029153f1adb10 SHA512 d5a5cb7733f3190915e2b1389fea48d119afef27eac6f04ac3967f57e894cab811727a694c6837bb5acef9997cd56018d4b37efeb413c654012aaaea02bf7c7a
EBUILD gvim-8.1.1486.ebuild 10494 BLAKE2B 51243386b3da023593d6bc76298a8eceb1bf6729af96e56e681f51c3918efb511646551c75b3948375a6e7f93b4c5a9019bb34014047aaef4d799404e0e77ae1 SHA512 9243aa4423bb4f7a728129462d6c59dfbd67eddee9f6ff2a8c3fdde0a4cacb47deef5dda4b1951c1e6c948c15d59d3f34c63c74fe63c77e95d8d79bc037b245f
EBUILD gvim-9999.ebuild 10407 BLAKE2B 1f0865de240b0e88ab55dc27f2f4ea230dc0eed0bf63d6551fd3bc4adb9bdb00e04ac09925e9d5a42dfaf900667a584f44b3cd2fd7fe711833ec96198bacc545 SHA512 c23d892f772dd4db9d612f8ce822192f9f136b41be207fd467ceef9d9997b0dc7154918ce7418257046e58c40f411e3518a6612f5203cecee8068dfa536d223f
EBUILD gvim-8.1.1846.ebuild 10570 BLAKE2B 5fa1b0d05aef06fe1a5ae514d2490052489afc3bed4d9ab3b24dff8f093f668d1a14e393d2ac2e6db2bffdc5078c79622d52a129522d10c5c7291e6127f8ddda SHA512 6d4ec8903fe888c20fd55368e8c18aad8840329982fd89ecd8dd48cc769eb8e6d29194c65cdd3dc67a322401028997c265a58cdb5e24e50bfdaa2476d9480fb6
EBUILD gvim-9999.ebuild 10479 BLAKE2B 23832b28593eae47c503d092017f98c4b6f71bbc68fe72ff9ccff50f390c262ddec420faf81dff19030e0a60fddcc9bdca3393b51400cef3e4b823af2b195c73 SHA512 37fd1e11ebf5b9e8d8547a7490ecf1fcef87aa8cec808353b11e6188e537f8670e0caede5a3a206ec02786806bb26e0e79bd819f14c84469443a2bec913a665b
MISC metadata.xml 633 BLAKE2B 5ecbefdb3a4a116a9e56113621970dd581f27dd42f8b6ed4fd445cb675bec4729bbce076a0d20de3dd329e00723f51d64df9a7b62658fa8f1348982aa8b8628d SHA512 bca6784d9746a7d98aaec2e3469b8bb3057802b869181c79622d16cfd31b06ca8c9dd89cb147f11c1f709fda2312973e7e115efea257a781905fb3a789b0cfce

@ -0,0 +1,370 @@
# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
VIM_VERSION="8.1"
PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
PYTHON_REQ_USE="threads(+)"
USE_RUBY="ruby24 ruby25 ruby26"
inherit vim-doc flag-o-matic xdg-utils gnome2-utils bash-completion-r1 prefix python-single-r1 ruby-single
if [[ ${PV} == 9999* ]]; then
inherit git-r3
EGIT_REPO_URI="https://github.com/vim/vim.git"
EGIT_CHECKOUT_DIR=${WORKDIR}/vim-${PV}
else
SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> vim-${PV}.tar.gz
https://dev.gentoo.org/~radhermit/vim/vim-8.0.0938-gentoo-patches.tar.bz2"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
fi
DESCRIPTION="GUI version of the Vim text editor"
HOMEPAGE="https://vim.sourceforge.io/ https://github.com/vim/vim"
SLOT="0"
LICENSE="vim"
IUSE="acl aqua cscope debug gtk gtk2 lua luajit motif neXt netbeans nls perl python racket ruby selinux session sound tcl"
REQUIRED_USE="
python? ( ${PYTHON_REQUIRED_USE} )
"
RDEPEND="
>=app-eselect/eselect-vi-1.1
>=sys-libs/ncurses-5.2-r2:0=
x11-libs/libICE
x11-libs/libSM
x11-libs/libXext
x11-libs/libXt
acl? ( kernel_linux? ( sys-apps/acl ) )
!aqua? (
gtk? (
x11-libs/gtk+:3
x11-libs/libXft
)
!gtk? (
gtk2? (
>=x11-libs/gtk+-2.6:2
x11-libs/libXft
)
!gtk2? (
motif? ( >=x11-libs/motif-2.3:0 )
!motif? (
neXt? ( x11-libs/neXtaw )
!neXt? ( x11-libs/libXaw )
)
)
)
)
cscope? ( dev-util/cscope )
lua? (
luajit? ( dev-lang/luajit:2= )
!luajit? ( dev-lang/lua:0[deprecated] )
)
nls? ( virtual/libintl )
perl? ( dev-lang/perl:= )
python? ( ${PYTHON_DEPS} )
racket? ( dev-scheme/racket )
ruby? ( ${RUBY_DEPS} )
selinux? ( sys-libs/libselinux )
session? ( x11-libs/libSM )
sound? ( media-libs/libcanberra )
tcl? ( dev-lang/tcl:0= )
"
DEPEND="${RDEPEND}
sys-devel/autoconf
virtual/pkgconfig
nls? ( sys-devel/gettext )
"
# temporarily use PDEPEND to allow upgrades past icon file collision, bug #673880
PDEPEND="~app-editors/vim-core-${PV}"
# various failures (bugs #630042 and #682320)
RESTRICT="test"
S=${WORKDIR}/vim-${PV}
pkg_setup() {
# people with broken alphabets run into trouble. bug 82186.
unset LANG LC_ALL
export LC_COLLATE="C"
# Gnome sandbox silliness. bug #114475.
mkdir -p "${T}"/home || die
export HOME="${T}"/home
use python && python-single-r1_pkg_setup
}
src_prepare() {
if [[ ${PV} != 9999* ]]; then
# Gentoo patches to fix runtime issues, cross-compile errors, etc
eapply "${WORKDIR}"/patches/
fi
# Fixup a script to use awk instead of nawk
sed -i -e \
'1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' \
"${S}"/runtime/tools/mve.awk || die "mve.awk sed failed"
# Read vimrc and gvimrc from /etc/vim
echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' \
>> "${S}"/src/feature.h || die "echo failed"
echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' \
>> "${S}"/src/feature.h || die "echo failed"
# Use exuberant ctags which installs as /usr/bin/exuberant-ctags.
# Hopefully this pattern won't break for a while at least.
# This fixes bug 29398 (27 Sep 2003 agriffis)
sed -i -e \
's/\<ctags\("\| [-*.]\)/exuberant-&/g' \
"${S}"/runtime/doc/syntax.txt \
"${S}"/runtime/doc/tagsrch.txt \
"${S}"/runtime/doc/usr_29.txt \
"${S}"/runtime/menu.vim \
"${S}"/src/configure.ac || die 'sed failed'
# Don't be fooled by /usr/include/libc.h. When found, vim thinks
# this is NeXT, but it's actually just a file in dev-libs/9libs
# This fixes bug 43885 (20 Mar 2004 agriffis)
sed -i -e \
's/ libc\.h / /' "${S}"/src/configure.ac || die 'sed failed'
# gcc on sparc32 has this, uhm, interesting problem with detecting EOF
# correctly. To avoid some really entertaining error messages about stuff
# which isn't even in the source file being invalid, we'll do some trickery
# to make the error never occur. bug 66162 (02 October 2004 ciaranm)
find "${S}" -name '*.c' | while read c; do
echo >> "$c" || die "echo failed"
done
# Try to avoid sandbox problems. Bug #114475.
if [[ -d "${S}"/src/po ]]; then
sed -i -e \
'/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \
"${S}"/src/po/Makefile || die
fi
cp -v "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk || die "cp failed"
# Bug #378107 - Build properly with >=perl-core/ExtUtils-ParseXS-3.20.0
sed -i -e \
"s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:" \
"${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed'
eapply_user
}
src_configure() {
local myconf=()
# Fix bug 37354: Disallow -funroll-all-loops on amd64
# Bug 57859 suggests that we want to do this for all archs
filter-flags -funroll-all-loops
# Fix bug 76331: -O3 causes problems, use -O2 instead. We'll do this for
# everyone since previous flag filtering bugs have turned out to affect
# multiple archs...
replace-flags -O3 -O2
# Fix bug 18245: Prevent "make" from the following chain:
# (1) Notice configure.ac is newer than auto/configure
# (2) Rebuild auto/configure
# (3) Notice auto/configure is newer than auto/config.mk
# (4) Run ./configure (with wrong args) to remake auto/config.mk
sed -i -e \
's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed"
rm -v src/auto/configure || die "rm failed"
emake -j1 -C src autoconf
# This should fix a sandbox violation (see bug 24447). The hvc
# things are for ppc64, see bug 86433.
local file
for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc*; do
if [[ -e ${file} ]]; then
addwrite $file
fi
done
use debug && append-flags "-DDEBUG"
myconf=(
--with-features=huge
--disable-gpm
--with-gnome=no
$(use_enable sound canberra)
$(use_enable acl)
$(use_enable cscope)
$(use_enable lua luainterp)
$(use_with luajit)
$(use_enable netbeans)
$(use_enable nls)
$(use_enable perl perlinterp)
$(use_enable python pythoninterp)
$(use_enable python python3interp)
$(use_with python python-command $(type -P $(eselect python show --python2)))
$(use_with python python3-command $(type -P $(eselect python show --python3)))
$(use_enable racket mzschemeinterp)
$(use_enable ruby rubyinterp)
$(use_enable selinux)
$(use_enable session xsmp)
$(use_enable tcl tclinterp)
)
# --with-features=huge forces on cscope even if we --disable it. We need
# to sed this out to avoid screwiness. (1 Sep 2004 ciaranm)
if ! use cscope; then
sed -i -e \
'/# define FEAT_CSCOPE/d' src/feature.h || die "couldn't disable cscope"
fi
# gvim's GUI preference order is as follows:
# aqua CARBON (not tested)
# -aqua gtk GTK3
# -aqua -gtk gtk2 GTK2
# -aqua -gtk -gtk motif MOTIF
# -aqua -gtk -gtk -motif neXt NEXTAW
# -aqua -gtk -gtk -motif -neXt ATHENA
echo ; echo
if use aqua; then
einfo "Building gvim with the Carbon GUI"
myconf+=(
--enable-darwin
--enable-gui=carbon
)
elif use gtk; then
myconf+=( --enable-gtk3-check )
einfo "Building gvim with the gtk+-3 GUI"
myconf+=( --enable-gui=gtk3 )
elif use gtk2; then
myconf+=( --enable-gtk2-check )
einfo "Building gvim with the gtk+-2 GUI"
myconf+=( --enable-gui=gtk2 )
elif use motif; then
einfo "Building gvim with the MOTIF GUI"
myconf+=( --enable-gui=motif )
elif use neXt; then
einfo "Building gvim with the neXtaw GUI"
myconf+=( --enable-gui=nextaw )
else
einfo "Building gvim with the Athena GUI"
myconf+=( --enable-gui=athena )
fi
echo ; echo
# let package manager strip binaries
export ac_cv_prog_STRIP="$(type -P true ) faking strip"
# keep prefix env contained within the EPREFIX
use prefix && myconf+=( --without-local-dir )
if [[ ${CHOST} == *-interix* ]]; then
# avoid finding of this function, to avoid having to patch either
# configure or the source, which would be much more hackish.
# after all vim does it right, only interix is badly broken (again)
export ac_cv_func_sigaction=no
fi
econf \
--with-modified-by=Gentoo-${PVR} \
--with-vim-name=gvim \
--with-x \
"${myconf[@]}"
}
src_compile() {
# The following allows emake to be used
emake -j1 -C src auto/osdef.h objects
emake
}
src_test() {
einfo
einfo "Starting vim tests. Several error messages will be shown"
einfo "while the tests run. This is normal behaviour and does not"
einfo "indicate a fault."
einfo
ewarn "If the tests fail, your terminal may be left in a strange"
ewarn "state. Usually, running 'reset' will fix this."
einfo
# Don't let vim talk to X
unset DISPLAY
# Make gvim not try to connect to X. See :help gui-x11-start in vim for how
# this evil trickery works.
ln -s "${S}"/src/gvim "${S}"/src/testvim || die
# Make sure our VIMPROG is used.
sed -i -e 's:\.\./vim:../testvim:' src/testdir/test49.vim || die
# Don't do additional GUI tests.
emake -j1 VIMPROG=../testvim -C src/testdir nongui
}
# Call eselect vi update with --if-unset
# to respect user's choice (bug 187449)
eselect_vi_update() {
einfo "Calling eselect vi update..."
eselect vi update --if-unset
eend $?
}
src_install() {
local vimfiles=/usr/share/vim/vim${VIM_VERSION/.}
dobin src/gvim
dosym gvim /usr/bin/gvimdiff
dosym gvim /usr/bin/evim
dosym gvim /usr/bin/eview
dosym gvim /usr/bin/gview
dosym gvim /usr/bin/rgvim
dosym gvim /usr/bin/rgview
emake -C src DESTDIR="${D}" DATADIR="${EPREFIX}"/usr/share install-icons
dodir /usr/share/man/man1
echo ".so vim.1" > "${ED}"/usr/share/man/man1/gvim.1 || die "echo failed"
echo ".so vim.1" > "${ED}"/usr/share/man/man1/gview.1 || die "echo failed"
echo ".so vimdiff.1" > "${ED}"/usr/share/man/man1/gvimdiff.1 || \
die "echo failed"
insinto /etc/vim
newins "${FILESDIR}"/gvimrc-r1 gvimrc
eprefixify "${ED}"/etc/vim/gvimrc
# bash completion script, bug #79018.
newbashcomp "${FILESDIR}"/${PN}-completion ${PN}
# don't install vim desktop file
rm -v "${ED}"/usr/share/applications/vim.desktop || die "failed to remove vim.desktop"
}
pkg_postinst() {
# Update documentation tags (from vim-doc.eclass)
update_vim_helptags
# Update fdo mime stuff, bug #78394
xdg_desktop_database_update
# Update icon cache
gnome2_icon_cache_update
# Call eselect vi update
eselect_vi_update
}
pkg_postrm() {
# Update documentation tags (from vim-doc.eclass)
update_vim_helptags
# Update fdo mime stuff, bug #78394
xdg_desktop_database_update
# Update icon cache
gnome2_icon_cache_update
# Call eselect vi update
eselect_vi_update
}

@ -24,7 +24,7 @@ HOMEPAGE="https://vim.sourceforge.io/ https://github.com/vim/vim"
SLOT="0"
LICENSE="vim"
IUSE="acl aqua cscope debug gtk gtk2 lua luajit motif neXt netbeans nls perl python racket ruby selinux session tcl"
IUSE="acl aqua cscope debug gtk gtk2 lua luajit motif neXt netbeans nls perl python racket ruby selinux session sound tcl"
REQUIRED_USE="
python? ( ${PYTHON_REQUIRED_USE} )
"
@ -69,6 +69,7 @@ RDEPEND="
ruby? ( ${RUBY_DEPS} )
selinux? ( sys-libs/libselinux )
session? ( x11-libs/libSM )
sound? ( media-libs/libcanberra )
tcl? ( dev-lang/tcl:0= )
"
DEPEND="${RDEPEND}
@ -190,6 +191,7 @@ src_configure() {
--with-features=huge
--disable-gpm
--with-gnome=no
$(use_enable sound canberra)
$(use_enable acl)
$(use_enable cscope)
$(use_enable lua luainterp)

@ -1,10 +1,13 @@
AUX teco-double-free.diff 936 BLAKE2B ee7151518462ac20bb5cca7ed74970696dcac9d5dae245286e56f0b87e5d7350319d2394750f263ca033760f2c7c82f92bbf68643a6bbb6ba554dfc319ef1376 SHA512 da914d198a057138c43d3fc7f3bd0f2b9577287c0c37319c09e128bf76af771dbd23301c2630eb4f7884d2298672632cec382fe2bddd06e2a315872023b05583
AUX teco-gcc4.patch 336 BLAKE2B 851886f3697c4e5a087acd459af69e2687ca403f1b0b3ff9b600e9ee786832cdc7a31235b38186bbc63a09c9a1f126beedceebd16f8feda35cc417faf2e6779f SHA512 8eb39de57df5f234c38d69c6b89c0422575113b9568336b8f726a2ae733c4af3e54c0e9da06d23c2ec34281fba7899df4a3af046d05d486a2c3d07eb7b55bf28
AUX teco-double-free.diff 907 BLAKE2B 4be36191ed98cd9c210ff523dac796ec7a78697abcbb776ccff526cc1172e2bf6e5da0387df65e70020cbc7041ef6e7ca66245fb886fafe78b5d0f1e67e7ebc0 SHA512 01711be1a61217ed3040f3b13fbcaf52160118c90251098bdf65efe1551a3198ff41228bd9895be7f55e11344858898276f162cff1e207595e3f5e6dfef507ba
AUX teco-gcc4.patch 294 BLAKE2B b09e7058029fb3d2fe2ded138ab92389f412cdc9613ae30eb3fd5b050f95e6efd48016e8f816a67d25b7d813e1ac2b813c20d60ac240b9138d635d958c7bc10f SHA512 ed7cf0fbe3a13dfb310be93460e07dcff50773ff1d0a1b5e3cfb304ecf5ef972243a7d3e7d429c743478b5cc2942a9ec562a25c1504324f59045685e69611d2b
AUX teco-warnings.patch 1206 BLAKE2B f9f8312c66e506d86cdd7544288965927895822eac3ad6f49dd0f1280ddc72f9d2cb2c6e4e7eca7c36c435677559e25bd4c9f6816a9e41816d23a39d64ee445b SHA512 7294ef66917eb549d9437327b32160317313d343c731423e34a07ed407e5595e7ac52d57c55bc1e5c6732f5ed0840533aa9c546ee32f4ea2bef54adf5a91b249
DIST tech.txt.gz 1971 BLAKE2B 327f9b860a3550e5e56ec1524dbc7ccfec31a4a58646f5a191f0867bdd94b97ecdad694cd5205be2896cef013ef63a52fe91859fe00db17da02160ad3a00384c SHA512 8c74d813d7e1bcd2f911982a8b49fa8b97ff85475a4798ea23d9a25ef30ad7243cfc851525aea895eec1a2f69aad84b6cce890ee6a29763a63c1a6d1358a200f
DIST teco-36_p19940820.tar.gz 61305 BLAKE2B 9bb15fcb20948dbcac1928e32b4ac69c4861be3b0c01d5be68836138d9478e71cc0dd5198d9ac6816245605c34f8b21fcd4e62c48c097e56cd585579df119939 SHA512 686b3944a82d088a2fce12a9b770f4aa5f58aaadde064b3d3342114f0ece2d7cbae27d0e92fd026def6f62a3ff0dc82b37146e30a93b2ec195dc7f376b45fdf7
DIST teco.doc.gz 129896 BLAKE2B 0372d5a697f432e41b138de9a5faff8c1032d7843ece1d1b54c325852280f51ef76d0d891e8747270b0c364edcbd731bfa849bd692afffc09041212325d010a2 SHA512 ea294aaa0d54de5b58ef645fbaf5c9512f5a27fb2b49b1120b4a712d01c6482f01a53ac2dac7c8eabdf110823a4556563cde828fc7416479b9c23157282e76da
DIST teco.tar.gz 61305 BLAKE2B 9bb15fcb20948dbcac1928e32b4ac69c4861be3b0c01d5be68836138d9478e71cc0dd5198d9ac6816245605c34f8b21fcd4e62c48c097e56cd585579df119939 SHA512 686b3944a82d088a2fce12a9b770f4aa5f58aaadde064b3d3342114f0ece2d7cbae27d0e92fd026def6f62a3ff0dc82b37146e30a93b2ec195dc7f376b45fdf7
DIST tecodoc.tar.gz 154109 BLAKE2B 70b9cd99281ab6180e4c13845f3fc97ccd6c142b4b9a3454ac9dcf189e2a65bfaf9b033312aeb9773301ff4d2ec166f79d587f79158b2b0f3f985f77b06f86c1 SHA512 1819450a08e296bdd3d4c282d9a9c7c58203acf82a67bdc9713b0cdfa2d0c4aa046c86ee4ee6f3b2d9ef0f3052705a13dd3d8afbf372bd3b1be8d4c5e8e96fef
DIST tecolore.txt.gz 7039 BLAKE2B db19af3081c4c9129d8298709fe77bb8acaf1c0b19e87d4d313cf65a9426449d9fc864378c85712b5716bc6b535c36bc1b9371a212b43ff4cff6d3aca290146c SHA512 f8b66637dd140057331bb950b639f755b7d2a58c6d9feb5c89c062350f3213b40f4e955c586643312b4bcdcfd5ce67c621c8f7351e08a4303be35af967ce206e
DIST tecoprog.doc.gz 15629 BLAKE2B c47ce219e6b7e98b4cd3332f78ea48bb9d98b7beadb0a11de0361ee680a014da4997e0657ad12052ebef02d1b3dbd234330be9f7c198b5645cc0dc6290aa01f6 SHA512 f49de461d6411345e9e72b51bf39bc1155acc07901b54d8fda94b99a4a573005ccffc475ef8aac3bfc0b8bd246dc0077399d4bcef70e8a5e753c45995df7ad55
EBUILD teco-1.00-r4.ebuild 1700 BLAKE2B 850055702cfc33f0fd155562d5c6b3d126a830e78bef02461cdbb31480f44c7163302ada80271fec203c433d2c16ef0f37eb1aee78b83d59035e36488d918cae SHA512 53257dd5f8ce362efc3b2be0885135c58df3866f3c9275c0db086ed7d9d035c0de001cdcc6f5a316320681b481d36757fb67c984d0e95c51e328cf0c6683f304
EBUILD teco-1.00-r4.ebuild 1698 BLAKE2B 4dee8cd8bf51f8981e51a4dd52066be80c1734e54dd326d94c877bdff97c00db1605728a80d94af46772b1c575f904332c8e6f0578a69c55ee906c04d2302952 SHA512 4c346e648fcde6b8bce1d16a83ae345d01b719983075c532aa7f729ec4d5504447685cc5644e696f637d40f65cf62faa1067a620d10e9276e098a3c904ab7c31
EBUILD teco-36_p19940820.ebuild 1460 BLAKE2B d87d09d90937509002d83bdaf590e143c80323a98c165f60d7ba5af83720004e361b04b9b62dde53024184571c7dccbf6c25c3863b4d19f96ace7f41ae8d871a SHA512 0e32a7ee28c2bd703eda6d3f3882c3492b6fa907bb775bdaeabb3128328b0f83bb891de60e7ebd85be8319ec63fd3964d43219318b401072434788318c9c47bb
MISC metadata.xml 1356 BLAKE2B a433a260d80042f9a4e034f93e94793b8ae3e9725d44cf4369f5baf506d6dcf9be045d3a4ccbefa842004c8bccd629d55f947ef591ce37a662c4199d4f27f2ca SHA512 3e8680b16e6de3e239f453d13d4b0cb41545aace84af0e9cf8103c0f605cec29467bb0b5feebd592dbded84cd109360c42f63da69115870fb57c97f8137dfdc0

@ -1,5 +1,7 @@
--- te_exec2.c 1993-11-12 21:12:47.000000000 +0000
+++ te_exec2.c.new 2005-08-21 18:31:26.495907720 +0100
https://bugs.gentoo.org/103257
--- teco-orig/te_exec2.c
+++ teco/te_exec2.c
@@ -197,7 +197,7 @@
{
if (eisw) /* if ending a file execute, restore the previous "old command string" */

@ -1,5 +1,5 @@
--- te_subs.c.orig 2007-03-18 19:58:40 +0100
+++ te_subs.c 2007-03-18 19:58:57 +0100
--- teco-orig/te_subs.c
+++ teco/te_subs.c
@@ -231,7 +231,7 @@
char c;
{

@ -1,4 +1,4 @@
# Copyright 1999-2014 Gentoo Foundation
# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@ -18,7 +18,7 @@ SLOT="0"
KEYWORDS="alpha amd64 ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
IUSE="doc"
RDEPEND="sys-libs/ncurses:0"
RDEPEND="sys-libs/ncurses:0="
DEPEND="${RDEPEND}
virtual/pkgconfig"

@ -0,0 +1,57 @@
# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
inherit toolchain-funcs flag-o-matic readme.gentoo-r1
DESCRIPTION="Classic TECO editor, Predecessor to EMACS"
HOMEPAGE="http://www.ibiblio.org/pub/linux/apps/editors/tty/ http://www.ibiblio.org/pub/academic/computer-science/history/pdp-11/teco"
SRC_URI="http://www.ibiblio.org/pub/linux/apps/editors/tty/teco.tar.gz -> ${P}.tar.gz
doc? ( https://dev.gentoo.org/~ulm/distfiles/tecodoc.tar.gz )"
LICENSE="freedist"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
IUSE="doc"
RDEPEND="sys-libs/ncurses:0="
DEPEND="${RDEPEND}"
BDEPEND="virtual/pkgconfig"
S="${WORKDIR}"
PATCHES=(
"${FILESDIR}"/${PN}-double-free.diff
"${FILESDIR}"/${PN}-gcc4.patch
"${FILESDIR}"/${PN}-warnings.patch
)
src_prepare() {
default
local pkg_config=$("$(tc-getPKG_CONFIG)" --libs ncurses)
sed -i -e "s:\$(CC):& \$(LDFLAGS):;s:-ltermcap:${pkg_config}:" \
Makefile || die
}
src_compile() {
append-flags -ansi
append-cppflags -D_POSIX_SOURCE
emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
}
src_install() {
dobin te
doman te.1
dodoc sample.tecorc sample.tecorc2 READ.ME
use doc && dodoc doc/*
DOC_CONTENTS="The TECO binary is called te.
\nSample configurations and documentation are available
in /usr/share/doc/${PF}/."
readme.gentoo_create_doc
}
pkg_postinst() {
readme.gentoo_print_elog
}

@ -3,6 +3,8 @@ AUX vimrc-r5 7337 BLAKE2B 3f28db016b3956b4c5e2833ff4440417d3ccdc446618a776119513
AUX xxd-completion 461 BLAKE2B 1f36c4877fffd68e951d80c1a64cd2d458d92555a99fd06e29513da8caa6c28c27e44131b2873258e3ff5a0ab232d66f75a8f051ccf7a4d940b3b0102e6967dd SHA512 fc92426ea657e86ff765aa5a60736cdc70db938156dd8946db0a30c54d3f557bd8af421f1713bd750e779ccacd73f8f290a12a5e71ed48259fe1e6dece2de19c
DIST vim-8.0.0938-gentoo-patches.tar.bz2 2316 BLAKE2B 05a87f32fc5cc65e7f5e4e5a87c654b2040ad39f1555ddde7e0e6f473dc8b520916a795406bb6bbeaf5e7ae8748aacebe7a9679461e48802e69417e945eea827 SHA512 a6062be5e6a5c5b437081312df5742353242b5171bf26da04aa6ca216d2b142b2411a88bc1edd460d28e00a59a210c8e1729e801fac6f1efd86bb2e437a56a2b
DIST vim-8.1.1486.tar.gz 14318109 BLAKE2B 6054df175a32e9ed36873802a4a669cc46e034bac879cb829e45ece53f9440e97cccad47e370ebdef8dc1bb963e8e8c84bd517a3a6561705786dcab7e2368d21 SHA512 0a521d74c60f2a32e8a11e16f256e2e99fb9c00f478cd8d7a9328315abbd445796153f03884ab2b240905260317809a33afb64627b9a71ac8d6db1cbd4026d20
DIST vim-8.1.1846.tar.gz 14415116 BLAKE2B 59c2864519e100f9bc2617dd7b31a8cc17ff20fc87a761eba653e91a70688c3b4a5f05c527acaf6d075830d23c7ef8842595b6558eac2ab5209029153f1adb10 SHA512 d5a5cb7733f3190915e2b1389fea48d119afef27eac6f04ac3967f57e894cab811727a694c6837bb5acef9997cd56018d4b37efeb413c654012aaaea02bf7c7a
EBUILD vim-core-8.1.1486.ebuild 6937 BLAKE2B 0409e1720c6082fca63bffe307bdfb0cf5c79325c3f61dd0d4f2360e33c03643b7e1ec0f6f8c98a3ed27fdb95f7ea50378d8063441ea594fdaec376ccbb2fa45 SHA512 b6c00c520c2d99a3325538fde47e2bb9d9088f491df6d5dc7c0802f53c2f365ff542f226f800ab0634c2b2589d456211dacc212407c70c77400c5ad80b401904
EBUILD vim-core-8.1.1846.ebuild 6948 BLAKE2B 7e9f614484bf8598c5240159d4ea0fed4b41cb98bbb1fea86b57a370918a50c730388c1cf7d5c26689d31edd1b0e2687c8aa1b6767db65d5208500796a171588 SHA512 b806c11fee9e7d5456df7d2d1785ec60699921ff95c769a3827d69422472528836af94d68a0484a468a31ab2010b8f66cd9e9ac9557fd735c0599c2505897e43
EBUILD vim-core-9999.ebuild 6948 BLAKE2B 7e9f614484bf8598c5240159d4ea0fed4b41cb98bbb1fea86b57a370918a50c730388c1cf7d5c26689d31edd1b0e2687c8aa1b6767db65d5208500796a171588 SHA512 b806c11fee9e7d5456df7d2d1785ec60699921ff95c769a3827d69422472528836af94d68a0484a468a31ab2010b8f66cd9e9ac9557fd735c0599c2505897e43
MISC metadata.xml 321 BLAKE2B 018b535f5c81e8df2ee4f38a61ab95f999fb7fcd07ab67f9d5f7d2459768dc7e771006f50f903e1d0ba6cbf42ba2ae299901c1edb951a6e1dcbe3decaac98c57 SHA512 7d4a40b09c24eb8f08e6c171a4cf0e332d82f06163846602db338a1ad2e51133ed18694f216ce061fd9964fba3380b9991d86b93f111c6f8d0bb62ac5e14f705

@ -0,0 +1,225 @@
# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
VIM_VERSION="8.1"
inherit estack vim-doc flag-o-matic bash-completion-r1 prefix desktop gnome2-utils
if [[ ${PV} == 9999* ]] ; then
inherit git-r3
EGIT_REPO_URI="https://github.com/vim/vim.git"
EGIT_CHECKOUT_DIR=${WORKDIR}/vim-${PV}
else
SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> vim-${PV}.tar.gz
https://dev.gentoo.org/~radhermit/vim/vim-8.0.0938-gentoo-patches.tar.bz2"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
DESCRIPTION="vim and gvim shared files"
HOMEPAGE="https://vim.sourceforge.io/ https://github.com/vim/vim"
SLOT="0"
LICENSE="vim"
IUSE="nls acl minimal"
DEPEND="sys-devel/autoconf"
# avoid icon file collision bug #673880
RDEPEND="!!<app-editors/gvim-8.1.0648"
PDEPEND="!minimal? ( app-vim/gentoo-syntax )"
S=${WORKDIR}/vim-${PV}
pkg_setup() {
# people with broken alphabets run into trouble. bug 82186.
unset LANG LC_ALL
export LC_COLLATE="C"
# Gnome sandbox silliness. bug #114475.
mkdir -p "${T}"/home || die "mkdir -p failed"
export HOME="${T}"/home
}
src_prepare() {
if [[ ${PV} != 9999* ]] ; then
# Gentoo patches to fix runtime issues, cross-compile errors, etc
eapply "${WORKDIR}"/patches
fi
# Fixup a script to use awk instead of nawk
sed -i \
-e '1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' \
"${S}"/runtime/tools/mve.awk || die "sed failed"
# See #77841. We remove this file after the tarball extraction.
rm -v "${S}"/runtime/tools/vimspell.sh || die "rm failed"
# Read vimrc and gvimrc from /etc/vim
echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' >> "${S}"/src/feature.h
echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' >> "${S}"/src/feature.h
# Use exuberant ctags which installs as /usr/bin/exuberant-ctags.
# Hopefully this pattern won't break for a while at least.
# This fixes bug 29398 (27 Sep 2003 agriffis)
sed -i 's/\<ctags\("\| [-*.]\)/exuberant-&/g' \
"${S}"/runtime/doc/syntax.txt \
"${S}"/runtime/doc/tagsrch.txt \
"${S}"/runtime/doc/usr_29.txt \
"${S}"/runtime/menu.vim \
"${S}"/src/configure.ac || die 'sed failed'
# Don't be fooled by /usr/include/libc.h. When found, vim thinks
# this is NeXT, but it's actually just a file in dev-libs/9libs
# This fixes bug 43885 (20 Mar 2004 agriffis)
sed -i 's/ libc\.h / /' "${S}"/src/configure.ac || die 'sed failed'
# gcc on sparc32 has this, uhm, interesting problem with detecting EOF
# correctly. To avoid some really entertaining error messages about stuff
# which isn't even in the source file being invalid, we'll do some trickery
# to make the error never occur. bug 66162 (02 October 2004 ciaranm)
find "${S}" -name '*.c' | while read c; do
echo >> "$c" || die "echo failed"
done
# Try to avoid sandbox problems. Bug #114475.
if [[ -d "${S}"/src/po ]]; then
sed -i -e \
'/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \
"${S}"/src/po/Makefile || die "sed failed"
fi
cp -v "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk || die "cp failed"
# Bug #378107 - Build properly with >=perl-core/ExtUtils-ParseXS-3.20.0
sed -i -e \
"s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:" \
"${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed'
eapply_user
}
src_configure() {
local myconf
# Fix bug 37354: Disallow -funroll-all-loops on amd64
# Bug 57859 suggests that we want to do this for all archs
filter-flags -funroll-all-loops
# Fix bug 76331: -O3 causes problems, use -O2 instead. We'll do this for
# everyone since previous flag filtering bugs have turned out to affect
# multiple archs...
replace-flags -O3 -O2
# Fix bug 18245: Prevent "make" from the following chain:
# (1) Notice configure.ac is newer than auto/configure
# (2) Rebuild auto/configure
# (3) Notice auto/configure is newer than auto/config.mk
# (4) Run ./configure (with wrong args) to remake auto/config.mk
sed -i 's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed"
# Remove src/auto/configure file.
rm -v src/auto/configure || die "rm configure failed"
emake -j1 -C src autoconf
# This should fix a sandbox violation (see bug 24447). The hvc
# things are for ppc64, see bug 86433.
for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc*; do
if [[ -e "${file}" ]]; then
addwrite $file
fi
done
# Let Portage do the stripping. Some people like that.
export ac_cv_prog_STRIP="$(type -P true ) faking strip"
# Keep Gentoo Prefix env contained within the EPREFIX
use prefix && myconf+=" --without-local-dir"
econf \
--with-modified-by=Gentoo-${PVR} \
--enable-gui=no \
--without-x \
--disable-darwin \
--disable-perlinterp \
--disable-pythoninterp \
--disable-rubyinterp \
--disable-gpm \
--disable-selinux \
$(use_enable nls) \
$(use_enable acl) \
${myconf}
}
src_compile() {
emake -j1 -C src auto/osdef.h objects
emake tools
}
src_test() { :; }
src_install() {
local vimfiles=/usr/share/vim/vim${VIM_VERSION/.}
dodir /usr/{bin,share/{man/man1,vim}}
emake -C src \
installruntime \
installmanlinks \
installmacros \
installtutor \
installtutorbin \
installtools \
install-languages \
DESTDIR="${D}" \
BINDIR="${EPREFIX}"/usr/bin \
MANDIR="${EPREFIX}"/usr/share/man \
DATADIR="${EPREFIX}"/usr/share
keepdir ${vimfiles}/keymap
# default vimrc is installed by vim-core since it applies to
# both vim and gvim
insinto /etc/vim/
newins "${FILESDIR}"/vimrc-r5 vimrc
eprefixify "${ED}"/etc/vim/vimrc
if use minimal; then
# To save space, install only a subset of the files.
# Helps minimalize the livecd, bug 65144.
eshopts_push -s extglob
rm -rv "${ED}${vimfiles}"/{compiler,doc,ftplugin,indent} || die "rm failed"
rm -rv "${ED}${vimfiles}"/{macros,print,tools,tutor} || die "rm failed"
rm -v "${ED}"/usr/bin/vimtutor || die "rm failed"
local keep_colors="default"
ignore=$(rm -fr "${ED}${vimfiles}"/colors/!(${keep_colors}).vim )
local keep_syntax="conf|crontab|fstab|inittab|resolv|sshdconfig"
# tinkering with the next line might make bad things happen ...
keep_syntax="${keep_syntax}|syntax|nosyntax|synload"
ignore=$(rm -fr "${ED}${vimfiles}"/syntax/!(${keep_syntax}).vim )
eshopts_pop
fi
newbashcomp "${FILESDIR}"/xxd-completion xxd
# install gvim icon since both vim/gvim desktop files reference it
doicon -s scalable "${FILESDIR}"/gvim.svg
}
pkg_postinst() {
# update documentation tags (from vim-doc.eclass)
update_vim_helptags
# update icon cache
gnome2_icon_cache_update
}
pkg_postrm() {
# Update documentation tags (from vim-doc.eclass)
update_vim_helptags
# update icon cache
gnome2_icon_cache_update
}

@ -1,6 +1,8 @@
AUX vim-completion 1004 BLAKE2B dea4230a8d2a57fd1af18df4037504a44382a97ff672410e987cb287d802c964baa502da4d08f09cb8684307481fec503c1d8cae7f4f6e61500f1cb06033a2c4 SHA512 dccf663a93efdf2ec3be69f49e418a0ef66277e2fae6c12287adde772592e19f5130388a04242121846f1dae39f78b30780c99dc6fe1b847f4f08354bda3cc41
DIST vim-8.0.0938-gentoo-patches.tar.bz2 2316 BLAKE2B 05a87f32fc5cc65e7f5e4e5a87c654b2040ad39f1555ddde7e0e6f473dc8b520916a795406bb6bbeaf5e7ae8748aacebe7a9679461e48802e69417e945eea827 SHA512 a6062be5e6a5c5b437081312df5742353242b5171bf26da04aa6ca216d2b142b2411a88bc1edd460d28e00a59a210c8e1729e801fac6f1efd86bb2e437a56a2b
DIST vim-8.1.1486.tar.gz 14318109 BLAKE2B 6054df175a32e9ed36873802a4a669cc46e034bac879cb829e45ece53f9440e97cccad47e370ebdef8dc1bb963e8e8c84bd517a3a6561705786dcab7e2368d21 SHA512 0a521d74c60f2a32e8a11e16f256e2e99fb9c00f478cd8d7a9328315abbd445796153f03884ab2b240905260317809a33afb64627b9a71ac8d6db1cbd4026d20
DIST vim-8.1.1846.tar.gz 14415116 BLAKE2B 59c2864519e100f9bc2617dd7b31a8cc17ff20fc87a761eba653e91a70688c3b4a5f05c527acaf6d075830d23c7ef8842595b6558eac2ab5209029153f1adb10 SHA512 d5a5cb7733f3190915e2b1389fea48d119afef27eac6f04ac3967f57e894cab811727a694c6837bb5acef9997cd56018d4b37efeb413c654012aaaea02bf7c7a
EBUILD vim-8.1.1486.ebuild 9093 BLAKE2B dea5afe5f46f73fc190210988cbad81fa3a4d91796f4e968e9675b2e3e09eb8dd4e678a1899d57405bbaf14f70fdb9d0125d64cf0394be09ccb5cde83e347446 SHA512 d6d231bf494b2742dd3820aa7f8f7a8303d7a6edd4dc3c2e61396fba3961a134017bcd81d093dbe9ef635da524ff0adf000dc52a06c18a528781922e4bf8523b
EBUILD vim-9999.ebuild 9104 BLAKE2B 23bb8fe36b201249da7357654dc600321b908db48118afcd82c6f037410c9f4f6c3746c45dd485a217ec65bbe05bca688e0e375487d7829830f23384d5c40101 SHA512 c35b426d97269f5c48b14ac3baddf4205ae4212fff76c15edd7c3553d3c26a940632bbcee459442863bc31c8707b16d7ca2b5cb4aeff63ed779b1c5bc0fd91fe
EBUILD vim-8.1.1846.ebuild 9180 BLAKE2B b5f478b9591fc2cd3fea99c82d89cad0bb2d8457180d47b9020ea0f259eef2cfcec7fabb49f8e12466f6bf7dadac74882fc5013e03fd9c76a7fa073802decf12 SHA512 2da5c7d28d1660c80299e0f3f3c454edb741e9bbcf94b577986ba2fdddd9ae1a072e44309e25962c5d9423b5538dee2fbcf2914787bbdfc460e6b62fbd464116
EBUILD vim-9999.ebuild 9199 BLAKE2B c7e0eb1fbb65ead20d911c9b6cf60c34b63a89d8dce49799ee496600496a83bffb671249f5a965b0f5f2a93684a92b967e759a7b6a61a431a7bf82abe6ff2a67 SHA512 383c348dd5be5d939b218a21bd3b281b8a9cd411c745c045ecdacd28e78a2364b005d8423cce6485ac78588a96a3b7aec0e980d2acb8fd7ab91d5ff5bbc07f11
MISC metadata.xml 807 BLAKE2B e876f33c06a0bb165a43a7c50ff9bbfa0513e43287f54dbcee396af736034e4cefba8831226b47cc8a334599632a94344623ae2343f0162dbbcd511f749d524a SHA512 a7801a4483b08944c01848593354322c406a929296075617736755c0b62852b76c30467cee2c360ea211521274f2019b495309bffb5a3285d73940aac45e4a53

@ -0,0 +1,320 @@
# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
VIM_VERSION="8.1"
PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
PYTHON_REQ_USE="threads(+)"
USE_RUBY="ruby24 ruby25 ruby26"
inherit vim-doc flag-o-matic bash-completion-r1 python-single-r1 ruby-single desktop xdg-utils
if [[ ${PV} == 9999* ]] ; then
inherit git-r3
EGIT_REPO_URI="https://github.com/vim/vim.git"
else
SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> ${P}.tar.gz
https://dev.gentoo.org/~radhermit/vim/vim-8.0.0938-gentoo-patches.tar.bz2"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
DESCRIPTION="Vim, an improved vi-style text editor"
HOMEPAGE="https://vim.sourceforge.io/ https://github.com/vim/vim"
SLOT="0"
LICENSE="vim"
IUSE="X acl cscope debug gpm lua luajit minimal nls perl python racket ruby selinux sound tcl terminal vim-pager"
REQUIRED_USE="
python? ( ${PYTHON_REQUIRED_USE} )
vim-pager? ( !minimal )
"
RDEPEND="
>=app-eselect/eselect-vi-1.1
>=sys-libs/ncurses-5.2-r2:0=
nls? ( virtual/libintl )
acl? ( kernel_linux? ( sys-apps/acl ) )
cscope? ( dev-util/cscope )
gpm? ( >=sys-libs/gpm-1.19.3 )
lua? (
luajit? ( dev-lang/luajit:2= )
!luajit? ( dev-lang/lua:0[deprecated] )
)
!minimal? ( ~app-editors/vim-core-${PV} )
vim-pager? ( app-editors/vim-core[-minimal] )
perl? ( dev-lang/perl:= )
python? ( ${PYTHON_DEPS} )
racket? ( dev-scheme/racket )
ruby? ( ${RUBY_DEPS} )
selinux? ( sys-libs/libselinux )
sound? ( media-libs/libcanberra )
tcl? ( dev-lang/tcl:0= )
X? ( x11-libs/libXt )
"
DEPEND="
${RDEPEND}
sys-devel/autoconf
nls? ( sys-devel/gettext )
"
pkg_setup() {
# people with broken alphabets run into trouble. bug 82186.
unset LANG LC_ALL
export LC_COLLATE="C"
# Gnome sandbox silliness. bug #114475.
mkdir -p "${T}"/home || die "mkdir failed"
export HOME="${T}"/home
use python && python-single-r1_pkg_setup
}
src_prepare() {
if [[ ${PV} != 9999* ]] ; then
# Gentoo patches to fix runtime issues, cross-compile errors, etc
eapply "${WORKDIR}"/patches/
fi
# Fixup a script to use awk instead of nawk
sed -i -e \
'1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' \
"${S}"/runtime/tools/mve.awk || die "mve.awk sed failed"
# Read vimrc and gvimrc from /etc/vim
echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' \
>> "${S}"/src/feature.h || die "echo failed"
echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' \
>> "${S}"/src/feature.h || die "echo failed"
# Use exuberant ctags which installs as /usr/bin/exuberant-ctags.
# Hopefully this pattern won't break for a while at least.
# This fixes bug 29398 (27 Sep 2003 agriffis)
sed -i -e \
's/\<ctags\("\| [-*.]\)/exuberant-&/g' \
"${S}"/runtime/doc/syntax.txt \
"${S}"/runtime/doc/tagsrch.txt \
"${S}"/runtime/doc/usr_29.txt \
"${S}"/runtime/menu.vim \
"${S}"/src/configure.ac || die 'sed failed'
# Don't be fooled by /usr/include/libc.h. When found, vim thinks
# this is NeXT, but it's actually just a file in dev-libs/9libs
# This fixes bug 43885 (20 Mar 2004 agriffis)
sed -i -e \
's/ libc\.h / /' \
"${S}"/src/configure.ac || die 'sed failed'
# gcc on sparc32 has this, uhm, interesting problem with detecting EOF
# correctly. To avoid some really entertaining error messages about stuff
# which isn't even in the source file being invalid, we'll do some trickery
# to make the error never occur. bug 66162 (02 October 2004 ciaranm)
find "${S}" -name '*.c' | while read c; do
echo >> "$c" || die "echo failed"
done
# conditionally make the manpager.sh script
if use vim-pager; then
cat > "${S}"/runtime/macros/manpager.sh <<-_EOF_ || die "cat EOF failed"
#!/bin/sh
sed -e 's/\x1B\[[[:digit:]]\+m//g' | col -b | \\
vim \\
-c 'let no_plugin_maps = 1' \\
-c 'set nolist nomod ft=man ts=8' \\
-c 'let g:showmarks_enable=0' \\
-c 'runtime! macros/less.vim' -
_EOF_
fi
# Try to avoid sandbox problems. Bug #114475.
if [[ -d "${S}"/src/po ]]; then
sed -i -e \
'/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \
"${S}"/src/po/Makefile || die "sed failed"
fi
cp -v "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk || die "cp failed"
sed -i -e \
"s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:" \
"${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed'
eapply_user
}
src_configure() {
local myconf=()
# Fix bug 37354: Disallow -funroll-all-loops on amd64
# Bug 57859 suggests that we want to do this for all archs
filter-flags -funroll-all-loops
# Fix bug 76331: -O3 causes problems, use -O2 instead. We'll do this for
# everyone since previous flag filtering bugs have turned out to affect
# multiple archs...
replace-flags -O3 -O2
# Fix bug 18245: Prevent "make" from the following chain:
# (1) Notice configure.ac is newer than auto/configure
# (2) Rebuild auto/configure
# (3) Notice auto/configure is newer than auto/config.mk
# (4) Run ./configure (with wrong args) to remake auto/config.mk
sed -i 's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed"
rm src/auto/configure || die "rm failed"
emake -j1 -C src autoconf
# This should fix a sandbox violation (see bug 24447). The hvc
# things are for ppc64, see bug 86433.
for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc*; do
if [[ -e "${file}" ]]; then
addwrite $file
fi
done
if use minimal; then
myconf=(
--with-features=tiny
--disable-nls
--disable-canberra
--disable-acl
--enable-gui=no
--without-x
--disable-darwin
--disable-luainterp
--disable-perlinterp
--disable-pythoninterp
--disable-mzschemeinterp
--disable-rubyinterp
--disable-selinux
--disable-tclinterp
--disable-gpm
)
else
use debug && append-flags "-DDEBUG"
myconf=(
--with-features=huge
$(use_enable sound canberra)
$(use_enable acl)
$(use_enable cscope)
$(use_enable gpm)
$(use_enable lua luainterp)
$(usex lua "--with-lua-prefix=${EPREFIX}/usr" "")
$(use_with luajit)
$(use_enable nls)
$(use_enable perl perlinterp)
$(use_enable python pythoninterp)
$(use_enable python python3interp)
$(use_with python python-command $(type -P $(eselect python show --python2)))
$(use_with python python3-command $(type -P $(eselect python show --python3)))
$(use_enable racket mzschemeinterp)
$(use_enable ruby rubyinterp)
$(use_enable selinux)
$(use_enable tcl tclinterp)
$(use_enable terminal)
)
# --with-features=huge forces on cscope even if we --disable it. We need
# to sed this out to avoid screwiness. (1 Sep 2004 ciaranm)
if ! use cscope; then
sed -i -e \
'/# define FEAT_CSCOPE/d' src/feature.h || die "sed failed"
fi
# don't test USE=X here ... see bug #19115
# but need to provide a way to link against X ... see bug #20093
myconf+=(
--enable-gui=no
--disable-darwin
$(use_with X x)
)
fi
# let package manager strip binaries
export ac_cv_prog_STRIP="$(type -P true ) faking strip"
# keep prefix env contained within the EPREFIX
use prefix && myconf+=( --without-local-dir )
econf \
--with-modified-by=Gentoo-${PVR} \
"${myconf[@]}"
}
src_compile() {
# The following allows emake to be used
emake -j1 -C src auto/osdef.h objects
emake
}
src_test() {
einfo
einfo "Starting vim tests. Several error messages will be shown"
einfo "while the tests run. This is normal behaviour and does not"
einfo "indicate a fault."
einfo
ewarn "If the tests fail, your terminal may be left in a strange"
ewarn "state. Usually, running 'reset' will fix this."
einfo
# Don't let vim talk to X
unset DISPLAY
emake -j1 -C src/testdir nongui
}
# Call eselect vi update with --if-unset
# to respect user's choice (bug 187449)
eselect_vi_update() {
einfo "Calling eselect vi update..."
eselect vi update --if-unset
eend $?
}
src_install() {
local vimfiles=/usr/share/vim/vim${VIM_VERSION/.}
# Note: Do not install symlinks for 'vi', 'ex', or 'view', as these are
# managed by eselect-vi
dobin src/vim
dosym vim /usr/bin/vimdiff
dosym vim /usr/bin/rvim
dosym vim /usr/bin/rview
if use vim-pager ; then
dosym ${vimfiles}/macros/less.sh /usr/bin/vimpager
dosym ${vimfiles}/macros/manpager.sh /usr/bin/vimmanpager
insinto ${vimfiles}/macros
doins runtime/macros/manpager.sh
fperms a+x ${vimfiles}/macros/manpager.sh
fi
domenu runtime/vim.desktop
newbashcomp "${FILESDIR}"/${PN}-completion ${PN}
# keep in sync with 'complete ... -F' list
bashcomp_alias vim ex vi view rvim rview vimdiff
}
pkg_postinst() {
# Update documentation tags (from vim-doc.eclass)
update_vim_helptags
# Call eselect vi update
eselect_vi_update
# update desktop file mime cache
xdg_desktop_database_update
}
pkg_postrm() {
# Update documentation tags (from vim-doc.eclass)
update_vim_helptags
# Call eselect vi update
eselect_vi_update
# update desktop file mime cache
xdg_desktop_database_update
}

@ -23,7 +23,7 @@ HOMEPAGE="https://vim.sourceforge.io/ https://github.com/vim/vim"
SLOT="0"
LICENSE="vim"
IUSE="X acl cscope debug gpm lua luajit minimal nls perl python racket ruby selinux tcl terminal vim-pager"
IUSE="X acl cscope debug gpm lua luajit minimal nls perl python racket ruby selinux sound tcl terminal vim-pager"
REQUIRED_USE="
python? ( ${PYTHON_REQUIRED_USE} )
vim-pager? ( !minimal )
@ -47,6 +47,7 @@ RDEPEND="
racket? ( dev-scheme/racket )
ruby? ( ${RUBY_DEPS} )
selinux? ( sys-libs/libselinux )
sound? ( media-libs/libcanberra )
tcl? ( dev-lang/tcl:0= )
X? ( x11-libs/libXt )
"
@ -174,6 +175,7 @@ src_configure() {
myconf=(
--with-features=tiny
--disable-nls
--disable-canberra
--disable-acl
--enable-gui=no
--without-x
@ -192,6 +194,7 @@ src_configure() {
myconf=(
--with-features=huge
$(use_enable sound canberra)
$(use_enable acl)
$(use_enable cscope)
$(use_enable gpm)

Binary file not shown.

@ -1,6 +1,4 @@
DIST diskimage-builder-2.24.0.tar.gz 408702 BLAKE2B 069083aef6214d59d9731a13691c2b48cb354085b698c8f711b3cd93c54d44acb08487510b2b9b038a53c533ea17f41b2521c36eee643c09dc409ea13c21fa6b SHA512 90bf13059f9310f3b45bf7c1a550d837e4d73920efa2af2ae30ec3cd5118d3db223b6953d5209ef0f7029c23f17772de1a36cfba87d7e86bbe8a481aa4ee0639
DIST diskimage-builder-2.25.0.tar.gz 419297 BLAKE2B 78ac5b1119233080dddef917b05ca4f51f73382bb325cbf228f63837ab79be9ce524351404f2a26cf735440c66a3dc246a1642258b77f217406998650860eb39 SHA512 4afd257b01924a526ef335bf6699f5fbf49ca0c08bb3d288a6823783b842827e3afb51794771994f068332c6ee2ecf6f105fc03112d6a7807932fb5ab1fa4c24
EBUILD diskimage-builder-2.24.0.ebuild 1278 BLAKE2B 8a763c66fa85499b81a5f74315a87bb38573a5c03675d9201ebe22fc803db75bf84d5828dbbbb5008ea746da8a9a8340cee2e8dee7aadab91d4edf0f32c2d90f SHA512 9bfc9661ad8b4c27b32a9c15653bed831abd1d8a7923bf9c0468c8d3a2e8f5acf48d783689c20ac90f834344ee629a0d6525f43e19e68bbfe3044bcf219dbe37
EBUILD diskimage-builder-2.25.0.ebuild 1280 BLAKE2B 82d085c4c67d556895ab02cee213e7914b08e2934907f4049308b3f2b1198e86661e9efe5621d3412a17a69543bef4e8fa90996bafecc648bf3231380b69ed52 SHA512 49f99b2bb3855d69595eb309675956ffc0a174f9f387eb1b508dcc6e1dcd0276db92355445f4f5604dd26f9bd93d56b0bd1cba78f0c475ae76aa71981d9b6f6a
EBUILD diskimage-builder-2.25.0.ebuild 1278 BLAKE2B 8a763c66fa85499b81a5f74315a87bb38573a5c03675d9201ebe22fc803db75bf84d5828dbbbb5008ea746da8a9a8340cee2e8dee7aadab91d4edf0f32c2d90f SHA512 9bfc9661ad8b4c27b32a9c15653bed831abd1d8a7923bf9c0468c8d3a2e8f5acf48d783689c20ac90f834344ee629a0d6525f43e19e68bbfe3044bcf219dbe37
EBUILD diskimage-builder-9999.ebuild 1280 BLAKE2B 82d085c4c67d556895ab02cee213e7914b08e2934907f4049308b3f2b1198e86661e9efe5621d3412a17a69543bef4e8fa90996bafecc648bf3231380b69ed52 SHA512 49f99b2bb3855d69595eb309675956ffc0a174f9f387eb1b508dcc6e1dcd0276db92355445f4f5604dd26f9bd93d56b0bd1cba78f0c475ae76aa71981d9b6f6a
MISC metadata.xml 718 BLAKE2B 04a2c90bcae79f187feb346d0b73f1d6dd1c1581123ca26bfd3182d97239a37e81875d7a3a7b03c4aa08f2974bd25be5f3021e2e48195d5d09e18b606b5b4c87 SHA512 8e16e9d92a81049d414ae54eaf7a4467982cbd949230adcfab22b636ba2b91885d80e9b047788ccd07eab547ae2f85a56d989b971b64bd926e6ca70972398277

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

@ -13,7 +13,7 @@ if [[ ${PV} == 9999* ]]; then
EGIT_REPO_URI="https://opendev.org/openstack/diskimage-builder.git"
else
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
fi
LICENSE="Apache-2.0"

@ -1,3 +1,5 @@
DIST dlx.tar.gz 112589 BLAKE2B 307785d08fd69e45264471fbc21e3b2bdba99798c0b7144c3d6a92819c29e4ac6449a6db83fdd55ba81d3b2e3f8ca6c991ee6c117ddc490a88ae210e5bc07ab8 SHA512 99297f14f6716ada7a29b204723a0c951002529362a22f695b3647517462f43af563ea55467985dda3e21d79a14d46b84dbc9b22a8c0751fba49257e30f70a7f
EBUILD dlx-1.0.0.ebuild 377 BLAKE2B 8a1a1a772ec38bbb2aafb68a5e8142064ae8eb2b45837d4ca55b13dee9f6d14f973b8dccdd1f2fa4ed0e5f49c506a3561eb7af8c015d3862fa3b640d0f957cc0 SHA512 e0f022d7469d8be2c3477cfd26f2413f35606578ae3ae14f9c5fcd632687ea6f69d43bf4bd618eedef960863ac6cc2fac8167a5164bb65bae410afb921e9aa58
DIST dlx-1.0.0.tar.gz 112589 BLAKE2B 307785d08fd69e45264471fbc21e3b2bdba99798c0b7144c3d6a92819c29e4ac6449a6db83fdd55ba81d3b2e3f8ca6c991ee6c117ddc490a88ae210e5bc07ab8 SHA512 99297f14f6716ada7a29b204723a0c951002529362a22f695b3647517462f43af563ea55467985dda3e21d79a14d46b84dbc9b22a8c0751fba49257e30f70a7f
DIST dlx-1.5.20.zip 137039 BLAKE2B 99dbb2e5bcd89b3e9f3d8edc2fe7e7cc0a59f870f597a40a61a993b95d8b27c4f95b8d0490fdbcbc15693040d6e3abdfb8b0062e109916f5299c3da3c203d755 SHA512 5c832c2a486a82574ae03ec0cb4e30bfec74ef968658a38fbd896a1383dcdc558501baef7cbbdf99df453ba2840622d16c1619f9c5fe34b6cd058a7718bd3790
EBUILD dlx-1.0.0.ebuild 375 BLAKE2B b9a5b9cfca4eb241491f272abf08bf2fd95935571404274f6df5b07ba044ca143b01d5e2dc25b4f07d289e732a84c45fdbe734fc1ae0eb092ed01b0dcfab3044 SHA512 c65ee800a5658c356972568a4ab7ed986b73cb3647e5ba71e071ed5a73ea5a5d8df3b829b6f07b6150bea9e078b9da7c91108e18dea0f6c95f55949f6559a499
EBUILD dlx-1.5.20.ebuild 594 BLAKE2B 25a39d4195d1995c58d3206288ee9d73f34010a0dd986b4a91b4dcfa5cb1d9a422c909d1cd1290dc63c2b4ec1b478e85c2dbbf495ac5e0ad8c3c86a25f8a60e8 SHA512 85cfc7920a765d93c13c002ea73b4d4853ab52be99c535892e0231bba339ec813d881339b22394bbb3186a22db8c96db0fed8c19e89fdf951ebc3e7573bce4d5
MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84

@ -6,8 +6,8 @@ EAPI=6
S=${WORKDIR}/dlx
DESCRIPTION="DLX Simulator"
HOMEPAGE="http://www.davidviner.com/dlx.php"
SRC_URI="http://www.davidviner.com/dlx/dlx.tar.gz"
HOMEPAGE="https://www.davidviner.com/dlx"
SRC_URI="mirror://gentoo/dlx.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"

@ -0,0 +1,30 @@
# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
inherit toolchain-funcs
DESCRIPTION="DLX Simulator"
HOMEPAGE="https://www.davidviner.com/dlx"
SRC_URI="https://www.davidviner.com/zip/dlx/dlx.zip -> ${P}.zip"
S=${WORKDIR}/dlx
LICENSE="GPL-2+"
SLOT="0"
KEYWORDS="~amd64 ~ppc ~x86"
IUSE=""
DEPEND="app-arch/unzip"
src_compile() {
# CXX not used
emake CC="$(tc-getCC)" LINK="$(tc-getCC)" \
CFLAGS="${CFLAGS} ${CPPFLAGS}" \
LFLAGS="${CFLAGS} ${LDFLAGS}"
}
src_install() {
dobin masm mon dasm
dodoc README.txt MANUAL.TXT
}

Binary file not shown.

@ -1,4 +1,4 @@
DIST ranger-1.9.2.tar.gz 265295 BLAKE2B 93e4d8ff1ad41c9bdf94af4a3ed9ab013048d1a601242553592b0e246f000b3a0226644b126ae7ec1c70562ff80b3f6c6711ee0e53dc1b7363c9ddf8f5fa75cc SHA512 5eb4743beaf0478d745cce8e5bfc2ac07c98ab5784e9394772782d06c0bb27dcd5478ead191ac527f21cce76db09a51eb46db0fabc7993684a6b5aaec0d43104
EBUILD ranger-1.9.2.ebuild 1062 BLAKE2B b59606cd9dd4f63b812e2ac1b97455c7b54041a844da5bc99a3cc76322228aa1d8c9e48ef5f92e74c9ce57cc052fb287a1899537859c266dff51e89b20569956 SHA512 5b632e83732b6443797c3eb81b51531f71c9f0ac8295bf34a861eab18e7ad257a75aaec8c693911ba53e947cc314b6d179a9c12c6f2b1173233875d44a569cee
EBUILD ranger-9999.ebuild 1064 BLAKE2B 3f1ac4ab95405186a6c072d56a0e8d003ce6a8788139aa64f5b4bdf23242df961b4c2b7a428fdea3bff5a692e18d243205a906774482ed7af96bae6ee2655dd0 SHA512 252f8781834fc376d6f9353b59cc4d253c216b3dffd03d6947a941e8a0e58c08b010abc76c63d5b9360356fb7ad21f29ebb9abd0bcb8a551b7ced6de0528ba07
EBUILD ranger-1.9.2.ebuild 1089 BLAKE2B 91eda15a696f8003f2e7fe52fa85d76af8d1637ac5a954554e331cb730868b75bdca707a144bdac237e5236e456a24a92789787e4f1c2e39e4f993dd015d5bd3 SHA512 b64b3bc1808e162698d89721bcfb1a2bf220182a144338ca03b7a13da1ff4a10c44db6fc92bf3810ef282f515c2a5244421721f9976685c1a06e96c12fdc5ab9
EBUILD ranger-9999.ebuild 1091 BLAKE2B c3adf38cab57b75499778afda6aaa00a8f324cecaa1a6afe4bc8ef58efe1689e9ce0395ee9a586f7315c2f172036ed2c055d4a0cdfea61ec39cdf6d3947d4509 SHA512 6a25719d142ddcf2bbe5acdc05924ff08d635d5b9f7204a23ae21c7cb7d1c58aa4b5f5b9c4c06737921ce12123eeba5d173e5496794e48b4c1526d20504388fb
MISC metadata.xml 694 BLAKE2B b7b43401693937cbe92d0737972b55168f10ad3e8c9b1cd66db850bdf1b1517445c6c0258f805f5d3f8f4a00a27efb4e5235d46739dac7daaada1d323d08b19e SHA512 d6a97f7a6342dc1f1e14fbb14f2c0d28b5c2d2f148b0ac4078421e85f25273b38d489009c1780570326d374196a1a93cdb4aa86de55265db643092affe610e54

@ -20,6 +20,7 @@ HOMEPAGE="https://ranger.github.io/"
LICENSE="GPL-3"
SLOT="0"
IUSE="test"
RESTRICT="!test? ( test )"
RDEPEND="virtual/pager"
DEPEND="test? ( dev-python/pytest[${PYTHON_USEDEP}] )"

@ -20,6 +20,7 @@ HOMEPAGE="https://ranger.github.io/"
LICENSE="GPL-3"
SLOT="0"
IUSE="test"
RESTRICT="!test? ( test )"
RDEPEND="virtual/pager"
DEPEND="test? ( dev-python/pytest[${PYTHON_USEDEP}] )"

Binary file not shown.

@ -9,5 +9,5 @@ AUX calligra-3.1.0-poppler-0.73.patch 1342 BLAKE2B e36495c1f1f6c546666f30473fea4
AUX calligra-3.1.0-qt-5.11.patch 3537 BLAKE2B 25aa9f832eb49876e0ee28d3af945658f9e93610fa894cb73dc274083febf5d62c97de427c10277f07aa7ef8054f4e0c811c70d4b0c4068cd018a3475c9a7e80 SHA512 f895ee2b9999ab4ff6dae523e4f4ea6f72bd05a8f8163a33f05401b63c08cc3c987a1207d1008ae808db0564c0036194e3d6ab5806c681b793c5191f9e585a7e
AUX calligra-3.1.0-stage-qt-5.11.patch 656 BLAKE2B 1a4d8f005fd03395617ba0b225302e40b4aaf75c2a838a3009a3b3b6df7e75afdc798f27f08e76b7ad0ea60766612912d06eebe87c209ad9cab45db4bb3ccf54 SHA512 685bfca658404dc9920c805b97832b0a481a0ec0614bf142978c4ae03329e5e93b28d5af09d021b53c6d7a1316404f87612ab316f6a47c3f174572b50c65989b
DIST calligra-3.1.0.tar.xz 58037392 BLAKE2B b933012fe0031f4d6eac626054e7fb248f85635e5873224328d30f9aed31dce0a0a49f99cf6eea9c232477400af1d16ffc4dae483cdfd5081720434e95684e50 SHA512 ad1b689a5b36deafcf6985d4a0a1e8148d10e19fb4a0be8343c6e1d24146b9a8ffa0890ab5bbb21816b3134d21150b57f6159db1a30cc54c0fde5bf7bdf4537b
EBUILD calligra-3.1.0-r3.ebuild 5944 BLAKE2B 73f21f83a3d932e71953e4fae4dbc616c4e1e33d7fa0a4cad4f26a53109d5ea03604543ca0b2e22ba3ac26ff0ed45ec7db6466a69ceaed8ab1cc21699e19f20e SHA512 dc7110e3f4b383681259e865382e9242b7d676ca6552864cd9541c501e9d148e9d007b2cf1fd95db1dd62b0eab8002bee38ee7d8676b492cd9045a96144d1c1a
EBUILD calligra-3.1.0-r3.ebuild 5946 BLAKE2B 095e253b2b02b61ffe7b9a6e5914d89fc349e14ed89ce93bb3cd2e5b390c3613b9a6b2284cac4f9f63bf223291f3bc8aa554b9ccd17bf744a7222627a143a49f SHA512 ac7abab5d3c246b29b09779710c3a3afcf9df7328c43b9f2b1a9f3ad4d216e54a401a96e9e28e26eb62b721106b41bbb4c4218c4309c44621a83450835db29aa
MISC metadata.xml 1223 BLAKE2B a488977274cd14e919409e0443ebadeefaabdc33a514e806fa2fb1bb3cd0b26fef95c705fcba1bbf7f9d259a7e50f2769a89cf42863c53996fda5cc60712487f SHA512 c965d2effceb77a5cc8696010f538046a703576671368def2c2990b70c00f43105d5a3bf9f438dab1220b2e20003d49596e4adc4b1c90146a13549daacc8bf89

@ -87,7 +87,7 @@ COMMON_DEPEND="
openexr? ( media-libs/openexr )
pdf? ( >=app-text/poppler-0.64:=[qt5] )
phonon? ( media-libs/phonon[qt5(+)] )
pim? ( $(add_kdeapps_dep kcalcore) )
pim? ( <kde-apps/kcalcore-19.04.50:5 )
spacenav? ( dev-libs/libspnav )
truetype? ( media-libs/freetype:2 )
X? (

@ -2,5 +2,5 @@ AUX calligraplan-3.1.0-missing-header.patch 629 BLAKE2B 8b6debd0dcaf51a492be0f17
AUX calligraplan-3.1.0-qca.patch 3725 BLAKE2B dfcc41d00c7c90691e6c9a8a8c25308ace7819c88282ed2f4a36725b9d26ce6ae7d1bf547ec01d097971302278bee914f23039bbf66e952ed1a5fedd84423bbc SHA512 df94f3348d824de566c0a6566f076ff2a25236030353907c828a0e1cde58768c6403e2d699c419e8ef05635e6af43cb3c7cb4780568c7bf8c9e6bdcf0086463c
AUX calligraplan-3.1.0-qt-5.11.patch 3618 BLAKE2B b1b3053e07f83eb2b07a8fde231a7deb727a34e9922246e75690e469b8b599525eb8148a5babd5771e18421bed1930bc800fddcafca6ce43d08eab1093f2d135 SHA512 3db56dfc75c667ab141259718899e7294b000ddc10084266fa9d6226da4ccde74e70673ef5603b4dbc4f92322eb0fbaaf3b0ec6bca312603f4da95463414df10
DIST calligraplan-3.1.0.tar.xz 3617600 BLAKE2B af45aa28529c18c9fa9fae2b7c03ea1b795d3fec3fd44dbcc4ed056a4b1b843b10cb8a9ad6dab319775a7d7032520721a4719605859dd60100a19eafdcb621ed SHA512 a8ccc6ee2f0381b811926a296122464bdb79aad7c75ff0f7a554e4596165ff7fd7ef62c9af9232ea36542d6b538446c8920fe77cbbe7ffacdf6e6b99a1b68156
EBUILD calligraplan-3.1.0.ebuild 2772 BLAKE2B 36691ae30b0a1ca70d97aa6bcc07de2b58d5aca3eb182eccfa624b41cb79b91e1f96c001ccf97fd7015a842c45b6868d4cb23a6fad61ddd27688c240312c90c9 SHA512 ca460565d986a6e6133bb64562117cf25aa7541f7af2e467462156a9d54ca31c6aab59830c0265ceb2235209bbcacab6b8619d06cc615915e6cf4dea65cfa65c
EBUILD calligraplan-3.1.0.ebuild 2774 BLAKE2B 6e920cbd42f9f1b10c45fb939e48cf342061c1e33b310304a2927880c9fafd1ae894a4f670c5b08be3926e4d7562646a063a4cb822007a4d5a3fbaf213ce1119 SHA512 19c778f338d42a7a65e003d4199df6c1c4bb747e34ae7f66d945df661c928564ca631d9efccc3bd1f7a3026b10cc13d9a89b90e9527862de1030301dba658ee6
MISC metadata.xml 724 BLAKE2B dd7cca931c7ffc08be44c9df711973d13fadc3deee2956b235af3653aab250977cbb491ac308da5a5502efbd359114e646ae1cb10e3f445308b90b4eeab8a6dd SHA512 367dbf0d7d0a2d03167e4e7abec2975ada6d047dd767a60967532c1fb89db09f2082ff52c1940a306dbff4feec5c8050f163d2fff6170dbe287b241d3f7c1c02

@ -59,7 +59,7 @@ DEPEND="
app-crypt/qca:2[qt5(+)]
)
pim? (
$(add_kdeapps_dep kcalcore)
<kde-apps/kcalcore-19.04.50:5
$(add_kdeapps_dep kcontacts)
)
X? (

@ -2,7 +2,8 @@ AUX scribus-1.5.3-docdir.patch 1309 BLAKE2B 978a5b54992bc2d2e84cc7435ffe15c2ace0
AUX scribus-1.5.3-fpic.patch 499 BLAKE2B 68790e6d7a76c4ae01490956b0db09bc79e1c27269fa4cd4c4752bd60b228e36973a1c32d5d8156c12782091fa15614ba274be07dee0d92df9ef521f2d4361a2 SHA512 e38fc85e72af67c0fea4c14dad92a759f5065cd4e337ef2257a90f27e39297c6991c467e53e9c51ae247bf2f8c34fa62fa76cf839a53b386c9c378e53756d015
AUX scribus-1.5.5-docdir.patch 1053 BLAKE2B 3efadd63156463cd0d955b8de072082a3d958849e1c2107eb9bf16260048ad5e9f162162a4f148025fcad091dd44a1f291a6ae708f17014205791e5fcc24b613 SHA512 cae03652fcf541bdce1c89f60e7ba7e2cd14ad3846bbaa7c832e97ee7617188310f51e72c5e88947b51892b61c174f18db35785cf5631b436fc63d35056e2bf1
AUX scribus-1.5.5_pre20190429-poppler-0.76.patch 2102 BLAKE2B 80cc47f73cd3c2d8fe5a5ff379b37c279d65fccc68864e28f0cfcbeaf4953eb548e8ccc87d2754a3d2b7014e5702bfb8a191a57e634e77abba55d59b9c6c3bd9 SHA512 210243d3a2f104cf0e03ba0a8df7db15818fcae5808f3974a1260079d31e83b363b29c85aced985cc29b889ea07359a0ac5e62fb03c3ecc0f2b4bc98d633a5e3
AUX scribus-1.5.6-docdir.patch 1107 BLAKE2B 2bd9aa5bfc6b3b125cfdee0ff513749c9cc5fe1e5b5d12da1c92b14397e50d3a9ae40b20c2638e9e0eada080f3b9df30ddba3190f25bbde4102a887101d1b609 SHA512 fb6d23f6e5a53246a8f1dd168195c8f101d8ff3e2f05b7af09e1a58a4c3ed3ab05b07803cf5e7877da1b9e9c17dd0677580dbdeeeacd83063ab0bf4bbf60ae06
DIST scribus-1.5.5_pre20190429.tar.gz 85838093 BLAKE2B 4ffdc6356b5a2c7372bf6395847f348e7c56276d39114fa5691b6c7f8345aa89a0efe221adbbf1d431d89208fae53ae211c5298d9406487d46ddf98dd69d8c1a SHA512 1aa76491560848dccbeb17f03ba4ac24d6045881f6f92f31b921cf1a91c051176b835d86e0c46046e73573bf60b330e07945c279c077a7619bf2ee9331ca9324
EBUILD scribus-1.5.5_pre20190429.ebuild 6843 BLAKE2B b302dbe626d7683093511f2b317115ba51afe5b74d1710238530be81672785b855d13aacb582d9bda07dce61e319b48e352f72daa8b5575af9d210dd74198270 SHA512 fa349878cfab3fc837a0956dd2af09d0c2ce8491fc04b3aaa8f81fdb8b8468937a5f3ba0a7a1bd08dbe6c49bca4067a46f7dd780e70325fe190e6bedfdbcb180
EBUILD scribus-9999.ebuild 6643 BLAKE2B 947ecd463c48fc34cb7320d24f5789114f1e5ff9c873b38e0964bc3bc9e254fbf994b94080491ce15a33b574123237ae4ac376f0c6c3d5dee0e381b25f6ea9a6 SHA512 c0a50923a702df8115d3087488e98eb97012c0d7b277d604ec718d660d28d44ed845566e273a788eaa44394f16077c24c008f117d8e3d7f0a0d759f156f1e9da
EBUILD scribus-9999.ebuild 6643 BLAKE2B f4c56004896b625cfcaddd1cd0a2dba01ece7f5b16a4cf745c4f61ab4747c1feb2d057d134a1bbad1039ac33255e82601efc2f9d5dc882028a8c60e5d9c113ae SHA512 d6a9251b10dd61e702ffff373763d939b9f3229846bd0416106cade51eb5546da0bdcaa5f26c39e7c723f3d6475016dcb6cc13567d16099e0363659e1ec89651
MISC metadata.xml 845 BLAKE2B 6522fd7c428e4f5f8bd77c03a09408e443e91d45fb0bbe72a312d48f1cdee38ab62a4059940237f18aa2e63b0595b79598846d5acb3d7289427b9d1cae768510 SHA512 18872713a1aa8d6739186ffa60f8f747f8ee9de41339c8a2d20c49d97771ce3967839044f7573bab2d7717a73c2705722071d16441bb458060db5f9e5c15f3d1

@ -0,0 +1,29 @@
diff --git a/CMakeLists_Directories.cmake b/CMakeLists_Directories.cmake
index db6133f..faf85ce 100644
--- a/CMakeLists_Directories.cmake
+++ b/CMakeLists_Directories.cmake
@@ -36,14 +36,16 @@ else()
endif()
#SHARE - use the default on Apple as TAG_VERSION is empty
-if(WIN32 OR OS2)
- set(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/")
-elseif(TAG_VERSION OR BUILD_OSX_BUNDLE)
- set(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${MAIN_DIR_NAME}${TAG_VERSION}/")
-elseif(NOT WANT_VERSIONING)
- set(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${MAIN_DIR_NAME}/")
-else()
- set(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${MAIN_DIR_NAME}-${VERSION}/")
+if(NOT DOCDIR)
+ if(WIN32 OR OS2)
+ set(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/")
+ elseif(TAG_VERSION OR BUILD_OSX_BUNDLE)
+ set(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${MAIN_DIR_NAME}${TAG_VERSION}/")
+ elseif(NOT WANT_VERSIONING)
+ set(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${MAIN_DIR_NAME}/")
+ else()
+ set(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${MAIN_DIR_NAME}-${VERSION}/")
+ endif()
endif()
if(IS_ABSOLUTE ${DOCDIR} AND WANT_RELOCATABLE)

@ -94,7 +94,7 @@ DEPEND="${COMMON_DEPEND}
"
PATCHES=(
"${FILESDIR}"/${PN}-1.5.5-docdir.patch
"${FILESDIR}"/${PN}-1.5.6-docdir.patch
"${FILESDIR}"/${PN}-1.5.3-fpic.patch
)

Binary file not shown.

@ -49,7 +49,6 @@ AUX bash-4.x-deferred-heredocs.patch 1255 BLAKE2B 944c8d5feaba6a6818fe7e20300fdd
AUX bash-5.0-assignment-preceding-builtin.patch 2790 BLAKE2B fbafa51f96f1fef538e56e55ab3b7067ac4532ab8c0f93d151eeaf6b3a521bc15d7d4ae580489352cc6d9ecc5b43b96494c8b661cf2db3b97265bd1dffad5390 SHA512 9a4ec56b341ed90f348c3ca5ec5c98790eb98a7d78d436131a56bcdde49f09f618398e87c81da7c1dde645690d9c779578f5a2b37dadda75c587332715ab1732
AUX bash-5.0-history-append.patch 1150 BLAKE2B cc3d4c2303b37b14da2cbb3130db0c2fa65cdc7f7f8d0a4413042a898c4c48afbedcca03c9dbfc525ab191ddc2b4258fb976a28830e03490011f89a1361974b4 SHA512 9c2fb93c67a5da1e97b293db4b26469fd6813e2cfc8ffd776042529878b96312644d8dc247887d6171c89c0853d552e9f7d5d2c0b2f3d05c25c15e17e6706999
AUX bash-5.0-history-zero-length.patch 1704 BLAKE2B e94683d245b233b95db8e67a2e536081816ce7d095080b17ee3a9ecef1d3a9094e09e8929eeed5aeff89cd268b49a9ca0cf5cba8aab0695914e88be1b724056c SHA512 2f21c7938c585d0126456b1d878e60d7ddef6a6188f49325cf1f15ab2f7f490ce8458504da8a08cf4b00c84a48f9f43079ff6ee334120d29c1529219d9e9074d
AUX bash-5.0-optimize-connection-fork.patch 2853 BLAKE2B 88d7d1a73d891b5ba2792c631a654fa8f67e4af11f2899bbebeca835f2a78f27f5ae1b5ce0a53825703b17b1d2e3e38297d97622fab5b0789653d07b0ec686fc SHA512 9192bf50d201d325561552cc6725c2c5e8984bee9fd762089ebe45bfd013fe7a560769b1282189bc97500ea5e49de313d59ddefad544affce61f78a2d605a997
AUX bash-5.0-syslog-history-extern.patch 376 BLAKE2B d883d3c3adbf8f4d19ecc3c2790754a7f6972682d1679b07d5bc599bdbfc019ba8ad4d1271ec550b59447db0a02f1219c9e6057a0b1c1c6c52f7750a746a07bf SHA512 c8dd17bdd8ccbd73061a7cbcb7351195e703a2c5fc6faf288ec3721fc6e526d88dd4b2201f87078a92ca134b98214ccfa935f82f585322f72e9a41fd51842b6a
AUX bash_logout 205 BLAKE2B b8c0266c3d1e31a714304a2b3b33389f042ae5bd497379f9b15ce31d47d1e3da73ba6536023953b00efe27b687e2ff45d94e3f01a13acc824dc12e31552c5b94 SHA512 7234250c03fc920996a381f9daef9e2d8ab1e1a29acdebed6669d8e0fe1c872a7fa343adf7d9ddc81225b0cd9eb223ba7ad1ff42448aff057fc6d6baa8f04a7d
AUX bashrc 3555 BLAKE2B 31b62f62632feb74cfadb5b831dd862eace55a603c24c07b50826070f599b0571962b315f7f45edb1a0dba91d7a36fa2b852215e9071012b02d0869cb6e5ab6a SHA512 4c2fded17c5346222939fac5b0a13913bdc062b93a4963ad33fe41cf00a04860b5006ec4c762acb6ce7e36e83f368d5c3427b8bc359ba6cba73d6114f219604e
@ -373,6 +372,8 @@ DIST bash50-004 1664 BLAKE2B 88b44a5268c8ec970f0c18997cfe5211f6a2a8c07f813d48fd9
DIST bash50-005 3732 BLAKE2B 3ded5d200102ad7cc547c6f7e9bf9bba468a10791fc096988c49f46ea8d6708efb0d4c383a9e2e2fccef8a49b217e6a22d9435c807233a1d0a971265bbe31761 SHA512 4d3e6f337a76b9ff1887c4c6e4e4352885779504f3c975b8d6fa587962f01e8adbd843b5341c1fc1d11152cf465f2982eebd9dc6e1384f319157d29740d510da
DIST bash50-006 1275 BLAKE2B ae3738874ada015202a6ff21a50ea9370c6147b4c74a23112e755396fc1db743afa42abdd4df635f0c0b9f3536796064b41d0667ef8ade1543b5c70b688ae9d1 SHA512 71df829a3a3927a363ad961de8af8db898ea8b0ccf604c5f1326fe4646d0d50b3c7038ee473c225fc10d26c2dc1f711d66b74d003bb0445d36a8a70c49e056e0
DIST bash50-007 1640 BLAKE2B 1c25af8c098322ad16353dfb32cdba2613659f5042792c725dbde7b2bc276ff09a4af44bf223fd6114dcc9beee98ccbd8081d3010fa1cfeb33bc93fc9c81e4f7 SHA512 467d377836c53d188cda39de550ce1e00b58895a6646c4da3535e74e599978558a92d8e7bf7c59c988159468fbce04f3a0dbf62cbded28472272f1b9811786e8
DIST bash50-008 2622 BLAKE2B 9919e24840f32a44a9040fd8fa9fb482da1859223e70e75d21d5fdfc03f229ec2e98324707b10fa3aa5b3fee0e8fe5328a684cdd1b3ee5567cd1eb127a4060cb SHA512 110fef44c1a26819ad8926ce00bd5378e99275763db4b0e9cfd125ba1ab7eb9f93abf912efb9841fa2ac59c380995e477683afc8cf6bf00367a9af7ae371e7f4
DIST bash50-009 1095 BLAKE2B 4a9b2035173dd23f9c8ac5474e573080112d9edcf918816b5dd41e880f212f66c2c80dd41793ec62449c487fec1ad2c57b353a00c0976a782098fa6be76d0f23 SHA512 6b770dbd4ca1175f9b958931b1e725d96626a24fb270bac5414d1679dde05276c87654815e9957d6932c515e8792caf8a5f0e9f2dc108bdd041d8024cf75a833
EBUILD bash-2.05b_p13.ebuild 4613 BLAKE2B c9eae8a532057dab41ca20640f7b85e9f0d8b11eacd84c91b0dc478dcc906cd14976e02b086e2fbc1786661f27ddfce0b8631211461ed77cced2037058e99338 SHA512 f933883acba8f96a5f0390b11650981291c8048211e832a6d3bcc6f41cafe9372380051f804e22958934803c4d8cac83d1bdb604689c313bddeb67446106bff8
EBUILD bash-3.0_p22.ebuild 4746 BLAKE2B f8840c82f5cfbcf224d1504d3cbadc3eabe015d991a8c41de978562cc0c806b6baed999d085774594deb620dd714fb8d020ccc89d65c3e622745875528b61b57 SHA512 c39a3f5b22a8b462e6b2abf63a13454559b358002e0efb16640fb9caa04cbd9b416640cf25df98b9fdcaaca465bbf083c0687dc08e122c8b965e2761b01b37f6
EBUILD bash-3.1_p23.ebuild 4427 BLAKE2B baf534ac2cf5a872673b355532b0b9ea8d4836df331f7e50425733815862435ffa44eb9cd95b1dbdd53a29010638b516deb16c8e72a44d5fa135eaea23c34bf5 SHA512 40e91cad8af0682565d4eed7ad2f6184e1624746a8f6ea1ce21bed459e45bcdc8157aa45cc7f89d1ce5c7f1f827707a839bc89a513956b827a50a5e3bc877959
@ -382,6 +383,6 @@ EBUILD bash-4.1_p17.ebuild 4142 BLAKE2B 5d8f2b031eb26211ff1f778629cfb8d9255b357e
EBUILD bash-4.2_p53.ebuild 4344 BLAKE2B 5565a97a0aa9465fd8eef2de0b78434c04096d84c988cdbb663af4b529e1207cc68d0030fa4d88e4028fa7bef08847df170a274ccba316213cceb7401163ed00 SHA512 d3cae3853f6c3b735dd9083b9f7d16bd96aac1ba29ba49e8d5e62140ebdb97f4c9d36e3bc36fcd96f32685236fe6bb80d53015b9dbb20a829968aa535a949a3f
EBUILD bash-4.3_p48-r2.ebuild 5642 BLAKE2B f5d114b98272cf7e6a900707e0abc4798cc1b85bf509f3260487959dad69a35a0badae19e1522e4746bb74c06f00a767a50c6a3199339c42036f3d92924722af SHA512 e83786756c9e65c08e78137396b393e04a7950d9393c6206491d7d7b13eb46fb4504fe34335706aa0835b6abc651e9578bf6157d6248de8e7fc2dc1a90cba927
EBUILD bash-4.4_p23-r1.ebuild 7389 BLAKE2B cffb239c13ab880e815dc9e5884020f2287cdbb3074e39862223fc3d3d56d64af121f4f04528e7e94b06df4fe4d520c805cf6a8f32088860cd7c4ffa2e612e2e SHA512 d9f730ce6353e99953eb95e1417d5e109ccf3612d5148087c2eab7c742d6cba979da5468ec260f3d258a9870a3b6b216dd45c67b2a79fa6fe818d6ba88a113c0
EBUILD bash-5.0_p3-r1.ebuild 7625 BLAKE2B 81f6b4b55c5d8f6c311469d4e06f8a729f7ab8ba892cf21d8e5befefc9d12bb39ec339b3751cc720e42a83d982e988b76878b07f37f9f71f14ee137ccbefe55c SHA512 230b6db992527d721eaf0b328cba6232548038b070c6ee40f8fb811f390927ce5dc1c171f9203e0c6113cc1ed7762384dbc6d8ddd159856108b3be75b595a383
EBUILD bash-5.0_p7.ebuild 7569 BLAKE2B ec03c5db2337f5bd9279f1717b791f850ac027320f602df801197ac831de3018552bc8e3eb5fb9b2634e9ead091e62c6a65315e4a9e58a3dd2d3ba2ad2e08482 SHA512 828d1606b9227bd0faedfce0f83d5bfa3585ccbb52dba5fffcfbdf5c5cdd27a10d25a53e9b86adb10246a2ba6cbe95aed453b59fb3dcfe01ce56558c1a1332a5
EBUILD bash-5.0_p9.ebuild 7522 BLAKE2B 8ec9456f0040cd7a869c486e3abed668cf0dcca6a1e5911c9b771b1ac69fb52168be4daa1ba28598329db8bedf25a600ed34d34770c702521486e8a419a2012b SHA512 96b77e64e3e7677947ac76503de702a624017b513fd8351cf8ef2969c203a1d79cc09c0557b6b5e217bbe026112ef79564eed8a80e6df7e72e58a3c99df8af6f
MISC metadata.xml 734 BLAKE2B 242fda202379209b74e12c1726c4f4aa487eb09423d2249d13cae38cb9b077a285beff221a824647c826c39f7400178cd04d6082915ad9c23287ea70da9ef961 SHA512 a9301e8d2347e0cf90a97325d9a705076150c00609d28338e5d7d72c135468e4f0531b2a4077b69679ae6ccf89eee691e0e5f0748caab60689f5f017afb544f1

@ -1,7 +1,7 @@
# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
EAPI=7
inherit flag-o-matic toolchain-funcs multilib prefix
@ -52,7 +52,6 @@ IUSE="afs bashlogger examples mem-scramble +net nls plugins +readline"
DEPEND="
>=sys-libs/ncurses-5.2-r2:0=
readline? ( >=sys-libs/readline-${READLINE_VER}:0= )
nls? ( virtual/libintl )
"
RDEPEND="
${DEPEND}
@ -60,14 +59,15 @@ RDEPEND="
"
# we only need yacc when the .y files get patched (bash42-005)
#DEPEND+=" virtual/yacc"
BDEPEND="
nls? ( virtual/libintl )
"
S="${WORKDIR}/${MY_P}"
PATCHES=(
# Patches from Chet sent to bashbug ml
"${FILESDIR}"/${PN}-5.0-history-zero-length.patch
"${FILESDIR}"/${PN}-5.0-history-append.patch
"${FILESDIR}"/${PN}-5.0-optimize-connection-fork.patch
"${FILESDIR}"/${PN}-5.0-syslog-history-extern.patch
"${FILESDIR}"/${PN}-5.0-assignment-preceding-builtin.patch
)
@ -190,7 +190,7 @@ src_install() {
default
dodir /bin
mv "${ED%/}"/usr/bin/bash "${ED%/}"/bin/ || die
mv "${ED}"/usr/bin/bash "${ED}"/bin/ || die
dosym bash /bin/rbash
insinto /etc/bash
@ -214,8 +214,8 @@ src_install() {
fi
sed -i \
"${sed_args[@]}" \
"${ED%/}"/etc/skel/.bashrc \
"${ED%/}"/etc/bash/bashrc || die
"${ED}"/etc/skel/.bashrc \
"${ED}"/etc/bash/bashrc || die
if use plugins ; then
exeinto /usr/$(get_libdir)/bash

@ -1,79 +0,0 @@
*** ../bash-5.0-patched/command.h 2018-07-20 21:16:31.000000000 -0400
--- command.h 2019-02-20 11:09:36.000000000 -0500
***************
*** 187,190 ****
--- 188,192 ----
#define CMD_LASTPIPE 0x2000
#define CMD_STDPATH 0x4000 /* use standard path for command lookup */
+ #define CMD_TRY_OPTIMIZING 0x8000 /* try to optimize this simple command */
/* What a command looks like. */
*** ../bash-5.0-patched/builtins/evalstring.c 2018-12-26 11:19:21.000000000 -0500
--- builtins/evalstring.c 2019-01-29 14:15:19.000000000 -0500
***************
*** 101,104 ****
--- 101,113 ----
}
+ int
+ can_optimize_connection (command)
+ COMMAND *command;
+ {
+ return (*bash_input.location.string == '\0' &&
+ (command->value.Connection->connector == AND_AND || command->value.Connection->connector == OR_OR || command->value.Connection->connector == ';') &&
+ command->value.Connection->second->type == cm_simple);
+ }
+
void
optimize_fork (command)
***************
*** 106,110 ****
{
if (command->type == cm_connection &&
! (command->value.Connection->connector == AND_AND || command->value.Connection->connector == OR_OR) &&
should_suppress_fork (command->value.Connection->second))
{
--- 115,120 ----
{
if (command->type == cm_connection &&
! (command->value.Connection->connector == AND_AND || command->value.Connection->connector == OR_OR || command->value.Connection->connector == ';') &&
! (command->value.Connection->second->flags & CMD_TRY_OPTIMIZING) &&
should_suppress_fork (command->value.Connection->second))
{
***************
*** 413,418 ****
command->value.Simple->flags |= CMD_NO_FORK;
}
! else if (command->type == cm_connection)
! optimize_fork (command);
#endif /* ONESHOT */
--- 423,438 ----
command->value.Simple->flags |= CMD_NO_FORK;
}
!
! /* Can't optimize forks out here execept for simple commands.
! This knows that the parser sets up commands as left-side heavy
! (&& and || are left-associative) and after the single parse,
! if we are at the end of the command string, the last in a
! series of connection commands is
! command->value.Connection->second. */
! else if (command->type == cm_connection && can_optimize_connection (command))
! {
! command->value.Connection->second->flags |= CMD_TRY_OPTIMIZING;
! command->value.Connection->second->value.Simple->flags |= CMD_TRY_OPTIMIZING;
! }
#endif /* ONESHOT */
*** ../bash-5.0-patched/execute_cmd.c 2018-12-05 09:05:14.000000000 -0500
--- execute_cmd.c 2019-01-25 15:59:00.000000000 -0500
***************
*** 2768,2771 ****
--- 2768,2773 ----
(exec_result != EXECUTION_SUCCESS)))
{
+ optimize_fork (command);
+
second = command->value.Connection->second;
if (ignore_return && second)

Binary file not shown.

@ -5,7 +5,7 @@ AUX calibre-server-3.init 1796 BLAKE2B f87d785d6f6fc10fa648d40944ec8538027854bb8
DIST calibre-3.26.1.tar.xz 39109660 BLAKE2B 0e98c273b8a5dfafea7a7027de3f83ad25ab835edadedf78b7e9bc356bcac8937d915944f2ab6503b414c49b4e792e090e7bd2433a4e86373bf115720ed78b0a SHA512 893e36b101defaca29281b4bd072aafc1c4cb20a9cd3ee06a0b68fbe6b39cab34952799939ac4f54c77148c87861c5ab4ddff84f5ec8c2274ae7fa6424259ff5
DIST calibre-3.44.0.tar.xz 38643008 BLAKE2B 7eb1412aa5de6ba2f48ea13e922dffff7ace0f4f475832ebe122db967c71df05b6bbb45092bdd53ddfe35d7a0c2af566ed83dde9aac64200d41ea2adc4cb1886 SHA512 a97f45f5f788357f62b4088c4d8190cd3e3b790685871d5a024342d5d21ca978d46fa4e47f85eef4b9fbc0774923732938a812dd188cd4a315445cf25b187d28
DIST calibre-3.46.0.tar.xz 38750284 BLAKE2B 5590ba422d0323ea7c0cea67d88d448f00f5a470e7a8fdf9851b488c0856c88175bd107715a856706e95b2e1a45604713d061f4a7a3603ecaa01dfc018c1ed58 SHA512 d8eb014ba4d943e1c2ed05104d9b0c13f45a8b0085fa240248210cd43ab3739036936324183ae8a63dc636f7f8603484e3ddf50a260308ce1127745a8d3c6763
EBUILD calibre-3.26.1-r1.ebuild 9308 BLAKE2B 07541b211051fe1ab42abcbefcc244e58987f58e22c6f444da32388e34ad38d131ede851be637f13665b6686874cb9db5d94e19915ad04141bd2b399d003faa3 SHA512 09c90d37a96294a1351cbc0703b9ea1855f1ea2016ba6fe449059fef2136109cfe5122862abf8f28bda3fea0f218a20653653650a50ce4593f12ea7c18352046
EBUILD calibre-3.44.0.ebuild 8459 BLAKE2B f8bb5e99492acdd8c99aa26681b1f9ceb4c7fbafb226ee7f1102608f8722f31cf6cbdcb6f21adc9394edc37946893258cb9b1ceadd9e24fe541e78b5ef18fc67 SHA512 19933bc77c456af17cb782d9b0770f7cfab64c37cf96e4f9697c669a9db9aece28e0b8b1f51b20649ecef57780b213f21d3859f296ae9d042e26494d234a2a7d
EBUILD calibre-3.46.0-r1.ebuild 8459 BLAKE2B f8bb5e99492acdd8c99aa26681b1f9ceb4c7fbafb226ee7f1102608f8722f31cf6cbdcb6f21adc9394edc37946893258cb9b1ceadd9e24fe541e78b5ef18fc67 SHA512 19933bc77c456af17cb782d9b0770f7cfab64c37cf96e4f9697c669a9db9aece28e0b8b1f51b20649ecef57780b213f21d3859f296ae9d042e26494d234a2a7d
EBUILD calibre-3.26.1-r1.ebuild 9203 BLAKE2B 9e3bc1630f915a8548e1480f0b00d6acb4001dee3be5a5119dd9b2eb8b984c4eecaa0a0742e550a36eca359e8806d2444d21f8bf344321c11ffeca59e7e10877 SHA512 98407a3605b58125ca783dadbe7dfed5f3bb526f816d79a167fb0358202cc56870601d16b7eae46d2464a0f64761168d9f0a00d69a5a184e17d705eb540afb97
EBUILD calibre-3.44.0.ebuild 8352 BLAKE2B 92a2d894b2ad0966588854cdece96930aa85e240699eb185cc32a4b7ec0b3e98c34e7cac2490c44b1909bc1e4fc92f7d5094ed8f6159e08ae22ef98d7156f06c SHA512 df60b94324ccfe704195af5a6188ea6a793767e342e058b1f5039f52ae7fab6b16e95266a0876f6ea8118b5e4a014d7d1e3636b58280d611ae94918e359763d4
EBUILD calibre-3.46.0-r1.ebuild 8352 BLAKE2B 92a2d894b2ad0966588854cdece96930aa85e240699eb185cc32a4b7ec0b3e98c34e7cac2490c44b1909bc1e4fc92f7d5094ed8f6159e08ae22ef98d7156f06c SHA512 df60b94324ccfe704195af5a6188ea6a793767e342e058b1f5039f52ae7fab6b16e95266a0876f6ea8118b5e4a014d7d1e3636b58280d611ae94918e359763d4
MISC metadata.xml 382 BLAKE2B 87fa7e63a6ed7a4ea55247b362288b43f7edd312cc3085bb8c1b947402ae4aa0df01fac4f6646d260653ff8af7fe28d3dabb8a213dbf3e206181b69835b33d5f SHA512 8503e0a4a48d93682c386eb1d6507b4b26585afc9d62b7cd52bc00b457a887bd17422a03669ff404570ff7f5ff6f0bba14ee935979f8b54722870d6620097de5

@ -206,8 +206,6 @@ src_install() {
[[ -e ${x} ]] && addpredict ${x}
done
#dodir "/usr/$(get_libdir)/python2.7/site-packages" # for init_calibre.py
#dodir $(python_get_sitedir)
PATH=${T}:${PATH} PYTHONPATH=${S}/src${PYTHONPATH:+:}${PYTHONPATH} \
"${PYTHON}" setup.py install \
--root="${D}" \

@ -196,8 +196,6 @@ src_install() {
addpredict /dev/dri #665310
#dodir "/usr/$(get_libdir)/python2.7/site-packages" # for init_calibre.py
#dodir $(python_get_sitedir)
PATH=${T}:${PATH} PYTHONPATH=${S}/src${PYTHONPATH:+:}${PYTHONPATH} \
"${PYTHON}" setup.py install \
--root="${D}" \
@ -252,7 +250,7 @@ pkg_preinst() {
pkg_postinst() {
[[ -n ${CALIBRE_LIB_DIR} ]] || die "CALIBRE_LIB_DIR is unset"
local x
for x in "${EROOT%/}${CALIBRE_LIB_DIR}"/*; do
for x in "${EROOT}${CALIBRE_LIB_DIR}"/*; do
if [[ " ${CALIBRE_LIB_CONTENT} " != *" ${x##*/} "* ]]; then
elog "Purging '${x}'"
rm -rf "${x}"

@ -196,8 +196,6 @@ src_install() {
addpredict /dev/dri #665310
#dodir "/usr/$(get_libdir)/python2.7/site-packages" # for init_calibre.py
#dodir $(python_get_sitedir)
PATH=${T}:${PATH} PYTHONPATH=${S}/src${PYTHONPATH:+:}${PYTHONPATH} \
"${PYTHON}" setup.py install \
--root="${D}" \
@ -252,7 +250,7 @@ pkg_preinst() {
pkg_postinst() {
[[ -n ${CALIBRE_LIB_DIR} ]] || die "CALIBRE_LIB_DIR is unset"
local x
for x in "${EROOT%/}${CALIBRE_LIB_DIR}"/*; do
for x in "${EROOT}${CALIBRE_LIB_DIR}"/*; do
if [[ " ${CALIBRE_LIB_CONTENT} " != *" ${x##*/} "* ]]; then
elog "Purging '${x}'"
rm -rf "${x}"

@ -1,4 +1,4 @@
AUX xhtml1-catalog.patch 834 BLAKE2B 47236e18d55237bbfb6299b634253545299dd9649a58d42af6fc8e56afbb8547564dc17bbefb808b96aea739d7ba673403ab2f3c96b5eddceb7f886353320b51 SHA512 0b4fdb64e73405be53930984e5f628a1b5b48e6d43bebef9f9c502fca31d13b760385c0481030f8a09556447891a542dc4c7bb23f0618fd937e2934936b26780
DIST xhtml1.tgz 232192 BLAKE2B 4e2da9b73da93a8196ade80549a2e255b1954178472fddaf2e3d979befda8689f3540a65d41723e40bd0450d626608ffcdcd1fa9183da5e3b13d90a5649fdc23 SHA512 184758381c5e2d36b80fa1e4470e864777383ff7539b48291036f8a3f1dba0b354a32142bfcc9071147fb20bcd4c0d4d541e09e865047938ab4cf9ae5a806412
EBUILD xhtml1-20020801-r5.ebuild 2177 BLAKE2B 0d0c33716b2f816b03713365af543835934e9112afd74c00099fb98d9013cc5b8adb0581f3e6dfd64456511cd1199352cd51dcee244acee426b3eb547ce19b55 SHA512 9b7732f5606ba95344bfe1bce64f5f3ccc7a298356b9d25f3ab6e9fa667c4f9be2f98168494c535b9226cec6c3dbf2b55a92f7681d5222fbaf7e6af0efede957
DIST xhtml1-20020801.tgz 232192 BLAKE2B 4e2da9b73da93a8196ade80549a2e255b1954178472fddaf2e3d979befda8689f3540a65d41723e40bd0450d626608ffcdcd1fa9183da5e3b13d90a5649fdc23 SHA512 184758381c5e2d36b80fa1e4470e864777383ff7539b48291036f8a3f1dba0b354a32142bfcc9071147fb20bcd4c0d4d541e09e865047938ab4cf9ae5a806412
EBUILD xhtml1-20020801-r5.ebuild 2174 BLAKE2B 2029974397a6deb6848f5310a0c3078e70219c204406d1ef115241cf22f870f10ce8c18a965b035cdead98db36e4f0833053a67c765d1e538cdad172abada25b SHA512 57294051e859fd17a6942d180026f3d8e74c84e5ddfcf012e1f04f1870a867d908c4b7343b1a99c5a1d52844e86bc4a5754e6488e8ce45973d25e578b0d4a478
MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84

@ -1,4 +1,4 @@
# Copyright 1999-2018 Gentoo Foundation
# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@ -7,7 +7,7 @@ inherit sgml-catalog eutils
DESCRIPTION="DTDs for the eXtensible HyperText Markup Language 1.0"
HOMEPAGE="http://www.w3.org/TR/xhtml1/"
SRC_URI="http://www.w3.org/TR/xhtml1/xhtml1.tgz"
SRC_URI="mirror://gentoo/xhtml1.tgz -> ${P}.tgz"
LICENSE="W3C"
SLOT="0"

Binary file not shown.

@ -1,4 +1,6 @@
AUX clickhouse-server.confd 74 BLAKE2B ccb1d957ce0ec20a65968bb1fe24d756d3f0d73bb0b2bec5b1de7913fdac71fcc04eef0e7d0ca7708b87cccb4ef08b4d5ec2ab514c24c1f39862dc1aced77725 SHA512 3f89e1d592d46c8173df42835c5c9ee541e6fc01eb4448f3351517110650fac3144a6da066f2ebf01bda9a004a972e47dc6c48967f914e541dfe26fb0637cd5c
AUX clickhouse-server.initd 445 BLAKE2B 166b867de3ad86f814cfbbdfa86a9328a3a54a88438e628f790cc6be1e0eee272effa06db37bdb0d31a41ac1551321b5a756bbfe3a9a8381e327e12515253da1 SHA512 98d396709899a428012fb8f01fbd861359913e12d765924a6a20e5f5cf0da73a2c8b0561a061d4c581443259605841f55fa33ee881f8eb764d6d2446dd4bf849
AUX clickhouse-server.initd-r1 552 BLAKE2B 39a75038f2cce6c09623b0c90b87a7536995da05fdedbc261e4a92e4add8bfdfb46c59856f9d0df8b49d115b3ea52e684827037c3da40a8fc02948ff47edcde6 SHA512 40324e870c8d0d2bb62acc78bf2c08be9cc0e64e94d00538d41961fb53d2df45f3d811b75c81a0b3e12ee17d99d2b9c0cbca623f7e1ffe5eadf3674bafb97832
AUX clickhouse-server.service 307 BLAKE2B 1f443f68db97408cb2b0a8e9007195cdc5d6e29f54e55b3bd2b023cfbcb9d3ee4c1083503f83a42cfd18bca3320dfa86571434fe89612fb0a1f5a9e178eb706b SHA512 185db8aed69b178540225fa41f623a78af09e30d2dd1e033baf4d7c80451e702f5d6b9ce5240f7f6fb6d63a4ebed5af4d483515c7e6fe019e7fd44334df4ab37
DIST cctz-4f9776a.tar.gz 290009 BLAKE2B 532eb7d590f9814c05cc7fdd3c75efe0a6b3f81d85201b14163a9600dd858c4fbac592270d0afccd7d5eef0080d7e70e9d716023bdb60d55479585e2cd3d3f59 SHA512 ba0dfc404cc70f03ef2be29fa3b0c70ea881c92a92525ea4ba1b5bcfc9e45df1b62a5eec180f498293e64bdd5cb9b41f97361cbb7e8baf299dcfdcd1557ca205
DIST clickhouse-18.10.3.tar.gz 6136661 BLAKE2B 5564bbe85f4ca43f18df702148af0e4e5b5a8826994d90f29beb3a37cdbeb36f9d3ec77d9c7bc6f843e7586e5441aeb0937548eb5eb61d27cecc5790d8c21a5b SHA512 c78386922388cf910a995b569724eb22fc41ab60e765a4d3644c4a48d8b9a67ef28b7e375186b2eb00c43b4f06e90783084f4ac4d3789f1b6e4251ee30e8833c
@ -10,6 +12,7 @@ DIST clickhouse-19.9.5.36.zip 11708002 BLAKE2B 075f9b1556c5ee207a608047fa559cec7
EBUILD clickhouse-18.10.3.ebuild 4915 BLAKE2B 3f6f0f1cea60a283b325b80100fc56ffcb548e6af01240a12a5f6a6aad521977c63e8918d3742c52c0fef2d5c79144f6a1f9cb95749a6c140cb16548af432f4a SHA512 0ecc73385521a4d916e8834d22e05a8be07fb0b2d6a4bcc3350dfab100717839835e4a47a17d87f50f98acbf420b077dc7f9db800e3456915dc2ed81fc0197ba
EBUILD clickhouse-18.12.17.ebuild 4912 BLAKE2B 71e1d446bc95be176c6946d18162b78f0ae0e936be2caedd9ee7b0df958daf8423ffce528c27c90607568f5bf3b391092ef264c7d1439506ab89f6fded52bb6b SHA512 6ac5f2e640ad5e6536a38a9693df2b31706f9d777f53213971ef848160886d16b6cc0a7f900ce587e53b1cdba3edcdd37541b4e639aa65662f9e0a26f9501fc5
EBUILD clickhouse-18.6.0.ebuild 4903 BLAKE2B d363915e46bfe1489e07f9ae9b07a39c146603af9496ab98371b053241566e02c7b85cf64a985ef8958e83a8741ac20583917e8268cec80702e4d37e69d8e110 SHA512 443eb0cd7f343eaff895dfbcb6a98abc4b2734495e2abd9c9f51e613fc2ac8698797bb5f780178c86bc0d8621cfe0b976470c7c4b9ec0bd337fa0599f0d01848
EBUILD clickhouse-19.13.1.11-r1.ebuild 5144 BLAKE2B 77f5416736145c44a1968ebb74968fe59b807c46dfb4104e73544a554f49a3d4ae34b494290c5beca798c32096014e63fac9940790f9ed3b9c4a4d7b59b09489 SHA512 9aff8448125ad6b1dad555289f1a345b9fbbcb2e7c1594ac680bcfb4274030149c52786cd1b58c620329ec587a683258d9dfd3aca111d1d04c7bdd3a36b309c9
EBUILD clickhouse-19.13.1.11.ebuild 5054 BLAKE2B 43ae8340ed6038c6ea92c44d4dbd27183feaea2f96ce0c563a2163ce2a3c8e0a851dab3f3a813fa83404fbc008bc84a8c905581756529e4f269b155c6d4d2e76 SHA512 092c727a4dd9a7a9ce0cac0032988e01d29d641674a5f47a0dc77eb4d99090c45925dca4aa304646cc89ceb0017463bbf93d4711683030ced0a18d3e4f04246e
EBUILD clickhouse-19.5.3.8.ebuild 5035 BLAKE2B 5af2ff21963b567b2f1f1600a046e90c885a17aeb2b4244a3d60b15b96d25fb268330de602db576ea3809785be984e2f511d63b17776e369f1798549398148ce SHA512 5642771484458e8fc390a259af958598972207706ed3f78247fbd91e242bcf79052be58fc49b50f6d44765fc1932f6731ff45b17244b6919daa69a44ea83023c
EBUILD clickhouse-19.9.5.36.ebuild 5035 BLAKE2B 5af2ff21963b567b2f1f1600a046e90c885a17aeb2b4244a3d60b15b96d25fb268330de602db576ea3809785be984e2f511d63b17776e369f1798549398148ce SHA512 5642771484458e8fc390a259af958598972207706ed3f78247fbd91e242bcf79052be58fc49b50f6d44765fc1932f6731ff45b17244b6919daa69a44ea83023c

@ -0,0 +1,205 @@
# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
CMAKE_MAKEFILE_GENERATOR="ninja"
inherit cmake-utils systemd toolchain-funcs user
DESCRIPTION="An OSS column-oriented database management system for real-time data analysis"
HOMEPAGE="https://clickhouse.yandex"
LICENSE="Apache-2.0"
MY_PN="ClickHouse"
TYPE="stable"
CCTZ_COMMIT="4f9776a"
SRC_URI="https://github.com/yandex/${MY_PN}/archive/v${PV}-${TYPE}.zip -> ${P}.zip
https://github.com/google/cctz/archive/${CCTZ_COMMIT}.tar.gz -> cctz-${CCTZ_COMMIT}.tar.gz
"
SLOT="0/${TYPE}"
IUSE="+client cpu_flags_x86_sse4_2 +server debug doc kafka mongodb mysql static test tools"
KEYWORDS="~amd64"
REQUIRED_USE="
server? ( cpu_flags_x86_sse4_2 )
static? ( client server tools )
"
RDEPEND="
dev-libs/re2:0=
!static? (
>=app-arch/lz4-1.8.0:=
>=app-arch/zstd-1.3.4:=
client? (
sys-libs/ncurses:0=
sys-libs/readline:0=
)
dev-libs/double-conversion
dev-libs/capnproto
dev-libs/libltdl:0
sys-libs/libunwind:7
sys-libs/zlib
dev-libs/poco[odbc]
dev-libs/icu:=
dev-libs/glib
>=dev-libs/boost-1.65.0:=
dev-libs/openssl:0=
kafka? ( dev-libs/librdkafka:= )
mysql? ( virtual/libmysqlclient )
)
>=dev-libs/poco-1.9.0
dev-libs/libpcre
dev-libs/jemalloc
dev-libs/protobuf
"
DEPEND="${RDEPEND}
doc? ( >=dev-python/mkdocs-1.0.1 )
static? (
>=app-arch/lz4-1.8.0[static-libs]
>=app-arch/zstd-1.3.4[static-libs]
client? (
sys-libs/ncurses:0=[static-libs]
sys-libs/readline:0=[static-libs]
)
dev-libs/double-conversion[static-libs]
dev-libs/capnproto[static-libs]
dev-libs/libltdl[static-libs]
sys-libs/libunwind:7[static-libs]
sys-libs/zlib[static-libs]
|| (
dev-db/unixODBC[static-libs]
dev-libs/poco[odbc]
)
dev-libs/icu[static-libs]
dev-libs/glib[static-libs]
>=dev-libs/boost-1.65.0[static-libs]
dev-libs/openssl[static-libs]
virtual/libmysqlclient[static-libs]
kafka? ( dev-libs/librdkafka[static-libs] )
)
=dev-cpp/gtest-1.8*
sys-libs/libtermcap-compat
dev-util/patchelf
>=sys-devel/lld-6.0.0
>=sys-devel/gcc-7.0
>=sys-devel/clang-6.0
"
S="${WORKDIR}/${MY_PN}-${PV}-${TYPE}"
_clang_fullversion() {
local ver="$1"; shift
set -- $($(tc-getCPP "$@") -E -P - <<<"__clang_major__ __clang_minor__ __clang_patchlevel__")
eval echo "$ver"
}
clang-fullversion() {
_clang_fullversion '$1.$2.$3' "$@"
}
clang-version() {
_clang_fullversion '$1.$2' "$@"
}
clang-major-version() {
_clang_fullversion '$1' "$@"
}
clang-minor-version() {
_clang_fullversion '$2' "$@"
}
clang-micro-version() {
_clang_fullversion '$3' "$@"
}
pkg_pretend() {
if [[ $(tc-getCC) == clang ]]; then
if [[ $(clang-major-version) -lt 6 ]]; then
eerror "Compilation with clang older than 6.0 is not supported"
die "Too old clang found"
fi
:
elif [[ $(gcc-major-version) -lt 7 ]] && [[$(gcc-minor-version) -lt 2 ]]; then
eerror "Compilation with gcc older than 7.2 is not supported"
die "Too old gcc found"
fi
}
src_unpack() {
default_src_unpack
[[ ${PV} == 9999 ]] && return 0
cd "${S}/contrib" || die "failed to cd to contrib"
mkdir -p cctz zstd || die "failed to create directories"
tar --strip-components=1 -C cctz -xf "${DISTDIR}/cctz-${CCTZ_COMMIT}.tar.gz" || die "failed to unpack cctz"
}
src_prepare() {
eapply_user
cmake-utils_src_prepare
}
src_configure() {
local mycmakeargs=(
-DENABLE_POCO_MONGODB="$(usex mongodb)"
-DENABLE_RDKAFKA="$(usex kafka)"
-DENABLE_TESTS="$(usex test)"
-DUSE_STATIC_LIBRARIES="$(usex static)"
-DMAKE_STATIC_LIBRARIES="$(usex static)"
-DUSE_MYSQL="$(usex mysql)"
-DENABLE_CLICKHOUSE_SERVER="$(usex server)"
-DENABLE_CLICKHOUSE_CLIENT="$(usex client)"
-DENABLE_CLICKHOUSE_LOCAL="$(usex tools)"
-DENABLE_CLICKHOUSE_BENCHMARK="$(usex tools)"
-DENABLE_CLICKHOUSE_PERFORMANCE="$(usex tools)"
-DENABLE_CLICKHOUSE_EXTRACT_FROM_CONFIG="$(usex tools)"
-DENABLE_CLICKHOUSE_COMPRESSOR="$(usex tools)"
-DENABLE_CLICKHOUSE_COPIER="$(usex tools)"
# As of now, clickhouse fails to build if odbc is disabled
-DENABLE_ODBC=True
-DENABLE_CLICKHOUSE_ODBC_BRIDGE=True
-DENABLE_CLICKHOUSE_ALL=OFF
-DUSE_INTERNAL_SSL_LIBRARY=False
-DUSE_INTERNAL_CITYHASH_LIBRARY=ON # Clickhouse explicitly requires bundled patched cityhash
-DUNBUNDLED=ON
)
cmake-utils_src_configure
}
src_install() {
cmake-utils_src_install
if ! use test; then
rm -rf "${D}/usr/share/clickhouse-test" || die "failed to remove tests"
fi
if use doc; then
pushd "${S}/docs/tools" || die "Failed to enter docs build directory"
./build.py || die "Failed to build docs"
popd || die "Failed to exit docs build directory"
dodoc -r "${S}/docs/build"
fi
if use server; then
newinitd "${FILESDIR}"/clickhouse-server.initd-r1 clickhouse-server
newconfd "${FILESDIR}"/clickhouse-server.confd clickhouse-server
systemd_dounit "${FILESDIR}"/clickhouse-server.service
fi
keepdir /var/log/clickhouse-server
chown clickhouse:clickhouse "${D}"/var/log/clickhouse-server
}
pkg_preinst() {
if use server; then
enewgroup clickhouse
enewuser clickhouse -1 -1 /var/lib/clickhouse clickhouse
fi
}

@ -0,0 +1,4 @@
user="clickhouse"
group="clickhouse"
logdir="/var/log/clickhouse-server"

@ -0,0 +1,23 @@
#!/sbin/openrc-run
# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
user="clickhouse"
group="clickhouse"
logdir="/var/log/clickhouse-server"
pidfile="/run/clickhouse-server.pid"
command_background=1
command="/usr/bin/clickhouse-server"
start_stop_daemon_args="--user ${user} --group ${group} \
--chdir /etc/clickhouse-server \
-1 ${logdir}/stdout.log \
-2 ${logdir}/stderr.log"
depend() {
need net
after mongodb
}
start_pre() {
checkpath -m 0755 -o "${user}:${group}" -d "${logdir}"
}

@ -1,12 +1,9 @@
AUX firebird-3.0.2.32703.0-cloop-compiler.patch 349 BLAKE2B 6906993819f5aa68c39522d82bb7fb57b910f8f311d173a326147a98e983d8cd95ca90dbb538a5caa696ce4337305ece744306bf88f608cc8639bdda198e4576 SHA512 1d57f26ada2023d8bd04d73dd0f55951cef6b373710c8cf73b6bea0b4d54f879d689644d26541b2366bd1071b08eda2e1b531f3779a88b8fb52d3c9312f0c091
AUX firebird-3.0.2.32703.0-gcc6.patch 806 BLAKE2B 85109e33f130582110e37188ef99cec5e5f0f3f95c481580df3a8c8a97215cd8e070e3febe47e46659e025b8a0c138fd0b271a5fd4b4aa67ca52419cef88db04 SHA512 184f754c4c23b7917acfabf1a5024069b8f35f58e667112a203a02e906560f2f5fea711b12975dafb3adcbe5159999e40fa459898a41d88e6de9b3499d8eaa67
AUX firebird-3.0.2.32703.0-unbundle.patch 1786 BLAKE2B 660af04975ecfdac0ae12a1ee89e0a4d97d321ac7de7e17ba53484a909962584828c18d1f119ecc1af63c1cb2b93f451b847c9363a25831630a807b89ad13bc8 SHA512 bb0f8cb283ee230f9128a9da16da21933a1709615b34bbfac117a0563e2451a07381b52ffc1fed665e74688ff8e2c2548f86c1413427665914cb3df8500543c5
AUX firebird.init.d.3.0 642 BLAKE2B 70f9b07a69c01e391ea8b1f1747a35eb303ff43a4923d65f76064257bfe5178601fa0b06dbf332b6a3529df30ddbe3e3c58e170ca33acfeb06a32474f1806938 SHA512 0805311d7e4ceb9cd5266be88fe61fb7d2d7cf5bf3c9482841c6431767cba9960d4f38418629519b23cdf64893173ebd01641056123ddc7f24c1f1bbf969812b
AUX firebird.logrotate 169 BLAKE2B e73e2ff85882cda144f969a9a20426f2e5bfbaf2ce894e4e7adf67a33eb4cb5f1bc2039385437dcc60436145b0d29bd1b9311d8328f68ad7870aea50b8e5402d SHA512 f99edc010272af28f18e2b89e420aabc204feda918a1181e477edb56612b6af97ca6bab2e39989db401eb8296e3233a64853f824af437329e117f09aa9868823
AUX firebird.xinetd.3.0 193 BLAKE2B 34017b978344bc2b05cfe7b92eafd56ba20dd78d1fa21dfb5455d7972325cedae9a6ac25b4fa491899b19cb3bbe2949b8ca78626467100661767f6c944b01c20 SHA512 e02c011b55c1d6823b051d14dbfabef6d034db32ee8046adc796fdf393c837b995c270e0efdcb97950f6fead82cd73773099a247dc29961b0e8f6c4f6c0723ae
DIST Firebird-3.0.2.32703-0.tar.bz2 9536416 BLAKE2B 58afbdb430adb5f9aafe33d5459fb4fe8607e9440b6b114291777e43d447a7a5b5696c9f5903a10b63217a15836ce6386569e636369e37bf83195ec0b96e4fc6 SHA512 5950d1689c77fbcda22f1bd8015321d887dec3c7ef39665428a8bda9122838e767b168442ce7d8fb3b9b80cbd1206725b0f54bd215c5c9eb1d322b546cb042e6
DIST Firebird-3.0.4.33054-0.tar.bz2 9778106 BLAKE2B 4b9116cbc351e0c2e10d15e6ea8e9754a383da77d8e016337604143eb2677ff2519da34b1a5c2e9b7b071fa9774eddbb535e9f926058ee626573b0411f6c042d SHA512 a346ebd53aeccf0b33eac5d35c3c3356624c1fbd0ad897173b3f68d940143062b28460a2822df807e8e8a1ea8792ebf98ed33e5b3ae273d86e6e36295a7fc8ad
DIST ib_b60_doc.zip 10530848 BLAKE2B b4008b3e8b0416014d024cbbc9ac2e648ad671c71b91b7aeb0eedf0f8479aef80e22aff7105c5e7417e88bcf57f2cdacbc2d5f51a2ef7fb870f9d361c5f0ed6d SHA512 59eccf1d6b1f0410eddbc5967fd77a3d00e09749640b3f81e2f8b624f5a45461dffad4af5ec61488e941fb3d3af266fe86c0b56e6b7e023239537cb6557a145a
EBUILD firebird-3.0.2.32703.0-r2.ebuild 6156 BLAKE2B 7894504d0d0b888a7c735538e6e262b3e0bde8c2b5c1b7a7de39dc9374187ebb81781390be9ca8d98c612da32138ffe71714815b1bf0a8793ee19e3c92e98b25 SHA512 b02a546183c0d704c8f40bac27e2185d8b3abdd58ef92f1d3eacf76261490a652540ac2998411a8492960cd2ebdb4b104d0797cfb296e19dea1f81f603955e9f
EBUILD firebird-3.0.4.33054.0.ebuild 6071 BLAKE2B 0382f9fcc3e18c4a13a903b2bf332b1e1c5523d4776bd1848fb9b5e60beadd3884933585e5a805e180b6e7b36cdb1f583c3fd4023d92a0c2687d021cd68e1624 SHA512 f07075eeaa7ca2a39213638b89a51268f2d7b6c03ee28e2e4d9f3032817f040a877bc0a797a4bdeb1412c8666c184ff1ef70fc45429e44fe6d0e08ee37ec2970
MISC metadata.xml 837 BLAKE2B 91e52f426cd9364da97ed6969369c3fa14a37e195f79192357d245e2e1ff90e20ada790e0a1904b05c4e9e0cdf25dec55aa4dbe14e2db32feb83bd5d465846a0 SHA512 98379c40f675f7b53e90e5327b76e554c17bda1ef7484165785b3d04884dd92fc3034c6b3f0f93667c456e7b23dc83f5143a8ec358759e2a0218c94e96127912

@ -1,19 +0,0 @@
commit 3618aa2171674babf79ef935aa049c40a3db1321
Author: asfernandes <asfernandes@users.sourceforge.net>
Date: Sat Mar 5 03:39:36 2016 +0000
Make the generated code compatible with gcc 6 in C++-14 mode.
diff --git a/src/gpre/c_cxx.cpp b/src/gpre/c_cxx.cpp
index 2af96c6..2dcffd6 100644
--- a/src/gpre/c_cxx.cpp
+++ b/src/gpre/c_cxx.cpp
@@ -2820,7 +2820,7 @@ static void gen_request(const gpre_req* request)
printa(0, "static %sshort\n isc_%dl = %d;",
(request->req_flags & REQ_extend_dpb) ? "" : CONST_STR,
request->req_ident, request->req_length);
- printa(0, "static %schar\n isc_%d [] = {", CONST_STR, request->req_ident);
+ printa(0, "static %sunsigned char\n isc_%d [] = {", CONST_STR, request->req_ident);
const TEXT* string_type = "blr";
if (gpreGlob.sw_raw)

@ -1,235 +0,0 @@
# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
inherit autotools flag-o-matic user versionator
MY_P=${PN/f/F}-$(replace_version_separator 4 -)
DESCRIPTION="Relational database offering many ANSI SQL:2003 and some SQL:2008 features"
HOMEPAGE="https://www.firebirdsql.org/"
SRC_URI="
mirror://sourceforge/firebird/${MY_P}.tar.bz2
doc? ( ftp://ftpc.inprise.com/pub/interbase/techpubs/ib_b60_doc.zip )"
LICENSE="IDPL Interbase-1.0"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="doc examples +server xinetd"
# FIXME: cloop?
CDEPEND="
dev-libs/libtommath
dev-libs/icu:=
dev-libs/libedit
"
DEPEND="${CDEPEND}
>=dev-util/btyacc-3.0-r2
doc? ( app-arch/unzip )
"
RDEPEND="${CDEPEND}
xinetd? ( virtual/inetd )
!sys-cluster/ganglia
"
S="${WORKDIR}/${MY_P}"
PATCHES=(
"${FILESDIR}/${P}"-unbundle.patch
"${FILESDIR}/${P}"-gcc6.patch
"${FILESDIR}/${P}"-cloop-compiler.patch
)
pkg_pretend() {
if [[ -e /var/run/${PN}/${PN}.pid ]] ; then
ewarn
ewarn "The presence of server connections may prevent isql or gsec"
ewarn "from establishing an embedded connection. Accordingly,"
ewarn "creating employee.fdb or security3.fdb could fail."
ewarn "It is more secure to stop the firebird daemon before running emerge."
ewarn
fi
}
pkg_setup() {
enewgroup firebird 450
enewuser firebird 450 /bin/sh /usr/$(get_libdir)/firebird firebird
}
check_sed() {
MSG="sed of $3, required $2 line(s) modified $1"
einfo "${MSG}"
[[ $1 -ge $2 ]] || die "${MSG}"
}
src_unpack() {
unpack "${MY_P}.tar.bz2"
if use doc; then
# Unpack docs
mkdir "manuals" || die
cd "manuals" || die
unpack ib_b60_doc.zip
fi
}
src_prepare() {
default
# Rename references to isql to fbsql
# sed vs patch for portability and addtional location changes
check_sed "$(sed -i -e 's:"isql :"fbsql :w /dev/stdout' \
src/isql/isql.epp | wc -l)" "1" "src/isql/isql.epp" # 1 line
check_sed "$(sed -i -e 's:isql :fbsql :w /dev/stdout' \
src/msgs/history2.sql | wc -l)" "4" "src/msgs/history2.sql" # 4 lines
check_sed "$(sed -i -e 's:--- ISQL:--- FBSQL:w /dev/stdout' \
-e 's:isql :fbsql :w /dev/stdout' \
-e 's:ISQL :FBSQL :w /dev/stdout' \
src/msgs/messages2.sql | wc -l)" "6" "src/msgs/messages2.sql" # 6 lines
find . -name \*.sh -exec chmod +x {} + || die
rm -r extern/{btyacc,editline,icu} || die
eautoreconf
}
src_configure() {
filter-flags -fprefetch-loop-arrays
filter-mfpmath sse
# otherwise this doesnt build with gcc-6
# http://tracker.firebirdsql.org/browse/CORE-5099
append-cflags -fno-sized-deallocation -fno-delete-null-pointer-checks
append-cxxflags -fno-sized-deallocation -fno-delete-null-pointer-checks -std=c++11
econf \
--prefix=/usr/$(get_libdir)/firebird \
--with-editline \
--with-system-editline \
--with-fbbin=/usr/bin \
--with-fbsbin=/usr/sbin \
--with-fbconf=/etc/${PN} \
--with-fblib=/usr/$(get_libdir) \
--with-fbinclude=/usr/include \
--with-fbdoc=/usr/share/doc/${PF} \
--with-fbudf=/usr/$(get_libdir)/${PN}/UDF \
--with-fbsample=/usr/share/doc/${PF}/examples \
--with-fbsample-db=/usr/share/doc/${PF}/examples/db \
--with-fbhelp=/usr/$(get_libdir)/${PN}/help \
--with-fbintl=/usr/$(get_libdir)/${PN}/intl \
--with-fbmisc=/usr/share/${PN} \
--with-fbsecure-db=/etc/${PN} \
--with-fbmsg=/usr/$(get_libdir)/${PN} \
--with-fblog=/var/log/${PN}/ \
--with-fbglock=/var/run/${PN} \
--with-fbplugins=/usr/$(get_libdir)/${PN}/plugins \
--with-gnu-ld \
${myconf}
}
# from linux underground, merging into this here
src_install() {
if use doc; then
dodoc -r doc
find "${WORKDIR}"/manuals -type f -iname "*.pdf" -exec dodoc '{}' + || die
fi
cd "${S}/gen/Release/${PN}" || die
doheader include/*
dolib.so lib/*.so*
# links for backwards compatibility
insinto /usr/$(get_libdir)
dosym libfbclient.so /usr/$(get_libdir)/libgds.so
dosym libfbclient.so /usr/$(get_libdir)/libgds.so.0
dosym libfbclient.so /usr/$(get_libdir)/libfbclient.so.1
insinto /usr/share/${PN}/msg
doins *.msg
use server || return
einfo "Renaming isql -> fbsql"
mv bin/isql bin/fbsql || die "failed to rename isql -> fbsql"
dobin bin/{fb_config,fbsql,fbsvcmgr,fbtracemgr,gbak,gfix,gpre,gsec,gsplit,gstat,nbackup,qli}
dosbin bin/{firebird,fbguard,fb_lock_print}
insinto /usr/share/${PN}/help
# why???
insopts -m0660 -o firebird -g firebird
doins help/help.fdb
exeinto /usr/$(get_libdir)/${PN}/intl
doexe intl/libfbintl.so
dosym libfbintl.so /usr/$(get_libdir)/${PN}/intl/fbintl.so
insinto /usr/$(get_libdir)/${PN}/intl
insopts -m0644 -o root -g root
doins intl/fbintl.conf
# plugins
exeinto /usr/$(get_libdir)/${PN}/plugins
doexe plugins/*.so
exeinto /usr/$(get_libdir)/${PN}/plugins/udr
doexe plugins/udr/*.so
exeinto /usr/$(get_libdir)/${PN}/UDF
doexe UDF/*.so
# logging (do we really need the perms?)
diropts -m 755 -o firebird -g firebird
dodir /var/log/${PN}
keepdir /var/log/${PN}
# logrotate
insinto /etc/logrotate.d
newins "${FILESDIR}/${PN}.logrotate" ${PN}
# configuration files
insinto /etc/${PN}/plugins
doins plugins/udr_engine.conf
insinto /etc/${PN}
doins {databases,fbtrace,firebird,plugins}.conf
# install secutity3.fdb
insopts -m0660 -o firebird -g firebird
doins security3.fdb
if use xinetd; then
insinto /etc/xinetd.d
newins "${FILESDIR}/${PN}.xinetd.3.0" ${PN}
else
newinitd "${FILESDIR}/${PN}.init.d.3.0" ${PN}
fi
if use examples; then
cd examples
insinto /usr/share/${PN}/examples
insopts -m0644 -o root -g root
doins -r api
doins -r dbcrypt
doins -r include
doins -r interfaces
doins -r package
doins -r stat
doins -r udf
doins -r udr
doins CMakeLists.txt
doins functions.c
doins README
insinto /usr/share/${PN}/examples/empbuild
insopts -m0660 -o firebird -g firebird
doins empbuild/employee.fdb
fi
einfo
elog "Starting with version 3, server mode is set in firebird.conf"
elog "The default setting is superserver."
einfo
elog "If you're using UDFs, please remember to move them to /usr/$(get_libdir)/firebird/UDF"
einfo
ewarn "${CATEGORY}/${PF} is still a tad experimental. Please test and file bugs!"
}

@ -37,5 +37,5 @@ EBUILD mysql-5.7.24.ebuild 30386 BLAKE2B ecf0c03821af6a21467b53a02e6e0a0ae2f7e5d
EBUILD mysql-5.7.25.ebuild 30465 BLAKE2B ec639482f3726ea18994c0e3b88ae991d16eda30c5acf7f6abee4f4301d0ada726494e4ebd2f045291faf967940adc8ef1172a48fb00e10ff69a83f837ac3e73 SHA512 6d45fd341a6f0e71d3546134d4bcfd745c6b488b28e848eb2ee1aaebb96745c797da452250a71c2eba87452e61f5ba017f80b88f4e16e23d076be4a70c6936ed
EBUILD mysql-5.7.26.ebuild 30471 BLAKE2B 783b6bbbe3fbe3067c4255da8180ebee2b5de4c9279d87ddda36dce8d70cc0026abca0634d60a98e3b9b4025c1ffe22bc35117b10891ea4011d286091ee2db78 SHA512 8be36c349123429dadb7593c242835274b881d0172b4796f27aa6476450d3ae865a797918c069a078b88f533b4ff861f7d3c8ba7d79024d87a69a936103f1042
EBUILD mysql-5.7.27.ebuild 30609 BLAKE2B 36b37798ad2063c7618456e5dd4cb7e85a8ec0abfb64c4ec39583958178c7d627310a3ea82b1bbfebd8404c3cd3158a74e03cab47f97fa6487ba7465f00a97de SHA512 acf5a9906453c4ef9e03f4344b070c6a159d8a88e11cbba6c6d39e871466ad738cf813ce299641860b80e60189bb9c2583b62dd30d1c89699c8db4e9cd407d89
EBUILD mysql-8.0.17_pre3.ebuild 34467 BLAKE2B 46de8bb97d877462f013218aa9362f8b332a032a71bdc484e5172ebf1b2ce4d3381d46913825685bde82ca8e7890f1cef12d518194e29534baf5fdbc340d85c8 SHA512 6c1ac90c34468363502686324f77f05bb7e0432d2817f7648933c7df655a69d53dbd5d57c7660b86ab9afcf8fd473a6427b469a481ed6e56f35c6199696b7eb8
EBUILD mysql-8.0.17_pre4.ebuild 36349 BLAKE2B 3851792cd703ee0cc726c4b6476060f0ed5d9beaea10cbfe4ca9b5016457756a316cbf7c987428c415216734297354c2a8deeba82f78c2af56e20802aa16dfd5 SHA512 34e7f9f8fb94f5a217d9525114b9ba54dacac2280cc18fb465ebeae487428dc65405da22ec6298e29da552360ccc45e77fb5a404ffe3567fef48f5d8c857fe56
MISC metadata.xml 1599 BLAKE2B cad6c530634fbf5923276e0b6e10e54aafca0afb7c4cdbb99ee1e3307e6b0004959eb4c8a35e5542ede6fd7d0c181933293acac0ec562988c3f8c8789546671c SHA512 cd18e4f2569e944648d23a21acf0b89c0c84e2b30a9ca6ad9d2d4f8b38b04fd29cecab598e2a836b99822c0356052fa8ada44c10241fcc03fedc5f0ce21cc36f

@ -6,7 +6,7 @@ MY_EXTRAS_VER="20190802-1549Z"
CMAKE_MAKEFILE_GENERATOR=emake
inherit cmake-utils eutils flag-o-matic linux-info \
inherit cmake-utils flag-o-matic linux-info \
multiprocessing prefix toolchain-funcs
MY_PV="${PV//_pre*}"
@ -107,49 +107,11 @@ RDEPEND="${COMMON_DEPEND}
PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 )"
mysql_init_vars() {
MY_SHAREDSTATEDIR=${MY_SHAREDSTATEDIR="${EPREFIX}/usr/share/mysql"}
MY_SYSCONFDIR=${MY_SYSCONFDIR="${EPREFIX}/etc/mysql"}
MY_LOCALSTATEDIR=${MY_LOCALSTATEDIR="${EPREFIX}/var/lib/mysql"}
MY_LOGDIR=${MY_LOGDIR="${EPREFIX}/var/log/mysql"}
if [[ -z "${MY_DATADIR}" ]] ; then
MY_DATADIR=""
if [[ -f "${MY_SYSCONFDIR}/my.cnf" ]] ; then
MY_DATADIR=$(my_print_defaults mysqld 2>/dev/null \
| sed -ne '/datadir/s|^--datadir=||p' \
| tail -n1)
if [[ -z "${MY_DATADIR}" ]] ; then
MY_DATADIR=$(grep ^datadir "${MY_SYSCONFDIR}/my.cnf" \
| sed -e 's/.*=\s*//' \
| tail -n1)
fi
fi
if [[ -z "${MY_DATADIR}" ]] ; then
MY_DATADIR="${MY_LOCALSTATEDIR}"
einfo "Using default MY_DATADIR"
fi
elog "MySQL MY_DATADIR is ${MY_DATADIR}"
if [[ -z "${PREVIOUS_DATADIR}" ]] ; then
if [[ -e "${MY_DATADIR}" ]] ; then
# If you get this and you're wondering about it, see bug #207636
elog "MySQL datadir found in ${MY_DATADIR}"
elog "A new one will not be created."
PREVIOUS_DATADIR="yes"
else
PREVIOUS_DATADIR="no"
fi
export PREVIOUS_DATADIR
fi
else
if [[ ${EBUILD_PHASE} == "config" ]] ; then
MY_DATADIR=$(my_print_defaults mysqld 2>/dev/null \
| sed -ne '/datadir/s|^--datadir=||p' \
| tail -n1)
fi
fi
: ${MY_SHAREDSTATEDIR="${EPREFIX}/usr/share/mysql"}
: ${MY_SYSCONFDIR="${EPREFIX}/etc/mysql"}
: ${MY_LOCALSTATEDIR="${EPREFIX}/var/lib/mysql"}
: ${MY_LOGDIR="${EPREFIX}/var/log/mysql"}
MY_DATADIR="${MY_LOCALSTATEDIR}"
export MY_SHAREDSTATEDIR MY_SYSCONFDIR
export MY_LOCALSTATEDIR MY_LOGDIR
@ -500,7 +462,7 @@ src_install() {
# testsuite. It DOES have a use to be installed, esp. when you want to do a
# validation of your database configuration after tuning it.
if ! use test ; then
rm -rf "${D}/${MY_SHAREDSTATEDIR}/mysql-test"
rm -rf "${ED}/${MY_SHAREDSTATEDIR#${EPREFIX}}/mysql-test"
fi
# Configuration stuff
@ -556,7 +518,8 @@ pkg_postinst() {
mysql_init_vars
# Create log directory securely if it does not exist
[[ -d "${EROOT}/${MY_LOGDIR#/}" ]] || install -d -m0750 -o mysql -g mysql "${EROOT}/${MY_LOGDIR#/}"
# NOTE: $MY_LOGDIR contains $EPREFIX by default
[[ -d "${MY_LOGDIR}" ]] || install -d -m0750 -o mysql -g mysql "${MY_LOGDIR}"
# Note about configuration change
einfo
@ -598,11 +561,38 @@ pkg_config() {
die "'${my_print_defaults_binary}' not found! Please re-install dev-db/mysql-connector-c!"
fi
if [[ -z "${MYSQL_USER}" ]] ; then
MYSQL_USER=mysql
if use prefix ; then
MYSQL_USER=$(id -u -n 2>/dev/null)
if [[ -z "${MYSQL_USER}" ]] ; then
die "Failed to determine current username!"
fi
fi
fi
if [[ -z "${MYSQL_GROUP}" ]] ; then
MYSQL_GROUP=mysql
if use prefix ; then
MYSQL_GROUP=$(id -g -n 2>/dev/null)
if [[ -z "${MYSQL_GROUP}" ]] ; then
die "Failed to determine current user groupname!"
fi
fi
fi
einfo "Will use username '${MYSQL_USER}' and group '${MYSQL_GROUP}' ..."
_getoptval() {
local section="$1"
local flag="--${2}="
local extra_options="${3}"
local results=( $("${my_print_defaults_binary}" ${extra_options} ${section} | sed -n "/^${flag}/s,${flag},,gp") )
local cmd=(
"${my_print_defaults_binary}"
"${extra_options}"
"${section}"
)
local results=( $(eval "${cmd[@]}" 2>/dev/null | sed -n "/^${flag}/s,${flag},,gp") )
if [[ ${#results[@]} -gt 0 ]] ; then
# When option is set multiple times only return last value
@ -610,33 +600,81 @@ pkg_config() {
fi
}
local old_MY_DATADIR="${MY_DATADIR}"
local old_HOME="${HOME}"
_mktemp_dry() {
# emktemp has no --dry-run option
local template="${1}"
if [[ -z "${template}" ]] ; then
if [[ -z "${T}" ]] ; then
template="/tmp/XXXXXXX"
else
template="${T}/XXXXXXX"
fi
fi
local template_wo_X=${template//X/}
local n_X
let n_X=${#template}-${#template_wo_X}
if [[ ${n_X} -lt 3 ]] ; then
echo "${FUNCNAME[0]}: too few X's in template ${template}" >&2
return
fi
local attempts=0
local character tmpfile
while [[ true ]] ; do
let attempts=attempts+1
new_file=
while read -n1 character ; do
if [[ "${character}" == "X" ]] ; then
tmpfile+="${RANDOM:0:1}"
else
tmpfile+="${character}"
fi
done < <(echo -n "${template}")
if [[ ! -f "${tmpfile}" ]]
then
echo "${tmpfile}"
return
fi
if [[ ${attempts} -ge 100 ]] ; then
echo "${FUNCNAME[0]}: Cannot create temporary file after 100 attempts." >&2
return
fi
done
}
# my_print_defaults needs to read stuff in $HOME/.my.cnf
local -x HOME="${EROOT}/root"
# Make sure the vars are correctly initialized
mysql_init_vars
# Read currently set data directory
MY_DATADIR="$(_getoptval mysqld datadir "--defaults-file='${MY_SYSCONFDIR}/my.cnf'")"
# Bug #213475 - MySQL _will_ object strenously if your machine is named
# localhost. Also causes weird failures.
[[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
if [[ -z "${MY_DATADIR}" ]] ; then
die "Sorry, unable to find MY_DATADIR!"
elif [[ -d "${EROOT}/${MY_DATADIR#/}/mysql" ]] ; then
ewarn "Looks like your data directory '${EROOT}/${MY_DATADIR#/}' is already initialized!"
elif [[ -d "${MY_DATADIR}/mysql" ]] ; then
ewarn "Looks like your data directory '${MY_DATADIR}' is already initialized!"
ewarn "Please rename or delete its content if you wish to initialize a new data directory."
die "${PN} data directory at '${EROOT}/${MY_DATADIR#/}' looks already initialized!"
die "${PN} data directory at '${MY_DATADIR}' looks already initialized!"
else
einfo "${PN} data directory detected as '${EROOT}/${MY_DATADIR#/}' ..."
einfo "${PN} data directory detected as '${MY_DATADIR}' ..."
fi
MYSQL_TMPDIR="$(_getoptval mysqld tmpdir)"
MYSQL_TMPDIR="$(_getoptval mysqld tmpdir "--defaults-file='${MY_SYSCONFDIR}/my.cnf'")"
# These are dir+prefix
MYSQL_LOG_BIN="$(_getoptval mysqld log-bin)"
MYSQL_LOG_BIN="$(_getoptval mysqld log-bin "--defaults-file='${MY_SYSCONFDIR}/my.cnf'")"
MYSQL_LOG_BIN=${MYSQL_LOG_BIN%/*}
MYSQL_RELAY_LOG="$(_getoptval mysqld relay-log)"
MYSQL_RELAY_LOG="$(_getoptval mysqld relay-log "--defaults-file='${MY_SYSCONFDIR}/my.cnf'")"
MYSQL_RELAY_LOG=${MYSQL_RELAY_LOG%/*}
# Create missing directories.
@ -646,79 +684,129 @@ pkg_config() {
PID_DIR="${EROOT}/run/mysqld"
if [[ ! -d "${PID_DIR}" ]] ; then
einfo "Creating ${PN} PID directory '${PID_DIR}' ..."
install -d -m 755 -o mysql -g mysql "${PID_DIR}" \
install -d -m 755 -o ${MYSQL_USER} -g ${MYSQL_GROUP} "${PID_DIR}" \
|| die "Failed to create PID directory '${PID_DIR}'!"
fi
local _pid_dir_testfile="$(mktemp --dry-run "${PID_DIR}/.pkg_config-access-test.XXXXXXXXX")"
su -s /bin/sh -c "touch ${_pid_dir_testfile}" mysql &>/dev/null
local _pid_dir_testfile="$(_mktemp_dry "${PID_DIR}/.pkg_config-access-test.XXXXXXXXX")"
[[ -z "${_pid_dir_testfile}" ]] \
&& die "_mktemp_dry() for '${PID_DIR}/.pkg_config-access-test.XXXXXXXXX' failed!"
if use prefix ; then
touch "${_pid_dir_testfile}" &>/dev/null
else
su -s /bin/sh -c "touch ${_pid_dir_testfile}" ${MYSQL_USER} &>/dev/null
fi
if [[ $? -ne 0 ]] ; then
die "mysql user cannot write into PID dir '${PID_DIR}'!"
die "${MYSQL_USER} user cannot write into PID dir '${PID_DIR}'!"
else
rm "${_pid_dir_testfile}" || die
unset _pid_dir_testfile
fi
if [[ ! -d "${EROOT}/${MY_DATADIR#/}" ]] ; then
einfo "Creating ${PN} data directory '${EROOT}/${MY_DATADIR#/}' ..."
install -d -m 770 -o mysql -g mysql "${EROOT}/${MY_DATADIR#/}" \
|| die "Failed to create ${PN} data directory '${EROOT}/${MY_DATADIR#/}'!"
if [[ ! -d "${MY_DATADIR}" ]] ; then
einfo "Creating ${PN} data directory '${MY_DATADIR}' ..."
install -d -m 770 -o ${MYSQL_USER} -g ${MYSQL_GROUP} "${MY_DATADIR}" \
|| die "Failed to create ${PN} data directory '${MY_DATADIR}'!"
fi
local _my_datadir_testfile="$(_mktemp_dry "${MY_DATADIR}/.pkg_config-access-test.XXXXXXXXX")"
[[ -z "${_my_datadir_testfile}" ]] \
&& die "_mktemp_dry() for '${MY_DATADIR}/.pkg_config-access-test.XXXXXXXXX' failed!"
if use prefix ; then
touch "${_my_datadir_testfile}" &>/dev/null
else
su -s /bin/sh -c "touch ${_my_datadir_testfile}" ${MYSQL_USER} &>/dev/null
fi
local _my_datadir_testfile="$(mktemp --dry-run "${EROOT}/${MY_DATADIR#/}/.pkg_config-access-test.XXXXXXXXX")"
su -s /bin/sh -c "touch '${_my_datadir_testfile}'" mysql &>/dev/null
if [[ $? -ne 0 ]]; then
die "mysql user cannot write into data directory '${EROOT}/${MY_DATADIR#/}'!"
die "${MYSQL_USER} user cannot write into data directory '${MY_DATADIR}'!"
else
rm "${_my_datadir_testfile}" || die
unset _my_datadir_testfile
fi
if [[ -n "${MYSQL_TMPDIR}" && ! -d "${EROOT}/${MYSQL_TMPDIR#/}" ]] ; then
einfo "Creating ${PN} tmpdir '${EROOT}/${MYSQL_TMPDIR#/}' ..."
install -d -m 770 -o mysql -g mysql "${EROOT}/${MYSQL_TMPDIR#/}" \
|| die "Failed to create ${PN} tmpdir '${EROOT}/${MYSQL_TMPDIR#/}'!"
if [[ -n "${MYSQL_TMPDIR}" && ! -d "${MYSQL_TMPDIR}" ]] ; then
einfo "Creating ${PN} tmpdir '${MYSQL_TMPDIR}' ..."
install -d -m 770 -o ${MYSQL_USER} -g ${MYSQL_GROUP} "${MYSQL_TMPDIR}" \
|| die "Failed to create ${PN} tmpdir '${MYSQL_TMPDIR}'!"
fi
if [[ -n "${MYSQL_TMPDIR}" ]] ; then
local _my_tmpdir_testfile="$(mktemp --dry-run "${EROOT}/${MYSQL_TMPDIR#/}/.pkg_config-access-test.XXXXXXXXX")"
su -s /bin/sh -c "touch '${_my_tmpdir_testfile}'" mysql &>/dev/null
local _my_tmpdir_testfile="$(_mktemp_dry "${MYSQL_TMPDIR}/.pkg_config-access-test.XXXXXXXXX")"
[[ -z "${_my_tmpdir_testfile}" ]] \
&& die "_mktemp_dry() for '${MYSQL_TMPDIR}/.pkg_config-access-test.XXXXXXXXX' failed!"
if use prefix ; then
touch "${_my_tmpdir_testfile}" &>/dev/null
else
su -s /bin/sh -c "touch ${_my_tmpdir_testfile}" ${MYSQL_USER} &>/dev/null
fi
if [[ $? -ne 0 ]]; then
die "mysql user cannot write into data directory '${EROOT}/${MYSQL_TMPDIR#/}'!"
die "${MYSQL_USER} user cannot write into data directory '${MYSQL_TMPDIR}'!"
else
rm "${_my_tmpdir_testfile}" || die
unset _my_tmpdir_testfile
fi
else
# If no tmpdir is set, mysqld will use default system tmpdir.
# However, we are using tmpdir from package manager at the
# moment which maybe isn't writeable for $MYSQL_USER...
MYSQL_TMPDIR="$(_mktemp_dry "${T}/mysqld-tmp.XXXXXXXXX")"
[[ -z "${MYSQL_TMPDIR}" ]] \
&& die "_mktemp_dry() for '${MYSQL_TMPDIR}' failed!"
mkdir "${MYSQL_TMPDIR}" || die
chown ${MYSQL_USER} "${MYSQL_TMPDIR}" || die
fi
if [[ -n "${MYSQL_LOG_BIN}" && ! -d "${EROOT}/${MYSQL_LOG_BIN#/}" ]] ; then
einfo "Creating ${PN} log-bin directory '${EROOT}/${MYSQL_LOG_BIN}' ..."
install -d -m 770 -o mysql -g mysql "${EROOT}/${MYSQL_LOG_BIN}" \
|| die "Failed to create ${PN} log-bin directory '${EROOT}/${MYSQL_LOG_BIN}'"
if [[ -n "${MYSQL_LOG_BIN}" && ! -d "${MYSQL_LOG_BIN}" ]] ; then
einfo "Creating ${PN} log-bin directory '${MYSQL_LOG_BIN}' ..."
install -d -m 770 -o ${MYSQL_USER} -g ${MYSQL_GROUP} "${MYSQL_LOG_BIN}" \
|| die "Failed to create ${PN} log-bin directory '${MYSQL_LOG_BIN}'"
fi
if [[ -n "${MYSQL_LOG_BIN}" ]] ; then
local _my_logbin_testfile="$(mktemp --dry-run "${EROOT}/${MYSQL_LOG_BIN#/}/.pkg_config-access-test.XXXXXXXXX")"
su -s /bin/sh -c "touch '${_my_logbin_testfile}'" mysql &>/dev/null
local _my_logbin_testfile="$(_mktemp_dry "${MYSQL_LOG_BIN}/.pkg_config-access-test.XXXXXXXXX")"
[[ -z "${_my_logbin_testfile}" ]] \
&& die "_mktemp_dry() for '${MYSQL_LOG_BIN}/.pkg_config-access-test.XXXXXXXXX' failed!"
if use prefix ; then
touch "${_my_logbin_testfile}" &>/dev/null
else
su -s /bin/sh -c "touch ${_my_logbin_testfile}" ${MYSQL_USER} &>/dev/null
fi
if [[ $? -ne 0 ]]; then
die "mysql user cannot write into data directory '${EROOT}/${MYSQL_LOG_BIN#/}'!"
die "${MYSQL_USER} user cannot write into log-bin directory '${MYSQL_LOG_BIN}'!"
else
rm "${_my_logbin_testfile}" || die
unset _my_logbin_testfile
fi
fi
if [[ -n "${MYSQL_RELAY_LOG}" && ! -d "${EROOT}/${MYSQL_RELAY_LOG#/}" ]] ; then
einfo "Creating ${PN} relay-log directory '${EROOT}/${MYSQL_RELAY_LOG#/}' ..."
install -d -m 770 -o mysql -g mysql "${EROOT}/${MYSQL_RELAY_LOG#/}" \
|| die "Failed to create ${PN} relay-log directory '${EROOT}/${MYSQL_RELAY_LOG#/}'!"
if [[ -n "${MYSQL_RELAY_LOG}" && ! -d "${MYSQL_RELAY_LOG}" ]] ; then
einfo "Creating ${PN} relay-log directory '${MYSQL_RELAY_LOG}' ..."
install -d -m 770 -o ${MYSQL_USER} -g ${MYSQL_GROUP} "${MYSQL_RELAY_LOG}" \
|| die "Failed to create ${PN} relay-log directory '${MYSQL_RELAY_LOG}'!"
fi
if [[ -n "${MYSQL_RELAY_LOG}" ]] ; then
local _my_relaylog_testfile="$(mktemp --dry-run "${EROOT}/${MYSQL_RELAY_LOG#/}/.pkg_config-access-test.XXXXXXXXX")"
su -s /bin/sh -c "touch '${_my_relaylog_testfile}'" mysql &>/dev/null
local _my_relaylog_testfile="$(_mktemp_dry "${MYSQL_RELAY_LOG}/.pkg_config-access-test.XXXXXXXXX")"
[[ -z "${_my_relaylog_testfile}" ]] \
&& die "_mktemp_dry() for '${MYSQL_RELAY_LOG}/.pkg_config-access-test.XXXXXXXXX' failed!"
if use prefix ; then
touch "${_my_relaylog_testfile}" &>/dev/null
else
su -s /bin/sh -c "touch ${_my_relaylog_testfile}" ${MYSQL_USER} &>/dev/null
fi
if [[ $? -ne 0 ]]; then
die "mysql user cannot write into data directory '${EROOT}/${MYSQL_RELAY_LOG#/}'!"
die "${MYSQL_USER} user cannot write into relay-log directory '${MYSQL_RELAY_LOG}'!"
else
rm "${_my_relaylog_testfile}" || die
unset _my_relaylog_testfile
@ -743,7 +831,7 @@ pkg_config() {
if [[ ${#config_files[@]} -gt 0 ]] ; then
if [[ -z "${MYSQL_DEFAULT_AUTHENTICATION_PLUGIN}" ]] ; then
local tmp_mysql_default_authentication_plugin
local user_answer
echo
einfo "Please select default authentication plugin (enter number or plugin name):"
@ -752,10 +840,10 @@ pkg_config() {
einfo
einfo "For details see:"
einfo "https://dev.mysql.com/doc/refman/8.0/en/upgrading-from-previous-series.html#upgrade-caching-sha2-password"
read -p " >" tmp_mysql_default_authentication_plugin
read -p " >" user_answer
echo
case "${tmp_mysql_default_authentication_plugin}" in
case "${user_answer}" in
1|caching_sha2_password)
MYSQL_DEFAULT_AUTHENTICATION_PLUGIN=caching_sha2_password
;;
@ -766,9 +854,11 @@ pkg_config() {
die "No authentication plugin selected!"
;;
*)
die "Authentication plugin '${tmp_mysql_default_authentication_plugin}' is unknown/unsupported!"
die "Authentication plugin '${user_answer}' is unknown/unsupported!"
;;
esac
unset user_answer
fi
local cfg_option cfg_option_tabs cfg_section
@ -880,11 +970,11 @@ pkg_config() {
die "mysql_tzinfo_to_sql failed!"
fi
chown mysql "${tz_sql}" || die
chown ${MYSQL_USER} "${tz_sql}" || die
local mysql_install_log="${TMPDIR}/mysql_install_db.log"
touch "${mysql_install_log}" || die
chown mysql "${mysql_install_log}" || die
chown ${MYSQL_USER} "${mysql_install_log}" || die
# --initialize-insecure will not set root password
# --initialize would set a random one in the log which we don't need as we set it ourselves
@ -894,17 +984,17 @@ pkg_config() {
"--initialize-insecure"
"--init-file='${tz_sql}'"
"--basedir='${EROOT}/usr'"
"--datadir='${EROOT}/${MY_DATADIR#/}'"
"--tmpdir='${EROOT}/${MYSQL_TMPDIR#/}'"
"--datadir='${MY_DATADIR}'"
"--tmpdir='${MYSQL_TMPDIR}'"
"--log-error='${mysql_install_log}'"
"--user=${MYSQL_USER}"
)
einfo "Initializing ${PN} data directory: ${cmd[@]}"
su -s /bin/sh -c "${cmd[*]}" mysql \
>>"${mysql_install_log}" 2>&1
eval "${cmd[@]}" >>"${mysql_install_log}" 2>&1
if [[ $? -ne 0 || ! -f "${EROOT}/${MY_DATADIR#/}/mysql.ibd" ]] ; then
grep -B5 -A999 -iE "(Aborting|ERROR|errno)" "${mysql_install_log}"
if [[ $? -ne 0 || ! -f "${MY_DATADIR}/mysql.ibd" ]] ; then
grep -B5 -A999 -iE "(Aborting|ERROR|errno)" "${mysql_install_log}" 1>&2
die "Failed to initialize ${PN} data directory. Please review '${mysql_install_log}'!"
fi
@ -915,24 +1005,24 @@ pkg_config() {
local mysqld_logfile="${TMPDIR}/mysqld.log"
touch "${mysqld_logfile}" || die
chown mysql "${mysqld_logfile}" || die
chown ${MYSQL_USER} "${mysqld_logfile}" || die
cmd=(
"${mysqld_binary}"
"${mysqld_options[@]}"
"--basedir='${EROOT}/usr'"
"--datadir='${EROOT}/${MY_DATADIR#/}'"
"--datadir='${MY_DATADIR}'"
"--tmpdir='${MYSQL_TMPDIR}'"
--max_allowed_packet=8M
--net_buffer_length=16K
"--socket='${socket}'"
"--pid-file='${pidfile}'"
"--tmpdir='${EROOT}/${MYSQL_TMPDIR#/}'"
"--log-error='${mysqld_logfile}'"
"--user=${MYSQL_USER}"
)
einfo "Starting mysqld to finalize initialization: ${cmd[@]}"
su -s /bin/sh -c "${cmd[*]} &" mysql \
>>"${mysqld_logfile}" 2>&1
eval "${cmd[@]}" >>"${mysqld_logfile}" 2>&1 &
echo -n "Waiting for mysqld to accept connections "
local maxtry=15
@ -956,7 +1046,7 @@ pkg_config() {
echo
if [[ ! -S "${socket}" ]] ; then
grep -B5 -A999 -iE "(Aborting|ERROR|errno)" "${mysqld_logfile}"
grep -B5 -A999 -iE "(Aborting|ERROR|errno)" "${mysqld_logfile}" 1>&2
die "mysqld was unable to start from initialized data directory. Please review '${mysqld_logfile}'!"
fi
@ -1008,5 +1098,5 @@ pkg_config() {
fi
fi
einfo "${PN} data directory at '${EROOT}/${MY_DATADIR#/}' successfully initialized!"
einfo "${PN} data directory at '${MY_DATADIR}' successfully initialized!"
}

Binary file not shown.

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

Loading…
Cancel
Save