from:"Andrew Savchenko"

[gentoo-commits] repo/gentoo:master commit in: dev-util/oprofile/files/, dev-util/oprofile/

2020-09-05 Thread Andrew Savchenko

commit: 44046f58059e057b3cddd7ce286cd71e6de81955
Author: Andrew Savchenko  gentoo  org>
AuthorDate: Sat Sep  5 10:59:57 2020 +
Commit:     Andrew Savchenko  gentoo  org>
CommitDate: Sat Sep  5 11:05:18 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=44046f58

dev-util/oprofile: fix build with musl

Package-Manager: Portage-3.0.3, Repoman-3.0.0
Signed-off-by: Andrew Savchenko  gentoo.org>

 dev-util/oprofile/files/musl.patch  | 23 +++
 dev-util/oprofile/oprofile-1.4.0.ebuild |  3 ++-
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/dev-util/oprofile/files/musl.patch 
b/dev-util/oprofile/files/musl.patch
new file mode 100644
index 000..985eeece7bd
--- /dev/null
+++ b/dev-util/oprofile/files/musl.patch
@@ -0,0 +1,23 @@
+--- oprofile-1.4.0/pe_profiling/operf.cpp.orig 2016-08-08 18:03:27.0 
+0300
 oprofile-1.4.0/pe_profiling/operf.cpp  2020-09-05 12:45:55.237558495 
+0300
+@@ -860,9 +860,9 @@
+ {
+   if (remove(fpath)) {
+   perror("sample data removal error");
+-  return FTW_STOP;
++  return 1;
+   } else {
+-  return FTW_CONTINUE;
++  return 0;
+   }
+ }
+ 
+@@ -897,7 +897,7 @@
+   return;
+ 
+   if (!operf_options::append) {
+-int flags = FTW_DEPTH | FTW_ACTIONRETVAL;
++int flags = FTW_DEPTH;
+   errno = 0;
+   if (nftw(previous_sampledir.c_str(), 
__delete_old_previous_sample_data, 32, flags) !=0 &&
+   errno != ENOENT) {

diff --git a/dev-util/oprofile/oprofile-1.4.0.ebuild 
b/dev-util/oprofile/oprofile-1.4.0.ebuild
index e881632d5f3..485fdf66c1f 100644
--- a/dev-util/oprofile/oprofile-1.4.0.ebuild
+++ b/dev-util/oprofile/oprofile-1.4.0.ebuild
@@ -20,7 +20,7 @@ BDEPEND="
 CDEPEND="
>=dev-libs/popt-1.7-r1
sys-libs/binutils-libs:=
-   >=sys-libs/glibc-2.3.2-r1
+   elibc_glibc? ( >=sys-libs/glibc-2.3.2-r1 )
ppc64? ( dev-libs/libpfm )
 "
 DEPEND="${CDEPEND}
@@ -46,6 +46,7 @@ pkg_setup() {
 }
 
 src_prepare() {
+   eapply "${FILESDIR}/musl.patch"
# bug 723092
sed -i 's/==/=/g' configure.ac || die

[gentoo-commits] repo/gentoo:master commit in: acct-user/sobexsrv/

2020-09-06 Thread Andrew Savchenko

commit: e9da70da93ae447fddd79ff28b7698bbb31f7009
Author: Andrew Savchenko  gentoo  org>
AuthorDate: Sun Sep  6 08:29:47 2020 +
Commit:     Andrew Savchenko  gentoo  org>
CommitDate: Sun Sep  6 09:56:47 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e9da70da

acct-user/sobexsrv: a user for app-mobilephone/sobexsrv

Package-Manager: Portage-3.0.5, Repoman-3.0.1
Signed-off-by: Andrew Savchenko  gentoo.org>

 acct-user/sobexsrv/metadata.xml  |  8 
 acct-user/sobexsrv/sobexsrv-0.ebuild | 13 +
 2 files changed, 21 insertions(+)

diff --git a/acct-user/sobexsrv/metadata.xml b/acct-user/sobexsrv/metadata.xml
new file mode 100644
index 000..45c8b6c75c9
--- /dev/null
+++ b/acct-user/sobexsrv/metadata.xml
@@ -0,0 +1,8 @@
+
+http://www.gentoo.org/dtd/metadata.dtd;>
+
+  
+birc...@gentoo.org
+Andrew Savchenko
+  
+

diff --git a/acct-user/sobexsrv/sobexsrv-0.ebuild 
b/acct-user/sobexsrv/sobexsrv-0.ebuild
new file mode 100644
index 000..613bd931349
--- /dev/null
+++ b/acct-user/sobexsrv/sobexsrv-0.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for sobexsrv: a secure OBEX server"
+ACCT_USER_ID=387
+ACCT_USER_GROUPS=( ${PN} )
+ACCT_USER_HOME="/var/spool/sobexsrv"
+
+acct-user_add_deps

[gentoo-commits] repo/gentoo:master commit in: app-mobilephone/sobexsrv/files/

2020-09-06 Thread Andrew Savchenko

commit: a6770b0bb394ffbbb79690dc1a126cdad35c0540
Author: Andrew Savchenko  gentoo  org>
AuthorDate: Sun Sep  6 08:55:49 2020 +
Commit:     Andrew Savchenko  gentoo  org>
CommitDate: Sun Sep  6 09:56:51 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a6770b0b

app-mobilephone/sobexsrv: init.d fixes

- double quote ${CHROOT} variable
- start-stop-daemon: migrate from --chuid to --user

Package-Manager: Portage-3.0.5, Repoman-3.0.1
Signed-off-by: Andrew Savchenko  gentoo.org>

 app-mobilephone/sobexsrv/files/init.d_sobexsrv | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app-mobilephone/sobexsrv/files/init.d_sobexsrv 
b/app-mobilephone/sobexsrv/files/init.d_sobexsrv
index e02530314ca..fa27e19ef11 100644
--- a/app-mobilephone/sobexsrv/files/init.d_sobexsrv
+++ b/app-mobilephone/sobexsrv/files/init.d_sobexsrv
@@ -1,5 +1,5 @@
 #!/sbin/openrc-run
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 depend() {
@@ -17,7 +17,7 @@ check_config() {
return 1
fi
 
-   if [ ${CHROOT} = "yes" ] ; then
+   if [ "${CHROOT}" = "yes" ] ; then
if [ ! -u /usr/bin/sobexsrv ] ; then
eerror "The \$CHROOT option requires /usr/bin/sobexsrv 
to be suid root!"
return 1
@@ -47,7 +47,7 @@ start() {
 
OPTIONS="-I -r ${INBOX} ${OPTIONS} ${SOBEXSRV_OPT}"
 
-   start-stop-daemon --chuid ${USER}:${GROUP} --start --quiet --exec 
/usr/bin/sobexsrv -- $OPTIONS
+   start-stop-daemon --user ${USER}:${GROUP} --start --quiet --exec 
/usr/bin/sobexsrv -- $OPTIONS
eend $?
 }

[gentoo-commits] repo/gentoo:master commit in: app-mobilephone/sobexsrv/

2020-09-06 Thread Andrew Savchenko

commit: f5d48e16d64ed36734a7aea566d5cb211a94b6b3
Author: Andrew Savchenko  gentoo  org>
AuthorDate: Sun Sep  6 09:53:06 2020 +
Commit:     Andrew Savchenko  gentoo  org>
CommitDate: Sun Sep  6 09:56:55 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f5d48e16

app-mobilephone/sobexsrv: ebuild fixes

- Migrate to GLEP 81
- Update to EAPI 7
- Drop USE=gtk as it requires python2-only dev-python/pygtk

Bug: https://bugs.gentoo.org/708178
Package-Manager: Portage-3.0.5, Repoman-3.0.1
Signed-off-by: Andrew Savchenko  gentoo.org>

 app-mobilephone/sobexsrv/sobexsrv-1.0.1-r3.ebuild | 72 +++
 1 file changed, 72 insertions(+)

diff --git a/app-mobilephone/sobexsrv/sobexsrv-1.0.1-r3.ebuild 
b/app-mobilephone/sobexsrv/sobexsrv-1.0.1-r3.ebuild
new file mode 100644
index 000..e748963f7b5
--- /dev/null
+++ b/app-mobilephone/sobexsrv/sobexsrv-1.0.1-r3.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+MY_P="${P/_pre/pre}"
+
+DESCRIPTION="Scripting/Secure OBEX Server (for BlueZ Linux)"
+SRC_URI="http://www.mulliner.org/bluetooth/${MY_P}.tar.gz
+https://dev.gentoo.org/~joker/${P}-fix64.patch;
+HOMEPAGE="http://www.mulliner.org/bluetooth/sobexsrv.php;
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+DEPEND="
+   >=dev-libs/openobex-1.7.2-r1
+   net-wireless/bluez
+"
+RDEPEND="${DEPEND}
+   acct-user/sobexsrv
+   acct-group/sobexsrv
+"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+   "${DISTDIR}/${P}"-fix64.patch
+   "${FILESDIR}/${P}"-openobex16.patch
+)
+
+src_prepare() {
+   default
+
+   sed -e 's:/usr/man/man8:/usr/share/man/man8:' \
+   -e 's/install: all/install:/' \
+   -i Makefile || die
+
+   sed -e 's/^CFLAGS =/CFLAGS +=/' \
+   -e 's/^CC =/CC ?=/' \
+   -e 's/$(CC) $(CFLAGS)/$(CC) $(LDFLAGS) $(CFLAGS)/' \
+   -i src/Makefile || die
+}
+
+src_compile() {
+   tc-export CC
+   emake -C src
+}
+
+src_install() {
+   default
+   dodoc AUTHOR CONFIG SECURITY THANKS
+   rm "${D}/usr/bin/sobexsrv_handler" || die
+
+   newinitd "${FILESDIR}/init.d_sobexsrv" sobexsrv
+   newconfd "${FILESDIR}/conf.d_sobexsrv" sobexsrv
+}
+
+pkg_postinst() {
+   elog
+   elog "/usr/bin/sobexsrv is *NOT* installed set-uid root by"
+   elog "default. suid is required for the chroot option (-R)."
+   elog
+   elog "Execute the following commands to enable suid:"
+   elog
+   elog "chown root:sobexsrv /usr/bin/sobexsrv"
+   elog "chmod 4710 /usr/bin/sobexsrv"
+   elog
+}

[gentoo-commits] repo/gentoo:master commit in: acct-group/sobexsrv/

2020-09-06 Thread Andrew Savchenko

commit: 134b44a3b70e28a27902921f78339a2de92e0b1b
Author: Andrew Savchenko  gentoo  org>
AuthorDate: Sun Sep  6 08:15:15 2020 +
Commit:     Andrew Savchenko  gentoo  org>
CommitDate: Sun Sep  6 09:56:43 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=134b44a3

acct-group/sobexsrv: add group for app-mobilephone/sobexsrv

Package-Manager: Portage-3.0.5, Repoman-3.0.1
Signed-off-by: Andrew Savchenko  gentoo.org>

 acct-group/sobexsrv/metadata.xml  | 8 
 acct-group/sobexsrv/sobexsrv-0.ebuild | 9 +
 2 files changed, 17 insertions(+)

diff --git a/acct-group/sobexsrv/metadata.xml b/acct-group/sobexsrv/metadata.xml
new file mode 100644
index 000..45c8b6c75c9
--- /dev/null
+++ b/acct-group/sobexsrv/metadata.xml
@@ -0,0 +1,8 @@
+
+http://www.gentoo.org/dtd/metadata.dtd;>
+
+  
+birc...@gentoo.org
+Andrew Savchenko
+  
+

diff --git a/acct-group/sobexsrv/sobexsrv-0.ebuild 
b/acct-group/sobexsrv/sobexsrv-0.ebuild
new file mode 100644
index 000..a91907f84e2
--- /dev/null
+++ b/acct-group/sobexsrv/sobexsrv-0.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A group for sobexsrv: a secure OBEX server"
+ACCT_GROUP_ID=387

[gentoo-commits] repo/gentoo:master commit in: media-sound/apulse/

2020-09-06 Thread Andrew Savchenko

commit: 1301cca54d4bce6a6ece78844ec45a49448850d3
Author: Andrew Savchenko  gentoo  org>
AuthorDate: Sun Sep  6 19:05:25 2020 +
Commit:     Andrew Savchenko  gentoo  org>
CommitDate: Sun Sep  6 19:10:22 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1301cca5

media-sound/apulse: fix tests

Closes: https://bugs.gentoo.org/724688
Package-Manager: Portage-3.0.5, Repoman-3.0.1
Signed-off-by: Andrew Savchenko  gentoo.org>

 media-sound/apulse/apulse-0.1.13.ebuild | 9 -
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/media-sound/apulse/apulse-0.1.13.ebuild 
b/media-sound/apulse/apulse-0.1.13.ebuild
index 350f525f8b2..30be8c6e763 100644
--- a/media-sound/apulse/apulse-0.1.13.ebuild
+++ b/media-sound/apulse/apulse-0.1.13.ebuild
@@ -51,7 +51,14 @@ multilib_src_configure() {
 }
 
 multilib_src_test() {
-   emake check
+   _test() {
+   pushd tests || die
+   cmake -S "${S}/tests" -B . || die
+   emake test_ringbuffer
+   ctest -j "$(makeopts_jobs)" --test-load "$(makeopts_loadavg)" 
|| die
+   popd || die
+   }
+   multilib_foreach_abi _test
 }
 
 multilib_src_install_all() {

[gentoo-commits] repo/gentoo:master commit in: net-fs/openafs/

2020-09-13 Thread Andrew Savchenko

commit: 0ebc700c71421c06d5d061ce49b5580812e215cc
Author: Andrew Savchenko  gentoo  org>
AuthorDate: Sun Sep 13 10:05:19 2020 +
Commit:     Andrew Savchenko  gentoo  org>
CommitDate: Sun Sep 13 10:07:10 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ebc700c

net-fs/openafs: remove old 1.8.2-r2

Package-Manager: Portage-3.0.6, Repoman-3.0.1
Signed-off-by: Andrew Savchenko  gentoo.org>

 net-fs/openafs/Manifest|   3 -
 net-fs/openafs/openafs-1.8.2-r2.ebuild | 341 -
 2 files changed, 344 deletions(-)

diff --git a/net-fs/openafs/Manifest b/net-fs/openafs/Manifest
index f483258091b..f0d76e99bc7 100644
--- a/net-fs/openafs/Manifest
+++ b/net-fs/openafs/Manifest
@@ -2,10 +2,7 @@ DIST openafs-1.6.22.1-doc.tar.bz2 3534064 BLAKE2B 
e9f67fb42b6c4e6c2092e713e801db
 DIST openafs-1.6.22.1-src.tar.bz2 14682183 BLAKE2B 
a01e08f30f28dda9484407bbe0568df7b517e587b6e2475d669269e09745050bee955438dfeab9d86564dbc22821bc2fb417c15f8add0aae6acdde266c080df0
 SHA512 
901959051f60f7ffa2db8a253a16f9460713e3637a53f0b6b05e72247e08b633951116dc28b19db9c7448d8ebc7a20a8a851d5356c52f16c28f5c89209f8190e
 DIST openafs-1.6.22.2-doc.tar.bz2 3533975 BLAKE2B 
a44b39291ece3d4b1f9f9e722b35f48698063e4daecb94745b5a8ead00412b9e8e7baef0c1264c6289de45cab66b4b83ed3cfe83a60072480c848c14bb61016c
 SHA512 
e8405ad2f5c3ad24d37789fdf71961ed3f1af4467b9385a87f70f8ffc39dfccf1db35a492360811cf62bb3959cdb7f6eee08991aaafa24961b24815f908172c1
 DIST openafs-1.6.22.2-src.tar.bz2 14673379 BLAKE2B 
06408ad98a1812608b14ee89ffa40ccbbf6aa7d41dc0741c9c7b9e2c59a3f88c1f6676aa2f996b888cb7f50c04f0c8fe2da15c3f3647e3998f70c973c18ea7d3
 SHA512 
e4f2ce326a1d04ec20b1fa4115509bf35f73d937ff77e6e017e851ce871542d935e5ae8a597efd14027c385869657cf538cffa2674878bd4d4da37f20626172c
-DIST openafs-1.8.2-doc.tar.bz2 3801937 BLAKE2B 
321af6f0b97cfe195b18a7fb55208981158f23671dec35c0462167d3ebddd245e3aabefbc13f3caddbd6d4556c448f137acfd70be768dbeb843bedf2acfe8e2b
 SHA512 
99bf052f7128e920766efaafc930fa33b7d3615f7c61c1182fd93159fd477d88da05f88fd9f39896c44d80a3687142367613adc2d7bd73d069dc5820b4cf8653
-DIST openafs-1.8.2-src.tar.bz2 15109003 BLAKE2B 
13a786bcc2053d70a161e32911eef9c774492b28f93d33747f51fd55e4374d1dba52c83733d6cce8fdb4496a222800acaf4f95d8e7b4790259476c29486fd601
 SHA512 
8115098fc60e12f63e9177a7487c08bf60ac738ceaa84644e4c57345928f2764a9e06653f235456e8667a779bbce7647521574751d1bd6b64827b12f63f91b92
 DIST openafs-1.8.6-doc.tar.bz2 3769160 BLAKE2B 
c5fe08fbb2cdab48dd691a7e228cc590644e05b22c87afef24a5fb35aa12e379d8d49d4b920cb84dd23b4e1f1a04512078f3018808531cdc7180778885bdc466
 SHA512 
7525325a5ef6e1ceada7075f489a03e1d250d3cbd8b8e83a25c8e40d506d50cbf10c2b28b682f2f9663a8cd450cb70891a04e6dbc296347945ee2454b138d971
 DIST openafs-1.8.6-src.tar.bz2 14874336 BLAKE2B 
a83f5bfe543b3797fa6d80ebc96cacb1a15f58cf5495d1c693593bc6d24a9f08678693080b3920a97afebe937689dd0ad08bbca95c996af0d2c83935974d3613
 SHA512 
0800c3825d4e0384b43cb801fc898e9255a0fa0d0baf1f231fbf383317919cc30f68526eeec803d2dc21fc7a6b55155ea4cb23197604c70e89ecf4d520b85ec1
 DIST openafs-patches-20170822.tar.xz 11036 BLAKE2B 
e53d9e01c5808ca9876fd22f729e0e82cb0f6bc7c1f4875ad0607ac9d547e216c61cc2c3506eaafb7c81318958cd038c177e9e5b2c3728997d7f44e13bbbded4
 SHA512 
f4b574287bfe54881a70f3ccd4d4901b2f8f9ecbec7b3a4975b59050d5ef27c6de3da25f820b7b2b10f1a38034bb28e5c01ee094fb38cae80e244eeb04b29d0a
-DIST openafs-patches-20190106.tar.xz 29712 BLAKE2B 
6377ffc6afa147f47e57e94c7c18c17c42f70c3c8d578ca7e53a4577918be0e6e6d3fbe427c5c460df8a5abb3e4f707beb27fda5e919b95285c4ce02484cd89d
 SHA512 
bc35e422ffb3b231a3ba80f5408ebbec7b1220b8be56bf4a84024a2554060ca1c0e2ea97af989bcafade3629d40520df3d69f58a90f526f0d60523f8d3f96d16
 DIST openafs-patches-20200913.tar.xz 28392 BLAKE2B 
5e8b8f2554453abdb0a84dd45d8e719cc60127224ee6ebeaca4fcddba3d38309d7e5070c43659d10301ab9eaf371ba7dcbcf12950166626a7d359d2a39c922c6
 SHA512 
ec0aa800b945de2fe70d949259c89a97660bdbfee3c3e43d886a5c2f6b7c530252a53ff8f196f6e80a9a657bb81f26a6937a1bec3fafbd2c70322b313a712820

diff --git a/net-fs/openafs/openafs-1.8.2-r2.ebuild 
b/net-fs/openafs/openafs-1.8.2-r2.ebuild
deleted file mode 100644
index e8456733be5..000
--- a/net-fs/openafs/openafs-1.8.2-r2.ebuild
+++ /dev/null
@@ -1,341 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools linux-mod flag-o-matic pam systemd toolchain-funcs
-
-MY_PV=${PV/_/}
-MY_P="${PN}-${MY_PV}"
-PVER=20190106
-KERNEL_LIMIT=4.21
-
-DESCRIPTION="The OpenAFS distributed file system"
-HOMEPAGE="https://www.openafs.org/;
-# We always d/l the doc tarball as man pages are not USE=doc material
-[[ ${PV} == *_pre* ]] && MY_PRE="candidate/" || MY_PRE=""
-SRC_URI="
-   https://openafs.org/dl/openafs/${MY_PRE}${MY_PV}/${MY_P}-src.tar.bz2
-   https://openafs.org/dl/openafs/${MY_PRE}${MY_PV}/${MY_P}-doc.tar.bz2
-

[gentoo-commits] repo/gentoo:master commit in: net-fs/openafs/

2020-09-13 Thread Andrew Savchenko

commit: a1aa73793f6d9d6372d4b7d5470c6075a9d723ed
Author: Andrew Savchenko  gentoo  org>
AuthorDate: Sun Sep 13 08:43:53 2020 +
Commit:     Andrew Savchenko  gentoo  org>
CommitDate: Sun Sep 13 09:47:41 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a1aa7379

net-fs/openafs: USE api -> apidoc

Rename USE flag api to apidoc to conform how most packages name API
documentation build (usually doxygen-based) and to use more precise
and less confusing flag name.

Package-Manager: Portage-3.0.6, Repoman-3.0.1
Signed-off-by: Andrew Savchenko  gentoo.org>

 net-fs/openafs/metadata.xml|  2 +-
 net-fs/openafs/openafs-1.8.2-r2.ebuild | 10 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/net-fs/openafs/metadata.xml b/net-fs/openafs/metadata.xml
index 32ca71d15eb..59c61d4d609 100644
--- a/net-fs/openafs/metadata.xml
+++ b/net-fs/openafs/metadata.xml
@@ -9,7 +9,7 @@
    Andrew Savchenko
 
 
-   Build API documentation using 
app-doc/doxygen.
+   Build API documentation using 
app-doc/doxygen.
May take a *long* time to build.
Enable fast startup of file server by not
reading bitmap till needed.

diff --git a/net-fs/openafs/openafs-1.8.2-r2.ebuild 
b/net-fs/openafs/openafs-1.8.2-r2.ebuild
index d88f7cf693a..e8456733be5 100644
--- a/net-fs/openafs/openafs-1.8.2-r2.ebuild
+++ b/net-fs/openafs/openafs-1.8.2-r2.ebuild
@@ -24,14 +24,14 @@ LICENSE="IBM BSD openafs-krb5-a APSL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 
-IUSE="api bitmap-later debug doc fuse kauth kerberos +modules +namei
+IUSE="apidoc bitmap-later debug doc fuse kauth kerberos +modules +namei
 ncurses perl +pthreaded-ubik +supergroups tsm ubik-read-while-write"
 
 BDEPEND="
dev-lang/perl
sys-devel/flex
virtual/yacc
-   api? (
+   apidoc? (
app-doc/doxygen
media-gfx/graphviz
)
@@ -153,7 +153,7 @@ src_configure() {
$(use_enable pthreaded-ubik) \
$(use_enable supergroups) \
$(use_enable ubik-read-while-write) \
-   $(use_with api dot) \
+   $(use_with apidoc dot) \
$(use_with doc docbook-stylesheets 
/usr/share/sgml/docbook/xsl-stylesheets) \
$(use_with kerberos krb5) \
$(use_with kerberos gssapi) \
@@ -170,7 +170,7 @@ src_compile() {
emake -C doc/xml/QuickStartUnix auqbg000.pdf
emake -C doc/xml/UserGuide auusg000.pdf
fi
-   use api && doxygen doc/doxygen/Doxyfile
+   use apidoc && doxygen doc/doxygen/Doxyfile
 }
 
 src_install() {
@@ -243,7 +243,7 @@ src_install() {
newdoc doc/xml/QuickStartUnix/auqbg000.pdf QuickStartUnix.pdf
newdoc doc/xml/UserGuide/auusg000.pdf UserGuide.pdf
fi
-   use api && DOCS+=( doc/doxygen/output/html )
+   use apidoc && DOCS+=( doc/doxygen/output/html )
einstalldocs
 
# Gentoo related scripts

[gentoo-commits] repo/gentoo:master commit in: net-fs/openafs/

2020-09-13 Thread Andrew Savchenko

commit: d9e3fbc9f8f1990ab161537c1e0ce3658489f20d
Author: Andrew Savchenko  gentoo  org>
AuthorDate: Sun Sep 13 09:40:58 2020 +
Commit:     Andrew Savchenko  gentoo  org>
CommitDate: Sun Sep 13 09:47:49 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d9e3fbc9

net-fs/openafs: update to 1.8.6

- Version bump to 1.8.6, this fixes many bugs,
- including CVE-2019-1860{1..3}.
- Update to the latest upstream stable 1_8_x branch, which fixes
  more bugs and bring kernel 5.9 support.
- Migrate to tmpfiles eclass.
- Fix build with USE=tsm.
- Fix systemd unit files, thanks Adrian  planetcoding.net>
  for suggestion.
- Fix doxygen dep.

Bug: https://bugs.gentoo.org/719136
Closes: https://bugs.gentoo.org/680944
Closes: https://bugs.gentoo.org/686488
Closes: https://bugs.gentoo.org/706738
Closes: https://bugs.gentoo.org/736160
Closes: https://bugs.gentoo.org/740630
Package-Manager: Portage-3.0.6, Repoman-3.0.1
Signed-off-by: Andrew Savchenko  gentoo.org>

 net-fs/openafs/Manifest |   3 +
 net-fs/openafs/openafs-1.8.6.ebuild | 343 
 2 files changed, 346 insertions(+)

diff --git a/net-fs/openafs/Manifest b/net-fs/openafs/Manifest
index 4626148ccc8..f483258091b 100644
--- a/net-fs/openafs/Manifest
+++ b/net-fs/openafs/Manifest
@@ -4,5 +4,8 @@ DIST openafs-1.6.22.2-doc.tar.bz2 3533975 BLAKE2B 
a44b39291ece3d4b1f9f9e722b35f4
 DIST openafs-1.6.22.2-src.tar.bz2 14673379 BLAKE2B 
06408ad98a1812608b14ee89ffa40ccbbf6aa7d41dc0741c9c7b9e2c59a3f88c1f6676aa2f996b888cb7f50c04f0c8fe2da15c3f3647e3998f70c973c18ea7d3
 SHA512 
e4f2ce326a1d04ec20b1fa4115509bf35f73d937ff77e6e017e851ce871542d935e5ae8a597efd14027c385869657cf538cffa2674878bd4d4da37f20626172c
 DIST openafs-1.8.2-doc.tar.bz2 3801937 BLAKE2B 
321af6f0b97cfe195b18a7fb55208981158f23671dec35c0462167d3ebddd245e3aabefbc13f3caddbd6d4556c448f137acfd70be768dbeb843bedf2acfe8e2b
 SHA512 
99bf052f7128e920766efaafc930fa33b7d3615f7c61c1182fd93159fd477d88da05f88fd9f39896c44d80a3687142367613adc2d7bd73d069dc5820b4cf8653
 DIST openafs-1.8.2-src.tar.bz2 15109003 BLAKE2B 
13a786bcc2053d70a161e32911eef9c774492b28f93d33747f51fd55e4374d1dba52c83733d6cce8fdb4496a222800acaf4f95d8e7b4790259476c29486fd601
 SHA512 
8115098fc60e12f63e9177a7487c08bf60ac738ceaa84644e4c57345928f2764a9e06653f235456e8667a779bbce7647521574751d1bd6b64827b12f63f91b92
+DIST openafs-1.8.6-doc.tar.bz2 3769160 BLAKE2B 
c5fe08fbb2cdab48dd691a7e228cc590644e05b22c87afef24a5fb35aa12e379d8d49d4b920cb84dd23b4e1f1a04512078f3018808531cdc7180778885bdc466
 SHA512 
7525325a5ef6e1ceada7075f489a03e1d250d3cbd8b8e83a25c8e40d506d50cbf10c2b28b682f2f9663a8cd450cb70891a04e6dbc296347945ee2454b138d971
+DIST openafs-1.8.6-src.tar.bz2 14874336 BLAKE2B 
a83f5bfe543b3797fa6d80ebc96cacb1a15f58cf5495d1c693593bc6d24a9f08678693080b3920a97afebe937689dd0ad08bbca95c996af0d2c83935974d3613
 SHA512 
0800c3825d4e0384b43cb801fc898e9255a0fa0d0baf1f231fbf383317919cc30f68526eeec803d2dc21fc7a6b55155ea4cb23197604c70e89ecf4d520b85ec1
 DIST openafs-patches-20170822.tar.xz 11036 BLAKE2B 
e53d9e01c5808ca9876fd22f729e0e82cb0f6bc7c1f4875ad0607ac9d547e216c61cc2c3506eaafb7c81318958cd038c177e9e5b2c3728997d7f44e13bbbded4
 SHA512 
f4b574287bfe54881a70f3ccd4d4901b2f8f9ecbec7b3a4975b59050d5ef27c6de3da25f820b7b2b10f1a38034bb28e5c01ee094fb38cae80e244eeb04b29d0a
 DIST openafs-patches-20190106.tar.xz 29712 BLAKE2B 
6377ffc6afa147f47e57e94c7c18c17c42f70c3c8d578ca7e53a4577918be0e6e6d3fbe427c5c460df8a5abb3e4f707beb27fda5e919b95285c4ce02484cd89d
 SHA512 
bc35e422ffb3b231a3ba80f5408ebbec7b1220b8be56bf4a84024a2554060ca1c0e2ea97af989bcafade3629d40520df3d69f58a90f526f0d60523f8d3f96d16
+DIST openafs-patches-20200913.tar.xz 28392 BLAKE2B 
5e8b8f2554453abdb0a84dd45d8e719cc60127224ee6ebeaca4fcddba3d38309d7e5070c43659d10301ab9eaf371ba7dcbcf12950166626a7d359d2a39c922c6
 SHA512 
ec0aa800b945de2fe70d949259c89a97660bdbfee3c3e43d886a5c2f6b7c530252a53ff8f196f6e80a9a657bb81f26a6937a1bec3fafbd2c70322b313a712820

diff --git a/net-fs/openafs/openafs-1.8.6.ebuild 
b/net-fs/openafs/openafs-1.8.6.ebuild
new file mode 100644
index 000..dcf7a9a179c
--- /dev/null
+++ b/net-fs/openafs/openafs-1.8.6.ebuild
@@ -0,0 +1,343 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools linux-mod flag-o-matic pam systemd tmpfiles toolchain-funcs
+
+MY_PV=${PV/_/}
+MY_P="${PN}-${MY_PV}"
+PVER=20200913
+KERNEL_LIMIT=5.10
+
+DESCRIPTION="The OpenAFS distributed file system"
+HOMEPAGE="https://www.openafs.org/;
+# We always d/l the doc tarball as man pages are not USE=doc material
+[[ ${PV} == *_pre* ]] && MY_PRE="candidate/" || MY_PRE=""
+SRC_URI="
+   https://openafs.org/dl/openafs/${MY_PRE}${MY_PV}/${MY_P}-src.tar.bz2
+   https://openafs.org/dl/openafs/${MY_PRE}${MY_PV}/${MY_P}-doc.tar.bz2
+   https://dev.gentoo.org/~bircoph/afs/${PN}-patches-${PVER}.tar.xz
+"
+
+LICE

[gentoo-commits] repo/gentoo:master commit in: x11-misc/e16menuedit2/, x11-misc/e16menuedit2/files/

2020-10-11 Thread Andrew Savchenko

commit: a1ae67275707d149aaf6daba5387dcbb2d94325c
Author: Andrew Savchenko  gentoo  org>
AuthorDate: Sun Oct 11 08:19:51 2020 +
Commit:     Andrew Savchenko  gentoo  org>
CommitDate: Sun Oct 11 08:19:51 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a1ae6727

x11-misc/e16menuedit2: fix build with -fno-common

Closes: https://bugs.gentoo.org/707426
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Andrew Savchenko  gentoo.org>

 x11-misc/e16menuedit2/e16menuedit2-0.0.3.ebuild  |  7 +--
 .../e16menuedit2/files/e16menuedit2-no-common.patch  | 20 
 2 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/x11-misc/e16menuedit2/e16menuedit2-0.0.3.ebuild 
b/x11-misc/e16menuedit2/e16menuedit2-0.0.3.ebuild
index e0d251548c5..9c379752fcb 100644
--- a/x11-misc/e16menuedit2/e16menuedit2-0.0.3.ebuild
+++ b/x11-misc/e16menuedit2/e16menuedit2-0.0.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -24,7 +24,10 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
-PATCHES=( "${FILESDIR}/${PN}-no-default-docs.patch" )
+PATCHES=(
+   "${FILESDIR}/${PN}-no-default-docs.patch"
+   "${FILESDIR}/${PN}-no-common.patch"
+)
 
 src_prepare() {
sed -i '1i#include ' src/e16menuedit2.c || die

diff --git a/x11-misc/e16menuedit2/files/e16menuedit2-no-common.patch 
b/x11-misc/e16menuedit2/files/e16menuedit2-no-common.patch
new file mode 100644
index 000..4ac213b101f
--- /dev/null
+++ b/x11-misc/e16menuedit2/files/e16menuedit2-no-common.patch
@@ -0,0 +1,20 @@
+--- e16menuedit2-0.0.3/src/e16menu.h.orig  2020-10-11 10:41:36.827021380 
+0300
 e16menuedit2-0.0.3/src/e16menu.h   2020-10-11 10:51:27.043070842 +0300
+@@ -45,6 +45,6 @@
+ gboolean table_check_func (GtkTreeModel *model, GtkTreePath *path,
+   GtkTreeIter *iter, gpointer user_data); 
  
+ 
+-gchar *menu_file[MAX_RECURSION];
++extern gchar *menu_file[MAX_RECURSION];
+ 
+ #endif /* _E16MENU_H */
+--- e16menuedit2-0.0.3/src/e16menu.c.orig  2005-02-18 15:09:55.0 
+0300
 e16menuedit2-0.0.3/src/e16menu.c   2020-10-11 10:51:52.615152314 +0300
+@@ -34,6 +34,7 @@
+ #include "treeview.h"
+ 
+ extern struct global_variables gv;
++gchar *menu_file[MAX_RECURSION];
+ 
+ GtkTreeModel *load_menus_from_disk (void)
+ {

[gentoo-commits] repo/gentoo:master commit in: x11-wm/e16/

2020-10-11 Thread Andrew Savchenko

commit: 00c36a787a81a728a3ee0cdce0b680f1c1fcde80
Author: Andrew Savchenko  gentoo  org>
AuthorDate: Sun Oct 11 08:42:41 2020 +
Commit:     Andrew Savchenko  gentoo  org>
CommitDate: Sun Oct 11 08:42:41 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=00c36a78

x11-wm/e16: pango code needs xft

Closes: https://bugs.gentoo.org/708630
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Andrew Savchenko  gentoo.org>

 x11-wm/e16/e16-1.0.21.ebuild | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/x11-wm/e16/e16-1.0.21.ebuild b/x11-wm/e16/e16-1.0.21.ebuild
index 5d940a12f3f..735f01c76d2 100644
--- a/x11-wm/e16/e16-1.0.21.ebuild
+++ b/x11-wm/e16/e16-1.0.21.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,6 +17,7 @@ libhack modules nls opengl +pango sndfile sound +themes 
xcomposite
 REQUIRED_USE="
audiofile? ( sound )
opengl? ( xcomposite )
+   pango? ( xft )
sndfile? ( sound )
sound? ( ^^ ( sndfile audiofile ) )
 "

[gentoo-commits] repo/gentoo:master commit in: media-sound/apulse/

2020-10-11 Thread Andrew Savchenko

commit: 3af426aa23929009c6dad4fd0e34bc9484895b58
Author: Andrew Savchenko  gentoo  org>
AuthorDate: Sun Oct 11 07:14:32 2020 +
Commit:     Andrew Savchenko  gentoo  org>
CommitDate: Sun Oct 11 07:41:46 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3af426aa

media-sound/apulse: drop old

Bug: https://bugs.gentoo.org/734010
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Andrew Savchenko  gentoo.org>

 media-sound/apulse/Manifest|  1 -
 media-sound/apulse/apulse-0.1.12-r4.ebuild | 61 --
 2 files changed, 62 deletions(-)

diff --git a/media-sound/apulse/Manifest b/media-sound/apulse/Manifest
index 82ac13350e9..a66d0db1ba2 100644
--- a/media-sound/apulse/Manifest
+++ b/media-sound/apulse/Manifest
@@ -1,2 +1 @@
-DIST apulse-0.1.12.tar.gz 117220 BLAKE2B 
04d88a298ff5e21e19fda1979ebbc96a6441f83212d6903a004a54ee360276985e66b637571a76e3fe6821d42762ac515b02a8a2cb0149a66f3150e34bd0d9b7
 SHA512 
9fe39ab93e90d7ec589c7632bf439bfc7fe8bbd0792ce1197ec8547fbe1901fec50facdf33c55cfbadbc1af4414fdf48f1f241406903a8f15f445b97dca7076a
 DIST apulse-0.1.13.tar.gz 117369 BLAKE2B 
8cf527daf21420a72e46968a3b07ab61029f404a2b6574ac1f08dd40528f3e6e4baf7e38f5914b0c89252e16eec5e8f3722be51e5a61b6a71c683e994740b4bf
 SHA512 
366385ae2304f7ff697ba70951d0753a5b1630310922e3763fd0813a73e0b4088b715135295aa2fa9111b8edcf91d82849dc31346b292b2e9db598bcdd47b007

diff --git a/media-sound/apulse/apulse-0.1.12-r4.ebuild 
b/media-sound/apulse/apulse-0.1.12-r4.ebuild
deleted file mode 100644
index c91aa5a9d13..000
--- a/media-sound/apulse/apulse-0.1.12-r4.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit multilib cmake-multilib
-
-DESCRIPTION="PulseAudio emulation for ALSA"
-HOMEPAGE="https://github.com/i-rinat/apulse;
-SRC_URI="https://github.com/i-rinat/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-IUSE="debug sdk test"
-RESTRICT="!test? ( test )"
-
-DEPEND="dev-libs/glib:2[${MULTILIB_USEDEP}]
-   media-libs/alsa-lib[${MULTILIB_USEDEP}]
-   sdk? ( !media-sound/pulseaudio ) "
-RDEPEND="${DEPEND}
-   !!media-plugins/alsa-plugins[pulseaudio]"
-
-PATCHES=( "${FILESDIR}/sdk.patch" )
-
-src_prepare() {
-   cmake-utils_src_prepare
-
-   if ! use sdk; then
-   # Ensure all relevant libdirs are added, to support all ABIs
-   DIRS=
-   _add_dir() { 
DIRS="${EPREFIX}/usr/$(get_libdir)/apulse${DIRS:+:${DIRS}}"; }
-   multilib_foreach_abi _add_dir
-   sed -e "s#@@DIRS@@#${DIRS}#g" "${FILESDIR}"/apulse > 
"${T}"/apulse || die
-   fi
-}
-
-multilib_src_configure() {
-   local mycmakeargs=(
-   "-DINSTALL_SDK=$(usex sdk)"
-   "-DLOG_TO_STDERR=$(usex debug)"
-   "-DWITH_TRACE=$(usex debug)"
-   )
-   cmake-utils_src_configure
-}
-
-multilib_src_test() {
-   emake check
-}
-
-multilib_src_install_all() {
-   # Do not use deprecated MULTILIB_CHOST_TOOLS
-   if ! use sdk; then
-   unset BUILD_DIR
-   _install_wrapper() { newbin "${BUILD_DIR}/apulse" 
"${CHOST}-apulse"; }
-   multilib_foreach_abi _install_wrapper
-   dobin "${T}/apulse"
-   fi
-   einstalldocs
-}

[gentoo-commits] repo/gentoo:master commit in: x11-wm/e16/

2020-10-11 Thread Andrew Savchenko

commit: 5f87c2a5ff042ccf273bd7d512fc03af25fc7121
Author: Andrew Savchenko  gentoo  org>
AuthorDate: Sun Oct 11 07:31:24 2020 +
Commit:     Andrew Savchenko  gentoo  org>
CommitDate: Sun Oct 11 07:41:50 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f87c2a5

x11-wm/e16: drop old

Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Andrew Savchenko  gentoo.org>

 x11-wm/e16/Manifest  |   1 -
 x11-wm/e16/e16-1.0.20.ebuild | 129 ---
 2 files changed, 130 deletions(-)

diff --git a/x11-wm/e16/Manifest b/x11-wm/e16/Manifest
index c13ebbf066b..3afe17b7c0a 100644
--- a/x11-wm/e16/Manifest
+++ b/x11-wm/e16/Manifest
@@ -1,2 +1 @@
-DIST e16-1.0.20.tar.xz 1438516 BLAKE2B 
32800ed079eb3c51c34277fa5d49ef7a892c0ccd5956f5f7eb7c34ab2e223fe7a5033b35d53402fa4a18283261a767ac692a5bfa08b46d5ea2a4e5195c656fed
 SHA512 
798225dcfad266febe0911aeeac1a57256c45071e72ed326ae2081efdcf0d110e951f41badf5ece92dd0a40f5e342f80035e46d3c2435eb2f32a08c556893612
 DIST e16-1.0.21.tar.xz 1440484 BLAKE2B 
ea9521d4939400e292e9e2be6e73770a48d966702897c30babfe036a655ef3c5d9766eca3867e1a84b8fbd934a05c4a0487239a78d641c41a6e93a19feeb70a2
 SHA512 
0f5984d3c3594bf94338c9b53c681cd40f8cc165a18d7d9e0e6202fdf237ace52d9aac9c5ba04f052f94dfd463dcf558b8015044b4d457114c19a7a27ac23723

diff --git a/x11-wm/e16/e16-1.0.20.ebuild b/x11-wm/e16/e16-1.0.20.ebuild
deleted file mode 100644
index 5d940a12f3f..000
--- a/x11-wm/e16/e16-1.0.20.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Enlightenment Window Manager (E16)"
-HOMEPAGE="https://www.enlightenment.org 
https://sourceforge.net/projects/enlightenment/;
-SRC_URI="mirror://sourceforge/enlightenment/${P}.tar.xz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="audiofile container dbus debug +dialogs doc examples gnome
-libhack modules nls opengl +pango sndfile sound +themes xcomposite
-+xft xi2 xinerama xpresent +xrandr +xrender +xsm +xsync zoom"
-
-REQUIRED_USE="
-   audiofile? ( sound )
-   opengl? ( xcomposite )
-   sndfile? ( sound )
-   sound? ( ^^ ( sndfile audiofile ) )
-"
-
-BDEPEND="
-   nls? ( sys-devel/gettext )
-   virtual/pkgconfig
-"
-COMMON_DEPEND="
-   media-libs/freetype:2
-   media-libs/imlib2[X]
-   virtual/libiconv
-   x11-libs/libX11
-   x11-libs/libXext
-   x11-misc/xbitmaps
-   dbus? ( sys-apps/dbus )
-   opengl? (
-   media-libs/glu
-   media-libs/mesa
-   )
-   pango? (
-   dev-libs/glib:2
-   x11-libs/pango[X]
-   )
-   sound? (
-   || (
-   media-sound/apulse[sdk]
-   media-sound/pulseaudio
-   )
-   sndfile? ( media-libs/libsndfile )
-   audiofile? ( media-libs/audiofile:= )
-   )
-   xcomposite? (
-   x11-libs/libXcomposite
-   x11-libs/libXdamage
-   x11-libs/libXfixes
-   )
-   xft? ( x11-libs/libXft )
-   xinerama? ( x11-libs/libXinerama )
-   xpresent? ( x11-libs/libXpresent )
-   xrandr? ( x11-libs/libXrandr )
-   xrender? ( x11-libs/libXrender )
-   xsm? (
-   x11-libs/libICE
-   x11-libs/libSM
-   )
-   zoom? ( x11-libs/libXxf86vm )
-"
-RDEPEND="${COMMON_DEPEND}
-   doc? ( app-doc/e16-docs )
-   nls? ( virtual/libintl )
-   themes? ( x11-themes/e16-themes )
-   !x11-wm/enlightenment:0
-"
-DEPEND="${COMMON_DEPEND}
-   x11-base/xorg-proto
-"
-
-PATCHES=( "${FILESDIR}/${PN}-user-fonts.patch" )
-
-src_configure() {
-   local myconf=(
-   $(use_enable container)
-   $(use_enable dbus)
-   $(use_enable debug libtrip)
-   $(use_enable dialogs)
-   $(use_enable doc docs)
-   $(use_enable libhack)
-   $(use_enable modules)
-   $(use_enable nls)
-   $(use_enable opengl glx)
-   $(use_enable pango)
-   $(use_enable sound sound pulseaudio)
-   $(use_enable xcomposite composite)
-   $(use_enable xft)
-   $(use_enable xi2)
-   $(use_enable xinerama)
-   $(use_enable xpresent)
-   $(use_enable xrandr)
-   $(use_enable xrender)
-   $(use_enable xsm sm)
-   $(use_enable xsync)
-   $(use_enable zoom)
-   $(use_with audiofile sndldr audiofile)
-   $(use_with gnome gnome gnome3)
-   $(use_with sndfile sndldr sndfile)
-   --enable-mans
-   --disable-docs
-   --disable-esdtest
-

[gentoo-commits] repo/gentoo:master commit in: profiles/

2020-10-11 Thread Andrew Savchenko

commit: 77fc8845e127ea2f5f2e5ffa7cfb50ff4e17729b
Author: Andrew Savchenko  gentoo  org>
AuthorDate: Sun Oct 11 18:59:29 2020 +
Commit:     Andrew Savchenko  gentoo  org>
CommitDate: Sun Oct 11 19:07:02 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=77fc8845

profiles/packages.mask: mask net-fs/openafs-kernel and revdep for removal

Use net-fs/openafs-1.8.*[modules] instead.

Bug: https://bugs.gentoo.org/719136

Signed-off-by: Andrew Savchenko  gentoo.org>

 profiles/package.mask | 9 +
 1 file changed, 9 insertions(+)

diff --git a/profiles/package.mask b/profiles/package.mask
index 9a68d238485..22c355f3398 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -32,6 +32,15 @@
 
 #--- END OF EXAMPLES ---
 
+# Andrew Savchenko  (2020-10-11)
+# Mask old openafs version and corresponding openafs-kernel with
+# multiple CVEs.
+# All kernel module functionality is merged back in the single
+# net-fs/openafs package using USE="modules" starting from 1.8 branch.
+# No reverse dependencies, bug #719136. Removal in 30 days.
+net-fs/openafs-kernel
+ (2020-10-11)
 # Current Wireshark in ~arch is vulnerable.
 # Maintainer did not want to update after QA

[gentoo-commits] repo/gentoo:master commit in: net-proxy/privoxy/

2020-08-19 Thread Andrew Savchenko

commit: 59283b47e6ee96680a527d2824ece4d38dde3ac6
Author: Andrew Savchenko  gentoo  org>
AuthorDate: Wed Aug 19 10:58:52 2020 +
Commit:     Andrew Savchenko  gentoo  org>
CommitDate: Wed Aug 19 11:05:55 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=59283b47

net-proxy/privoxy: USE client-tags must depend on threads

Closes: https://bugs.gentoo.org/736058
Package-Manager: Portage-3.0.3, Repoman-3.0.0
Signed-off-by: Andrew Savchenko  gentoo.org>

 net-proxy/privoxy/privoxy-3.0.28-r1.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/net-proxy/privoxy/privoxy-3.0.28-r1.ebuild 
b/net-proxy/privoxy/privoxy-3.0.28-r1.ebuild
index 6c5646fbc58..4bf768abcc4 100644
--- a/net-proxy/privoxy/privoxy-3.0.28-r1.ebuild
+++ b/net-proxy/privoxy/privoxy-3.0.28-r1.ebuild
@@ -36,6 +36,7 @@ RDEPEND="${DEPEND}
)
 "
 REQUIRED_USE="
+   client-tags? ( threads )
compression? ( zlib )
fuzz? ( zlib )
toggle? ( editor )

[gentoo-commits] repo/gentoo:master commit in: net-proxy/privoxy/files/, net-proxy/privoxy/

2020-08-19 Thread Andrew Savchenko

commit: 406d69036668018cd3086eff091b37c36019ffc9
Author: Andrew Savchenko  gentoo  org>
AuthorDate: Wed Aug 19 13:35:52 2020 +
Commit:     Andrew Savchenko  gentoo  org>
CommitDate: Wed Aug 19 13:42:09 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=406d6903

net-proxy/privoxy: fix build without native symlinks and custom STRIP

Original GNUMakefile uses $(STRIP) to pass optional -s argument to
install and $(STRIP_PROG) for strip binary. This caused problems
with custom STRIP set by portage. Fixed now by using $(STRIP) and
$(STRIP_ARGS).

Closes: https://bugs.gentoo.org/732572
Package-Manager: Portage-3.0.3, Repoman-3.0.0
Signed-off-by: Andrew Savchenko  gentoo.org>

 net-proxy/privoxy/files/privoxy-3.0.28-strip.patch | 47 ++
 net-proxy/privoxy/privoxy-3.0.28-r1.ebuild |  1 +
 2 files changed, 48 insertions(+)

diff --git a/net-proxy/privoxy/files/privoxy-3.0.28-strip.patch 
b/net-proxy/privoxy/files/privoxy-3.0.28-strip.patch
new file mode 100644
index 000..2ca24330b46
--- /dev/null
+++ b/net-proxy/privoxy/files/privoxy-3.0.28-strip.patch
@@ -0,0 +1,47 @@
+Privory uses STRIP Makefile variable for passing strip argument,
+this clashes with STRIP set in the environment. So rename STRIP ->
+STRIP_ARGS and then use real STRIP instead of STRIP_PROG with
+fallback on predefined "strip" if STRIP is not set.
+
+--- privoxy-3.0.28-stable/GNUmakefile.in.orig  2020-08-19 15:24:46.930551734 
+0300
 privoxy-3.0.28-stable/GNUmakefile.in   2020-08-19 16:12:18.214837417 
+0300
+@@ -117,7 +117,7 @@
+ CP = cp -f
+ RMDIR  = rmdir
+ MKDIR  = ./mkinstalldirs
+-STRIP_PROG = strip
++STRIP ?= strip
+ SED= sed
+ GREP   = grep
+ CAT= cat
+@@ -391,7 +391,7 @@
+   @$(ECHO) "You have run autoconf && autoheader && ./configure right?"
+   @$(ECHO) ""
+   $(MAKE) $(PROGRAM)
+-  $(STRIP_PROG) $(PROGRAM)
++  $(STRIP) $(PROGRAM)
+   $(LN) -s `pwd` ../privoxy-$(VERSION)-$(CODE_STATUS)
+ # add program
+   (cd .. && $(TAR) --exclude "PACKAGERS" -cvhf $(GEN_DIST_TAR_NAME) 
privoxy-$(VERSION)-$(CODE_STATUS)/$(PROGRAM))
+@@ -822,7 +822,7 @@
+fi)
+ 
+ install-strip:
+-  $(MAKE) install STRIP=-s
++  $(MAKE) install STRIP_ARG=-s
+ 
+ # FIXME: Test USER and GROUP on Slack to make sure this works as
+ # intended.
+@@ -848,10 +848,10 @@
+   $(DESTDIR)$(CONF_DEST)/templates $(DESTDIR)$(SHARE_DEST) \
+   $(DESTDIR)$(LOG_DEST) $(DESTDIR)$(PID_DEST)
+   @# Install the executable binary, strip if invoked as install-strip
+-  @test -n "$(STRIP)" &&\
++  @test -n "$(STRIP_ARG)" &&\
+   $(ECHO) Installing $(PROGRAM) stripped executable to $(SBIN_DEST) ||\
+   $(ECHO) Installing $(PROGRAM) executable to $(DESTDIR)$(SBIN_DEST)
+-  $(INSTALL) $(INSTALL_P) $(STRIP) $(PROGRAM) $(DESTDIR)$(SBIN_DEST)
++  $(INSTALL) $(INSTALL_P) $(STRIP_ARG) $(PROGRAM) $(DESTDIR)$(SBIN_DEST)
+ 
+   @# Install the DOCS and man page. install-sh only does one file at a 
time.
+   @# FIXME: only handles jpegs.

diff --git a/net-proxy/privoxy/privoxy-3.0.28-r1.ebuild 
b/net-proxy/privoxy/privoxy-3.0.28-r1.ebuild
index 4bf768abcc4..7df385fb2d2 100644
--- a/net-proxy/privoxy/privoxy-3.0.28-r1.ebuild
+++ b/net-proxy/privoxy/privoxy-3.0.28-r1.ebuild
@@ -48,6 +48,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-3.0.19-gentoo.patch
"${FILESDIR}"/${P}-chdir.patch
"${FILESDIR}"/${P}-null-termination.patch
+   "${FILESDIR}"/${P}-strip.patch
 )
 
 pkg_pretend() {

[gentoo-commits] repo/gentoo:master commit in: sys-power/suspend/

2020-09-25 Thread Andrew Savchenko

commit: 8c9b73bcb18805465de9e9888f190c25db5783a9
Author: Andrew Savchenko  gentoo  org>
AuthorDate: Fri Sep 25 09:34:40 2020 +
Commit:     Andrew Savchenko  gentoo  org>
CommitDate: Fri Sep 25 09:41:52 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8c9b73bc

sys-power/suspend: patchlevel bump

Fixes:
- build with -fcommon / gcc-10
- size_t format warnings

Closes: https://bugs.gentoo.org/721972
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Andrew Savchenko  gentoo.org>

 sys-power/suspend/Manifest |  1 +
 sys-power/suspend/suspend-1.0_p20200924.ebuild | 59 ++
 2 files changed, 60 insertions(+)

diff --git a/sys-power/suspend/Manifest b/sys-power/suspend/Manifest
index b3200f4a3fd..885d0e20e12 100644
--- a/sys-power/suspend/Manifest
+++ b/sys-power/suspend/Manifest
@@ -1,2 +1,3 @@
 DIST suspend-1.0_p20120915.tar.xz 111080 BLAKE2B 
99eea1d9808219373501001f0af90973c9176c1b19d62bff7be26886b11ebb514134b68434e9b453146ef1a4af2c4cc8e26326b956a1b2378c38c100638af17c
 SHA512 
bb714b4a7c0f5749c4b711a5c38ca5d8cb5078176a75387957123f75cfe8348adc3aa4e96335eb65c14ad1dd2f99fd6dbca3b415525dd39b3c547f9b13b775be
 DIST suspend-1.0_p20190605.patch.xz 6224 BLAKE2B 
0eefbef5a8d777590f69c85b02edb5575a357b373b78d94846e2c2bd59430cbd55af59ee0e676faa7f60388cb3910adb2182dedadb1fdc1df38a409411ea2df1
 SHA512 
cf576a029b35306368cbdabb9863965e055198920b86eab7205083f3502ae69ec3e8a4267fb6ceaaf1560a8bdb0c59543453f1baad4758c8adc4ac4ae92736bc
+DIST suspend-1.0_p20200924.patch.xz 6664 BLAKE2B 
8a0529859cfd1a19f52fb46f306111ec4e520c9678113fd7c5ad12ada85bed89fedeeafee5145f11f07ef8dac1c6c1ae0ff2d6c6d6f794c268759d70895b1af9
 SHA512 
27c7cfcf2b2a0f8ccafd4c0020c1dce3aa1df352adac81ba5f24b76381a833f10621f7ae58e55c7c3d41f41ba63a38aa818454edaa32ad1f0fdc6db45b5bfe73

diff --git a/sys-power/suspend/suspend-1.0_p20200924.ebuild 
b/sys-power/suspend/suspend-1.0_p20200924.ebuild
new file mode 100644
index 000..e40e3e8d371
--- /dev/null
+++ b/sys-power/suspend/suspend-1.0_p20200924.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+BASE_PV="1.0_p20120915"
+
+DESCRIPTION="Userspace Software Suspend and S2Ram"
+HOMEPAGE="http://suspend.sourceforge.net
+https://github.com/bircoph/suspend;
+SRC_URI="https://dev.gentoo.org/~bircoph/distfiles/${PN}-${BASE_PV}.tar.xz
+   https://dev.gentoo.org/~bircoph/patches/${P}.patch.xz;
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="crypt +lzo threads"
+
+RDEPEND="
+   dev-libs/libx86
+   >=sys-apps/pciutils-2.2.4
+   crypt? (
+   >=dev-libs/libgcrypt-1.6.3:0[static-libs]
+   dev-libs/libgpg-error[static-libs] )
+   lzo? ( >=dev-libs/lzo-2[static-libs] ) "
+DEPEND="${RDEPEND}"
+BDEPEND="
+   >=dev-lang/perl-5.10
+   virtual/pkgconfig"
+
+S="${WORKDIR}/${PN}"
+
+PATCHES=( "${WORKDIR}/${P}.patch" )
+
+src_prepare() {
+   default
+   eautoreconf
+}
+
+src_configure() {
+   econf \
+   --disable-fbsplash \
+   $(use_enable crypt encrypt) \
+   $(use_enable lzo compress) \
+   $(use_enable threads)
+}
+
+src_install() {
+   dodir etc
+   emake DESTDIR="${D}" install
+   rm "${D}/usr/share/doc/${PF}"/COPYING* || die
+}
+
+pkg_postinst() {
+   elog "In order to make this package work with genkernel see:"
+   elog "https://bugs.gentoo.org/show_bug.cgi?id=156445;
+}

[gentoo-commits] repo/gentoo:master commit in: app-admin/apg/files/, app-admin/apg/

2020-09-30 Thread Andrew Savchenko

commit: aa72164a2295449bbe4728884441a79d21aa975d
Author: Andrew Savchenko  gentoo  org>
AuthorDate: Wed Sep 30 15:16:32 2020 +
Commit:     Andrew Savchenko  gentoo  org>
CommitDate: Wed Sep 30 15:21:26 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aa72164a

app-admin/apg: version bump

- switch to new upstream
- update to the latest git head
- port cracklib support to the new build system

Closes: https://bugs.gentoo.org/629272
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Andrew Savchenko  gentoo.org>

 app-admin/apg/Manifest |  1 +
 app-admin/apg/apg-2.3.0b_p20150129.ebuild  | 43 
 .../apg/files/apg-2.3.0b_p20150129-cracklib.patch  | 47 ++
 app-admin/apg/metadata.xml | 10 -
 4 files changed, 99 insertions(+), 2 deletions(-)

diff --git a/app-admin/apg/Manifest b/app-admin/apg/Manifest
index ea6ed5bf852..64074f5c0ab 100644
--- a/app-admin/apg/Manifest
+++ b/app-admin/apg/Manifest
@@ -1 +1,2 @@
 DIST apg-2.3.0b.tar.gz 109995 BLAKE2B 
9b4a6141fb7f6e649fe06ed91bda636879a03d6e5e6071267bbb6cd27e63b4588c23ea7902c5b1a74dde8520843566a4f2857a34f4d66020142425e5faf53daf
 SHA512 
3112d2267f2311f960a52fa268b55a5faf0250a4a8c5e7444f0c1326afa2844a476a54befcf79e5b8532d74c53f6f58ffc420591c8c36798dd82b43c14869e1a
+DIST apg-2.3.0b_p20150129.tar.xz 313372 BLAKE2B 
f5a1b894a0379294c478020de512af047aec2e7c9d881cb2f4c79df88583707b5ce0e995623915b6bd11b720e60e0f8696e0ddce472441cb1d04f3bf7a818e32
 SHA512 
7be813368b4b6fe4ae2882d85c40b6cf80ad44b7aa7e46c8cb97926ef89edf4f59e9a4c76a7aa9f725ac6ce1f0df361f8b68ef6dce798e1e0a8d55767c7a16e8

diff --git a/app-admin/apg/apg-2.3.0b_p20150129.ebuild 
b/app-admin/apg/apg-2.3.0b_p20150129.ebuild
new file mode 100644
index 000..0d351d723be
--- /dev/null
+++ b/app-admin/apg/apg-2.3.0b_p20150129.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+BASEVER=$(ver_cut 1-4)
+
+DESCRIPTION="Another Password Generator"
+HOMEPAGE="https://github.com/wilx/apg;
+SRC_URI="https://dev.gentoo.org/~bircoph/distfiles/${P}.tar.xz;
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux 
~ppc-macos"
+IUSE="cracklib"
+
+DEPEND="cracklib? ( sys-libs/cracklib )"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+   "${FILESDIR}/${PN}-${BASEVER}-crypt_password.patch"
+   "${FILESDIR}/${P}-cracklib.patch"
+)
+
+DOCS=( CHANGES README THANKS TODO doc/APG_TIPS doc/rfc0972.txt doc/rfc1750.txt 
)
+
+S="${WORKDIR}/${PN}"
+
+src_prepare() {
+   default
+   eautoreconf
+}
+
+src_configure() {
+   econf $(use_with cracklib)
+}
+
+src_install() {
+   default
+   doman doc/man/apg*
+}

diff --git a/app-admin/apg/files/apg-2.3.0b_p20150129-cracklib.patch 
b/app-admin/apg/files/apg-2.3.0b_p20150129-cracklib.patch
new file mode 100644
index 000..b019f565e15
--- /dev/null
+++ b/app-admin/apg/files/apg-2.3.0b_p20150129-cracklib.patch
@@ -0,0 +1,47 @@
+commit 8c3976544af138aa5d8bc21aa5bc80ba91babc92
+Author: Andrew Savchenko 
+Date:   Wed Sep 30 17:12:18 2020 +0300
+
+add cracklib support to the new build system
+
+diff --git a/Makefile.am b/Makefile.am
+index 42068bf..3871295 100644
+--- a/Makefile.am
 b/Makefile.am
+@@ -19,9 +19,15 @@ common_apg_sources = \
+ convert.c
+ 
+ apg_SOURCES = $(common_apg_sources)
++if HAVE_CRACKLIB
++apg_LDFLAGS = -lcrack
++apg_CPPFLAGS = -DAPG_USE_CRACKLIB 
-DCRACKLIB_DICTPATH=\"/usr/lib/cracklib_dict\"
++endif
+ 
+ apgd_SOURCES = $(common_apg_sources)
+ apgd_CPPFLAGS = -DCLISERV
++apgd_CPPFLAGS += $(apg_CPPFLAGS)
++apgd_LDFLAGS = $(apg_LDFLAGS)
+ 
+ apgbfm_SOURCES = apgbfm.c bloom.c sha/sha.c errors.c getopt.c convert.c
+ apgbfm_CPPFLAGS = -DAPGBFM
+diff --git a/configure.ac b/configure.ac
+index d8fd056..75483d1 100644
+--- a/configure.ac
 b/configure.ac
+@@ -43,8 +43,16 @@ AC_SEARCH_LIBS([strerror], [cposix])
+ AC_CHECK_FUNCS([getpass gettimeofday inet_ntoa memset strchr strerror])
+ AC_CHECK_FUNCS([crypt])
+ 
++AC_ARG_WITH([cracklib],
++AC_HELP_STRING([--with-cracklib], [Use cracklib for strong password 
checking [default=no]]))
++AS_IF([test "x$with_cracklib" = "xyes"],[
++AC_SEARCH_LIBS([FascistCheck],[crack],[HAVE_CRACKLIB=1],
++AC_MSG_ERROR([cracklib requested but not found]))
++])
++
+ LT_PREREQ([2.4.2])
+ LT_INIT([win32-dll disable-static pic-only])
+ 
++AM_CONDITIONAL([HAVE_CRACKLIB],[test "x$HAVE_CRACKLIB" != "x"])
+ AC_CONFIG_FILES([Makefile])
+ AC_OUTPUT

diff --git a/app-admin/apg/metadata.xml b/app-admin/apg/metadata.xml
index 585b0dc75dd..039bfee611a 100644
--- a/app-admin/apg/metadata.xml
+++ b/app-admin/apg/m

[gentoo-commits] repo/gentoo:master commit in: profiles/

2020-09-30 Thread Andrew Savchenko

commit: 1f0c05db9b0b574399f8d5d23f72039063ff3f88
Author: Andrew Savchenko  gentoo  org>
AuthorDate: Wed Sep 30 15:17:27 2020 +
Commit:     Andrew Savchenko  gentoo  org>
CommitDate: Wed Sep 30 15:21:30 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1f0c05db

profiles/package.mask: unmask app-admin/apg

Package is taken and switched to new upstream, problems are fixed,
so mask is removed.

Signed-off-by: Andrew Savchenko  gentoo.org>

 profiles/package.mask | 6 --
 1 file changed, 6 deletions(-)

diff --git a/profiles/package.mask b/profiles/package.mask
index 51a26850d31..f555e72c435 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -650,12 +650,6 @@ dev-ada/gnatcoll-db
 >=dev-libs/vala-common-0.49
 dev-lang/vala:0.50
 
-# Jonas Stein  (2020-08-13)
-# One of many password generators, but with dead upstream in this case.
-# Masked for removal after 2020-10-01.
-# Bug #629272
-app-admin/apg
-
 # Mikle Kolyada  (2020-08-02)
 # consolekit is abandoned upstream.
 # People are encouraged to switch to any logind

[gentoo-commits] repo/gentoo:master commit in: app-text/xpdf/

2020-09-19 Thread Andrew Savchenko

commit: 3f535c7636d53f04ddf69e514f9a2b9e9009ed61
Author: Andrew Savchenko  gentoo  org>
AuthorDate: Sat Sep 19 10:18:32 2020 +
Commit:     Andrew Savchenko  gentoo  org>
CommitDate: Sat Sep 19 10:21:08 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3f535c76

app-text/xpdf: workaround inkscape sandbox violations

Closes: https://bugs.gentoo.org/739166
Package-Manager: Portage-3.0.6, Repoman-3.0.1
Signed-off-by: Andrew Savchenko  gentoo.org>

 app-text/xpdf/xpdf-4.02-r4.ebuild | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app-text/xpdf/xpdf-4.02-r4.ebuild 
b/app-text/xpdf/xpdf-4.02-r4.ebuild
index 4311f1b32ef..c8a43737864 100644
--- a/app-text/xpdf/xpdf-4.02-r4.ebuild
+++ b/app-text/xpdf/xpdf-4.02-r4.ebuild
@@ -87,6 +87,9 @@ src_compile() {
cmake-utils_src_compile
 
if use icons; then
+   # in some cases inkscape tries to write font cache to the
+   # system dir, see bug 739166
+   addpredict /usr/share/inkscape/fonts
local inkarg="-e"
has_version -b '>media-gfx/inkscape-0.99' && inkarg="-o"

[gentoo-commits] repo/gentoo:master commit in: app-text/xpdf/

2020-09-19 Thread Andrew Savchenko

commit: c630935617aa5c55593b0d0497d83610bb5320d9
Author: Andrew Savchenko  gentoo  org>
AuthorDate: Sat Sep 19 15:36:47 2020 +
Commit:     Andrew Savchenko  gentoo  org>
CommitDate: Sat Sep 19 15:40:37 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c6309356

app-text/xpdf: migrate from cmake-utils to cmake eclass

Package-Manager: Portage-3.0.6, Repoman-3.0.1
Signed-off-by: Andrew Savchenko  gentoo.org>

 app-text/xpdf/xpdf-4.02-r4.ebuild | 11 ++-
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/app-text/xpdf/xpdf-4.02-r4.ebuild 
b/app-text/xpdf/xpdf-4.02-r4.ebuild
index c8a43737864..288d1e75901 100644
--- a/app-text/xpdf/xpdf-4.02-r4.ebuild
+++ b/app-text/xpdf/xpdf-4.02-r4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils desktop xdg
+inherit cmake desktop xdg
 
 DESCRIPTION="The PDF viewer and tools"
 HOMEPAGE="https://www.xpdfreader.com;
@@ -65,7 +65,8 @@ src_prepare() {
sed -i "s|/usr/local|${EPREFIX}/usr|" 
"${WORKDIR}"/*/add-to-xpdfrc || die
fi
 
-   cmake-utils_src_prepare
+   xdg_environment_reset
+   cmake_src_prepare
 }
 
 src_configure() {
@@ -80,11 +81,11 @@ src_configure() {
-DXPDFWIDGET_PRINTING=$(usex cups)
-DSYSTEM_XPDFRC="${EPREFIX}/etc/xpdfrc"
)
-   cmake-utils_src_configure
+   cmake_src_configure
 }
 
 src_compile() {
-   cmake-utils_src_compile
+   cmake_src_compile
 
if use icons; then
# in some cases inkscape tries to write font cache to the
@@ -104,7 +105,7 @@ src_compile() {
 }
 
 src_install() {
-   cmake-utils_src_install
+   cmake_src_install
 
domenu "${FILESDIR}/xpdf.desktop"
newicon -s scalable xpdf-qt/xpdf-icon.svg xpdf.svg

[gentoo-commits] repo/gentoo:master commit in: app-admin/clsync/

2020-05-31 Thread Andrew Savchenko

commit: 12ef9b3a598775cfa576812182006dcc0e8eaac7
Author: Andrew Savchenko  gentoo  org>
AuthorDate: Sun May 31 07:56:15 2020 +
Commit:     Andrew Savchenko  gentoo  org>
CommitDate: Sun May 31 08:09:52 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=12ef9b3a

app-admin/clsync: add live ebuild

- Add live ebuild to facilitate development and testing
- Merge all clsync components (libclsync, clsync-docs) back to the
  main package.

Package-Manager: Portage-2.3.82, Repoman-2.3.20
Signed-off-by: Andrew Savchenko  gentoo.org>

 app-admin/clsync/clsync-.ebuild | 143 
 app-admin/clsync/metadata.xml   |   3 +
 2 files changed, 146 insertions(+)

diff --git a/app-admin/clsync/clsync-.ebuild 
b/app-admin/clsync/clsync-.ebuild
new file mode 100644
index 000..05e00ff84f2
--- /dev/null
+++ b/app-admin/clsync/clsync-.ebuild
@@ -0,0 +1,143 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+if [[ ${PV} == "" ]] ; then
+   EGIT_REPO_URI="https://github.com/clsync/clsync.git;
+   inherit git-r3
+   KEYWORDS=""
+else
+   SRC_URI="https://github.com/clsync/${MY_PN}/archive/v${PV}.tar.gz -> 
${MY_P}.tar.gz"
+   KEYWORDS="~amd64 ~x86"
+fi
+
+inherit autotools linux-info systemd
+
+DESCRIPTION="Live sync tool based on inotify, written in GNU C"
+HOMEPAGE="https://github.com/clsync/clsync http://ut.mephi.ru/oss/clsync;
+LICENSE="GPL-3+"
+SLOT="0"
+IUSE="apidoc +caps +clsync cluster control-socket cgroups doc debug
+examples extra-debug extra-hardened gio +hardened +highload-locks
++inotify mhash namespaces seccomp socket-library static-libs"
+
+REQUIRED_USE="
+   || ( clsync socket-library )
+   || ( gio inotify )
+   mhash? ( cluster )
+   seccomp? ( caps )
+"
+BDEPEND="
+   virtual/pkgconfig
+   apidoc? ( app-doc/doxygen[dot] )
+"
+DEPEND="
+   caps? ( sys-libs/libcap )
+   cgroups? ( dev-libs/libcgroup )
+   clsync? ( dev-libs/glib:2 )
+   mhash? ( app-crypt/mhash )
+"
+RDEPEND="${DEPEND}
+   !app-doc/clsync-docs
+   !dev-libs/libclsync
+"
+
+pkg_pretend() {
+   if use clsync; then
+   use inotify && CONFIG_CHECK+=" ~INOTIFY_USER"
+   use namespaces && CONFIG_CHECK="~NAMESPACES ~UTS_NS ~IPC_NS 
~USER_NS ~PID_NS ~NET_NS"
+   use seccomp && CONFIG_CHECK+=" ~SECCOMP"
+   check_extra_config
+   fi
+}
+
+src_prepare() {
+   eapply_user
+   eautoreconf
+}
+
+src_configure() {
+   local harden_level=0
+   use hardened && harden_level=1
+   use extra-hardened && harden_level=2
+
+   local debug_level=0
+   use debug && debug_level=1
+   use extra-debug && debug_level=2
+
+   econf \
+   --enable-debug=${debug_level} \
+   --enable-paranoid=${harden_level} \
+   --without-bsm \
+   --without-kqueue \
+   $(use_enable caps capabilities) \
+   $(use_enable clsync) \
+   $(use_enable cluster) \
+   $(use_enable control-socket socket) \
+   $(use_enable highload-locks) \
+   $(use_enable namespaces unshare) \
+   $(use_enable seccomp) \
+   $(use_enable socket-library) \
+   $(use_with cgroups libcgroup) \
+   $(use_with gio gio lib) \
+   $(use_with inotify inotify native) \
+   $(use_with mhash)
+}
+
+src_compile() {
+   default
+   if use apidoc; then
+   doxygen .doxygen || die "doxygen failed"
+   fi
+}
+
+src_install() {
+   emake DESTDIR="${D}" install
+
+   if use socket-library; then
+   find "${ED}" -name "*.la" -delete
+   use static-libs || find "${ED}" -name "*.a" -delete || die 
"failed to remove static libs"
+   fi
+
+   if use clsync; then
+   newinitd "${FILESDIR}/${PN}.initd" "${PN}"
+   newconfd "${FILESDIR}/${PN}.confd" "${PN}"
+
+   # filter rules and sync scripts are supposed to be here
+   insinto /etc/${PN}
+   newins "${FILESDIR}/${PN}.conf" "${PN}.conf"
+   keepdir /etc/${PN}
+
+   systemd_dounit "examples/clsync@.service"
+   fi
+
+   if use doc; then
+   dodoc -r DEVELOPING NOTES PROTOCOL SHORTHANDS TODO doc/devel/*
+   else
+   rm 
"${ED}/usr/share/doc/${PF}/"{DEVELOPING,LICENSE,PROTOCOL,TODO}* || die
+   fi
+   use apidoc &&

[gentoo-commits] repo/gentoo:master commit in: app-admin/clsync/

2020-05-31 Thread Andrew Savchenko

commit: 5353570df96a853b2e95e194bfd4156940ab9802
Author: Andrew Savchenko  gentoo  org>
AuthorDate: Sun May 31 08:08:05 2020 +
Commit:     Andrew Savchenko  gentoo  org>
CommitDate: Sun May 31 08:09:56 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5353570d

app-admin/clsync: check for inotify support in kernel

However unlikely it is still possible that user has kernel without
inotify support, so check for INOTIFY_USER if inotify is requested
(which is default behaviour).

Package-Manager: Portage-2.3.82, Repoman-2.3.20
Signed-off-by: Andrew Savchenko  gentoo.org>

 app-admin/clsync/clsync-0.4.4.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app-admin/clsync/clsync-0.4.4.ebuild 
b/app-admin/clsync/clsync-0.4.4.ebuild
index ee8baf2da67..2d3aee38a85 100644
--- a/app-admin/clsync/clsync-0.4.4.ebuild
+++ b/app-admin/clsync/clsync-0.4.4.ebuild
@@ -36,6 +36,7 @@ RDEPEND="${DEPEND}
 "
 
 pkg_pretend() {
+   use inotify && CONFIG_CHECK+=" ~INOTIFY_USER"
use namespaces && CONFIG_CHECK="~NAMESPACES ~UTS_NS ~IPC_NS ~USER_NS 
~PID_NS ~NET_NS"
use seccomp && CONFIG_CHECK+=" ~SECCOMP"
check_extra_config

[gentoo-commits] repo/gentoo:master commit in: acct-user/privoxy/

2020-07-12 Thread Andrew Savchenko

commit: 69181ddeb01a39b3248e447084dbe309bdf2ee1f
Author: Andrew Savchenko  gentoo  org>
AuthorDate: Sun Jul 12 07:00:52 2020 +
Commit:     Andrew Savchenko  gentoo  org>
CommitDate: Sun Jul 12 08:20:39 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=69181dde

acct-user/privoxy: new user for net-proxy/privoxy

UID 392, group 392 (privoxy)

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Andrew Savchenko  gentoo.org>

 acct-user/privoxy/metadata.xml |  8 
 acct-user/privoxy/privoxy-0.ebuild | 12 
 2 files changed, 20 insertions(+)

diff --git a/acct-user/privoxy/metadata.xml b/acct-user/privoxy/metadata.xml
new file mode 100644
index 000..45c8b6c75c9
--- /dev/null
+++ b/acct-user/privoxy/metadata.xml
@@ -0,0 +1,8 @@
+
+http://www.gentoo.org/dtd/metadata.dtd;>
+
+  
+birc...@gentoo.org
+Andrew Savchenko
+  
+

diff --git a/acct-user/privoxy/privoxy-0.ebuild 
b/acct-user/privoxy/privoxy-0.ebuild
new file mode 100644
index 000..9a3113c4229
--- /dev/null
+++ b/acct-user/privoxy/privoxy-0.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A privoxy: privacy oriented web proxy user"
+ACCT_USER_ID=392
+ACCT_USER_GROUPS=( ${PN} )
+
+acct-user_add_deps

[gentoo-commits] repo/gentoo:master commit in: net-proxy/privoxy/, net-proxy/privoxy/files/

2020-07-12 Thread Andrew Savchenko

commit: 5c1e46228c4d82bd7ce24d740b11622d31ec8291
Author: Andrew Savchenko  gentoo  org>
AuthorDate: Sun Jul 12 07:48:05 2020 +
Commit:     Andrew Savchenko  gentoo  org>
CommitDate: Sun Jul 12 08:20:47 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c1e4622

net-proxy/privoxy: fix problems found by gcc

1. Check chdir return value for possible failure in jcc.c

2. Fix possible buffer overflow in gateway.c: strncpy does not
always NULL-terminate string.

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Andrew Savchenko  gentoo.org>

 net-proxy/privoxy/files/privoxy-3.0.28-chdir.patch| 15 +++
 .../privoxy/files/privoxy-3.0.28-null-termination.patch   | 13 +
 net-proxy/privoxy/privoxy-3.0.28.ebuild   |  2 ++
 3 files changed, 30 insertions(+)

diff --git a/net-proxy/privoxy/files/privoxy-3.0.28-chdir.patch 
b/net-proxy/privoxy/files/privoxy-3.0.28-chdir.patch
new file mode 100644
index 000..66d14a9fc3c
--- /dev/null
+++ b/net-proxy/privoxy/files/privoxy-3.0.28-chdir.patch
@@ -0,0 +1,15 @@
+diff '--color=auto' -Naurd privoxy-3.0.28-stable.orig/jcc.c 
privoxy-3.0.28-stable/jcc.c
+--- privoxy-3.0.28-stable.orig/jcc.c   2018-12-30 21:40:13.0 +0300
 privoxy-3.0.28-stable/jcc.c2020-07-11 14:43:39.851143843 +0300
+@@ -4013,7 +4013,10 @@
+   }
+ #endif
+ 
+-  chdir("/");
++  if (chdir("/"))
++  {
++ log_error(LOG_LEVEL_FATAL, "Cannot chdir /");
++  }
+ 
+} /* -END- if (daemon_mode) */
+ 

diff --git a/net-proxy/privoxy/files/privoxy-3.0.28-null-termination.patch 
b/net-proxy/privoxy/files/privoxy-3.0.28-null-termination.patch
new file mode 100644
index 000..295b739a05f
--- /dev/null
+++ b/net-proxy/privoxy/files/privoxy-3.0.28-null-termination.patch
@@ -0,0 +1,13 @@
+diff '--color=auto' -Naurd privoxy-3.0.28-stable.orig/gateway.c 
privoxy-3.0.28-stable/gateway.c
+--- privoxy-3.0.28-stable.orig/gateway.c   2018-12-30 21:40:13.0 
+0300
 privoxy-3.0.28-stable/gateway.c2020-07-11 14:55:15.442676106 +0300
+@@ -1103,7 +1103,8 @@
+cbuf[client_pos++] = (char)(hostlen & 0xffu);
+assert(sizeof(cbuf) - client_pos > (size_t)255);
+/* Using strncpy because we really want the nul byte padding. */
+-   strncpy(cbuf + client_pos, target_host, sizeof(cbuf) - client_pos);
++   strncpy(cbuf + client_pos, target_host, sizeof(cbuf) - client_pos - 1);
++   cbuf[sizeof(cbuf)-1] = 0;
+client_pos += (hostlen & 0xffu);
+cbuf[client_pos++] = (char)((target_port >> 8) & 0xff);
+cbuf[client_pos++] = (char)((target_port ) & 0xff);

diff --git a/net-proxy/privoxy/privoxy-3.0.28.ebuild 
b/net-proxy/privoxy/privoxy-3.0.28.ebuild
index efb5ce555c4..8c973414546 100644
--- a/net-proxy/privoxy/privoxy-3.0.28.ebuild
+++ b/net-proxy/privoxy/privoxy-3.0.28.ebuild
@@ -43,6 +43,8 @@ S="${WORKDIR}/${P%_*}-${PRIVOXY_STATUS}"
 
 PATCHES=(
"${FILESDIR}"/${PN}-3.0.19-gentoo.patch
+   "${FILESDIR}"/${P}-chdir.patch
+   "${FILESDIR}"/${P}-null-termination.patch
 )
 
 pkg_pretend() {

[gentoo-commits] repo/gentoo:master commit in: net-proxy/privoxy/, net-proxy/privoxy/files/

2020-07-12 Thread Andrew Savchenko

commit: 3a6ae3463132ba3791bae78df6ecf0aa2a05ba88
Author: Andrew Savchenko  gentoo  org>
AuthorDate: Sun Jul 12 07:31:36 2020 +
Commit:     Andrew Savchenko  gentoo  org>
CommitDate: Sun Jul 12 08:20:43 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3a6ae346

net-proxy/privoxy: simplify /var/run removal

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Andrew Savchenko  gentoo.org>

 net-proxy/privoxy/files/privoxy-3.0.28-no-var-run.patch | 11 ---
 net-proxy/privoxy/privoxy-3.0.28.ebuild |  3 ++-
 2 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/net-proxy/privoxy/files/privoxy-3.0.28-no-var-run.patch 
b/net-proxy/privoxy/files/privoxy-3.0.28-no-var-run.patch
deleted file mode 100644
index f9f2afb4ff3..000
--- a/net-proxy/privoxy/files/privoxy-3.0.28-no-var-run.patch
+++ /dev/null
@@ -1,11 +0,0 @@
 privoxy-3.0.28-stable/GNUmakefile.in.orig  2020-07-11 12:03:38.784441229 
+0300
-+++ privoxy-3.0.28-stable/GNUmakefile.in   2020-07-11 12:04:16.148597612 
+0300
-@@ -846,7 +846,7 @@
-   $(CHMOD) $(DIR_MODE) $(MKDIR)
-   @$(MKDIR) $(DESTDIR)$(SBIN_DEST) $(DESTDIR)$(prefix) 
$(DESTDIR)$(CONF_DEST) \
-   $(DESTDIR)$(CONF_DEST)/templates $(DESTDIR)$(SHARE_DEST) \
--  $(DESTDIR)$(LOG_DEST) $(DESTDIR)$(PID_DEST)
-+  $(DESTDIR)$(LOG_DEST)
-   @# Install the executable binary, strip if invoked as install-strip
-   @test -n "$(STRIP)" &&\
-   $(ECHO) Installing $(PROGRAM) stripped executable to $(SBIN_DEST) ||\

diff --git a/net-proxy/privoxy/privoxy-3.0.28.ebuild 
b/net-proxy/privoxy/privoxy-3.0.28.ebuild
index 30ee789ff1e..efb5ce555c4 100644
--- a/net-proxy/privoxy/privoxy-3.0.28.ebuild
+++ b/net-proxy/privoxy/privoxy-3.0.28.ebuild
@@ -43,7 +43,6 @@ S="${WORKDIR}/${P%_*}-${PRIVOXY_STATUS}"
 
 PATCHES=(
"${FILESDIR}"/${PN}-3.0.19-gentoo.patch
-   "${FILESDIR}"/${P}-no-var-run.patch
 )
 
 pkg_pretend() {
@@ -117,6 +116,8 @@ src_install() {
dobin tools/{privoxy-log-parser.pl,privoxy-regression-test.pl}
newbin tools/uagen.pl privoxy-uagen.pl
fi
+
+   rmdir "${ED}/var/run" || die
 }
 
 pkg_postinst() {

[gentoo-commits] repo/gentoo:master commit in: acct-group/privoxy/

2020-07-12 Thread Andrew Savchenko

commit: 1ad46d602c23c80b8acad903d7ed4ec8b375f688
Author: Andrew Savchenko  gentoo  org>
AuthorDate: Sun Jul 12 06:39:30 2020 +
Commit:     Andrew Savchenko  gentoo  org>
CommitDate: Sun Jul 12 08:20:36 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ad46d60

acct-group/privoxy: new group for net-proxy/privoxy

GID 392

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Andrew Savchenko  gentoo.org>

 acct-group/privoxy/metadata.xml | 8 
 acct-group/privoxy/privoxy-0.ebuild | 9 +
 2 files changed, 17 insertions(+)

diff --git a/acct-group/privoxy/metadata.xml b/acct-group/privoxy/metadata.xml
new file mode 100644
index 000..45c8b6c75c9
--- /dev/null
+++ b/acct-group/privoxy/metadata.xml
@@ -0,0 +1,8 @@
+
+http://www.gentoo.org/dtd/metadata.dtd;>
+
+  
+birc...@gentoo.org
+Andrew Savchenko
+  
+

diff --git a/acct-group/privoxy/privoxy-0.ebuild 
b/acct-group/privoxy/privoxy-0.ebuild
new file mode 100644
index 000..c45bf8db39b
--- /dev/null
+++ b/acct-group/privoxy/privoxy-0.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="A privoxy: privacy oriented web proxy group"
+ACCT_GROUP_ID=392

[gentoo-commits] repo/gentoo:master commit in: net-proxy/privoxy/

2020-07-12 Thread Andrew Savchenko

commit: 1103a7c342cf6a81f51ce53811c7dae671b14f32
Author: Andrew Savchenko  gentoo  org>
AuthorDate: Sun Jul 12 08:02:51 2020 +
Commit:     Andrew Savchenko  gentoo  org>
CommitDate: Sun Jul 12 08:20:50 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1103a7c3

net-proxy/privoxy: migrate to GLEP 81

Migrate from user.eclass to acct-{user,group}/privoxy per GLEP 81

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Andrew Savchenko  gentoo.org>

 net-proxy/privoxy/privoxy-3.0.28-r1.ebuild | 131 +
 1 file changed, 131 insertions(+)

diff --git a/net-proxy/privoxy/privoxy-3.0.28-r1.ebuild 
b/net-proxy/privoxy/privoxy-3.0.28-r1.ebuild
new file mode 100644
index 000..6c5646fbc58
--- /dev/null
+++ b/net-proxy/privoxy/privoxy-3.0.28-r1.ebuild
@@ -0,0 +1,131 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools systemd toolchain-funcs
+
+[ "${PV##*_}" = "beta" ] &&
+   PRIVOXY_STATUS="beta" ||
+   PRIVOXY_STATUS="stable"
+
+HOMEPAGE="https://www.privoxy.org https://sourceforge.net/projects/ijbswa/;
+DESCRIPTION="A web proxy with advanced filtering capabilities for enhancing 
privacy"
+SRC_URI="mirror://sourceforge/ijbswa/${P%_*}-${PRIVOXY_STATUS}-src.tar.gz"
+
+IUSE="+acl client-tags compression editor extended-host-patterns
+external-filters +fast-redirects +force fuzz graceful-termination
++image-blocking ipv6 lfs png-images selinux +stats +threads toggle
+tools whitelists +zlib"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
+LICENSE="GPL-2"
+
+DEPEND="
+   acct-group/privoxy
+   acct-user/privoxy
+   dev-libs/libpcre
+   zlib? ( sys-libs/zlib )
+"
+RDEPEND="${DEPEND}
+   extended-host-patterns? ( dev-lang/perl )
+   selinux? ( sec-policy/selinux-privoxy )
+   tools? (
+   net-misc/curl
+   dev-lang/perl
+   )
+"
+REQUIRED_USE="
+   compression? ( zlib )
+   fuzz? ( zlib )
+   toggle? ( editor )
+"
+
+S="${WORKDIR}/${P%_*}-${PRIVOXY_STATUS}"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-3.0.19-gentoo.patch
+   "${FILESDIR}"/${P}-chdir.patch
+   "${FILESDIR}"/${P}-null-termination.patch
+)
+
+pkg_pretend() {
+   if ! use threads; then
+   ewarn
+   ewarn "Privoxy may be very slow without threads support, 
consider to enable them."
+   ewarn "See also 
http://www.privoxy.org/faq/trouble.html#GENTOO-RICERS;
+   ewarn
+   fi
+}
+
+src_prepare() {
+   default
+   mv configure.in configure.ac || die
+   sed -i "s|/p\.p/|/config.privoxy.org/|g" 
tools/privoxy-regression-test.pl || die
+
+   # autoreconf needs to be called even if we don't modify any autotools 
source files
+   # See main makefile
+   eautoreconf
+}
+
+src_configure() {
+   # --with-debug only enables debug CFLAGS
+   # --with-docbook and --with-db2html and their deps are useless,
+   #   since docs are already pregenerated in the source tarball
+   econf \
+   --sysconfdir=/etc/privoxy \
+   --enable-dynamic-pcre \
+   --with-user=privoxy \
+   --with-group=privoxy \
+   $(use_enable acl acl-support) \
+   $(use_enable compression) \
+   $(use_enable client-tags) \
+   $(use_enable editor) \
+   $(use_enable extended-host-patterns) \
+   $(use_enable fast-redirects) \
+   $(use_enable force) \
+   $(use_enable fuzz) \
+   $(use_enable graceful-termination) \
+   $(use_enable image-blocking) \
+   $(use_enable ipv6 ipv6-support) \
+   $(use_enable kernel_FreeBSD accept-filter) \
+   $(use_enable lfs large-file-support) \
+   $(use_enable png-images no-gifs) \
+   $(use_enable stats) \
+   $(use_enable threads pthread) \
+   $(use_enable toggle) \
+   $(use_enable whitelists trust-files) \
+   $(use_enable zlib)
+}
+
+src_install() {
+   default
+
+   newinitd "${FILESDIR}/privoxy.initd-3" privoxy
+   systemd_dounit "${FILESDIR}"/${PN}.service
+
+   insinto /etc/logrotate.d
+   newins "${FILESDIR}/privoxy.logrotate" privoxy
+
+   diropts -m 0750 -g privoxy -o privoxy
+   keepdir /var/log/privoxy
+
+   use extended-host-patterns && newbin tools/url-pattern-translator.pl 
privoxy-url-pattern-translator.pl
+   if use tools; then
+   dobin tools/{privoxy-log-parser.pl,privoxy-regression-test.pl}
+   newbin tool

[gentoo-commits] repo/gentoo:master commit in: net-proxy/privoxy/

2020-07-12 Thread Andrew Savchenko

commit: 839142a09eaa406886dfc5e0310ef9e10d42ed2c
Author: Andrew Savchenko  gentoo  org>
AuthorDate: Sun Jul 12 08:06:12 2020 +
Commit:     Andrew Savchenko  gentoo  org>
CommitDate: Sun Jul 12 08:20:54 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=839142a0

net-proxy/privoxy: remove old

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Andrew Savchenko  gentoo.org>

 net-proxy/privoxy/privoxy-3.0.28.ebuild | 133 
 1 file changed, 133 deletions(-)

diff --git a/net-proxy/privoxy/privoxy-3.0.28.ebuild 
b/net-proxy/privoxy/privoxy-3.0.28.ebuild
deleted file mode 100644
index 8c973414546..000
--- a/net-proxy/privoxy/privoxy-3.0.28.ebuild
+++ /dev/null
@@ -1,133 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools systemd toolchain-funcs user
-
-[ "${PV##*_}" = "beta" ] &&
-   PRIVOXY_STATUS="beta" ||
-   PRIVOXY_STATUS="stable"
-
-HOMEPAGE="https://www.privoxy.org https://sourceforge.net/projects/ijbswa/;
-DESCRIPTION="A web proxy with advanced filtering capabilities for enhancing 
privacy"
-SRC_URI="mirror://sourceforge/ijbswa/${P%_*}-${PRIVOXY_STATUS}-src.tar.gz"
-
-IUSE="+acl client-tags compression editor extended-host-patterns
-external-filters +fast-redirects +force fuzz graceful-termination
-+image-blocking ipv6 lfs png-images selinux +stats +threads toggle
-tools whitelists +zlib"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
-LICENSE="GPL-2"
-
-DEPEND="
-   dev-libs/libpcre
-   zlib? ( sys-libs/zlib )
-"
-RDEPEND="${DEPEND}
-   extended-host-patterns? ( dev-lang/perl )
-   selinux? ( sec-policy/selinux-privoxy )
-   tools? (
-   net-misc/curl
-   dev-lang/perl
-   )
-"
-REQUIRED_USE="
-   compression? ( zlib )
-   fuzz? ( zlib )
-   toggle? ( editor )
-"
-
-S="${WORKDIR}/${P%_*}-${PRIVOXY_STATUS}"
-
-PATCHES=(
-   "${FILESDIR}"/${PN}-3.0.19-gentoo.patch
-   "${FILESDIR}"/${P}-chdir.patch
-   "${FILESDIR}"/${P}-null-termination.patch
-)
-
-pkg_pretend() {
-   if ! use threads; then
-   ewarn
-   ewarn "Privoxy may be very slow without threads support, 
consider to enable them."
-   ewarn "See also 
http://www.privoxy.org/faq/trouble.html#GENTOO-RICERS;
-   ewarn
-   fi
-}
-
-pkg_setup() {
-   enewgroup privoxy
-   enewuser privoxy -1 -1 /etc/privoxy privoxy
-}
-
-src_prepare() {
-   default
-   mv configure.in configure.ac || die
-   sed -i "s|/p\.p/|/config.privoxy.org/|g" 
tools/privoxy-regression-test.pl || die
-
-   # autoreconf needs to be called even if we don't modify any autotools 
source files
-   # See main makefile
-   eautoreconf
-}
-
-src_configure() {
-   # --with-debug only enables debug CFLAGS
-   # --with-docbook and --with-db2html and their deps are useless,
-   #   since docs are already pregenerated in the source tarball
-   econf \
-   --sysconfdir=/etc/privoxy \
-   --enable-dynamic-pcre \
-   --with-user=privoxy \
-   --with-group=privoxy \
-   $(use_enable acl acl-support) \
-   $(use_enable compression) \
-   $(use_enable client-tags) \
-   $(use_enable editor) \
-   $(use_enable extended-host-patterns) \
-   $(use_enable fast-redirects) \
-   $(use_enable force) \
-   $(use_enable fuzz) \
-   $(use_enable graceful-termination) \
-   $(use_enable image-blocking) \
-   $(use_enable ipv6 ipv6-support) \
-   $(use_enable kernel_FreeBSD accept-filter) \
-   $(use_enable lfs large-file-support) \
-   $(use_enable png-images no-gifs) \
-   $(use_enable stats) \
-   $(use_enable threads pthread) \
-   $(use_enable toggle) \
-   $(use_enable whitelists trust-files) \
-   $(use_enable zlib)
-}
-
-src_install() {
-   default
-
-   newinitd "${FILESDIR}/privoxy.initd-3" privoxy
-   systemd_dounit "${FILESDIR}"/${PN}.service
-
-   insinto /etc/logrotate.d
-   newins "${FILESDIR}/privoxy.logrotate" privoxy
-
-   diropts -m 0750 -g privoxy -o privoxy
-   keepdir /var/log/privoxy
-
-   use extended-host-patterns && newbin tools/url-pattern-translator.pl 
privoxy-url-pattern-translator.pl
-   if use tools; then
-   dobin tools/{privoxy-log-parser.pl,privoxy-regression-test.pl}
-   newbin tools/uagen.pl

[gentoo-commits] repo/gentoo:master commit in: net-dialup/openl2tp/files/, net-dialup/openl2tp/

2020-07-12 Thread Andrew Savchenko

commit: b67d6ae849572e4def3456b5b847ab11471b9512
Author: Andrew Savchenko  gentoo  org>
AuthorDate: Sun Jul 12 14:04:19 2020 +
Commit:     Andrew Savchenko  gentoo  org>
CommitDate: Sun Jul 12 14:15:10 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b67d6ae8

net-dialup/openl2tp: fix insecure string operations

Fix possible string overflows found by gcc.
The main problem is that strncpy does not always NULL-terminate string.

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Andrew Savchenko  gentoo.org>

 .../openl2tp/files/openl2tp-1.8-strings.patch  | 114 ++
 net-dialup/openl2tp/openl2tp-1.8-r2.ebuild | 129 +
 2 files changed, 243 insertions(+)

diff --git a/net-dialup/openl2tp/files/openl2tp-1.8-strings.patch 
b/net-dialup/openl2tp/files/openl2tp-1.8-strings.patch
new file mode 100644
index 000..16b7beffb21
--- /dev/null
+++ b/net-dialup/openl2tp/files/openl2tp-1.8-strings.patch
@@ -0,0 +1,114 @@
+diff '--color=auto' -Naurd openl2tp-1.8.orig/l2tp_plugin.c 
openl2tp-1.8/l2tp_plugin.c
+--- openl2tp-1.8.orig/l2tp_plugin.c2008-09-25 19:00:55.0 +0400
 openl2tp-1.8/l2tp_plugin.c 2020-07-12 11:55:23.292225206 +0300
+@@ -85,16 +85,20 @@
+ 
+   if (strchr(name, '/') == 0) {
+   const char *base = L2TP_PLUGIN_DIR;
+-  int len = strlen(base) + strlen(name) + 2;
++  size_t len_base, len_name, len;
++  len_base = strlen(base);
++  len_name = strlen(name);
++  len = len_base + len_name + 2;
+   path = malloc(len);
+   if (path == NULL) {
+   l2tp_log(LOG_ERR, "OOM: plugin file path");
+   return -ENOMEM;
+   }
+ 
+-  strncpy(path, base, len);
+-  strncat(path, "/", len);
+-  strncat(path, name, len);
++  memcpy(path, base, len_base);
++  path[len_base] = '/';
++  memcpy(path + len_base + 1, name, len_name);
++  path[len - 1] = '\0';
+   } else {
+   path = strdup(name);
+   if (path == NULL) {
+diff '--color=auto' -Naurd openl2tp-1.8.orig/plugins/ppp_unix.c 
openl2tp-1.8/plugins/ppp_unix.c
+--- openl2tp-1.8.orig/plugins/ppp_unix.c   2020-07-12 11:37:06.287914337 
+0300
 openl2tp-1.8/plugins/ppp_unix.c2020-07-12 12:31:26.042810957 +0300
+@@ -811,7 +811,7 @@
+ {
+   pid_t pid;
+   int result = 0;
+-  char str[10];
++  char str[11];
+   struct l2tp_session_config const *scfg;
+ 
+   pid = usl_pid_safe_fork();
+@@ -1362,7 +1362,8 @@
+   tmp_fd = socket(AF_INET, SOCK_DGRAM, 0);
+   if (tmp_fd >= 0) {
+   memset (, '\0', sizeof (ifr));
+-  strncpy(ifr.ifr_name, ppp->interface_name, sizeof 
(ifr.ifr_name));
++  strncpy(ifr.ifr_name, ppp->interface_name, sizeof 
(ifr.ifr_name) - 1);
++  ifr.ifr_name[sizeof(ifr.ifr_name)-1] = '\0';
+   ifr.ifr_mtu = mtu;
+ 
+   result = ioctl(tmp_fd, SIOCSIFMTU, (caddr_t) );
+diff '--color=auto' -Naurd openl2tp-1.8.orig/l2tp_statusfile.c 
openl2tp-1.8/l2tp_statusfile.c
+--- openl2tp-1.8.orig/l2tp_statusfile.c2020-07-12 15:58:52.279211936 
+0300
 openl2tp-1.8/l2tp_statusfile.c 2020-07-12 15:59:07.949273953 +0300
+@@ -48,7 +48,7 @@
+ 
+ static FILE *l2tp_statusfile_file_create(const char *parent, const char *name)
+ {
+-  char filename[256];
++  char filename[257];
+   FILE *file;
+ 
+   if (name != NULL) {
+@@ -66,7 +66,7 @@
+ static int l2tp_statusfile_file_delete(const char *root, const char *parent, 
const char *name)
+ {
+   int result;
+-  char filename[256];
++  char filename[257];
+ 
+   if (root == NULL) {
+   if (name != NULL) {
+@@ -102,7 +102,7 @@
+ static int l2tp_statusfile_dir_create(const char *parent, const char *name)
+ {
+   int result;
+-  char dirname[256];
++  char dirname[257];
+ 
+   if (name != NULL) {
+   sprintf(dirname, L2TP_STATUSFILE_DIR "/%s/%s", parent, name);
+@@ -127,8 +127,8 @@
+ static int l2tp_statusfile_dir_delete(const char *root, const char *parent, 
const char *name, int recursive)
+ {
+   int result;
+-  char dirname[256];
+-  char filename[256];
++  char dirname[257];
++  char filename[257];
+   DIR *dir;
+   struct dirent *entry;
+   struct stat statbuf;
+diff '--color=auto' -Naurd openl2tp-1.8.orig/l2tp_config.c 
openl2tp-1.8/l2tp_config.c
+--- openl2tp-1.8.orig/l2tp_config.c2020-07-12 16:03:00.062192426 +0300
 openl2tp-1.8/l2tp_config.c 2020-07-12 16:07:00.035142012 +0300
+@@ -135,7 +135,8 @@
+   goto out;
+   }
+   if (strcmp(server_name, [0])) {
+-  strncpy([0], server_n

[gentoo-commits] repo/gentoo:master commit in: net-dialup/openl2tp/files/

2020-07-12 Thread Andrew Savchenko

commit: 598ce885303151097f29e96a0952c1ec642a4454
Author: Andrew Savchenko  gentoo  org>
AuthorDate: Sun Jul 12 13:52:50 2020 +
Commit:     Andrew Savchenko  gentoo  org>
CommitDate: Sun Jul 12 14:15:06 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=598ce885

net-dialup/openl2tp: fix rare parallel race

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Andrew Savchenko  gentoo.org>

 .../openl2tp/files/openl2tp-1.8-parallelbuild.patch | 21 +++--
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/net-dialup/openl2tp/files/openl2tp-1.8-parallelbuild.patch 
b/net-dialup/openl2tp/files/openl2tp-1.8-parallelbuild.patch
index fb6b9f96b35..8851f321f27 100644
--- a/net-dialup/openl2tp/files/openl2tp-1.8-parallelbuild.patch
+++ b/net-dialup/openl2tp/files/openl2tp-1.8-parallelbuild.patch
@@ -1,6 +1,5 @@
-diff -rau openl2tp-1.8.o/Makefile openl2tp-1.8/Makefile
 openl2tp-1.8.o/Makefile2011-06-03 18:21:09.0 +0200
-+++ openl2tp-1.8/Makefile  2011-06-03 18:54:43.0 +0200
+--- openl2tp-1.8/Makefile.orig 2020-07-12 12:53:31.484055262 +0300
 openl2tp-1.8/Makefile  2020-07-12 12:56:45.783822669 +0300
 @@ -197,7 +197,7 @@
  
  .PHONY:   $(SUBDIRS:%=subdir-%)
@@ -19,9 +18,19 @@ diff -rau openl2tp-1.8.o/Makefile openl2tp-1.8/Makefile
$(CC) -I. -MMD -w $(CFLAGS.optimize) -c -DYY_NO_UNPUT $<
  
  l2tp_config_parse.o:  l2tp_config_parse.c l2tp_config_parse.h
-@@ -271,7 +271,7 @@
- l2tpconfig:   $(L2TPCONFIG_SRCS.o)
-   $(CC) $(LDFLAGS) -o $@ $^ $(LDFLAGS.l2tpconfig)
+@@ -265,13 +265,13 @@
+   @for d in $(SUBDIRS); do $(MAKE) -C $$d $(MFLAGS) $@; 
done
+   etags $(wildcard *.c) $(wildcard *.h)
+ 
+-openl2tpd:$(L2TPD_SRCS.o)
+-  $(CC) $(LDFLAGS) -o $@ $^ $(LDFLAGS.l2tpd)
++openl2tpd:generated-files $(SUBDIRS:%=subdir-%)   $(L2TPD_SRCS.o)
++  $(CC) $(LDFLAGS) -o $@ $(L2TPD_SRCS.o) $(LDFLAGS.l2tpd)
+ 
+-l2tpconfig:   $(L2TPCONFIG_SRCS.o)
+-  $(CC) $(LDFLAGS) -o $@ $^ $(LDFLAGS.l2tpconfig)
++l2tpconfig:   openl2tpd   $(L2TPCONFIG_SRCS.o)
++  $(CC) $(LDFLAGS) -o $@ $(L2TPCONFIG_SRCS.o) 
$(LDFLAGS.l2tpconfig)
  
 -%.o:  %.c
 +%.o:  %.c generated-files

[gentoo-commits] repo/gentoo:master commit in: net-dialup/openl2tp/, net-dialup/openl2tp/files/

2020-07-12 Thread Andrew Savchenko

commit: 7e2c66693ed08e55462f261140e9334398ea5c84
Author: Andrew Savchenko  gentoo  org>
AuthorDate: Sun Jul 12 13:49:46 2020 +
Commit:     Andrew Savchenko  gentoo  org>
CommitDate: Sun Jul 12 14:14:38 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e2c6669

net-dialup/openl2tp: fix build with musl

Closes: https://bugs.gentoo.org/717064
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Andrew Savchenko  gentoo.org>

 net-dialup/openl2tp/files/openl2tp-1.8-musl.patch | 55 +++
 net-dialup/openl2tp/openl2tp-1.8-r1.ebuild|  1 +
 2 files changed, 56 insertions(+)

diff --git a/net-dialup/openl2tp/files/openl2tp-1.8-musl.patch 
b/net-dialup/openl2tp/files/openl2tp-1.8-musl.patch
new file mode 100644
index 000..437f96f4d6f
--- /dev/null
+++ b/net-dialup/openl2tp/files/openl2tp-1.8-musl.patch
@@ -0,0 +1,55 @@
+diff -u openl2tp-1.8/cli/cli_readline.c openl2tp-1.8/cli/cli_readline.c
+--- openl2tp-1.8/cli/cli_readline.c2020-07-12 11:16:13.583798412 +0300
 openl2tp-1.8/cli/cli_readline.c2020-07-12 11:35:50.872615494 +0300
+@@ -18,12 +18,15 @@
+  *
+  
*/
+ 
++#define _GNU_SOURCE
++
+ #include 
+ #include 
+ #include 
+ #include 
+ #include 
+-#include 
++#include 
++#include 
+ #include 
+ 
+ #include 
+@@ -633,7 +636,7 @@
+ 
+ static int cli_rl_install_signal_handlers(void)
+ {
+-  __sighandler_t handler;
++  sighandler_t handler;
+ 
+   rl_catch_signals = 0;
+   rl_clear_signals();
+unchanged:
+--- openl2tp-1.8.orig/usl/usl_pid.c2008-05-08 00:44:20.0 +0400
 openl2tp-1.8/usl/usl_pid.c 2020-07-12 10:29:47.047052036 +0300
+@@ -26,6 +26,10 @@
+ 
+ #include "usl.h"
+ 
++#ifndef WAIT_ANY
++#define WAIT_ANY (-1)
++#endif
++
+ /* We maintain a list of child process pids and functions to call when
+  * they exit.
+  */
+unchanged:
+--- openl2tp-1.8.orig/l2tp_main.c  2010-02-12 22:09:23.0 +0300
 openl2tp-1.8/l2tp_main.c   2020-07-12 10:58:59.343655159 +0300
+@@ -42,7 +42,7 @@
+ #include 
+ #include 
+ 
+-#include 
++#include 
+ 
+ #include "usl.h"
+ #include "l2tp_private.h"

diff --git a/net-dialup/openl2tp/openl2tp-1.8-r1.ebuild 
b/net-dialup/openl2tp/openl2tp-1.8-r1.ebuild
index 778f59179e2..8a763797d12 100644
--- a/net-dialup/openl2tp/openl2tp-1.8-r1.ebuild
+++ b/net-dialup/openl2tp/openl2tp-1.8-r1.ebuild
@@ -48,6 +48,7 @@ PATCHES=(
"${FILESDIR}/${P}-cflags.patch"
"${FILESDIR}/${P}-tirpc.patch"
"${FILESDIR}/${P}-native-tc.patch"
+   "${FILESDIR}/${P}-musl.patch"
 )
 
 src_prepare() {

[gentoo-commits] repo/gentoo:master commit in: net-dialup/openl2tp/

2020-07-12 Thread Andrew Savchenko

commit: 319d3752f5ca9a54c2bb8a754ff61896401922bd
Author: Andrew Savchenko  gentoo  org>
AuthorDate: Sun Jul 12 14:07:53 2020 +
Commit:     Andrew Savchenko  gentoo  org>
CommitDate: Sun Jul 12 14:15:14 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=319d3752

net-dialup/openl2tp: remove old

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Andrew Savchenko  gentoo.org>

 net-dialup/openl2tp/openl2tp-1.8-r1.ebuild | 128 -
 1 file changed, 128 deletions(-)

diff --git a/net-dialup/openl2tp/openl2tp-1.8-r1.ebuild 
b/net-dialup/openl2tp/openl2tp-1.8-r1.ebuild
deleted file mode 100644
index 8a763797d12..000
--- a/net-dialup/openl2tp/openl2tp-1.8-r1.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit linux-info
-
-DESCRIPTION="Userspace tools for kernel L2TP implementation"
-HOMEPAGE="https://sourceforge.net/projects/openl2tp/;
-SRC_URI="mirror://sourceforge/openl2tp/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+client debug dmalloc doc +examples rpc server stats"
-
-REQUIRED_USE="|| ( client server )"
-
-BDEPEND="
-   >=net-libs/rpcsvc-proto-1.3.1-r1
-   sys-devel/bison
-   sys-devel/flex
-"
-DEPEND="
-   >=net-dialup/ppp-2.4.5
-   >=net-libs/libtirpc-1.0.3
-   sys-libs/readline:=
-   dmalloc? ( dev-libs/dmalloc )
-"
-RDEPEND="${DEPEND}
-   rpc? ( net-nds/rpcbind )
-"
-
-CONFIG_CHECK="~PPPOL2TP"
-
-PATCHES=(
-   "${FILESDIR}/${P}-werror.patch"
-   "${FILESDIR}/${P}-ldflags.patch"
-   "${FILESDIR}/${P}-pppd-2.patch"
-   "${FILESDIR}/${P}-man.patch"
-   "${FILESDIR}/${P}-l2tpconfig.patch"
-   "${FILESDIR}/${P}-parallelbuild.patch"
-   "${FILESDIR}/${P}-optionsfile.patch"
-   "${FILESDIR}/${P}-clientip_as_ipparam.patch"
-   "${FILESDIR}/${P}-setkey.patch"
-   "${FILESDIR}/${P}-unused-var.patch"
-   "${FILESDIR}/${P}-configure-Makefile.patch"
-   "${FILESDIR}/${P}-cflags.patch"
-   "${FILESDIR}/${P}-tirpc.patch"
-   "${FILESDIR}/${P}-native-tc.patch"
-   "${FILESDIR}/${P}-musl.patch"
-)
-
-src_prepare() {
-   default
-   sed -i 's/CFLAGS.optimize/CFLAGS_optimize/g' Makefile */Makefile || die 
"Makefile sed failed"
-}
-
-src_configure() {
-   myconf=
-
-   use client  || myconf+=" L2TP_FEATURE_LAC_SUPPORT=n
-
L2TP_FEATURE_LAIC_SUPPORT=n
-
L2TP_FEATURE_LAOC_SUPPORT=n "
-
-   use server  || myconf+=" L2TP_FEATURE_LNS_SUPPORT=n
-
L2TP_FEATURE_LNIC_SUPPORT=n
-
L2TP_FEATURE_LNOC_SUPPORT=n "
-
-   use rpc || myconf+=" L2TP_FEATURE_RPC_MANAGEMENT=n "
-
-   use stats   && myconf+=" L2TP_FEATURE_LOCAL_STAT_FILE=y "
-   use debug   && myconf+=" L2TP_DEBUG=y "
-   use dmalloc && myconf+=" USE_DMALLOC=y "
-
-   echo ${myconf} > "${T}/myconf"
-}
-
-src_compile() {
-   emake $(cat "${T}/myconf")
-}
-
-src_install() {
-   emake $(cat "${T}/myconf") DESTDIR="${D}" install
-
-   if use examples; then
-   docinto event_socket
-   dodoc doc/{event_sock_example.c,README.event_sock}
-   docinto
-   dodoc -r "${FILESDIR}"/examples
-   fi
-
-   if use doc; then
-   dodoc doc/*.txt
-   newdoc plugins/README README.plugins
-   dodoc -r ipsec
-   fi
-
-   newinitd "${FILESDIR}"/openl2tpd.initd openl2tpd
-   # init.d script is quite different for RPC and non-RPC versions.
-   use rpc || sed -i s/userpc=\"yes\"/userpc=\"no\"/ 
"${D}/etc/init.d/openl2tpd" || die "sed failed"
-   newconfd "${FILESDIR}"/openl2tpd.confd openl2tpd
-}
-
-pkg_postinst() {
-   if use rpc; then
-   ewarn
-   ewarn "RPC control does not provide any auth checks for control 
connection."
-   ewarn "Unless you need this you should disable it, for 
reference:"
-   ewarn "http://forums.openl2tp.org/viewtopic.php?f=4=41;
-   ewarn
-   ewarn "Therefore DO NOT USE RPC IN INSECURE ENVIRONMENTS!"
-   else
-   ewarn
-

[gentoo-commits] data/api:master commit in: files/

2020-07-11 Thread Andrew Savchenko

commit: 333555c4dfb6d26a651a8be182fb310a8f6c975f
Author: Andrew Savchenko  gentoo  org>
AuthorDate: Sat Jul 11 08:33:15 2020 +
Commit:     Andrew Savchenko  gentoo  org>
CommitDate: Sat Jul 11 08:33:15 2020 +
URL:https://gitweb.gentoo.org/data/api.git/commit/?id=333555c4

uid-gid.txt: add UID+GID 392 for net-proxy/privoxy

Signed-off-by: Andrew Savchenko  gentoo.org>

 files/uid-gid.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/files/uid-gid.txt b/files/uid-gid.txt
index 6294a49..db49f41 100644
--- a/files/uid-gid.txt
+++ b/files/uid-gid.txt
@@ -243,6 +243,7 @@ spamd   337 337 acct
 stunnel341 341 acct
 dnscrypt-proxy 353 353 acct
 octoprint  368 368 historical
+privoxy392 392 acct
 buildbot   393 393 acctUsed by 
dev-util/buildbot, dev-util/buildbot-worker
 openvpn394 394 acct
 motion 395 395 acct

[gentoo-commits] repo/gentoo:master commit in: net-proxy/privoxy/

2020-07-11 Thread Andrew Savchenko

commit: ea7ac78835559b478c7e323bd6549b7d85e9664c
Author: Andrew Savchenko  gentoo  org>
AuthorDate: Sat Jul 11 09:41:57 2020 +
Commit:     Andrew Savchenko  gentoo  org>
CommitDate: Sat Jul 11 10:02:52 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ea7ac788

net-proxy/privoxy: fuzz testing needs zlib support

Closes: https://bugs.gentoo.org/722720
Package-Manager: Portage-2.3.82, Repoman-2.3.20
Signed-off-by: Andrew Savchenko  gentoo.org>

 net-proxy/privoxy/privoxy-3.0.28.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/net-proxy/privoxy/privoxy-3.0.28.ebuild 
b/net-proxy/privoxy/privoxy-3.0.28.ebuild
index df8533f1883..5b36343401e 100644
--- a/net-proxy/privoxy/privoxy-3.0.28.ebuild
+++ b/net-proxy/privoxy/privoxy-3.0.28.ebuild
@@ -35,6 +35,7 @@ RDEPEND="${DEPEND}
 "
 REQUIRED_USE="
compression? ( zlib )
+   fuzz? ( zlib )
toggle? ( editor )
 "

[gentoo-commits] repo/gentoo:master commit in: net-proxy/privoxy/, net-proxy/privoxy/files/

2020-07-11 Thread Andrew Savchenko

commit: 4696e449ce82871adc6f9d56238a5448d4e1480e
Author: Andrew Savchenko  gentoo  org>
AuthorDate: Sat Jul 11 09:54:39 2020 +
Commit:     Andrew Savchenko  gentoo  org>
CommitDate: Sat Jul 11 10:02:56 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4696e449

net-proxy/privoxy: do not install /var/run

Package-Manager: Portage-2.3.82, Repoman-2.3.20
Signed-off-by: Andrew Savchenko  gentoo.org>

 net-proxy/privoxy/files/privoxy-3.0.28-no-var-run.patch | 11 +++
 net-proxy/privoxy/privoxy-3.0.28.ebuild |  5 -
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/net-proxy/privoxy/files/privoxy-3.0.28-no-var-run.patch 
b/net-proxy/privoxy/files/privoxy-3.0.28-no-var-run.patch
new file mode 100644
index 000..f9f2afb4ff3
--- /dev/null
+++ b/net-proxy/privoxy/files/privoxy-3.0.28-no-var-run.patch
@@ -0,0 +1,11 @@
+--- privoxy-3.0.28-stable/GNUmakefile.in.orig  2020-07-11 12:03:38.784441229 
+0300
 privoxy-3.0.28-stable/GNUmakefile.in   2020-07-11 12:04:16.148597612 
+0300
+@@ -846,7 +846,7 @@
+   $(CHMOD) $(DIR_MODE) $(MKDIR)
+   @$(MKDIR) $(DESTDIR)$(SBIN_DEST) $(DESTDIR)$(prefix) 
$(DESTDIR)$(CONF_DEST) \
+   $(DESTDIR)$(CONF_DEST)/templates $(DESTDIR)$(SHARE_DEST) \
+-  $(DESTDIR)$(LOG_DEST) $(DESTDIR)$(PID_DEST)
++  $(DESTDIR)$(LOG_DEST)
+   @# Install the executable binary, strip if invoked as install-strip
+   @test -n "$(STRIP)" &&\
+   $(ECHO) Installing $(PROGRAM) stripped executable to $(SBIN_DEST) ||\

diff --git a/net-proxy/privoxy/privoxy-3.0.28.ebuild 
b/net-proxy/privoxy/privoxy-3.0.28.ebuild
index 5b36343401e..30ee789ff1e 100644
--- a/net-proxy/privoxy/privoxy-3.0.28.ebuild
+++ b/net-proxy/privoxy/privoxy-3.0.28.ebuild
@@ -41,7 +41,10 @@ REQUIRED_USE="
 
 S="${WORKDIR}/${P%_*}-${PRIVOXY_STATUS}"
 
-PATCHES=( "${FILESDIR}"/${PN}-3.0.19-gentoo.patch )
+PATCHES=(
+   "${FILESDIR}"/${PN}-3.0.19-gentoo.patch
+   "${FILESDIR}"/${P}-no-var-run.patch
+)
 
 pkg_pretend() {
if ! use threads; then

[gentoo-commits] repo/gentoo:master commit in: net-proxy/privoxy/

2020-07-11 Thread Andrew Savchenko

commit: abaf01850544b468e0c749d80851a354c081bcd5
Author: Andrew Savchenko  gentoo  org>
AuthorDate: Sat Jul 11 09:36:46 2020 +
Commit:     Andrew Savchenko  gentoo  org>
CommitDate: Sat Jul 11 10:02:48 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=abaf0185

net-proxy/privoxy: update homepage

Package-Manager: Portage-2.3.82, Repoman-2.3.20
Signed-off-by: Andrew Savchenko  gentoo.org>

 net-proxy/privoxy/privoxy-3.0.26.ebuild | 2 +-
 net-proxy/privoxy/privoxy-3.0.28.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-proxy/privoxy/privoxy-3.0.26.ebuild 
b/net-proxy/privoxy/privoxy-3.0.26.ebuild
index 1eec1ca7ab7..6f7945dded4 100644
--- a/net-proxy/privoxy/privoxy-3.0.26.ebuild
+++ b/net-proxy/privoxy/privoxy-3.0.26.ebuild
@@ -9,7 +9,7 @@ inherit autotools systemd toolchain-funcs user
PRIVOXY_STATUS="beta" ||
PRIVOXY_STATUS="stable"
 
-HOMEPAGE="http://www.privoxy.org https://sourceforge.net/projects/ijbswa/;
+HOMEPAGE="https://www.privoxy.org https://sourceforge.net/projects/ijbswa/;
 DESCRIPTION="A web proxy with advanced filtering capabilities for enhancing 
privacy"
 SRC_URI="mirror://sourceforge/ijbswa/${P%_*}-${PRIVOXY_STATUS}-src.tar.gz"
 

diff --git a/net-proxy/privoxy/privoxy-3.0.28.ebuild 
b/net-proxy/privoxy/privoxy-3.0.28.ebuild
index 361254fd124..df8533f1883 100644
--- a/net-proxy/privoxy/privoxy-3.0.28.ebuild
+++ b/net-proxy/privoxy/privoxy-3.0.28.ebuild
@@ -9,7 +9,7 @@ inherit autotools systemd toolchain-funcs user
PRIVOXY_STATUS="beta" ||
PRIVOXY_STATUS="stable"
 
-HOMEPAGE="http://www.privoxy.org https://sourceforge.net/projects/ijbswa/;
+HOMEPAGE="https://www.privoxy.org https://sourceforge.net/projects/ijbswa/;
 DESCRIPTION="A web proxy with advanced filtering capabilities for enhancing 
privacy"
 SRC_URI="mirror://sourceforge/ijbswa/${P%_*}-${PRIVOXY_STATUS}-src.tar.gz"

[gentoo-commits] repo/gentoo:master commit in: net-dialup/openl2tp/files/, net-dialup/openl2tp/

2020-07-11 Thread Andrew Savchenko

commit: fcee0a2dfee5920e09772a604f72faa96d264209
Author: Andrew Savchenko  gentoo  org>
AuthorDate: Sat Jul 11 07:52:08 2020 +
Commit:     Andrew Savchenko  gentoo  org>
CommitDate: Sat Jul 11 07:55:45 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fcee0a2d

net-dialup/openl2tp: use native tc variables

If native toolchain variables are provided (e.g. CC), use them.

Closes: https://bugs.gentoo.org/724964
Package-Manager: Portage-2.3.82, Repoman-2.3.20
Signed-off-by: Andrew Savchenko  gentoo.org>

 .../openl2tp/files/openl2tp-1.8-native-tc.patch| 23 ++
 net-dialup/openl2tp/openl2tp-1.8-r1.ebuild |  1 +
 2 files changed, 24 insertions(+)

diff --git a/net-dialup/openl2tp/files/openl2tp-1.8-native-tc.patch 
b/net-dialup/openl2tp/files/openl2tp-1.8-native-tc.patch
new file mode 100644
index 000..9e5ff3411af
--- /dev/null
+++ b/net-dialup/openl2tp/files/openl2tp-1.8-native-tc.patch
@@ -0,0 +1,23 @@
+--- openl2tp-1.8/Makefile.orig 2020-07-11 10:04:54.485853377 +0300
 openl2tp-1.8/Makefile  2020-07-11 10:21:10.616327547 +0300
+@@ -69,13 +69,13 @@
+ 
+ # END CONFIGURABLE SETTINGS
+ 
+-AS= $(CROSS_COMPILE)as
+-LD= $(CROSS_COMPILE)ld
+-CC= $(CROSS_COMPILE)gcc
+-AR= $(CROSS_COMPILE)ar
+-NM= $(CROSS_COMPILE)nm
+-STRIP = $(CROSS_COMPILE)strip
+-INSTALL   = $(CROSS_COMPILE)install
++AS?= $(CROSS_COMPILE)as
++LD?= $(CROSS_COMPILE)ld
++CC?= $(CROSS_COMPILE)gcc
++AR?= $(CROSS_COMPILE)ar
++NM?= $(CROSS_COMPILE)nm
++STRIP ?= $(CROSS_COMPILE)strip
++INSTALL   ?= $(CROSS_COMPILE)install
+ 
+ ifneq ($(READLINE_DIR),)
+ READLINE_LDFLAGS= -L $(READLINE_DIR)/lib

diff --git a/net-dialup/openl2tp/openl2tp-1.8-r1.ebuild 
b/net-dialup/openl2tp/openl2tp-1.8-r1.ebuild
index 2d42d7523f4..778f59179e2 100644
--- a/net-dialup/openl2tp/openl2tp-1.8-r1.ebuild
+++ b/net-dialup/openl2tp/openl2tp-1.8-r1.ebuild
@@ -47,6 +47,7 @@ PATCHES=(
"${FILESDIR}/${P}-configure-Makefile.patch"
"${FILESDIR}/${P}-cflags.patch"
"${FILESDIR}/${P}-tirpc.patch"
+   "${FILESDIR}/${P}-native-tc.patch"
 )
 
 src_prepare() {

[gentoo-commits] repo/gentoo:master commit in: net-dialup/openl2tp/

2020-07-11 Thread Andrew Savchenko

commit: aaa2cf3a8fc796ba2d3ffe60ba976109fc422e6d
Author: Andrew Savchenko  gentoo  org>
AuthorDate: Sat Jul 11 07:41:33 2020 +
Commit:     Andrew Savchenko  gentoo  org>
CommitDate: Sat Jul 11 07:55:41 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aaa2cf3a

net-dialup/openl2tp: update homepage

Package-Manager: Portage-2.3.82, Repoman-2.3.20
Signed-off-by: Andrew Savchenko  gentoo.org>

 net-dialup/openl2tp/openl2tp-1.8-r1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-dialup/openl2tp/openl2tp-1.8-r1.ebuild 
b/net-dialup/openl2tp/openl2tp-1.8-r1.ebuild
index fb5611675f4..2d42d7523f4 100644
--- a/net-dialup/openl2tp/openl2tp-1.8-r1.ebuild
+++ b/net-dialup/openl2tp/openl2tp-1.8-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -6,7 +6,7 @@ EAPI=7
 inherit linux-info
 
 DESCRIPTION="Userspace tools for kernel L2TP implementation"
-HOMEPAGE="http://www.openl2tp.org/;
+HOMEPAGE="https://sourceforge.net/projects/openl2tp/;
 SRC_URI="mirror://sourceforge/openl2tp/${P}.tar.gz"
 
 LICENSE="GPL-2"

[gentoo-commits] repo/gentoo:master commit in: media-sound/apulse/

2020-06-27 Thread Andrew Savchenko

commit: 76b41767cace01fd52f806bfee16c878d95e23c7
Author: Andrew Savchenko  gentoo  org>
AuthorDate: Sat Jun 27 16:38:17 2020 +
Commit:     Andrew Savchenko  gentoo  org>
CommitDate: Sat Jun 27 16:38:17 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=76b41767

media-sound/apulse: remove old version

Package-Manager: Portage-2.3.82, Repoman-2.3.20
Signed-off-by: Andrew Savchenko  gentoo.org>

 media-sound/apulse/Manifest|  1 -
 media-sound/apulse/apulse-0.1.12-r4.ebuild | 61 --
 2 files changed, 62 deletions(-)

diff --git a/media-sound/apulse/Manifest b/media-sound/apulse/Manifest
index 82ac13350e9..a66d0db1ba2 100644
--- a/media-sound/apulse/Manifest
+++ b/media-sound/apulse/Manifest
@@ -1,2 +1 @@
-DIST apulse-0.1.12.tar.gz 117220 BLAKE2B 
04d88a298ff5e21e19fda1979ebbc96a6441f83212d6903a004a54ee360276985e66b637571a76e3fe6821d42762ac515b02a8a2cb0149a66f3150e34bd0d9b7
 SHA512 
9fe39ab93e90d7ec589c7632bf439bfc7fe8bbd0792ce1197ec8547fbe1901fec50facdf33c55cfbadbc1af4414fdf48f1f241406903a8f15f445b97dca7076a
 DIST apulse-0.1.13.tar.gz 117369 BLAKE2B 
8cf527daf21420a72e46968a3b07ab61029f404a2b6574ac1f08dd40528f3e6e4baf7e38f5914b0c89252e16eec5e8f3722be51e5a61b6a71c683e994740b4bf
 SHA512 
366385ae2304f7ff697ba70951d0753a5b1630310922e3763fd0813a73e0b4088b715135295aa2fa9111b8edcf91d82849dc31346b292b2e9db598bcdd47b007

diff --git a/media-sound/apulse/apulse-0.1.12-r4.ebuild 
b/media-sound/apulse/apulse-0.1.12-r4.ebuild
deleted file mode 100644
index c91aa5a9d13..000
--- a/media-sound/apulse/apulse-0.1.12-r4.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit multilib cmake-multilib
-
-DESCRIPTION="PulseAudio emulation for ALSA"
-HOMEPAGE="https://github.com/i-rinat/apulse;
-SRC_URI="https://github.com/i-rinat/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-IUSE="debug sdk test"
-RESTRICT="!test? ( test )"
-
-DEPEND="dev-libs/glib:2[${MULTILIB_USEDEP}]
-   media-libs/alsa-lib[${MULTILIB_USEDEP}]
-   sdk? ( !media-sound/pulseaudio ) "
-RDEPEND="${DEPEND}
-   !!media-plugins/alsa-plugins[pulseaudio]"
-
-PATCHES=( "${FILESDIR}/sdk.patch" )
-
-src_prepare() {
-   cmake-utils_src_prepare
-
-   if ! use sdk; then
-   # Ensure all relevant libdirs are added, to support all ABIs
-   DIRS=
-   _add_dir() { 
DIRS="${EPREFIX}/usr/$(get_libdir)/apulse${DIRS:+:${DIRS}}"; }
-   multilib_foreach_abi _add_dir
-   sed -e "s#@@DIRS@@#${DIRS}#g" "${FILESDIR}"/apulse > 
"${T}"/apulse || die
-   fi
-}
-
-multilib_src_configure() {
-   local mycmakeargs=(
-   "-DINSTALL_SDK=$(usex sdk)"
-   "-DLOG_TO_STDERR=$(usex debug)"
-   "-DWITH_TRACE=$(usex debug)"
-   )
-   cmake-utils_src_configure
-}
-
-multilib_src_test() {
-   emake check
-}
-
-multilib_src_install_all() {
-   # Do not use deprecated MULTILIB_CHOST_TOOLS
-   if ! use sdk; then
-   unset BUILD_DIR
-   _install_wrapper() { newbin "${BUILD_DIR}/apulse" 
"${CHOST}-apulse"; }
-   multilib_foreach_abi _install_wrapper
-   dobin "${T}/apulse"
-   fi
-   einstalldocs
-}

[gentoo-commits] repo/gentoo:master commit in: dev-util/oprofile/, dev-util/oprofile/files/

2020-06-27 Thread Andrew Savchenko

commit: c852a7c84f28fe745437bcddc4d88b9dc44c85f5
Author: Andrew Savchenko  gentoo  org>
AuthorDate: Sat Jun 27 18:19:05 2020 +
Commit:     Andrew Savchenko  gentoo  org>
CommitDate: Sat Jun 27 18:22:49 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c852a7c8

dev-util/oprofile: fix build with binutils-2.34

Use upstream patch 377610414fb6cd7ac30e4485d9d6482fcf29aca6 to fix
build with new binutils api (2.34) while keeping compatibility
support with older versions.

Closes: https://bugs.gentoo.org/707850
Closes: https://github.com/gentoo/gentoo/pull/15469
Package-Manager: Portage-2.3.82, Repoman-2.3.20
Signed-off-by: Andrew Savchenko  gentoo.org>

 dev-util/oprofile/files/binutils-2.34.patch | 157 
 dev-util/oprofile/oprofile-1.3.0.ebuild |   8 +-
 2 files changed, 164 insertions(+), 1 deletion(-)

diff --git a/dev-util/oprofile/files/binutils-2.34.patch 
b/dev-util/oprofile/files/binutils-2.34.patch
new file mode 100644
index 000..6337191a21d
--- /dev/null
+++ b/dev-util/oprofile/files/binutils-2.34.patch
@@ -0,0 +1,157 @@
+commit 377610414fb6cd7ac30e4485d9d6482fcf29aca6
+Author: William Cohen 
+Date:   Wed Mar 18 21:19:16 2020 -0400
+
+Macro wrappers to handle the binutils 2.34 api changes
+
+Changes in binutils 2.34 API prevented oprofile from compiling with
+it.  This patch tests for the changes in the binutils API during
+configuration and selects the appropiate wrappers to allow oprofile to
+compile.  This allows oprofile to compile with both older and newer
+versions of binutils.
+
+diff --git a/configure.ac b/configure.ac
+index ac2fd35e..df032a78 100644
+--- a/configure.ac
 b/configure.ac
+@@ -224,6 +224,26 @@ if test "$host_cpu" = "powerpc64le" -o "$host_cpu" = 
"powerpc64"; then
+ fi
+ AC_SUBST(PFM_LIB)
+ 
++HAVE_BINUTILS_234='1'
++AC_MSG_CHECKING([whether binutils 2.34 is being used])
++rm -f test-for-BINUTILS
++AC_LANG_CONFTEST(
++  [AC_LANG_PROGRAM([[#include ]],
++  [[asection * sect;
++  bfd_size_type buildid_sect_size = bfd_section_size(sect);
++  return 0;]])
++  ])
++$CC conftest.$ac_ext $CFLAGS $LDFLAGS $LIBS $PERF_EVENT_FLAGS -o 
test-for-BINUTILS  > /dev/null 2>&1
++if test -f test-for-BINUTILS; then
++  echo "yes"
++  HAVE_BINUTILS_234='1'
++else
++  echo "no"
++  HAVE_BINUTILS_234='0'
++fi
++AC_DEFINE_UNQUOTED(HAVE_BINUTILS_234, $HAVE_BINUTILS_234, [Using binutils 
2.34])
++rm -f test-for-BINUTILS*
++
+ AC_ARG_WITH(java,
+ [  --with-java=java-homePath to Java home directory (default is "no"; 
"yes" will use /usr as Java home)],
+ JAVA_HOMEDIR=$with_java, [with_java=no])
+diff --git a/libutil++/bfd_support.cpp b/libutil++/bfd_support.cpp
+index fa904839..cd0f4f71 100644
+--- a/libutil++/bfd_support.cpp
 b/libutil++/bfd_support.cpp
+@@ -19,6 +19,7 @@
+ #include "locate_images.h"
+ #include "op_libiberty.h"
+ #include "op_exception.h"
++#include "op_bfd_wrappers.h"
+ 
+ #include 
+ #include 
+@@ -137,7 +138,7 @@ static bool get_build_id(bfd * ibfd, unsigned char * 
build_id)
+   }
+   }
+ 
+-  bfd_size_type buildid_sect_size = bfd_section_size(ibfd, sect);
++  bfd_size_type buildid_sect_size = op_bfd_section_size(ibfd, sect);
+   char * contents = (char *) xmalloc(buildid_sect_size);
+   errno = 0;
+   if (!bfd_get_section_contents(ibfd, sect,
+@@ -188,7 +189,7 @@ bool get_debug_link_info(bfd * ibfd, string & filename, 
unsigned long & crc32)
+   if (sect == NULL)
+   return false;
+   
+-  bfd_size_type debuglink_size = bfd_section_size(ibfd, sect);  
++  bfd_size_type debuglink_size = op_bfd_section_size(ibfd, sect);
+   char * contents = (char *) xmalloc(debuglink_size);
+   cverb << vbfd
+ << ".gnu_debuglink section has size " << debuglink_size << endl;
+@@ -346,7 +347,7 @@ void fixup_linenr(bfd * abfd, asection * section, asymbol 
** syms,
+   // first restrict the search on a sensible range of vma, 16 is
+   // an intuitive value based on epilog code look
+   size_t max_search = 16;
+-  size_t section_size = bfd_section_size(abfd, section);
++  size_t section_size = op_bfd_section_size(abfd, section);
+   if (pc + max_search > section_size)
+   max_search = section_size - pc;
+ 
+@@ -819,10 +820,10 @@ find_nearest_line(bfd_info const & b, op_bfd_symbol 
const & sym,
+   else
+   pc = (sym.value() + offset) - sym.filepos();
+ 
+-  if ((bfd_get_section_flags(abfd, section) & SEC_ALLOC) == 0)
++  if ((op_bfd_get_section_flags(abfd, section) & SEC_ALLOC) == 0)
+   goto fail;
+ 
+-  if (pc >= bfd_section_size(abfd, section))
++  if (pc >=

[gentoo-commits] repo/gentoo:master commit in: app-admin/clsync/

2020-06-12 Thread Andrew Savchenko

commit: 8421f5d3141ac121ab0815abee28e62f4695d022
Author: Andrew Savchenko  gentoo  org>
AuthorDate: Fri Jun 12 16:42:17 2020 +
Commit:     Andrew Savchenko  gentoo  org>
CommitDate: Fri Jun 12 17:02:12 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8421f5d3

app-admin/clsync: remove old

Package-Manager: Portage-2.3.82, Repoman-2.3.20
Signed-off-by: Andrew Savchenko  gentoo.org>

 app-admin/clsync/Manifest|   1 -
 app-admin/clsync/clsync-0.4.2.ebuild | 102 ---
 2 files changed, 103 deletions(-)

diff --git a/app-admin/clsync/Manifest b/app-admin/clsync/Manifest
index bc0327932be..53ae0d386a1 100644
--- a/app-admin/clsync/Manifest
+++ b/app-admin/clsync/Manifest
@@ -1,2 +1 @@
-DIST clsync-0.4.2.tar.gz 256042 BLAKE2B 
28474fc66341b93705a502fcff390e3affcd89a9e1eb272dce9b28be709562e09c03e9c300cfeb5371e2e618a2239468a58c46212a39d751fbbfddeaab12bcf6
 SHA512 
d14a2efc4bf58d9d5c7a3fe5634cacdd182cd7cd814b0e9ebd99024a7282b056d1f7ceeec6903666391c3572d599a18e205af818b098ed7768d5c0e0f4cd1200
 DIST clsync-0.4.4.tar.gz 268276 BLAKE2B 
0027760cfdee5c4410c4cea45aae2def6498d812d2f50038993c39a33c6029722ec2dd2cfff20815a3ffd8834eb8c439059e5f1d2cc3d2cf98ecb22ed22f2322
 SHA512 
cdafbf43fdeafe9cb53c08e0514ef356fb5b4bbd8da2226263180e7441d222c76e6c73f847f484b3688a8672e4a85df0346c0236d8d0ed4506d209189af02dcd

diff --git a/app-admin/clsync/clsync-0.4.2.ebuild 
b/app-admin/clsync/clsync-0.4.2.ebuild
deleted file mode 100644
index d40e8568b97..000
--- a/app-admin/clsync/clsync-0.4.2.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools eutils linux-info
-
-DESCRIPTION="Live sync tool based on inotify, written in GNU C"
-HOMEPAGE="https://github.com/xaionaro/clsync http://ut.mephi.ru/oss/clsync;
-SRC_URI="https://github.com/xaionaro/${PN}/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+caps cluster control-socket cgroups debug extra-debug
-extra-hardened gio hardened +highload-locks +inotify mhash
-namespaces seccomp"
-
-REQUIRED_USE="
-   || ( gio inotify )
-   extra-debug? ( debug )
-   extra-hardened? ( hardened )
-   mhash? ( cluster )
-   seccomp? ( caps )
-"
-CDEPEND="
-   dev-libs/glib:2
-   cgroups? ( dev-libs/libcgroup )
-   mhash? ( app-crypt/mhash )
-"
-DEPEND="${CDEPEND}
-   virtual/pkgconfig
-"
-RDEPEND="${CDEPEND}
-   ~app-doc/clsync-docs-${PV}
-"
-
-pkg_pretend() {
-   use namespaces && CONFIG_CHECK="~NAMESPACES ~UTS_NS ~IPC_NS ~USER_NS 
~PID_NS ~NET_NS"
-   use seccomp && CONFIG_CHECK+=" ~SECCOMP"
-   check_extra_config
-}
-
-src_prepare() {
-   eapply_user
-   eautoreconf
-}
-
-src_configure() {
-   local harden_level=0
-   use hardened && harden_level=1
-   use extra-hardened && harden_level=2
-
-   local debug_level=0
-   use debug && debug_level=1
-   use extra-debug && debug_level=2
-
-   econf \
-   --disable-socket-library \
-   --enable-clsync \
-   --enable-debug=${debug_level} \
-   --enable-paranoid=${harden_level} \
-   --without-bsm \
-   --without-kqueue \
-   $(use_enable caps capabilities) \
-   $(use_enable cluster) \
-   $(use_enable control-socket socket) \
-   $(use_enable highload-locks) \
-   $(use_enable namespaces unshare) \
-   $(use_enable seccomp) \
-   $(use_with cgroups libcgroup) \
-   $(use_with gio gio lib) \
-   $(use_with inotify inotify native) \
-   $(use_with mhash)
-}
-
-src_install() {
-   emake DESTDIR="${D}" install
-
-   # docs go into clsync-docs
-   rm -rf "${ED}/usr/share/doc" || die
-
-   newinitd "${FILESDIR}/${PN}.initd" "${PN}"
-   newconfd "${FILESDIR}/${PN}.confd" "${PN}"
-
-   # filter rules and sync scripts are supposed to be here
-   insinto /etc/${PN}
-   newins "${FILESDIR}/${PN}.conf" "${PN}.conf"
-   keepdir /etc/${PN}
-}
-
-pkg_postinst() {
-   einfo "${PN} is just a convenient way to run synchronization tools on 
live data,"
-   einfo "it doesn't copy data itself, so you need to install software to 
do actual"
-   einfo "data transfer. Usually net-misc/rsync is a good choise, but 
${PN} is"
-   einfo "is flexible enough to use any user tool, see manual page for 
details."
-   einfo
-   einfo "${PN} init script can be multiplexed, to use symlink init script 
to"
-   einfo "othername and use conf.d/othername to configure it."
-   einfo
-   einfo "If you're interested in improved security, enable"
-   einfo "USE=\"caps cgroups hardened namespaces seccomp\""
-}

[gentoo-commits] repo/gentoo:master commit in: dev-libs/libclsync/

2020-06-12 Thread Andrew Savchenko

commit: 69ce958af77c743d21454b328e7d783de28f4c70
Author: Andrew Savchenko  gentoo  org>
AuthorDate: Fri Jun 12 16:58:36 2020 +
Commit:     Andrew Savchenko  gentoo  org>
CommitDate: Fri Jun 12 17:02:19 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=69ce958a

dev-libs/libclsync: remove old

Package-Manager: Portage-2.3.82, Repoman-2.3.20
Signed-off-by: Andrew Savchenko  gentoo.org>

 dev-libs/libclsync/Manifest   |  1 -
 dev-libs/libclsync/libclsync-0.4.2.ebuild | 73 ---
 2 files changed, 74 deletions(-)

diff --git a/dev-libs/libclsync/Manifest b/dev-libs/libclsync/Manifest
index bc0327932be..53ae0d386a1 100644
--- a/dev-libs/libclsync/Manifest
+++ b/dev-libs/libclsync/Manifest
@@ -1,2 +1 @@
-DIST clsync-0.4.2.tar.gz 256042 BLAKE2B 
28474fc66341b93705a502fcff390e3affcd89a9e1eb272dce9b28be709562e09c03e9c300cfeb5371e2e618a2239468a58c46212a39d751fbbfddeaab12bcf6
 SHA512 
d14a2efc4bf58d9d5c7a3fe5634cacdd182cd7cd814b0e9ebd99024a7282b056d1f7ceeec6903666391c3572d599a18e205af818b098ed7768d5c0e0f4cd1200
 DIST clsync-0.4.4.tar.gz 268276 BLAKE2B 
0027760cfdee5c4410c4cea45aae2def6498d812d2f50038993c39a33c6029722ec2dd2cfff20815a3ffd8834eb8c439059e5f1d2cc3d2cf98ecb22ed22f2322
 SHA512 
cdafbf43fdeafe9cb53c08e0514ef356fb5b4bbd8da2226263180e7441d222c76e6c73f847f484b3688a8672e4a85df0346c0236d8d0ed4506d209189af02dcd

diff --git a/dev-libs/libclsync/libclsync-0.4.2.ebuild 
b/dev-libs/libclsync/libclsync-0.4.2.ebuild
deleted file mode 100644
index 0dac4bb0c59..000
--- a/dev-libs/libclsync/libclsync-0.4.2.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_PN=${PN#lib}
-MY_P="${MY_PN}-${PV}"
-
-inherit autotools eutils ltprune
-
-DESCRIPTION="Control and monitoring library for clsync"
-HOMEPAGE="http://ut.mephi.ru/oss/clsync https://github.com/xaionaro/clsync;
-SRC_URI="https://github.com/xaionaro/${MY_PN}/archive/v${PV}.tar.gz -> 
${MY_P}.tar.gz"
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug extra-debug extra-hardened hardened static-libs"
-S="${WORKDIR}/${MY_P}"
-
-REQUIRED_USE="
-   extra-debug? ( debug )
-   extra-hardened? ( hardened )
-"
-
-DEPEND="virtual/pkgconfig"
-RDEPEND="=app-doc/clsync-docs-0.4*"
-
-src_prepare() {
-   eapply_user
-   eautoreconf
-}
-
-src_configure() {
-   local harden_level=0
-   use hardened && harden_level=1
-   use extra-hardened && harden_level=2
-
-   local debug_level=0
-   use debug && debug_level=1
-   use extra-debug && debug_level=2
-
-   econf \
-   --enable-socket-library \
-   --disable-clsync \
-   --enable-debug=${debug_level} \
-   --enable-paranoid=${harden_level} \
-   --without-bsm \
-   --without-kqueue \
-   --disable-capabilities \
-   --disable-cluster \
-   --enable-socket \
-   --disable-highload-locks \
-   --disable-unshare \
-   --disable-seccomp \
-   --without-libcgroup \
-   --without-gio \
-   --with-inotify=native \
-   --without-mhash
-}
-
-src_install() {
-   emake DESTDIR="${D}" install
-   prune_libtool_files
-   use static-libs || find "${ED}" -name "*.a" -delete || die "failed to 
remove static libs"
-
-   # docs go into clsync-docs
-   rm -rf "${ED}/usr/share/doc" || die
-}
-
-pkg_postinst() {
-   einfo "clsync instances you are going to use _must_ be compiled"
-   einfo "with control-socket support"
-}

[gentoo-commits] repo/gentoo:master commit in: app-doc/clsync-docs/

2020-06-12 Thread Andrew Savchenko

commit: ca5da1e06f6960ba6a892d3adf24512f57de2ad9
Author: Andrew Savchenko  gentoo  org>
AuthorDate: Fri Jun 12 16:50:08 2020 +
Commit:     Andrew Savchenko  gentoo  org>
CommitDate: Fri Jun 12 17:02:15 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ca5da1e0

app-doc/clsync-docs: remove old

Package-Manager: Portage-2.3.82, Repoman-2.3.20
Signed-off-by: Andrew Savchenko  gentoo.org>

 app-doc/clsync-docs/Manifest |  1 -
 app-doc/clsync-docs/clsync-docs-0.4.2.ebuild | 40 
 2 files changed, 41 deletions(-)

diff --git a/app-doc/clsync-docs/Manifest b/app-doc/clsync-docs/Manifest
index bc0327932be..53ae0d386a1 100644
--- a/app-doc/clsync-docs/Manifest
+++ b/app-doc/clsync-docs/Manifest
@@ -1,2 +1 @@
-DIST clsync-0.4.2.tar.gz 256042 BLAKE2B 
28474fc66341b93705a502fcff390e3affcd89a9e1eb272dce9b28be709562e09c03e9c300cfeb5371e2e618a2239468a58c46212a39d751fbbfddeaab12bcf6
 SHA512 
d14a2efc4bf58d9d5c7a3fe5634cacdd182cd7cd814b0e9ebd99024a7282b056d1f7ceeec6903666391c3572d599a18e205af818b098ed7768d5c0e0f4cd1200
 DIST clsync-0.4.4.tar.gz 268276 BLAKE2B 
0027760cfdee5c4410c4cea45aae2def6498d812d2f50038993c39a33c6029722ec2dd2cfff20815a3ffd8834eb8c439059e5f1d2cc3d2cf98ecb22ed22f2322
 SHA512 
cdafbf43fdeafe9cb53c08e0514ef356fb5b4bbd8da2226263180e7441d222c76e6c73f847f484b3688a8672e4a85df0346c0236d8d0ed4506d209189af02dcd

diff --git a/app-doc/clsync-docs/clsync-docs-0.4.2.ebuild 
b/app-doc/clsync-docs/clsync-docs-0.4.2.ebuild
deleted file mode 100644
index 80ae3e55b4a..000
--- a/app-doc/clsync-docs/clsync-docs-0.4.2.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_PN="${PN%-docs}"
-MY_P="${MY_PN}-${PV}"
-
-SRC_URI="https://github.com/xaionaro/${MY_PN}/archive/v${PV}.tar.gz -> 
${MY_P}.tar.gz"
-KEYWORDS="amd64 x86"
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="Clsync and libclsync API documentation"
-HOMEPAGE="http://ut.mephi.ru/oss/clsync https://github.com/xaionaro/clsync;
-LICENSE="GPL-3+"
-SLOT="0"
-IUSE="api +examples"
-
-DEPEND="api? ( app-doc/doxygen )"
-
-src_configure() {
-   : # doxygen doesn't depend on configuration
-}
-
-src_compile() {
-   if use api; then
-   doxygen .doxygen || die "doxygen failed"
-   fi
-}
-
-src_install() {
-   dodoc CONTRIB DEVELOPING NOTES PROTOCOL README.md SHORTHANDS TODO
-   if use api; then
-   dodoc -r doc/doxygen/html doc/devel/*
-   fi
-   if use examples; then
-   docinto examples
-   dodoc -r examples/{production,clsync*}
-   fi
-}

[gentoo-commits] repo/gentoo:master commit in: profiles/

2020-12-26 Thread Andrew Savchenko

commit: b081ffcb2b08df0e6a529646b22275671ce638bd
Author: Andrew Savchenko  gentoo  org>
AuthorDate: Sat Dec 26 08:13:10 2020 +
Commit:     Andrew Savchenko  gentoo  org>
CommitDate: Sat Dec 26 08:13:10 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b081ffcb

package.mask: mask app-doc/clsync-docs dev-libs/libclsync

Functionality provided by these packages is merged back into
>=app-admin/clsync-0.4.5, so separate packages are no longer
>required.

Signed-off-by: Andrew Savchenko  gentoo.org>

 profiles/package.mask | 9 +
 1 file changed, 9 insertions(+)

diff --git a/profiles/package.mask b/profiles/package.mask
index 8d3d6919e5b..48d425d84ec 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -32,6 +32,15 @@
 
 #--- END OF EXAMPLES ---
 
+# Andrew Savchenko  (2020-12-26)
+# All docs and socket library functionality are merged back into single
+# app-admin/clsync package using USE="apidoc doc socket-library" starting
+# from clsync-0.4.5.
+# No reverse dependencies. Removal in 30 days.
+ (2020-12-22)
 # Renamed version of dev-python/pycryptodome.  The ebuild is missing
 # fixes from the original.  Maintaining and installing two copies

[gentoo-commits] repo/gentoo:master commit in: net-proxy/privoxy/

2021-01-07 Thread Andrew Savchenko

commit: a3c965d37acea5479b08abcbeb0bc05d1aa0a0a2
Author: Andrew Savchenko  gentoo  org>
AuthorDate: Thu Jan  7 15:27:25 2021 +
Commit:     Andrew Savchenko  gentoo  org>
CommitDate: Thu Jan  7 15:30:27 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a3c965d3

net-proxy/privoxy: enable mbedtls by default

In order to avoid REQUIRED_USE conflict on default Linux profile
mbedtls is enabled as default ssl implementation, but both mbedtls
and openssl are ignored if ssl support is disabled.

Closes: https://bugs.gentoo.org/764248
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Andrew Savchenko  gentoo.org>

 net-proxy/privoxy/privoxy-3.0.29.ebuild | 18 +++---
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/net-proxy/privoxy/privoxy-3.0.29.ebuild 
b/net-proxy/privoxy/privoxy-3.0.29.ebuild
index 6d4bcb7581c..fffcbe231db 100644
--- a/net-proxy/privoxy/privoxy-3.0.29.ebuild
+++ b/net-proxy/privoxy/privoxy-3.0.29.ebuild
@@ -15,7 +15,7 @@ 
SRC_URI="mirror://sourceforge/ijbswa/${P%_*}-${PRIVOXY_STATUS}-src.tar.gz"
 
 IUSE="+acl brotli client-tags compression editor extended-host-patterns
 extended-statistics external-filters +fast-redirects +force fuzz
-graceful-termination +image-blocking ipv6 lfs mbedtls openssl
+graceful-termination +image-blocking ipv6 lfs +mbedtls openssl
 png-images selinux ssl +stats +threads toggle tools whitelists
 +zlib"
 SLOT="0"
@@ -27,8 +27,10 @@ DEPEND="
acct-user/privoxy
dev-libs/libpcre
brotli? ( app-arch/brotli )
-   mbedtls? ( net-libs/mbedtls )
-   openssl? ( dev-libs/openssl )
+   ssl? (
+   mbedtls? ( net-libs/mbedtls )
+   openssl? ( dev-libs/openssl )
+   )
zlib? ( sys-libs/zlib )
 "
 RDEPEND="${DEPEND}
@@ -46,8 +48,6 @@ REQUIRED_USE="
brotli? ( zlib )
fuzz? ( zlib )
ssl? ( ^^ ( mbedtls openssl ) )
-   mbedtls? ( ssl )
-   openssl? ( ssl )
 "
 
 S="${WORKDIR}/${P%_*}-${PRIVOXY_STATUS}"
@@ -79,6 +79,11 @@ src_prepare() {
 }
 
 src_configure() {
+   local myconf="--without-mbedtls --without-openssl"
+   if use ssl; then
+   myconf="$(use_with mbedtls) $(use_with openssl)"
+   fi
+
# --with-debug only enables debug CFLAGS
# --with-docbook and --with-db2html and their deps are useless,
#   since docs are already pregenerated in the source tarball
@@ -108,8 +113,7 @@ src_configure() {
$(use_enable whitelists trust-files) \
$(use_enable zlib) \
$(use_with brotli) \
-   $(use_with mbedtls) \
-   $(use_with openssl)
+   ${myconf}
 }
 
 src_install() {

[gentoo-commits] repo/gentoo:master commit in: profiles/features/hardened/

2020-11-29 Thread Andrew Savchenko

commit: c5bbabacc02e40aaf790fe8b78b3aa20a0a091dd
Author: Andrew Savchenko  gentoo  org>
AuthorDate: Sun Nov 29 19:04:33 2020 +
Commit:     Andrew Savchenko  gentoo  org>
CommitDate: Sun Nov 29 19:14:16 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c5bbabac

profiles/features/hardened/package.mask: drop last rited net-fs/openafs-kernel 
mask

Signed-off-by: Andrew Savchenko  gentoo.org>

 profiles/features/hardened/package.mask | 5 -
 1 file changed, 5 deletions(-)

diff --git a/profiles/features/hardened/package.mask 
b/profiles/features/hardened/package.mask
index c5d117e47c2..4f541debfd1 100644
--- a/profiles/features/hardened/package.mask
+++ b/profiles/features/hardened/package.mask
@@ -5,8 +5,3 @@
 sys-devel/prelink
 # depends on prelink
 app-crypt/hmaccalc
-
-# OpenAFS kernel module is not compatible with hardened kernels
-# due to C99 struct init requirement by hardened kernels,
-# see bug 540196 comment 9.
-net-fs/openafs-kernel

[gentoo-commits] repo/gentoo:master commit in: profiles/

2020-11-29 Thread Andrew Savchenko

commit: ae5c34136d8b1034d0dc5b4435c6314223e6ac7d
Author: Andrew Savchenko  gentoo  org>
AuthorDate: Sun Nov 29 19:06:09 2020 +
Commit:     Andrew Savchenko  gentoo  org>
CommitDate: Sun Nov 29 19:14:20 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ae5c3413

profiles/package.mask: net-fs/openafs-kernel is removed from the tree

So drop it's mask as well as openafs-1.6* mask (it is also removed).

Signed-off-by: Andrew Savchenko  gentoo.org>

 profiles/package.mask | 9 -
 1 file changed, 9 deletions(-)

diff --git a/profiles/package.mask b/profiles/package.mask
index e8ee1845c62..03ad4264c79 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -567,15 +567,6 @@ dev-lua/luacrypto
 >=dev-lua/lpeg-1.0.2-r100
 >=dev-lua/lgi-0.9.2-r100
 
-# Andrew Savchenko  (2020-10-11)
-# Mask old openafs version and corresponding openafs-kernel with
-# multiple CVEs.
-# All kernel module functionality is merged back in the single
-# net-fs/openafs package using USE="modules" starting from 1.8 branch.
-# No reverse dependencies, bug #719136. Removal in 30 days.
-net-fs/openafs-kernel
- (2020-10-06)
 # 1.3.3 is broken and failing unittests for net-im/prosody. Bug #746782.
 >=dev-lua/luaexpat-1.3.3

[gentoo-commits] repo/gentoo:master commit in: net-fs/openafs/

2020-11-29 Thread Andrew Savchenko

commit: c13a871446d8632c473fc7eed27fd33862895e54
Author: Andrew Savchenko  gentoo  org>
AuthorDate: Sun Nov 29 18:47:00 2020 +
Commit:     Andrew Savchenko  gentoo  org>
CommitDate: Sun Nov 29 19:14:07 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c13a8714

net-fs/openafs: remove old versions

Bug: https://bugs.gentoo.org/719136
Closes: https://bugs.gentoo.org/642542
Package-Manager: Portage-3.0.10, Repoman-3.0.2
Signed-off-by: Andrew Savchenko  gentoo.org>

 net-fs/openafs/Manifest|   5 -
 net-fs/openafs/openafs-1.6.22.1.ebuild | 222 -
 net-fs/openafs/openafs-1.6.22.2.ebuild | 222 -
 3 files changed, 449 deletions(-)

diff --git a/net-fs/openafs/Manifest b/net-fs/openafs/Manifest
index f0d76e99bc7..d37d811001a 100644
--- a/net-fs/openafs/Manifest
+++ b/net-fs/openafs/Manifest
@@ -1,8 +1,3 @@
-DIST openafs-1.6.22.1-doc.tar.bz2 3534064 BLAKE2B 
e9f67fb42b6c4e6c2092e713e801db5479beccb1e3dc6d48c16e655151dcf91693497c4ee57c47c98c52cba6eb0ad271698ed450487bdb462111a9276cb1eb74
 SHA512 
1c9481507824a450d6610dbbb427bdbccb3373e12bae0bf603ec121023ee7bbb05fef366f5eec793736b0643d0f6e8f611bc55473c71a831e3b31970420ec44c
-DIST openafs-1.6.22.1-src.tar.bz2 14682183 BLAKE2B 
a01e08f30f28dda9484407bbe0568df7b517e587b6e2475d669269e09745050bee955438dfeab9d86564dbc22821bc2fb417c15f8add0aae6acdde266c080df0
 SHA512 
901959051f60f7ffa2db8a253a16f9460713e3637a53f0b6b05e72247e08b633951116dc28b19db9c7448d8ebc7a20a8a851d5356c52f16c28f5c89209f8190e
-DIST openafs-1.6.22.2-doc.tar.bz2 3533975 BLAKE2B 
a44b39291ece3d4b1f9f9e722b35f48698063e4daecb94745b5a8ead00412b9e8e7baef0c1264c6289de45cab66b4b83ed3cfe83a60072480c848c14bb61016c
 SHA512 
e8405ad2f5c3ad24d37789fdf71961ed3f1af4467b9385a87f70f8ffc39dfccf1db35a492360811cf62bb3959cdb7f6eee08991aaafa24961b24815f908172c1
-DIST openafs-1.6.22.2-src.tar.bz2 14673379 BLAKE2B 
06408ad98a1812608b14ee89ffa40ccbbf6aa7d41dc0741c9c7b9e2c59a3f88c1f6676aa2f996b888cb7f50c04f0c8fe2da15c3f3647e3998f70c973c18ea7d3
 SHA512 
e4f2ce326a1d04ec20b1fa4115509bf35f73d937ff77e6e017e851ce871542d935e5ae8a597efd14027c385869657cf538cffa2674878bd4d4da37f20626172c
 DIST openafs-1.8.6-doc.tar.bz2 3769160 BLAKE2B 
c5fe08fbb2cdab48dd691a7e228cc590644e05b22c87afef24a5fb35aa12e379d8d49d4b920cb84dd23b4e1f1a04512078f3018808531cdc7180778885bdc466
 SHA512 
7525325a5ef6e1ceada7075f489a03e1d250d3cbd8b8e83a25c8e40d506d50cbf10c2b28b682f2f9663a8cd450cb70891a04e6dbc296347945ee2454b138d971
 DIST openafs-1.8.6-src.tar.bz2 14874336 BLAKE2B 
a83f5bfe543b3797fa6d80ebc96cacb1a15f58cf5495d1c693593bc6d24a9f08678693080b3920a97afebe937689dd0ad08bbca95c996af0d2c83935974d3613
 SHA512 
0800c3825d4e0384b43cb801fc898e9255a0fa0d0baf1f231fbf383317919cc30f68526eeec803d2dc21fc7a6b55155ea4cb23197604c70e89ecf4d520b85ec1
-DIST openafs-patches-20170822.tar.xz 11036 BLAKE2B 
e53d9e01c5808ca9876fd22f729e0e82cb0f6bc7c1f4875ad0607ac9d547e216c61cc2c3506eaafb7c81318958cd038c177e9e5b2c3728997d7f44e13bbbded4
 SHA512 
f4b574287bfe54881a70f3ccd4d4901b2f8f9ecbec7b3a4975b59050d5ef27c6de3da25f820b7b2b10f1a38034bb28e5c01ee094fb38cae80e244eeb04b29d0a
 DIST openafs-patches-20200913.tar.xz 28392 BLAKE2B 
5e8b8f2554453abdb0a84dd45d8e719cc60127224ee6ebeaca4fcddba3d38309d7e5070c43659d10301ab9eaf371ba7dcbcf12950166626a7d359d2a39c922c6
 SHA512 
ec0aa800b945de2fe70d949259c89a97660bdbfee3c3e43d886a5c2f6b7c530252a53ff8f196f6e80a9a657bb81f26a6937a1bec3fafbd2c70322b313a712820

diff --git a/net-fs/openafs/openafs-1.6.22.1.ebuild 
b/net-fs/openafs/openafs-1.6.22.1.ebuild
deleted file mode 100644
index 79daf3d59cf..000
--- a/net-fs/openafs/openafs-1.6.22.1.ebuild
+++ /dev/null
@@ -1,222 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit autotools eutils flag-o-matic multilib pam systemd toolchain-funcs
-
-MY_PV=${PV/_/}
-MY_P="${PN}-${MY_PV}"
-PVER="20170822"
-
-DESCRIPTION="The OpenAFS distributed file system"
-HOMEPAGE="https://www.openafs.org/;
-# We always d/l the doc tarball as man pages are not USE=doc material
-[[ ${PV} == *_pre* ]] && MY_PRE="candidate/" || MY_PRE=""
-SRC_URI="
-   https://openafs.org/dl/openafs/${MY_PRE}${MY_PV}/${MY_P}-src.tar.bz2
-   https://openafs.org/dl/openafs/${MY_PRE}${MY_PV}/${MY_P}-doc.tar.bz2
-   https://dev.gentoo.org/~bircoph/afs/${PN}-patches-${PVER}.tar.xz
-"
-
-LICENSE="IBM BSD openafs-krb5-a APSL-2"
-SLOT="0"
-KEYWORDS="amd64 ~sparc x86 ~amd64-linux ~x86-linux"
-
-IUSE="bitmap-later debug doc fuse kerberos +modules ncurses pam pthreaded-ubik 
+supergroups"
-
-CDEPEND="
-   virtual/libintl
-   fuse? ( sys-fs/fuse:0= )
-   kerberos? ( virtual/krb5 )
-   ncurses? ( sys-libs/ncurses:0= )
-   pam? ( sys-libs/pam )"
-
-DEPEND="${CDEPEND}
-   virtual/yacc
-

[gentoo-commits] repo/gentoo:master commit in: net-fs/openafs-kernel/

2020-11-29 Thread Andrew Savchenko

commit: 07628bb2188c4ce09f32bd8263987a107b794ce5
Author: Andrew Savchenko  gentoo  org>
AuthorDate: Sun Nov 29 18:55:26 2020 +
Commit:     Andrew Savchenko  gentoo  org>
CommitDate: Sun Nov 29 19:14:12 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=07628bb2

net-fs/openafs-kernel: remove last rited and vulnerable package

All functionality is peserved within net-fs/openafs[modules].

Bug: https://bugs.gentoo.org/719136
Closes: https://bugs.gentoo.org/703506
Closes: https://bugs.gentoo.org/707928
Closes: https://bugs.gentoo.org/724920

Signed-off-by: Andrew Savchenko  gentoo.org>

 net-fs/openafs-kernel/Manifest |   3 -
 net-fs/openafs-kernel/metadata.xml |  11 --
 .../openafs-kernel-1.6.22.1-r1.ebuild  | 134 -
 .../openafs-kernel-1.6.22.2-r1.ebuild  | 134 -
 4 files changed, 282 deletions(-)

diff --git a/net-fs/openafs-kernel/Manifest b/net-fs/openafs-kernel/Manifest
deleted file mode 100644
index 34c6a22cc32..000
--- a/net-fs/openafs-kernel/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST openafs-1.6.22.1-src.tar.bz2 14682183 BLAKE2B 
a01e08f30f28dda9484407bbe0568df7b517e587b6e2475d669269e09745050bee955438dfeab9d86564dbc22821bc2fb417c15f8add0aae6acdde266c080df0
 SHA512 
901959051f60f7ffa2db8a253a16f9460713e3637a53f0b6b05e72247e08b633951116dc28b19db9c7448d8ebc7a20a8a851d5356c52f16c28f5c89209f8190e
-DIST openafs-1.6.22.2-src.tar.bz2 14673379 BLAKE2B 
06408ad98a1812608b14ee89ffa40ccbbf6aa7d41dc0741c9c7b9e2c59a3f88c1f6676aa2f996b888cb7f50c04f0c8fe2da15c3f3647e3998f70c973c18ea7d3
 SHA512 
e4f2ce326a1d04ec20b1fa4115509bf35f73d937ff77e6e017e851ce871542d935e5ae8a597efd14027c385869657cf538cffa2674878bd4d4da37f20626172c
-DIST openafs-patches-20170822.tar.xz 11036 BLAKE2B 
e53d9e01c5808ca9876fd22f729e0e82cb0f6bc7c1f4875ad0607ac9d547e216c61cc2c3506eaafb7c81318958cd038c177e9e5b2c3728997d7f44e13bbbded4
 SHA512 
f4b574287bfe54881a70f3ccd4d4901b2f8f9ecbec7b3a4975b59050d5ef27c6de3da25f820b7b2b10f1a38034bb28e5c01ee094fb38cae80e244eeb04b29d0a

diff --git a/net-fs/openafs-kernel/metadata.xml 
b/net-fs/openafs-kernel/metadata.xml
deleted file mode 100644
index e76fe2c4c44..000
--- a/net-fs/openafs-kernel/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-http://www.gentoo.org/dtd/metadata.dtd;>
-
-
-   np-hard...@gentoo.org
-
-
-   birc...@gentoo.org
-   Andrew Savchenko
-
-

diff --git a/net-fs/openafs-kernel/openafs-kernel-1.6.22.1-r1.ebuild 
b/net-fs/openafs-kernel/openafs-kernel-1.6.22.1-r1.ebuild
deleted file mode 100644
index 8dbaaf5e78d..000
--- a/net-fs/openafs-kernel/openafs-kernel-1.6.22.1-r1.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit autotools linux-mod multilib toolchain-funcs versionator
-
-MY_PV=$(delete_version_separator '_')
-MY_PN="${PN/-kernel}"
-MY_P="${MY_PN}-${MY_PV}"
-PVER="20170822"
-
-DESCRIPTION="The OpenAFS distributed file system kernel module"
-HOMEPAGE="https://www.openafs.org/;
-# We always d/l the doc tarball as man pages are not USE=doc material
-[[ ${PV} == *_pre* ]] && MY_PRE="candidate/" || MY_PRE=""
-SRC_URI="
-   https://openafs.org/dl/openafs/${MY_PRE}${MY_PV}/${MY_P}-src.tar.bz2
-   https://dev.gentoo.org/~bircoph/afs/${MY_PN}-patches-${PVER}.tar.xz
-"
-
-LICENSE="IBM BSD openafs-krb5-a APSL-2"
-SLOT="0"
-KEYWORDS="amd64 ~sparc x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-S=${WORKDIR}/${MY_P}
-
-CONFIG_CHECK="~!AFS_FS KEYS"
-ERROR_AFS_FS="OpenAFS conflicts with the in-kernel AFS-support. Make sure not 
to load both at the same time!"
-ERROR_KEYS="OpenAFS needs CONFIG_KEYS option enabled"
-
-QA_TEXTRELS_x86_fbsd="/boot/modules/libafs.ko"
-QA_TEXTRELS_amd64_fbsd="/boot/modules/libafs.ko"
-
-PATCHES=( "${WORKDIR}/gentoo/patches" )
-
-pkg_pretend() {
-   if use kernel_linux && kernel_is ge 4 15 ; then
-   ewarn "Gentoo supports kernels which are supported by OpenAFS"
-   ewarn "which are limited to the kernel versions: < 4.15"
-   ewarn ""
-   ewarn "You are free to utilize epatch_user to provide whatever"
-   ewarn "support you feel is appropriate, but will not receive"
-   ewarn "support as a result of those changes."
-   ewarn ""
-   ewarn "Please do not file a bug report about this."
-   fi
-}
-
-pkg_setup() {
-   if use kernel_linux; then
-   linux-mod_pkg_setup
-   fi
-}
-
-src_prepare() {
-   default
-
-   # packaging is f-ed up, so we can't run eautore

[gentoo-commits] repo/gentoo:master commit in: app-admin/clsync/

2020-11-08 Thread Andrew Savchenko

commit: b1da862281d2c97a9fc1e6a63c377a30eefa4fbd
Author: Andrew Savchenko  gentoo  org>
AuthorDate: Sun Nov  8 14:30:53 2020 +
Commit:     Andrew Savchenko  gentoo  org>
CommitDate: Sun Nov  8 14:35:40 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b1da8622

app-admin/clsync: version bump

- Update to 0.4.5
- Enable LTO support
- Merge back dev-libs/libclsync and app-doc/clsync-docs into app-admin/clsync

Bug: https://bugs.gentoo.org/749978
Bug: https://bugs.gentoo.org/750356
Closes: https://bugs.gentoo.org/717340
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Andrew Savchenko  gentoo.org>

 app-admin/clsync/Manifest|   1 +
 app-admin/clsync/clsync-0.4.5.ebuild | 144 +++
 2 files changed, 145 insertions(+)

diff --git a/app-admin/clsync/Manifest b/app-admin/clsync/Manifest
index 53ae0d386a1..aa1738bbfb7 100644
--- a/app-admin/clsync/Manifest
+++ b/app-admin/clsync/Manifest
@@ -1 +1,2 @@
 DIST clsync-0.4.4.tar.gz 268276 BLAKE2B 
0027760cfdee5c4410c4cea45aae2def6498d812d2f50038993c39a33c6029722ec2dd2cfff20815a3ffd8834eb8c439059e5f1d2cc3d2cf98ecb22ed22f2322
 SHA512 
cdafbf43fdeafe9cb53c08e0514ef356fb5b4bbd8da2226263180e7441d222c76e6c73f847f484b3688a8672e4a85df0346c0236d8d0ed4506d209189af02dcd
+DIST clsync-0.4.5.tar.gz 276096 BLAKE2B 
4fa534b342a806ca691f8a65455cb800800f7a943fa3f0913a26c37d2cd0f9d762630ad01eeb80bdd0d90a0731bed5f2aa60444a654972da9479c116e0e937aa
 SHA512 
6568f3c49ac4fe11e54593ba23eed392d0b7d9b5bf052983c4a5a2befbb807dbd3f9d13412264f8909998702f869d1cd6db77d89bd9491414b1f3213437c5212

diff --git a/app-admin/clsync/clsync-0.4.5.ebuild 
b/app-admin/clsync/clsync-0.4.5.ebuild
new file mode 100644
index 000..c17448327bb
--- /dev/null
+++ b/app-admin/clsync/clsync-0.4.5.ebuild
@@ -0,0 +1,144 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+if [[ ${PV} == "" ]] ; then
+   EGIT_REPO_URI="https://github.com/clsync/clsync.git;
+   inherit git-r3
+   KEYWORDS=""
+else
+   SRC_URI="https://github.com/clsync/${PN}/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
+   KEYWORDS="~amd64 ~x86"
+fi
+
+inherit autotools linux-info systemd
+
+DESCRIPTION="Live sync tool based on inotify, written in GNU C"
+HOMEPAGE="https://github.com/clsync/clsync http://ut.mephi.ru/oss/clsync;
+LICENSE="GPL-3+"
+SLOT="0"
+IUSE="apidoc +caps +clsync cluster control-socket cgroups doc debug
+examples extra-debug extra-hardened gio +hardened +highload-locks
++inotify +lto mhash namespaces seccomp socket-library static-libs"
+
+REQUIRED_USE="
+   || ( clsync socket-library )
+   || ( gio inotify )
+   mhash? ( cluster )
+   seccomp? ( caps )
+"
+BDEPEND="
+   virtual/pkgconfig
+   apidoc? ( app-doc/doxygen[dot] )
+"
+DEPEND="
+   caps? ( sys-libs/libcap )
+   cgroups? ( dev-libs/libcgroup )
+   clsync? ( dev-libs/glib:2 )
+   mhash? ( app-crypt/mhash )
+"
+RDEPEND="${DEPEND}
+   !app-doc/clsync-docs
+   !dev-libs/libclsync
+"
+
+pkg_pretend() {
+   if use clsync; then
+   use inotify && CONFIG_CHECK+=" ~INOTIFY_USER"
+   use namespaces && CONFIG_CHECK="~NAMESPACES ~UTS_NS ~IPC_NS 
~USER_NS ~PID_NS ~NET_NS"
+   use seccomp && CONFIG_CHECK+=" ~SECCOMP"
+   check_extra_config
+   fi
+}
+
+src_prepare() {
+   eapply_user
+   eautoreconf
+}
+
+src_configure() {
+   local harden_level=0
+   use hardened && harden_level=1
+   use extra-hardened && harden_level=2
+
+   local debug_level=0
+   use debug && debug_level=1
+   use extra-debug && debug_level=2
+
+   econf \
+   --enable-debug=${debug_level} \
+   --enable-paranoid=${harden_level} \
+   --without-bsm \
+   --without-kqueue \
+   $(use_enable caps capabilities) \
+   $(use_enable clsync) \
+   $(use_enable cluster) \
+   $(use_enable control-socket socket) \
+   $(use_enable highload-locks) \
+   $(use_enable lto) \
+   $(use_enable namespaces unshare) \
+   $(use_enable seccomp) \
+   $(use_enable socket-library) \
+   $(use_with cgroups libcgroup) \
+   $(use_with gio gio lib) \
+   $(use_with inotify inotify native) \
+   $(use_with mhash)
+}
+
+src_compile() {
+   default
+   if use apidoc; then
+   doxygen .doxygen || die "doxygen failed"
+   fi
+}
+
+src_install() {
+   emake DESTDIR="${D}" install
+
+   if use socket-library; then
+   find "${ED}&

[gentoo-commits] repo/gentoo:master commit in: app-admin/clsync/

2020-11-08 Thread Andrew Savchenko

commit: c5f4621f3787eca11e2673bfaf964c8fa2b22ae8
Author: Andrew Savchenko  gentoo  org>
AuthorDate: Sun Nov  8 14:13:27 2020 +
Commit:     Andrew Savchenko  gentoo  org>
CommitDate: Sun Nov  8 14:35:35 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c5f4621f

app-admin/clsync: update live ebuild to reflect upstream changes

Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Andrew Savchenko  gentoo.org>

 app-admin/clsync/clsync-.ebuild | 5 +++--
 app-admin/clsync/metadata.xml   | 1 +
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/app-admin/clsync/clsync-.ebuild 
b/app-admin/clsync/clsync-.ebuild
index 05e00ff84f2..c17448327bb 100644
--- a/app-admin/clsync/clsync-.ebuild
+++ b/app-admin/clsync/clsync-.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} == "" ]] ; then
inherit git-r3
KEYWORDS=""
 else
-   SRC_URI="https://github.com/clsync/${MY_PN}/archive/v${PV}.tar.gz -> 
${MY_P}.tar.gz"
+   SRC_URI="https://github.com/clsync/${PN}/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
KEYWORDS="~amd64 ~x86"
 fi
 
@@ -20,7 +20,7 @@ LICENSE="GPL-3+"
 SLOT="0"
 IUSE="apidoc +caps +clsync cluster control-socket cgroups doc debug
 examples extra-debug extra-hardened gio +hardened +highload-locks
-+inotify mhash namespaces seccomp socket-library static-libs"
++inotify +lto mhash namespaces seccomp socket-library static-libs"
 
 REQUIRED_USE="
|| ( clsync socket-library )
@@ -76,6 +76,7 @@ src_configure() {
$(use_enable cluster) \
$(use_enable control-socket socket) \
$(use_enable highload-locks) \
+   $(use_enable lto) \
$(use_enable namespaces unshare) \
$(use_enable seccomp) \
$(use_enable socket-library) \

diff --git a/app-admin/clsync/metadata.xml b/app-admin/clsync/metadata.xml
index fd64593a277..39a9cda50e2 100644
--- a/app-admin/clsync/metadata.xml
+++ b/app-admin/clsync/metadata.xml
@@ -24,6 +24,7 @@
 Enable extra security checks. This will hurt 
performance.
 Enable GIO for FS monitoring (glib based alternative to 
inotify interface, not recommended; if both are compiled, may be selected at 
runtime).
 Allows to use spinlocks for short delays 
instead of mutexes, but only on SMP systems.
+Build with link time optimization (LTO).
 Enable namespaces isolation.
 Build the control and monitoring socket 
library: libclsync.

[gentoo-commits] repo/gentoo:master commit in: app-text/xpdf/

2020-11-09 Thread Andrew Savchenko

commit: 33385b46bea50e05915917ebdb14f6adb97a8797
Author: Andrew Savchenko  gentoo  org>
AuthorDate: Mon Nov  9 18:02:02 2020 +
Commit:     Andrew Savchenko  gentoo  org>
CommitDate: Mon Nov  9 18:04:48 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=33385b46

app-text/xpdf: switch from inkscape to rsvg-convert

rsvg-convert is faster, more lightweight and less troublesome
dependency than inkscape, so use it for png generation.
This is a better fix of bug 739166.

Bug: https://bugs.gentoo.org/739166
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Andrew Savchenko  gentoo.org>

 app-text/xpdf/xpdf-4.02-r4.ebuild | 10 ++
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/app-text/xpdf/xpdf-4.02-r4.ebuild 
b/app-text/xpdf/xpdf-4.02-r4.ebuild
index 288d1e75901..e887f2ce996 100644
--- a/app-text/xpdf/xpdf-4.02-r4.ebuild
+++ b/app-text/xpdf/xpdf-4.02-r4.ebuild
@@ -28,7 +28,7 @@ KEYWORDS="amd64 x86"
 IUSE="cmyk cups +fontconfig i18n icons +libpaper metric opi png +textselect 
utils"
 
 BDEPEND="
-   icons? ( media-gfx/inkscape )
+   icons? ( gnome-base/librsvg )
 "
 DEPEND="
cups? (
@@ -88,18 +88,12 @@ src_compile() {
cmake_src_compile
 
if use icons; then
-   # in some cases inkscape tries to write font cache to the
-   # system dir, see bug 739166
-   addpredict /usr/share/inkscape/fonts
-   local inkarg="-e"
-   has_version -b '>media-gfx/inkscape-0.99' && inkarg="-o"
-
sizes="16 22 24 32 36 48 64 72 96 128 192 256 512"
cd xpdf-qt
mkdir $sizes
local i
for i in $sizes; do
-   inkscape xpdf-icon.svg -w $i -h $i $inkarg $i/xpdf.png
+   rsvg-convert xpdf-icon.svg -w $i -h $i -o $i/xpdf.png
done
fi
 }

[gentoo-commits] repo/gentoo:master commit in: app-admin/apg/files/, app-admin/apg/

2021-01-05 Thread Andrew Savchenko

commit: eb92af2b5638720bd439406295a237063f0f1a4e
Author: Andrew Savchenko  gentoo  org>
AuthorDate: Wed Jan  6 03:14:28 2021 +
Commit:     Andrew Savchenko  gentoo  org>
CommitDate: Wed Jan  6 03:17:23 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eb92af2b

app-admin/apg: remove old

Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Andrew Savchenko  gentoo.org>

 app-admin/apg/Manifest|  1 -
 app-admin/apg/apg-2.3.0b-r7.ebuild| 49 ---
 app-admin/apg/files/apg-2.3.0b-cracklib.patch | 17 --
 app-admin/apg/files/apg-glibc-2.4.patch   | 11 --
 4 files changed, 78 deletions(-)

diff --git a/app-admin/apg/Manifest b/app-admin/apg/Manifest
index 64074f5c0ab..67631f69f40 100644
--- a/app-admin/apg/Manifest
+++ b/app-admin/apg/Manifest
@@ -1,2 +1 @@
-DIST apg-2.3.0b.tar.gz 109995 BLAKE2B 
9b4a6141fb7f6e649fe06ed91bda636879a03d6e5e6071267bbb6cd27e63b4588c23ea7902c5b1a74dde8520843566a4f2857a34f4d66020142425e5faf53daf
 SHA512 
3112d2267f2311f960a52fa268b55a5faf0250a4a8c5e7444f0c1326afa2844a476a54befcf79e5b8532d74c53f6f58ffc420591c8c36798dd82b43c14869e1a
 DIST apg-2.3.0b_p20150129.tar.xz 313372 BLAKE2B 
f5a1b894a0379294c478020de512af047aec2e7c9d881cb2f4c79df88583707b5ce0e995623915b6bd11b720e60e0f8696e0ddce472441cb1d04f3bf7a818e32
 SHA512 
7be813368b4b6fe4ae2882d85c40b6cf80ad44b7aa7e46c8cb97926ef89edf4f59e9a4c76a7aa9f725ac6ce1f0df361f8b68ef6dce798e1e0a8d55767c7a16e8

diff --git a/app-admin/apg/apg-2.3.0b-r7.ebuild 
b/app-admin/apg/apg-2.3.0b-r7.ebuild
deleted file mode 100644
index cfc9ecdda9b..000
--- a/app-admin/apg/apg-2.3.0b-r7.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="Another Password Generator"
-HOMEPAGE="http://www.adel.nursat.kz/apg/;
-SRC_URI="http://www.adel.nursat.kz/apg/download/${P}.tar.gz;
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ppc ~ppc64 x86 ~amd64-linux ~x86-linux 
~ppc-macos"
-IUSE="cracklib"
-
-DEPEND="cracklib? ( sys-libs/cracklib )"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-   default
-   if use cracklib; then
-   eapply "${FILESDIR}"/${P}-cracklib.patch
-   fi
-   eapply "${FILESDIR}"/${PN}-glibc-2.4.patch
-   eapply "${FILESDIR}"/${P}-crypt_password.patch
-
-   sed -i 's,^#\(APG_CS_CLIBS += -lnsl\)$,\1,' Makefile \
-   || die "Sed failed"
-   if [[ ${CHOST} == *-darwin* ]]; then
-   sed -i 's,^APG_CLIBS += -lcrypt,APG_CLIBS += ,' Makefile \
-   || die "Sed failed"
-   fi
-}
-
-src_compile() {
-   emake \
-   FLAGS="${CFLAGS} ${LDFLAGS}" CFLAGS="${CFLAGS} ${LDFLAGS}" \
-   CC="$(tc-getCC)" standalone
-   emake FLAGS="${CFLAGS} ${LDFLAGS}" CC="$(tc-getCC)" \
-   -C bfconvert
-}
-
-src_install() {
-   dobin apg apgbfm bfconvert/bfconvert
-   dodoc CHANGES INSTALL README THANKS TODO \
-   doc/{APG_TIPS,pronun.txt,rfc0972.txt,rfc1750.txt}
-   doman doc/man/{apg.1,apgbfm.1}
-}

diff --git a/app-admin/apg/files/apg-2.3.0b-cracklib.patch 
b/app-admin/apg/files/apg-2.3.0b-cracklib.patch
deleted file mode 100644
index d297495b321..000
--- a/app-admin/apg/files/apg-2.3.0b-cracklib.patch
+++ /dev/null
@@ -1,17 +0,0 @@
 a/Makefile 2003-08-07 09:40:39.0 -0600
-+++ b/Makefile 2004-10-14 07:16:17.288530686 -0600
-@@ -44,10 +44,10 @@
- # If you want to use cracklib for password quality check then you
- # must uncomment the folowing 4 lines (you must not do this for WIN32)
- #
--#CRACKLIB_DICTPATH = "/usr/local/lib/pw_dict"
--#STANDALONE_OPTIONS += -DAPG_USE_CRACKLIB 
'-DCRACKLIB_DICTPATH=${CRACKLIB_DICTPATH}' -I/usr/local/include -L/usr/local/lib
--#CLISERV_OPTIONS += -DAPG_USE_CRACKLIB 
'-DCRACKLIB_DICTPATH=${CRACKLIB_DICTPATH}' -I/usr/local/include -L/usr/local/lib
--#APG_CLIBS += -lcrack
-+CRACKLIB_DICTPATH = "/usr/lib/cracklib_dict"
-+STANDALONE_OPTIONS += -DAPG_USE_CRACKLIB 
'-DCRACKLIB_DICTPATH=${CRACKLIB_DICTPATH}'
-+CLISERV_OPTIONS += -DAPG_USE_CRACKLIB 
'-DCRACKLIB_DICTPATH=${CRACKLIB_DICTPATH}'
-+APG_CLIBS += -lcrack
- 
- ##
- # Support for ANSI X9.17/SHA1 PRNG

diff --git a/app-admin/apg/files/apg-glibc-2.4.patch 
b/app-admin/apg/files/apg-glibc-2.4.patch
deleted file mode 100644
index 43b5874fa2b..000
--- a/app-admin/apg/files/apg-glibc-2.4.patch
+++ /dev/null
@@ -1,11 +0,0 @@
 a/restrict.h   2006-03-26 03:33:50.168661936 +0400
-+++ b/restrict.h   2006-03-26 03:34:10.427582112 +0400
-@@ -33,6 +33,8 @@
- #ifndef APG_RESTRICT_H
- #define APG_RESTRICT_H1
- 
-+#define uint32_t int
-+
- #if defined(APG_USE_CRACKLIB)
- #include 
- #endif

[gentoo-commits] repo/gentoo:master commit in: net-proxy/privoxy/

2021-01-05 Thread Andrew Savchenko

commit: f5cce2da10d7c1ab4c0cecdfabbd9336cc4b3b6c
Author: Andrew Savchenko  gentoo  org>
AuthorDate: Wed Jan  6 03:00:34 2021 +
Commit:     Andrew Savchenko  gentoo  org>
CommitDate: Wed Jan  6 03:17:18 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f5cce2da

net-proxy/privoxy: remove old

Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Andrew Savchenko  gentoo.org>

 net-proxy/privoxy/Manifest  |   1 -
 net-proxy/privoxy/metadata.xml  |   1 -
 net-proxy/privoxy/privoxy-3.0.26.ebuild | 126 
 3 files changed, 128 deletions(-)

diff --git a/net-proxy/privoxy/Manifest b/net-proxy/privoxy/Manifest
index fb0156258e1..1aba478ea92 100644
--- a/net-proxy/privoxy/Manifest
+++ b/net-proxy/privoxy/Manifest
@@ -1,2 +1 @@
-DIST privoxy-3.0.26-stable-src.tar.gz 1741772 BLAKE2B 
19dc72d93535e6eb960a53e3679886655b2aff037ad6002844eb76c970c7da52d016b7a54993e3dcf453c394da354cf8ec8f1f23a02b9216240e5460d6239b34
 SHA512 
e448305287d0451c761b76b8d8974ea1ec837b621bbb498a7ff16a54cb4d8f1f734efe2eef03235c01163bb40e225785065aad6ee265a31d90970ab98af11044
 DIST privoxy-3.0.28-stable-src.tar.gz 1753809 BLAKE2B 
1ea0d6339c96bd294eadc124ebac252c43dcdc062709868668959bdb4f959267afb2ec7f27fc0d58db3655102f2412f1c8acb273267d447271465ac21f7a9be4
 SHA512 
5d58024ae73d623a2b8fb2ac49e18f047dfe252c9441388f025cf888c0e4b11546b8796cfa559759ee137002b1b31b30ad28b356ae226836454f32591eb835fc

diff --git a/net-proxy/privoxy/metadata.xml b/net-proxy/privoxy/metadata.xml
index 6fcf7430880..3794962c567 100644
--- a/net-proxy/privoxy/metadata.xml
+++ b/net-proxy/privoxy/metadata.xml
@@ -23,7 +23,6 @@
Allow single-page disable (force load)
Exposes Privoxy internals to input from files 
or stdout. Intended for fuzzing testing
Allow to shutdown Privoxy 
through the webinterface
-   Enable a quick but not always reliable 
auto-detect whether requests from MS Internet Explorer are for an image or 
not
Allows the +handle-as-image action, 
to send "blocked" images instead of HTML
Support large files (2GB) on 32-bit 
systems
Use PNG format instead of GIF for 
built-in images

diff --git a/net-proxy/privoxy/privoxy-3.0.26.ebuild 
b/net-proxy/privoxy/privoxy-3.0.26.ebuild
deleted file mode 100644
index 6f7945dded4..000
--- a/net-proxy/privoxy/privoxy-3.0.26.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit autotools systemd toolchain-funcs user
-
-[ "${PV##*_}" = "beta" ] &&
-   PRIVOXY_STATUS="beta" ||
-   PRIVOXY_STATUS="stable"
-
-HOMEPAGE="https://www.privoxy.org https://sourceforge.net/projects/ijbswa/;
-DESCRIPTION="A web proxy with advanced filtering capabilities for enhancing 
privacy"
-SRC_URI="mirror://sourceforge/ijbswa/${P%_*}-${PRIVOXY_STATUS}-src.tar.gz"
-
-IUSE="+acl client-tags compression editor extended-host-patterns
-external-filters +fast-redirects +force graceful-termination
-ie-images +image-blocking ipv6 lfs png-images selinux +stats
-+threads toggle tools whitelists +zlib"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ppc ppc64 sparc x86"
-LICENSE="GPL-2"
-
-DEPEND="
-   dev-libs/libpcre
-   zlib? ( sys-libs/zlib )
-"
-RDEPEND="${DEPEND}
-   extended-host-patterns? ( dev-lang/perl )
-   selinux? ( sec-policy/selinux-privoxy )
-   tools? (
-   net-misc/curl
-   dev-lang/perl
-   )
-"
-REQUIRED_USE="
-   compression? ( zlib )
-   toggle? ( editor )
-"
-
-S="${WORKDIR}/${P%_*}-${PRIVOXY_STATUS}"
-
-PATCHES=( "${FILESDIR}"/${PN}-3.0.19-gentoo.patch )
-
-pkg_pretend() {
-   if ! use threads; then
-   ewarn
-   ewarn "Privoxy may be very slow without threads support, 
consider to enable them."
-   ewarn "See also 
http://www.privoxy.org/faq/trouble.html#GENTOO-RICERS;
-   ewarn
-   fi
-}
-
-pkg_setup() {
-   enewgroup privoxy
-   enewuser privoxy -1 -1 /etc/privoxy privoxy
-}
-
-src_prepare() {
-   default
-   mv configure.in configure.ac || die
-   sed -i "s|/p\.p/|/config.privoxy.org/|g" 
tools/privoxy-regression-test.pl || die
-
-   # autoreconf needs to be called even if we don't modify any autotools 
source files
-   # See main makefile
-   eautoreconf
-}
-
-src_configure() {
-   # --with-debug only enables debug CFLAGS
-   # --with-docbook and --with-db2html and their deps are useless,
-   #   since docs are already pregenerated in the source tarball
-   econf \
-   --sysconfdir=/etc/privoxy \
-   --enable-dynamic

[gentoo-commits] repo/gentoo:master commit in: net-proxy/privoxy/files/, net-proxy/privoxy/

2021-01-06 Thread Andrew Savchenko

commit: 6eaffccd00555e127e54f6a9684a7fc0b15d10f7
Author: Andrew Savchenko  gentoo  org>
AuthorDate: Wed Jan  6 18:02:35 2021 +
Commit:     Andrew Savchenko  gentoo  org>
CommitDate: Wed Jan  6 18:06:01 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6eaffccd

net-proxy/privoxy: version bump

Update to 3.0.29:
- This fixes multiple security bugs
- Add support for brotli compressed data
- Add support for HTTPS inspection using either mbedtls or openssl,
  libressl is deliberately not added since it is pending removal
  from the tree.

Bug: https://bugs.gentoo.org/758428
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Andrew Savchenko  gentoo.org>

 net-proxy/privoxy/Manifest |   1 +
 .../privoxy/files/privoxy-3.0.29-gentoo.patch  | 118 +
 net-proxy/privoxy/metadata.xml |  11 +-
 net-proxy/privoxy/privoxy-3.0.29.ebuild| 145 +
 4 files changed, 272 insertions(+), 3 deletions(-)

diff --git a/net-proxy/privoxy/Manifest b/net-proxy/privoxy/Manifest
index 1aba478ea92..cb6d11ed6c1 100644
--- a/net-proxy/privoxy/Manifest
+++ b/net-proxy/privoxy/Manifest
@@ -1 +1,2 @@
 DIST privoxy-3.0.28-stable-src.tar.gz 1753809 BLAKE2B 
1ea0d6339c96bd294eadc124ebac252c43dcdc062709868668959bdb4f959267afb2ec7f27fc0d58db3655102f2412f1c8acb273267d447271465ac21f7a9be4
 SHA512 
5d58024ae73d623a2b8fb2ac49e18f047dfe252c9441388f025cf888c0e4b11546b8796cfa559759ee137002b1b31b30ad28b356ae226836454f32591eb835fc
+DIST privoxy-3.0.29-stable-src.tar.gz 1830550 BLAKE2B 
ecd0a78f2c4a3a6006fb229a7115a3c1b5041508233ef36d7995607984e5f9fbf7f117aa4611f384eed4434a6a3204a7f31a33857112d5f1f0a71fddb2134df3
 SHA512 
2f483a37d697738815f4c58a775fbf116a34ac5e0e74d19814252c5ff1572350181066d468327189faf20c92d808d551b0017a9525ec98276330ee539554c1ba

diff --git a/net-proxy/privoxy/files/privoxy-3.0.29-gentoo.patch 
b/net-proxy/privoxy/files/privoxy-3.0.29-gentoo.patch
new file mode 100644
index 000..572d03439b9
--- /dev/null
+++ b/net-proxy/privoxy/files/privoxy-3.0.29-gentoo.patch
@@ -0,0 +1,118 @@
+diff '--color=auto' -Naur privoxy-3.0.29-stable.orig/config 
privoxy-3.0.29-stable/config
+--- privoxy-3.0.29-stable.orig/config  2020-11-28 13:19:00.0 +0300
 privoxy-3.0.29-stable/config   2021-01-06 19:44:52.824746891 +0300
+@@ -259,7 +259,7 @@
+ #
+ #  No trailing "/", please.
+ #
+-confdir .
++confdir /etc/privoxy
+ #
+ #  2.2. templdir
+ #  ==
+@@ -344,7 +344,7 @@
+ #
+ #  No trailing "/", please.
+ #
+-logdir .
++logdir /var/log/privoxy
+ #
+ #  2.5. actionsfile
+ #  =
+@@ -477,7 +477,7 @@
+ #  require additional software to do it. For details, please
+ #  refer to the documentation for your operating system.
+ #
+-logfile logfile
++logfile privoxy.log
+ #
+ #  2.8. trustfile
+ #  ===
+diff '--color=auto' -Naur privoxy-3.0.29-stable.orig/default.action.master 
privoxy-3.0.29-stable/default.action.master
+--- privoxy-3.0.29-stable.orig/default.action.master   2020-11-28 
13:19:00.0 +0300
 privoxy-3.0.29-stable/default.action.master2021-01-06 
19:44:52.825746892 +0300
+@@ -559,7 +559,7 @@
+ +client-header-tagger{image-requests} \
+ +client-header-tagger{range-requests} \
+ +hide-from-header{block} \
+-+set-image-blocker{pattern} \
+++set-image-blocker{blank} \
+ }
+ standard.Cautious
+ 
+@@ -582,7 +582,7 @@
+ +hide-from-header{block} \
+ +hide-referrer{conditional-block} \
+ +session-cookies-only \
+-+set-image-blocker{pattern} \
+++set-image-blocker{blank} \
+ }
+ standard.Medium
+ 
+@@ -622,7 +622,7 @@
+ +hide-referrer{conditional-block} \
+ +limit-connect{,} \
+ +overwrite-last-modified{randomize} \
+-+set-image-blocker{pattern} \
+++set-image-blocker{blank} \
+ }
+ standard.Advanced
+ 
+diff '--color=auto' -Naur privoxy-3.0.29-stable.orig/GNUmakefile.in 
privoxy-3.0.29-stable/GNUmakefile.in
+--- privoxy-3.0.29-stable.orig/GNUmakefile.in  2020-11-28 13:19:00.0 
+0300
 privoxy-3.0.29-stable/GNUmakefile.in   2021-01-06 19:45:20.535798829 
+0300
+@@ -62,8 +62,8 @@
+ MAN_DEST = $(MAN_DIR)/man1
+ MAN_PAGE = privoxy.1
+ SHARE_DEST   = @datadir@
+-DOC_DEST = $(SHARE_DEST)/doc/privoxy
+-VAR_DEST = @localstatedir@
++DOC_DEST = @docdir@
++VAR_DEST = /var
+ LOGS_DEST= $(VAR_DEST)/log/privoxy
+ PIDS_DEST= $(VAR_DEST)/run
+ 
+@@ -890,8 +890,6 @@
+   $(INSTALL) $(INSTALL_T) $(DOK_WEB)/man-page/*html 
$(DESTDIR)$$DOC/man-page;\
+   $(INSTALL) $(INSTALL_T) $(DOK_WEB)/privoxy-index.html 
$(DESTDIR)$$DOC/index.html;\
+   $(INSTALL) $(INSTALL_T) AUTHORS $(DESTDIR)$$DOC;\
+-  $(INSTALL) $(INSTALL_T) LICENSE $(DESTDIR)$$DOC;\
+-  $(INSTALL) $(INSTALL_T) LICENSE.GPLv3 $(DESTDIR)$$DOC;\
+   $(INSTALL) $(INSTALL_T) README $(DESTDIR)$$DOC;\
+   $(INSTALL) $(INSTALL

[gentoo-commits] repo/gentoo:master commit in: net-fs/openafs/

2021-01-15 Thread Andrew Savchenko

commit: bf5eac4aac7fa7aa1a81598a9b4468e498355b0d
Author: Andrew Savchenko  gentoo  org>
AuthorDate: Fri Jan 15 21:32:17 2021 +
Commit:     Andrew Savchenko  gentoo  org>
CommitDate: Fri Jan 15 21:37:42 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf5eac4a

net-fs/openafs: 1.8.7 version bump

This update fixes critical bug in the generation of Rx connection IDs
that prevent Rx clients started after 14 Jan 2021 08:25:36 AM UTC
from being able to successfully make connections.

Bug: https://bugs.gentoo.org/765463
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Andrew Savchenko  gentoo.org>

 net-fs/openafs/Manifest |   3 +
 net-fs/openafs/openafs-1.8.7.ebuild | 343 
 2 files changed, 346 insertions(+)

diff --git a/net-fs/openafs/Manifest b/net-fs/openafs/Manifest
index d37d811001a..af422ef675c 100644
--- a/net-fs/openafs/Manifest
+++ b/net-fs/openafs/Manifest
@@ -1,3 +1,6 @@
 DIST openafs-1.8.6-doc.tar.bz2 3769160 BLAKE2B 
c5fe08fbb2cdab48dd691a7e228cc590644e05b22c87afef24a5fb35aa12e379d8d49d4b920cb84dd23b4e1f1a04512078f3018808531cdc7180778885bdc466
 SHA512 
7525325a5ef6e1ceada7075f489a03e1d250d3cbd8b8e83a25c8e40d506d50cbf10c2b28b682f2f9663a8cd450cb70891a04e6dbc296347945ee2454b138d971
 DIST openafs-1.8.6-src.tar.bz2 14874336 BLAKE2B 
a83f5bfe543b3797fa6d80ebc96cacb1a15f58cf5495d1c693593bc6d24a9f08678693080b3920a97afebe937689dd0ad08bbca95c996af0d2c83935974d3613
 SHA512 
0800c3825d4e0384b43cb801fc898e9255a0fa0d0baf1f231fbf383317919cc30f68526eeec803d2dc21fc7a6b55155ea4cb23197604c70e89ecf4d520b85ec1
+DIST openafs-1.8.7-doc.tar.bz2 3808045 BLAKE2B 
8ded75239dd59633297ee4208a0f3f018486b5b5b71fda91229583fd2d6a7743bbbeba280e61ff91d602617fc47944105b06a5c0610b0c89c808ecba38af7f9c
 SHA512 
6d087320ab6681686b6afb78621b21eaec26b91dbd03a13df447ad9f0ce897332ac378b38bf1abc590575d82d8cb22757249e60a2407e4ad498d46c083632e0d
+DIST openafs-1.8.7-src.tar.bz2 15059909 BLAKE2B 
89aacc48100d3eabbec45acca3911fbd823c029a30e79ad16564dcc3646b9bbadb60a528f142fc907de0d4eb2831d922d8146cdba72c02f4e8db9ab806c84d86
 SHA512 
12d5aa9177dde10e504f71b4b1ae19be0b0c52e8031e0f5afacce4a2c3f2321970af65591edab6145f7400f6276acd7e8624aa66e816d2394324e2ef5c403c01
 DIST openafs-patches-20200913.tar.xz 28392 BLAKE2B 
5e8b8f2554453abdb0a84dd45d8e719cc60127224ee6ebeaca4fcddba3d38309d7e5070c43659d10301ab9eaf371ba7dcbcf12950166626a7d359d2a39c922c6
 SHA512 
ec0aa800b945de2fe70d949259c89a97660bdbfee3c3e43d886a5c2f6b7c530252a53ff8f196f6e80a9a657bb81f26a6937a1bec3fafbd2c70322b313a712820
+DIST openafs-patches-20210116.tar.xz 67300 BLAKE2B 
aaafa197d1be1e9d89685fe5193a4682ea9e5e5c1c3227963a97ca7a98e6ab5e855ee65d615a31162559b30ae5867fde6ceeec1055af1a375e73b9fa25654de5
 SHA512 
06e9e1b65fceda34a197556aba1a05eabb630723fc17c5060d5e2a054e60ab8c5195d5c80eff3d3444bcdca40b7115da9143f5b8100659061446038ad4a79007

diff --git a/net-fs/openafs/openafs-1.8.7.ebuild 
b/net-fs/openafs/openafs-1.8.7.ebuild
new file mode 100644
index 000..afee31697da
--- /dev/null
+++ b/net-fs/openafs/openafs-1.8.7.ebuild
@@ -0,0 +1,343 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools linux-mod flag-o-matic pam systemd tmpfiles toolchain-funcs
+
+MY_PV=${PV/_/}
+MY_P="${PN}-${MY_PV}"
+PVER=20210116
+KERNEL_LIMIT=5.10
+
+DESCRIPTION="The OpenAFS distributed file system"
+HOMEPAGE="https://www.openafs.org/;
+# We always d/l the doc tarball as man pages are not USE=doc material
+[[ ${PV} == *_pre* ]] && MY_PRE="candidate/" || MY_PRE=""
+SRC_URI="
+   https://openafs.org/dl/openafs/${MY_PRE}${MY_PV}/${MY_P}-src.tar.bz2
+   https://openafs.org/dl/openafs/${MY_PRE}${MY_PV}/${MY_P}-doc.tar.bz2
+   https://dev.gentoo.org/~bircoph/afs/${PN}-patches-${PVER}.tar.xz
+"
+
+LICENSE="IBM BSD openafs-krb5-a APSL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+IUSE="apidoc bitmap-later debug doc fuse kauth kerberos +modules +namei
+ncurses perl +pthreaded-ubik +supergroups tsm ubik-read-while-write"
+
+BDEPEND="
+   dev-lang/perl
+   sys-devel/flex
+   virtual/yacc
+   apidoc? (
+   app-doc/doxygen[dot]
+   media-gfx/graphviz
+   )
+   doc? (
+   dev-libs/libxslt
+   || (
+   dev-java/fop
+   app-text/dblatex
+   app-text/docbook-sgml-utils[jadetex]
+   )
+   )
+   perl? ( dev-lang/swig )"
+DEPEND="
+   !net-fs/openafs-kernel
+   virtual/libintl
+   amd64? ( tsm? ( app-backup/tsm ) )
+   doc? (
+   app-text/docbook-xsl-stylesheets
+   app-text/docbook-xml-dtd:4.3
+   )
+   fuse? ( sys-fs/fuse:0= )
+   kauth? ( sys-libs/pam )
+   kerberos? ( virtual/

[gentoo-commits] repo/gentoo:master commit in: dev-util/pretrace/, dev-util/pretrace/files/

2021-01-14 Thread Andrew Savchenko

commit: 077594f6d42c9a0115783ce07d533d8198c4df64
Author: Andrew Savchenko  gentoo  org>
AuthorDate: Thu Jan 14 17:03:12 2021 +
Commit:     Andrew Savchenko  gentoo  org>
CommitDate: Thu Jan 14 17:10:56 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=077594f6

dev-util/pretrace: fix QA issues

- Align build patch to -p1 (bug 651256)
- Update homepage and src uri
- Install docs to ${PN}-${PVR} instead of ${PN}-${PV}
- Do not compress man pages
- Provide soname for the library

Closes: https://bugs.gentoo.org/651256
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Andrew Savchenko  gentoo.org>

 dev-util/pretrace/Manifest   |  1 +
 dev-util/pretrace/files/pretrace-0.4-build.patch |  4 +--
 dev-util/pretrace/files/pretrace-0.4-qa.patch| 39 
 dev-util/pretrace/pretrace-0.4-r2.ebuild | 31 +++
 4 files changed, 73 insertions(+), 2 deletions(-)

diff --git a/dev-util/pretrace/Manifest b/dev-util/pretrace/Manifest
index 07fb758cb0f..97c797900f1 100644
--- a/dev-util/pretrace/Manifest
+++ b/dev-util/pretrace/Manifest
@@ -1 +1,2 @@
 DIST libpretrace-0.4.tar.gz 7370 BLAKE2B 
08fb2022433af807675ef089dcf1fbd642c165b353959f81547c2f65fd9e60c49b7494c661f81698c738bd27a3cdbd28d6a227589ef7a2906c5fa930d9709fc6
 SHA512 
64d1041ce398c73342ed371ebac4f656620c9ae4bc6da1b56b43bccd9898564a44dfe7bfaf3d4c865b89c5924b9d03aa21f393dcbafc185f84ac4b9ea2eb17d8
+DIST pretrace-0.4.tar.xz 6988 BLAKE2B 
a9b05aa106142fa090e09bd6c07d2972be72453e1bfe5a15a0b67c8bb5c3a20c2e19ad03dc738f24b6bcbee5629ad47438cdf04b1eab8c1d757fe4d62ee59a9e
 SHA512 
cdd70b9b06451c0142c79b50f2264c034bdc8d815edaaeb78bbde55127a31a68e49df7ba2d6599bd108f9161f768afca84e85a917ef7353b1ace9e2256be84ef

diff --git a/dev-util/pretrace/files/pretrace-0.4-build.patch 
b/dev-util/pretrace/files/pretrace-0.4-build.patch
index 4d7056fa83f..9db1cb241e7 100644
--- a/dev-util/pretrace/files/pretrace-0.4-build.patch
+++ b/dev-util/pretrace/files/pretrace-0.4-build.patch
@@ -2,8 +2,8 @@ fix building with newer glibc
 
 http://bugs.gentoo.org/227923
 
 pretrace.h
-+++ pretrace.h
+--- a/pretrace.h
 b/pretrace.h
 @@ -20,3 +20,8 @@
  #include 
  # define RANDOMIZE(x) { struct timeval tv; gettimeofday(, NULL); x = 
tv.tv_usec; }

diff --git a/dev-util/pretrace/files/pretrace-0.4-qa.patch 
b/dev-util/pretrace/files/pretrace-0.4-qa.patch
new file mode 100644
index 000..8cf40e796a1
--- /dev/null
+++ b/dev-util/pretrace/files/pretrace-0.4-qa.patch
@@ -0,0 +1,39 @@
+--- pretrace-0.4/Makefile.orig 2021-01-14 13:31:45.950615134 +0300
 pretrace-0.4/Makefile  2021-01-14 13:32:04.940676578 +0300
+@@ -2,14 +2,14 @@
+ # $Id: Makefile,v 1.1 2005/07/27 07:45:37 taviso Exp $
+ #
+ 
+-VERSION=0.4
++VERSION?=0.4
+ PREFIX=/usr/local
+ DOCDIR=$(PREFIX)/share/doc/pretrace-$(VERSION)
+ LIBDIR=$(PREFIX)/lib
+ BINDIR=$(PREFIX)/bin
+ MANDIR=$(PREFIX)/share/man
+ 
+-all: libpretrace.so ptgenmap doc
++all: libpretrace.so ptgenmap
+   @echo 'libpretrace.so has been built, please see README for 
instructions.'
+   @echo 'type `make install` to install to $(PREFIX)'
+ 
+@@ -26,7 +26,7 @@
+   $(CC) $(CFLAGS) -Wall -g -fPIC -c trie.c
+ 
+ libpretrace.so: libpretrace.o trie.o
+-  $(CC) $(CFLAGS) $(LDFLAGS) -g -shared -o libpretrace.so libpretrace.o 
trie.o
++  $(CC) $(CFLAGS) $(LDFLAGS) -g -shared -Wl,-soname,libpretrace.so -o 
libpretrace.so libpretrace.o trie.o
+ 
+ doc:
+   gzip -9c pretrace.3 > pretrace.3.gz
+@@ -38,8 +41,8 @@
+   install -m 0755 libpretrace.so $(LIBDIR)
+   install -m 0755 ptgenmap $(BINDIR)
+   install -m 0644 README pretrace.conf.example ChangeLog $(DOCDIR)
+-  install -m 0644 pretrace.3.gz $(MANDIR)/man3
+-  install -m 0644 ptgenmap.8.gz $(MANDIR)/man8
++  install -m 0644 pretrace.3 $(MANDIR)/man3
++  install -m 0644 ptgenmap.8 $(MANDIR)/man8
+ 
+ clean:
+   -rm -f libpretrace.so libpretrace.o trie.o ptgenmap.o ptgenmap *~

diff --git a/dev-util/pretrace/pretrace-0.4-r2.ebuild 
b/dev-util/pretrace/pretrace-0.4-r2.ebuild
new file mode 100644
index 000..c6ff1edc585
--- /dev/null
+++ b/dev-util/pretrace/pretrace-0.4-r2.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit readme.gentoo-r1
+
+DESCRIPTION="start dynamically linked applications under debugging environment"
+HOMEPAGE="https://github.com/robholland/pretrace;
+SRC_URI="https://dev.gentoo.org/~bircoph/distfiles/${P}.tar.xz;
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+DOC_CONTENTS="Remember to execute ptgenmap after modifying pretrace.conf"
+
+PATCHES=(
+   "${FILESDIR}"/${P}--as-needed.diff
+   "${FILESDIR}"/${P}-build.patch #227923
+   "${FILESDIR}"/${P}-qa.patch
+)
+
+src_install() {
+   dodir /usr/bin /usr/

[gentoo-commits] repo/gentoo:master commit in: dev-util/pretrace/

2021-01-14 Thread Andrew Savchenko

commit: c914909238f92dbbd4e91bfa5eee1d444d034504
Author: Andrew Savchenko  gentoo  org>
AuthorDate: Thu Jan 14 17:09:39 2021 +
Commit:     Andrew Savchenko  gentoo  org>
CommitDate: Thu Jan 14 17:10:59 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c9149092

dev-util/pretrace: remove old

Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Andrew Savchenko  gentoo.org>

 dev-util/pretrace/Manifest   |  1 -
 dev-util/pretrace/pretrace-0.4-r1.ebuild | 33 
 2 files changed, 34 deletions(-)

diff --git a/dev-util/pretrace/Manifest b/dev-util/pretrace/Manifest
index 97c797900f1..12e3801543f 100644
--- a/dev-util/pretrace/Manifest
+++ b/dev-util/pretrace/Manifest
@@ -1,2 +1 @@
-DIST libpretrace-0.4.tar.gz 7370 BLAKE2B 
08fb2022433af807675ef089dcf1fbd642c165b353959f81547c2f65fd9e60c49b7494c661f81698c738bd27a3cdbd28d6a227589ef7a2906c5fa930d9709fc6
 SHA512 
64d1041ce398c73342ed371ebac4f656620c9ae4bc6da1b56b43bccd9898564a44dfe7bfaf3d4c865b89c5924b9d03aa21f393dcbafc185f84ac4b9ea2eb17d8
 DIST pretrace-0.4.tar.xz 6988 BLAKE2B 
a9b05aa106142fa090e09bd6c07d2972be72453e1bfe5a15a0b67c8bb5c3a20c2e19ad03dc738f24b6bcbee5629ad47438cdf04b1eab8c1d757fe4d62ee59a9e
 SHA512 
cdd70b9b06451c0142c79b50f2264c034bdc8d815edaaeb78bbde55127a31a68e49df7ba2d6599bd108f9161f768afca84e85a917ef7353b1ace9e2256be84ef

diff --git a/dev-util/pretrace/pretrace-0.4-r1.ebuild 
b/dev-util/pretrace/pretrace-0.4-r1.ebuild
deleted file mode 100644
index 998da63f105..000
--- a/dev-util/pretrace/pretrace-0.4-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit readme.gentoo-r1
-
-DESCRIPTION="start dynamically linked applications under debugging environment"
-HOMEPAGE="http://dev.inversepath.com/trac/pretrace;
-SRC_URI="http://dev.inversepath.com/pretrace/libpretrace-${PV}.tar.gz;
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-S="${WORKDIR}/lib${P}"
-
-DOC_CONTENTS="Remember to execute ptgenmap after modifying pretrace.conf"
-
-PATCHES=(
-   "${FILESDIR}"/${P}--as-needed.diff
-   "${FILESDIR}"/${P}-build.patch #227923
-)
-
-src_install() {
-   dodir /usr/bin /usr/share/man/man3 /usr/share/man/man8
-   emake DESTDIR="${D}" LIBDIR="${D}/usr/$(get_libdir)" PREFIX="${D}/usr" 
install
-   readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-   readme.gentoo_print_elog
-}

[gentoo-commits] repo/gentoo:master commit in: media-libs/imlib2/

2021-01-16 Thread Andrew Savchenko

commit: 2eae9d631d6772e15fd57a10624d6d725dee84ff
Author: Andrew Savchenko  gentoo  org>
AuthorDate: Sat Jan 16 12:34:55 2021 +
Commit:     Andrew Savchenko  gentoo  org>
CommitDate: Sat Jan 16 12:59:46 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2eae9d63

media-libs/imlib2: pick an orphaned package

Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Andrew Savchenko  gentoo.org>

 media-libs/imlib2/metadata.xml | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/media-libs/imlib2/metadata.xml b/media-libs/imlib2/metadata.xml
index 51aeb95e5ca..51478a0dd18 100644
--- a/media-libs/imlib2/metadata.xml
+++ b/media-libs/imlib2/metadata.xml
@@ -1,7 +1,10 @@
 
 http://www.gentoo.org/dtd/metadata.dtd;>
 
-   
+   
+   birc...@gentoo.org
+       Andrew Savchenko
+   

Use the X window system
Bzip2 loader support

[gentoo-commits] repo/gentoo:master commit in: media-libs/imlib2/

2021-01-16 Thread Andrew Savchenko

commit: 1fd2999b763351713371ce1babb60a4ca660d11f
Author: Andrew Savchenko  gentoo  org>
AuthorDate: Sat Jan 16 12:42:56 2021 +
Commit:     Andrew Savchenko  gentoo  org>
CommitDate: Sat Jan 16 12:59:52 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1fd2999b

media-libs/imlib2: version bump

Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Andrew Savchenko  gentoo.org>

 media-libs/imlib2/Manifest|  1 +
 media-libs/imlib2/imlib2-1.7.1.ebuild | 78 +++
 2 files changed, 79 insertions(+)

diff --git a/media-libs/imlib2/Manifest b/media-libs/imlib2/Manifest
index 3fed7f9dc4f..386f7e92f85 100644
--- a/media-libs/imlib2/Manifest
+++ b/media-libs/imlib2/Manifest
@@ -1 +1,2 @@
 DIST imlib2-1.6.1.tar.gz 1038614 BLAKE2B 
89751ea5548e86b810d621cbcd5b3d37c7ddbedc9e634095f61d91779c1e96d50f87842136687e2b9cefa249b17fc98df61d07b368c7c4f466687ed38f2ed70f
 SHA512 
0c6d874973c46c7e96e49fc391d463ec8c7c5ce9de682600cb4e28ca81ff0366a02055cbec2a2b743204051243d20b2316ab602b98df9d03dcf319297f7e6a13
+DIST imlib2-1.7.1.tar.bz2 893631 BLAKE2B 
637bf70ea223a63c51def0fac4102683a090de41a1f5904d6232fd2fa004915e3dcde54eac51d16532d2df83a0f8df127266766ac3700ae2948d39fefef512b8
 SHA512 
36e457855da0f129c7e7ba3dfcb44162b6624b1d56df5f84448495a96fe9ad1ce3e6c628222630be7274476722c4feaa8e1648d1e463439ca758e66ce9645970

diff --git a/media-libs/imlib2/imlib2-1.7.1.ebuild 
b/media-libs/imlib2/imlib2-1.7.1.ebuild
new file mode 100644
index 000..4817a18e5c5
--- /dev/null
+++ b/media-libs/imlib2/imlib2-1.7.1.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib-minimal toolchain-funcs
+
+DESCRIPTION="Version 2 of an advanced replacement library for libraries like 
libXpm"
+HOMEPAGE="https://www.enlightenment.org/
+   https://sourceforge.net/projects/enlightenment/files/imlib2-src/;
+SRC_URI="https://downloads.sourceforge.net/enlightenment/${P}.tar.bz2;
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc 
~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris 
~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="+X bzip2 cpu_flags_x86_mmx cpu_flags_x86_sse2 doc +gif +jpeg mp3 +png 
+shm
+   static-libs +tiff +webp zlib"
+
+REQUIRED_USE="shm? ( X )"
+
+RDEPEND="
+   media-libs/freetype:2[${MULTILIB_USEDEP}]
+   bzip2? ( app-arch/bzip2[${MULTILIB_USEDEP}] )
+   gif? ( media-libs/giflib[${MULTILIB_USEDEP}] )
+   jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] )
+   mp3? ( media-libs/libid3tag[${MULTILIB_USEDEP}] )
+   png? ( >=media-libs/libpng-1.6.10:0=[${MULTILIB_USEDEP}] )
+   tiff? ( >=media-libs/tiff-4.0.4:0[${MULTILIB_USEDEP}] )
+   webp? ( media-libs/libwebp:=[${MULTILIB_USEDEP}] )
+   X? (
+   x11-libs/libX11[${MULTILIB_USEDEP}]
+   x11-libs/libXext[${MULTILIB_USEDEP}]
+   )
+   zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )
+   !

[gentoo-commits] repo/gentoo:master commit in: media-plugins/imlib2_loaders/, media-plugins/imlib2_loaders/files/

2021-01-16 Thread Andrew Savchenko

commit: e26d3281554a06cd8d22d181ed6942768de3a18a
Author: Andrew Savchenko  gentoo  org>
AuthorDate: Sat Jan 16 12:53:35 2021 +
Commit:     Andrew Savchenko  gentoo  org>
CommitDate: Sat Jan 16 13:00:01 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e26d3281

media-plugins/imlib2_loaders: version bump

Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Andrew Savchenko  gentoo.org>

 media-plugins/imlib2_loaders/Manifest  |  1 +
 .../files/imlib2_loaders-1.7.1-loader-api.patch| 36 
 .../imlib2_loaders/imlib2_loaders-1.7.1.ebuild | 38 ++
 3 files changed, 75 insertions(+)

diff --git a/media-plugins/imlib2_loaders/Manifest 
b/media-plugins/imlib2_loaders/Manifest
index 6498e5921da..39671ffc852 100644
--- a/media-plugins/imlib2_loaders/Manifest
+++ b/media-plugins/imlib2_loaders/Manifest
@@ -1 +1,2 @@
 DIST imlib2_loaders-1.6.1.tar.gz 375642 BLAKE2B 
20f4213e3d84c333faff82910f4f402524e50f567cddcce225678c0706d04c5a9520d8a54956f50be4d42fd231f317573ec091864f1d526336aacc8f7e0ae399
 SHA512 
1017b3587b2815d8347e9aef3f11649bdaadd48be10fe89d6e6eb8cb1d022723d414869cf12a2bff3eaa2f14c12ffd424767993e07990f8fa3ce5062ab0844fa
+DIST imlib2_loaders-1.7.1.tar.bz2 302348 BLAKE2B 
8f73daa5b70d7122c136a001df920649a438edc60d4e7e94b691dfecc0864b66c321c676fb78a2f9e990b842d31fd5f95dcbacf232d6b9809382173449f86673
 SHA512 
5752768aa61c36e8f8ae5ff9219f950ba7b1561629bb21e4b4e16890d0fa904e93899e64152f05c6d7190553404336ec33b1d88b0cbec46c61a26598e27d449d

diff --git 
a/media-plugins/imlib2_loaders/files/imlib2_loaders-1.7.1-loader-api.patch 
b/media-plugins/imlib2_loaders/files/imlib2_loaders-1.7.1-loader-api.patch
new file mode 100644
index 000..981b1ce1e9b
--- /dev/null
+++ b/media-plugins/imlib2_loaders/files/imlib2_loaders-1.7.1-loader-api.patch
@@ -0,0 +1,36 @@
+diff '--color=auto' -Naurd 
imlib2_loaders-1.7.1.orig/src/modules/loaders/loader_common.h 
imlib2_loaders-1.7.1/src/modules/loaders/loader_common.h
+--- imlib2_loaders-1.7.1.orig/src/modules/loaders/loader_common.h  
2020-05-21 06:49:09.0 +0300
 imlib2_loaders-1.7.1/src/modules/loaders/loader_common.h   2021-01-16 
15:11:53.229675567 +0300
+@@ -4,6 +4,7 @@
+ #include "config.h"
+ #include "common.h"
+ #include "image.h"
++#include "loaders.h"
+ 
+ __EXPORT__ char load(ImlibImage * im, ImlibProgressFunction progress,
+  char progress_granularity, char load_data);
+diff '--color=auto' -Naurd 
imlib2_loaders-1.7.1.orig/src/modules/loaders/loaders.h 
imlib2_loaders-1.7.1/src/modules/loaders/loaders.h
+--- imlib2_loaders-1.7.1.orig/src/modules/loaders/loaders.h1970-01-01 
03:00:00.0 +0300
 imlib2_loaders-1.7.1/src/modules/loaders/loaders.h 2020-07-28 
21:13:51.0 +0300
+@@ -0,0 +1,21 @@
++#ifndef __LOADERS
++#define __LOADERS 1
++
++#include "image.h"
++
++struct _imlibloader {
++   char   *file;
++   int num_formats;
++   char  **formats;
++   void   *handle;
++   char(*load)(ImlibImage * im,
++   ImlibProgressFunction progress,
++   char progress_granularity, char load_data);
++   char(*save)(ImlibImage * im,
++   ImlibProgressFunction progress,
++   char progress_granularity);
++   ImlibLoader*next;
++   int (*load2)(ImlibImage * im, int load_data);
++};
++
++#endif /* __LOADERS */

diff --git a/media-plugins/imlib2_loaders/imlib2_loaders-1.7.1.ebuild 
b/media-plugins/imlib2_loaders/imlib2_loaders-1.7.1.ebuild
new file mode 100644
index 000..06e19e93bd3
--- /dev/null
+++ b/media-plugins/imlib2_loaders/imlib2_loaders-1.7.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Additional image loaders for Imlib2"
+HOMEPAGE="https://www.enlightenment.org/
+   https://sourceforge.net/projects/enlightenment/files/imlib2-src/;
+SRC_URI="https://downloads.sourceforge.net/enlightenment/${P}.tar.bz2;
+
+LICENSE="|| ( BSD GPL-2 )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux 
~ppc-macos ~x64-solaris ~x86-solaris"
+IUSE="eet xcf"
+
+RDEPEND=">=media-libs/imlib2-${PV}
+   eet? ( dev-libs/efl[eet] )"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}/${P}-loader-api.patch" )
+
+src_configure() {
+   local myconf=(
+   --disable-static
+   $(use_enable eet)
+   $(use_enable xcf)
+   )
+
+   econf "${myconf[@]}"
+}
+
+src_install() {
+   V=1 emake install DESTDIR="${D}"
+   einstalldocs
+
+   find "${D}" -name '*.la' -delete || die
+}

[gentoo-commits] repo/gentoo:master commit in: media-plugins/imlib2_loaders/

2021-01-16 Thread Andrew Savchenko

commit: 70a1a45b8c98653ae0b65ae1623a5c12d021cfb8
Author: Andrew Savchenko  gentoo  org>
AuthorDate: Sat Jan 16 12:47:57 2021 +
Commit:     Andrew Savchenko  gentoo  org>
CommitDate: Sat Jan 16 12:59:57 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=70a1a45b

media-plugins/imlib2_loaders: pick an orphaned package

Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Andrew Savchenko  gentoo.org>

 media-plugins/imlib2_loaders/metadata.xml | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/media-plugins/imlib2_loaders/metadata.xml 
b/media-plugins/imlib2_loaders/metadata.xml
index b55a612ff94..bf2ad974a04 100644
--- a/media-plugins/imlib2_loaders/metadata.xml
+++ b/media-plugins/imlib2_loaders/metadata.xml
@@ -1,7 +1,10 @@
 
 http://www.gentoo.org/dtd/metadata.dtd;>
 
-  
+  
+birc...@gentoo.org
+Andrew Savchenko
+  
   
 Enable Eet image loader
 Enable XCF image loader

[gentoo-commits] repo/gentoo:master commit in: net-fs/openafs/

2021-01-16 Thread Andrew Savchenko

commit: 1a1cd139e785b68de5073046bc7b12df56b14d22
Author: Andrew Savchenko  gentoo  org>
AuthorDate: Sat Jan 16 21:00:30 2021 +
Commit:     Andrew Savchenko  gentoo  org>
CommitDate: Sat Jan 16 21:05:10 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a1cd139

net-fs/openafs: update kernel version check

OpenAFS-1.8.7 supports 5.10 kernel as well:
https://bugs.gentoo.org/765463#c10

Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Andrew Savchenko  gentoo.org>

 net-fs/openafs/openafs-1.8.7.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-fs/openafs/openafs-1.8.7.ebuild 
b/net-fs/openafs/openafs-1.8.7.ebuild
index afee31697da..9772a65a676 100644
--- a/net-fs/openafs/openafs-1.8.7.ebuild
+++ b/net-fs/openafs/openafs-1.8.7.ebuild
@@ -8,7 +8,7 @@ inherit autotools linux-mod flag-o-matic pam systemd tmpfiles 
toolchain-funcs
 MY_PV=${PV/_/}
 MY_P="${PN}-${MY_PV}"
 PVER=20210116
-KERNEL_LIMIT=5.10
+KERNEL_LIMIT=5.11
 
 DESCRIPTION="The OpenAFS distributed file system"
 HOMEPAGE="https://www.openafs.org/;

[gentoo-commits] repo/gentoo:master commit in: net-fs/openafs/

2021-01-20 Thread Andrew Savchenko

commit: 8b4d1b8ee7bad3ee3df2482875b5df484a12f4f1
Author: Andrew Savchenko  gentoo  org>
AuthorDate: Wed Jan 20 11:26:29 2021 +
Commit:     Andrew Savchenko  gentoo  org>
CommitDate: Wed Jan 20 11:29:18 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b4d1b8e

net-fs/openafs: remove old and broken version

Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Andrew Savchenko  gentoo.org>

 net-fs/openafs/Manifest |   3 -
 net-fs/openafs/openafs-1.8.6.ebuild | 343 
 2 files changed, 346 deletions(-)

diff --git a/net-fs/openafs/Manifest b/net-fs/openafs/Manifest
index af422ef675c..80a8020f345 100644
--- a/net-fs/openafs/Manifest
+++ b/net-fs/openafs/Manifest
@@ -1,6 +1,3 @@
-DIST openafs-1.8.6-doc.tar.bz2 3769160 BLAKE2B 
c5fe08fbb2cdab48dd691a7e228cc590644e05b22c87afef24a5fb35aa12e379d8d49d4b920cb84dd23b4e1f1a04512078f3018808531cdc7180778885bdc466
 SHA512 
7525325a5ef6e1ceada7075f489a03e1d250d3cbd8b8e83a25c8e40d506d50cbf10c2b28b682f2f9663a8cd450cb70891a04e6dbc296347945ee2454b138d971
-DIST openafs-1.8.6-src.tar.bz2 14874336 BLAKE2B 
a83f5bfe543b3797fa6d80ebc96cacb1a15f58cf5495d1c693593bc6d24a9f08678693080b3920a97afebe937689dd0ad08bbca95c996af0d2c83935974d3613
 SHA512 
0800c3825d4e0384b43cb801fc898e9255a0fa0d0baf1f231fbf383317919cc30f68526eeec803d2dc21fc7a6b55155ea4cb23197604c70e89ecf4d520b85ec1
 DIST openafs-1.8.7-doc.tar.bz2 3808045 BLAKE2B 
8ded75239dd59633297ee4208a0f3f018486b5b5b71fda91229583fd2d6a7743bbbeba280e61ff91d602617fc47944105b06a5c0610b0c89c808ecba38af7f9c
 SHA512 
6d087320ab6681686b6afb78621b21eaec26b91dbd03a13df447ad9f0ce897332ac378b38bf1abc590575d82d8cb22757249e60a2407e4ad498d46c083632e0d
 DIST openafs-1.8.7-src.tar.bz2 15059909 BLAKE2B 
89aacc48100d3eabbec45acca3911fbd823c029a30e79ad16564dcc3646b9bbadb60a528f142fc907de0d4eb2831d922d8146cdba72c02f4e8db9ab806c84d86
 SHA512 
12d5aa9177dde10e504f71b4b1ae19be0b0c52e8031e0f5afacce4a2c3f2321970af65591edab6145f7400f6276acd7e8624aa66e816d2394324e2ef5c403c01
-DIST openafs-patches-20200913.tar.xz 28392 BLAKE2B 
5e8b8f2554453abdb0a84dd45d8e719cc60127224ee6ebeaca4fcddba3d38309d7e5070c43659d10301ab9eaf371ba7dcbcf12950166626a7d359d2a39c922c6
 SHA512 
ec0aa800b945de2fe70d949259c89a97660bdbfee3c3e43d886a5c2f6b7c530252a53ff8f196f6e80a9a657bb81f26a6937a1bec3fafbd2c70322b313a712820
 DIST openafs-patches-20210116.tar.xz 67300 BLAKE2B 
aaafa197d1be1e9d89685fe5193a4682ea9e5e5c1c3227963a97ca7a98e6ab5e855ee65d615a31162559b30ae5867fde6ceeec1055af1a375e73b9fa25654de5
 SHA512 
06e9e1b65fceda34a197556aba1a05eabb630723fc17c5060d5e2a054e60ab8c5195d5c80eff3d3444bcdca40b7115da9143f5b8100659061446038ad4a79007

diff --git a/net-fs/openafs/openafs-1.8.6.ebuild 
b/net-fs/openafs/openafs-1.8.6.ebuild
deleted file mode 100644
index c76c6d0c78f..000
--- a/net-fs/openafs/openafs-1.8.6.ebuild
+++ /dev/null
@@ -1,343 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools linux-mod flag-o-matic pam systemd tmpfiles toolchain-funcs
-
-MY_PV=${PV/_/}
-MY_P="${PN}-${MY_PV}"
-PVER=20200913
-KERNEL_LIMIT=5.10
-
-DESCRIPTION="The OpenAFS distributed file system"
-HOMEPAGE="https://www.openafs.org/;
-# We always d/l the doc tarball as man pages are not USE=doc material
-[[ ${PV} == *_pre* ]] && MY_PRE="candidate/" || MY_PRE=""
-SRC_URI="
-   https://openafs.org/dl/openafs/${MY_PRE}${MY_PV}/${MY_P}-src.tar.bz2
-   https://openafs.org/dl/openafs/${MY_PRE}${MY_PV}/${MY_P}-doc.tar.bz2
-   https://dev.gentoo.org/~bircoph/afs/${PN}-patches-${PVER}.tar.xz
-"
-
-LICENSE="IBM BSD openafs-krb5-a APSL-2"
-SLOT="0"
-KEYWORDS="amd64 ~sparc x86 ~amd64-linux ~x86-linux"
-
-IUSE="apidoc bitmap-later debug doc fuse kauth kerberos +modules +namei
-ncurses perl +pthreaded-ubik +supergroups tsm ubik-read-while-write"
-
-BDEPEND="
-   dev-lang/perl
-   sys-devel/flex
-   virtual/yacc
-   apidoc? (
-   app-doc/doxygen[dot]
-   media-gfx/graphviz
-   )
-   doc? (
-   dev-libs/libxslt
-   || (
-   dev-java/fop
-   app-text/dblatex
-   app-text/docbook-sgml-utils[jadetex]
-   )
-   )
-   perl? ( dev-lang/swig )"
-DEPEND="
-   !net-fs/openafs-kernel
-   virtual/libintl
-   amd64? ( tsm? ( app-backup/tsm ) )
-   doc? (
-   app-text/docbook-xsl-stylesheets
-   app-text/docbook-xml-dtd:4.3
-   )
-   fuse? ( sys-fs/fuse:0= )
-   kauth? ( sys-libs/pam )
-   kerberos? ( virtual/krb5 )
-   ncurses? ( sys-libs/ncurses:0= )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=( "${WORKDIR}/gentoo/patches" )
-
-CONFIG_CHECK="~!AFS_FS KEYS

[gentoo-commits] repo/gentoo:master commit in: x11-wm/e16/

2021-01-17 Thread Andrew Savchenko

commit: 42904aa1d85bdaaef2d1de02428aca6497e008a4
Author: Andrew Savchenko  gentoo  org>
AuthorDate: Sun Jan 17 14:47:55 2021 +
Commit:     Andrew Savchenko  gentoo  org>
CommitDate: Sun Jan 17 14:47:55 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=42904aa1

x11-wm/e16: relax REQUIRED_USE constraints

REQUIRED_USE for alsa and pulseaudio only make sense with USE=sound.

Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Andrew Savchenko  gentoo.org>

 x11-wm/e16/e16-1.0.22.ebuild | 10 ++
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/x11-wm/e16/e16-1.0.22.ebuild b/x11-wm/e16/e16-1.0.22.ebuild
index cd17cb3f495..8490c84fa23 100644
--- a/x11-wm/e16/e16-1.0.22.ebuild
+++ b/x11-wm/e16/e16-1.0.22.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/enlightenment/${P}.tar.xz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+alsa audiofile container dbus debug +dialogs doc examples
 gnome libhack modules nls opengl +pango player pulseaudio +sndfile
 sound +themes xcomposite +xft xi2 xinerama xpresent +xrandr
@@ -18,9 +18,11 @@ sound +themes xcomposite +xft xi2 xinerama xpresent +xrandr
 REQUIRED_USE="
opengl? ( xcomposite )
pango? ( xft )
-   sound? ( ^^ ( alsa player pulseaudio ) )
-   alsa?   ( ^^ ( sndfile audiofile ) )
-   pulseaudio? ( ^^ ( sndfile audiofile ) )
+   sound? (
+   ^^ ( alsa player pulseaudio )
+   alsa?   ( ^^ ( sndfile audiofile ) )
+   pulseaudio? ( ^^ ( sndfile audiofile ) )
+   )
 "
 
 BDEPEND="

[gentoo-commits] repo/gentoo:master commit in: x11-wm/e16/

2021-01-17 Thread Andrew Savchenko

commit: 38d61e3a58de9bf45cd0e6af1261ce7ade03e868
Author: Andrew Savchenko  gentoo  org>
AuthorDate: Sun Jan 17 13:34:56 2021 +
Commit:     Andrew Savchenko  gentoo  org>
CommitDate: Sun Jan 17 13:40:05 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=38d61e3a

x11-wm/e16: version bump

- 1.0.22 version bump
- Add sound support via ALSA
- Improve sound-related USE flags handling

Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Andrew Savchenko  gentoo.org>

 x11-wm/e16/Manifest  |   1 +
 x11-wm/e16/e16-1.0.22.ebuild | 144 +++
 x11-wm/e16/metadata.xml  |   1 +
 3 files changed, 146 insertions(+)

diff --git a/x11-wm/e16/Manifest b/x11-wm/e16/Manifest
index 3afe17b7c0a..88a572a9594 100644
--- a/x11-wm/e16/Manifest
+++ b/x11-wm/e16/Manifest
@@ -1 +1,2 @@
 DIST e16-1.0.21.tar.xz 1440484 BLAKE2B 
ea9521d4939400e292e9e2be6e73770a48d966702897c30babfe036a655ef3c5d9766eca3867e1a84b8fbd934a05c4a0487239a78d641c41a6e93a19feeb70a2
 SHA512 
0f5984d3c3594bf94338c9b53c681cd40f8cc165a18d7d9e0e6202fdf237ace52d9aac9c5ba04f052f94dfd463dcf558b8015044b4d457114c19a7a27ac23723
+DIST e16-1.0.22.tar.xz 1442288 BLAKE2B 
7f102474f9054935ea15ed58c91f18613561eaad84c8398c410014a5dbfb2f7f5fd079399db4c6462096c9a351bd89e47fbd61d304ca99ec844806c26c97d6a9
 SHA512 
0ff40390a56f0dbd2219d9e4e665b1c1802801e552df3bd76fa71502ad2fb7466f2f175757b088b490fbc58e4196b362d6cf451ad43d5104849ac8ce2805299e

diff --git a/x11-wm/e16/e16-1.0.22.ebuild b/x11-wm/e16/e16-1.0.22.ebuild
new file mode 100644
index 000..cd17cb3f495
--- /dev/null
+++ b/x11-wm/e16/e16-1.0.22.ebuild
@@ -0,0 +1,144 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Enlightenment Window Manager (E16)"
+HOMEPAGE="https://www.enlightenment.org 
https://sourceforge.net/projects/enlightenment/;
+SRC_URI="mirror://sourceforge/enlightenment/${P}.tar.xz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+alsa audiofile container dbus debug +dialogs doc examples
+gnome libhack modules nls opengl +pango player pulseaudio +sndfile
+sound +themes xcomposite +xft xi2 xinerama xpresent +xrandr
++xrender +xsm +xsync zoom"
+
+REQUIRED_USE="
+   opengl? ( xcomposite )
+   pango? ( xft )
+   sound? ( ^^ ( alsa player pulseaudio ) )
+   alsa?   ( ^^ ( sndfile audiofile ) )
+   pulseaudio? ( ^^ ( sndfile audiofile ) )
+"
+
+BDEPEND="
+   nls? ( sys-devel/gettext )
+   virtual/pkgconfig
+"
+COMMON_DEPEND="
+   media-libs/freetype:2
+   media-libs/imlib2[X]
+   virtual/libiconv
+   x11-libs/libX11
+   x11-libs/libXext
+   x11-misc/xbitmaps
+   dbus? ( sys-apps/dbus )
+   opengl? (
+   media-libs/glu
+   media-libs/mesa
+   )
+   pango? (
+   dev-libs/glib:2
+   x11-libs/pango[X]
+   )
+   sound? (
+   alsa? ( media-libs/alsa-lib )
+   player? ( media-sound/alsa-utils )
+   pulseaudio? ( || (
+   media-sound/apulse[sdk]
+   media-sound/pulseaudio
+   ) )
+   audiofile? ( media-libs/audiofile:= )
+   sndfile? ( media-libs/libsndfile )
+   )
+   xcomposite? (
+   x11-libs/libXcomposite
+   x11-libs/libXdamage
+   x11-libs/libXfixes
+   )
+   xft? ( x11-libs/libXft )
+   xinerama? ( x11-libs/libXinerama )
+   xpresent? ( x11-libs/libXpresent )
+   xrandr? ( x11-libs/libXrandr )
+   xrender? ( x11-libs/libXrender )
+   xsm? (
+   x11-libs/libICE
+   x11-libs/libSM
+   )
+   zoom? ( x11-libs/libXxf86vm )
+"
+RDEPEND="${COMMON_DEPEND}
+   doc? ( app-doc/e16-docs )
+   nls? ( virtual/libintl )
+   themes? ( x11-themes/e16-themes )
+   !x11-wm/enlightenment:0
+"
+DEPEND="${COMMON_DEPEND}
+   x11-base/xorg-proto
+"
+
+PATCHES=( "${FILESDIR}/${PN}-user-fonts.patch" )
+
+src_configure() {
+   local myconf=(
+   $(use_enable container)
+   $(use_enable dbus)
+   $(use_enable debug libtrip)
+   $(use_enable dialogs)
+   $(use_enable doc docs)
+   $(use_enable libhack)
+   $(use_enable modules)
+   $(use_enable nls)
+   $(use_enable opengl glx)
+   $(use_enable pango)
+   $(use_enable xcomposite composite)
+   $(use_enable xft)
+   $(use_enable xi2)
+   $(use_enable xinerama)
+   $(use_enable xpresent)
+   $(use_enable xrandr)
+   $(use_enable xrender)
+   $(use_enable xsm sm)
+   $(use_enable xsync)
+

[gentoo-commits] repo/gentoo:master commit in: app-text/xpdf/

2021-01-30 Thread Andrew Savchenko

commit: a76641e3eaf92f7c8b19af72e44c9fea310338c2
Author: Andrew Savchenko  gentoo  org>
AuthorDate: Sat Jan 30 09:29:29 2021 +
Commit:     Andrew Savchenko  gentoo  org>
CommitDate: Sat Jan 30 09:51:49 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a76641e3

app-text/xpdf: update license

It is either GPLv2 or GPLv3, not mix of both; see README:

Xpdf is licensed under the GNU General Public License (GPL), version 2
or 3.  This means that you can distribute derivatives of Xpdf under
any of the following:
  - GPL v2 only
  - GPL v3 only
  - GPL v2 or v3

Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Andrew Savchenko  gentoo.org>

 app-text/xpdf/xpdf-4.02-r4.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-text/xpdf/xpdf-4.02-r4.ebuild 
b/app-text/xpdf/xpdf-4.02-r4.ebuild
index e887f2ce996..42e80e86fbd 100644
--- a/app-text/xpdf/xpdf-4.02-r4.ebuild
+++ b/app-text/xpdf/xpdf-4.02-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -22,7 +22,7 @@ SRC_URI="https://xpdfreader-dl.s3.amazonaws.com/${P}.tar.gz
https://xpdfreader-dl.s3.amazonaws.com/xpdf-turkish.tar.gz
)"
 
-LICENSE="GPL-2 GPL-3 i18n? ( BSD )"
+LICENSE="|| ( GPL-2 GPL-3 ) i18n? ( BSD )"
 SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="cmyk cups +fontconfig i18n icons +libpaper metric opi png +textselect 
utils"

[gentoo-commits] repo/gentoo:master commit in: app-text/xpdf/

2021-01-30 Thread Andrew Savchenko

commit: ee2f467df6f1d70f5d7e7741ac264c6d2893d323
Author: Andrew Savchenko  gentoo  org>
AuthorDate: Sat Jan 30 09:47:21 2021 +
Commit:     Andrew Savchenko  gentoo  org>
CommitDate: Sat Jan 30 09:51:59 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ee2f467d

app-text/xpdf: version bump

This is mostly a bugfix release, it fixes plentiful of bugs (see
CHANGES) including many security issues, including but not limited
to CVE-2020-{25725,35376}.

Bug: https://bugs.gentoo.org/755938
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Andrew Savchenko  gentoo.org>

 app-text/xpdf/Manifest |   1 +
 app-text/xpdf/xpdf-4.03.ebuild | 146 +
 2 files changed, 147 insertions(+)

diff --git a/app-text/xpdf/Manifest b/app-text/xpdf/Manifest
index 38d054373af..075768e2b3a 100644
--- a/app-text/xpdf/Manifest
+++ b/app-text/xpdf/Manifest
@@ -1,4 +1,5 @@
 DIST xpdf-4.02.tar.gz 912885 BLAKE2B 
70dec3d213566c1a7c13edd05e4f6145b45ad4c4805843393e0f86a07820511a5187cd61a04adf3c3fc671840acdb3b1bbb19dda7dc101df75e564971f51b76f
 SHA512 
72c9413fc7241dde5288137ca8a68c837d2a68e95e909dbe2afe8f374b5a7c92af4edf82918963d1c6388c947057fcf5f0ae1e6fbb2b31c3d5eb9a07d3c74ddc
+DIST xpdf-4.03.tar.gz 936046 BLAKE2B 
bd0198ec6be627edce6386f0d93b0921906b2c5f79b3eb02f89719e64cbe3ca3b2df53db8aecc6df3581eb022ca0d4c209a880760e5bbb3eb46b40b106d6d144
 SHA512 
5f8478c2c4863a3c50f9b45a6fec73c7e67a74adbeaa651dd2e29982ea4cf050740874ee670672f985a323c12c28c968c16238c4238aeb52810a45e2728d622f
 DIST xpdf-arabic.tar.gz 1057 BLAKE2B 
5889fa5704a805b152886043ee32082d5e60044fb96f91d429661f823d1ea9c929dcae22460421a7c26a7aae43d5926263fa2a1ea4c07e0e130e67f2fb0b6fab
 SHA512 
1ddaee045c0c3576bda0ebf065021e66e1ac6673d6872aff8e8afb3bae33dd927d920d89761553bade040d20e4b60eb286131bdb2f2d75ec1e833b9a9ce58d3e
 DIST xpdf-chinese-simplified-20201222.tar.gz 912967 BLAKE2B 
74eb8da7642147cc6a0d5ee92379823786a78d0dccbdc1d4eab46094d15009bbe72599152b5001c58e7a88bfbb2f7af515e3582e293367a5b0a12bb1c017e8e1
 SHA512 
91c80dc4173a7b40267af1c95708f24557fb56ffc72cbaf48e9adcb0fc310b1bb40f327a8f36b3c6024317e98a44a8ab04d99f6f7b1ea81e775686534f0251ef
 DIST xpdf-chinese-traditional-20201222.tar.gz 922808 BLAKE2B 
39a9bc094061298eb2afbdb8a53d71bf4e1fb1fbe33ca7a8855a34e4ece1b319edc334db71fec72df1860362878b401557fb623eaa2ca8c7ed973d5344e57e75
 SHA512 
c7709409f00365fea83f92db74401b6afbe4ceab9290d9471b9226b71ff24823d19054472d5700fbd91043859e78958628b82afa8b0361544247a76cf9d21d1e

diff --git a/app-text/xpdf/xpdf-4.03.ebuild b/app-text/xpdf/xpdf-4.03.ebuild
new file mode 100644
index 000..486c4bc1629
--- /dev/null
+++ b/app-text/xpdf/xpdf-4.03.ebuild
@@ -0,0 +1,146 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake desktop xdg
+
+DESCRIPTION="The PDF viewer and tools"
+HOMEPAGE="https://www.xpdfreader.com;
+SRC_URI="https://dl.xpdfreader.com/${P}.tar.gz
+   i18n? (
+   https://dl.xpdfreader.com/xpdf-arabic.tar.gz
+   https://dl.xpdfreader.com/xpdf-chinese-simplified.tar.gz -> 
xpdf-chinese-simplified-20201222.tar.gz
+   https://dl.xpdfreader.com/xpdf-chinese-traditional.tar.gz -> 
xpdf-chinese-traditional-20201222.tar.gz
+   https://dl.xpdfreader.com/xpdf-cyrillic.tar.gz
+   https://dl.xpdfreader.com/xpdf-greek.tar.gz
+   https://dl.xpdfreader.com/xpdf-hebrew.tar.gz
+   https://dl.xpdfreader.com/xpdf-japanese.tar.gz -> 
xpdf-japanese-20201222.tar.gz
+   https://dl.xpdfreader.com/xpdf-korean.tar.gz -> 
xpdf-korean-20201222.tar.gz
+   https://dl.xpdfreader.com/xpdf-latin2.tar.gz
+   https://dl.xpdfreader.com/xpdf-thai.tar.gz
+   https://dl.xpdfreader.com/xpdf-turkish.tar.gz
+   )"
+
+LICENSE="|| ( GPL-2 GPL-3 ) i18n? ( BSD )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="cmyk cups +fontconfig i18n icons +libpaper metric opi png +textselect 
utils"
+
+BDEPEND="
+   icons? ( gnome-base/librsvg )
+"
+DEPEND="
+   cups? (
+   dev-qt/qtprintsupport:5[cups]
+   net-print/cups
+   )
+   fontconfig? ( media-libs/fontconfig )
+   libpaper? ( app-text/libpaper )
+   utils? ( png? ( media-libs/libpng:0 ) )
+   dev-qt/qtnetwork:5
+   dev-qt/qtwidgets:5
+   media-libs/freetype
+   sys-libs/zlib
+"
+RDEPEND="${DEPEND}
+   dev-qt/qtsvg:5
+   media-fonts/urw-fonts
+"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-automagic.patch
+   "${FILESDIR}"/${PN}-visibility.patch
+   "${FILESDIR}"/${PN}-shared-libs.patch
+)
+
+DOCS=( ANNOUNCE CHANGES README )
+
+src_prepare() {
+   sed -i \
+   "s|/usr/local/etc|${EPREFIX}/etc|;
+s|/usr/local|${EPREFIX}

[gentoo-commits] repo/gentoo:master commit in: app-text/xpdf/

2021-01-30 Thread Andrew Savchenko

commit: a11a0db0a8cd5cb501a75b5a5247fa6a9c212bea
Author: Andrew Savchenko  gentoo  org>
AuthorDate: Sat Jan 30 09:34:25 2021 +
Commit:     Andrew Savchenko  gentoo  org>
CommitDate: Sat Jan 30 09:51:55 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a11a0db0

app-text/xpdf: update download links

Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Andrew Savchenko  gentoo.org>

 app-text/xpdf/Manifest|  8 
 app-text/xpdf/xpdf-4.02-r4.ebuild | 24 
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/app-text/xpdf/Manifest b/app-text/xpdf/Manifest
index f777d0be04f..38d054373af 100644
--- a/app-text/xpdf/Manifest
+++ b/app-text/xpdf/Manifest
@@ -1,12 +1,12 @@
 DIST xpdf-4.02.tar.gz 912885 BLAKE2B 
70dec3d213566c1a7c13edd05e4f6145b45ad4c4805843393e0f86a07820511a5187cd61a04adf3c3fc671840acdb3b1bbb19dda7dc101df75e564971f51b76f
 SHA512 
72c9413fc7241dde5288137ca8a68c837d2a68e95e909dbe2afe8f374b5a7c92af4edf82918963d1c6388c947057fcf5f0ae1e6fbb2b31c3d5eb9a07d3c74ddc
 DIST xpdf-arabic.tar.gz 1057 BLAKE2B 
5889fa5704a805b152886043ee32082d5e60044fb96f91d429661f823d1ea9c929dcae22460421a7c26a7aae43d5926263fa2a1ea4c07e0e130e67f2fb0b6fab
 SHA512 
1ddaee045c0c3576bda0ebf065021e66e1ac6673d6872aff8e8afb3bae33dd927d920d89761553bade040d20e4b60eb286131bdb2f2d75ec1e833b9a9ce58d3e
-DIST xpdf-chinese-simplified.tar.gz 918277 BLAKE2B 
ad41cc6ceae8d5295e49e6cb6356885a77dd314fd55cae95f4adf7ca597c7d86c0029b2767b1ecae86883d31cf9acc5d67997e1ab7871f10d2b6550734bb3b34
 SHA512 
1f016ff06301cf445546b380fe4cf0c1c9ef08b5e37bd392ca975b4a54fa43afbe251c31e14f216c68fb38dcf04f40ab5baf828586734efb7881a755f92cc49e
-DIST xpdf-chinese-traditional.tar.gz 906297 BLAKE2B 
63f4e482b0ba127331ae9adaa69a64ac868e5973d631cec57867ccab83566b61c37771be28c42d02994f574e7bf0fe16813d2d18d6ef5869dc1200f702d7c6dc
 SHA512 
6fec238af3c76f149087bb4445786cb1de31fbcb17982b8da779e71a91e76c780dde7970515eaa6131db2e654d04d13aebe8d840203293b9072850c5d1e6ba0b
+DIST xpdf-chinese-simplified-20201222.tar.gz 912967 BLAKE2B 
74eb8da7642147cc6a0d5ee92379823786a78d0dccbdc1d4eab46094d15009bbe72599152b5001c58e7a88bfbb2f7af515e3582e293367a5b0a12bb1c017e8e1
 SHA512 
91c80dc4173a7b40267af1c95708f24557fb56ffc72cbaf48e9adcb0fc310b1bb40f327a8f36b3c6024317e98a44a8ab04d99f6f7b1ea81e775686534f0251ef
+DIST xpdf-chinese-traditional-20201222.tar.gz 922808 BLAKE2B 
39a9bc094061298eb2afbdb8a53d71bf4e1fb1fbe33ca7a8855a34e4ece1b319edc334db71fec72df1860362878b401557fb623eaa2ca8c7ed973d5344e57e75
 SHA512 
c7709409f00365fea83f92db74401b6afbe4ceab9290d9471b9226b71ff24823d19054472d5700fbd91043859e78958628b82afa8b0361544247a76cf9d21d1e
 DIST xpdf-cyrillic.tar.gz 1656 BLAKE2B 
454b9a276106d61481fdb8da934ac0de50b86a99d882e27bc9e1cf09a03ae2156909df405de78413e0ac3b529af479b2fbdf5978cc1022cee25c50df6ef21f0e
 SHA512 
ab1197c90f8cd3d8664ebbdc7ecefdfb8ec12e24da2f7616cad1d5bc9c7fd172c48db6a18d76172de8342377acc8e1dcd78bcf0fb1ef9f05cf94729e90586827
 DIST xpdf-greek.tar.gz 1259 BLAKE2B 
f9f695b55c48ee2956ccab1ba9c7ae5bcb2df0669efcb8e111c6100f957238ae73b18589e40dece8b0c38212f00a52c1dc381cc5efcca7c97fe261d72470bb6f
 SHA512 
2e0e281e09e1abc2f0e40b6787703538d52cb62edcd4c4156698700a5f908afee290c62ad9a6ff4ea74bc42e0a8fe9a7765a212efbc223512d4bb442448ea52f
 DIST xpdf-hebrew.tar.gz 1317 BLAKE2B 
bfd5bddc250c1ae1e01fe68f1a4caa649d2a443d3c39565b5209d07f32d46e3474e6823f243b08ab6088e4686cb79e58fce5c9a3de271a77c6b1713fa58b1000
 SHA512 
0ebe652f8633151d13ef2403bd293682b511ab86c1391ce187f1fc0274f33bd9c7e6ec682c8f79ac4fd27c74ab81ad2ae334a75f26001092521cff9a73cd0b8a
-DIST xpdf-japanese.tar.gz 1011166 BLAKE2B 
67c2e8045214462737aa2332aa6ddba35581866e22bece5c166aa3fa808da0dddae11b7e9bcfe50f00087b74f1e7694ac8e407268cdefcab1fe60163eb3bdf70
 SHA512 
0d7b6e4c31caae1ec49d43f108d2dacc76fa84b79e9794d2d0071f33d7fadfacd533f0da1d5bcac3ec1c0757dbd6be4279acac1d148620e1d89d7a9af0966a08
-DIST xpdf-korean.tar.gz 526847 BLAKE2B 
e1640f6df0bc1e126b2e0f010403fc3ff068a8171d31cc616dfaff43170acfa69ff5dc0ac732d346d6aa9b2b21549b21e11f98f5038050b5075ee7fff8a93444
 SHA512 
871a9de0e40d7ef9fb42bb2d90558875f5b84962d7f811d5a18f4b68fadbe7c34e2c18c660a160c9ed9539adc22684985f296c77af2ed3bf604d9989bdcb3d1d
+DIST xpdf-japanese-20201222.tar.gz 1012686 BLAKE2B 
14d59d2dd73dc9be913fb7557bce4844d2babbb88a573f9b962e7cc39e55268bb1a93c69c59585dc6b8aea8e6d771571e0105d1b9ee008ff07c80ae606125ed4
 SHA512 
f4e33525038f89c7b6ffb06b5b49726ab66ad1d61f5d0b813054ccefc035871e50996f31f3f67e6079eccf4c00619f582bdb2e1059df70e0101731a1e067d950
+DIST xpdf-korean-20201222.tar.gz 809664 BLAKE2B 
3c3a4397f25ae74ed8bd68d0736144b9f644f79757ce48f435030cc675650aaa919ee95e8ad7a8b039777f3505c78fdf335cfefbf780957b7c5442a25c5e10c4
 SHA512 
1b829f276f9fbf0ab637cef345f1343faa582af2db95f68003c01d1ec96ca0d9ab38093502ac666ad7b4ce55120a9103bd492a9fea1e8287983227d45ebc378f
 DIST xpdf-latin2.tar.gz 143

[gentoo-commits] repo/gentoo:master commit in: net-proxy/privoxy/

2021-01-30 Thread Andrew Savchenko

commit: 1183a61ede3a2357f6229f4f192c7f189a4e11b6
Author: Andrew Savchenko  gentoo  org>
AuthorDate: Sun Jan 31 03:18:21 2021 +
Commit:     Andrew Savchenko  gentoo  org>
CommitDate: Sun Jan 31 03:18:21 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1183a61e

net-proxy/privoxy: version bump

This is an urgent bugfix release which among multiple bugs fixes
security issues: OVE-20210130-0001 OVE-20210128-0001.
First one is remote DoS.

Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Andrew Savchenko  gentoo.org>

 net-proxy/privoxy/Manifest  |   1 +
 net-proxy/privoxy/privoxy-3.0.31.ebuild | 147 
 2 files changed, 148 insertions(+)

diff --git a/net-proxy/privoxy/Manifest b/net-proxy/privoxy/Manifest
index cb6d11ed6c1..e37cde2c908 100644
--- a/net-proxy/privoxy/Manifest
+++ b/net-proxy/privoxy/Manifest
@@ -1,2 +1,3 @@
 DIST privoxy-3.0.28-stable-src.tar.gz 1753809 BLAKE2B 
1ea0d6339c96bd294eadc124ebac252c43dcdc062709868668959bdb4f959267afb2ec7f27fc0d58db3655102f2412f1c8acb273267d447271465ac21f7a9be4
 SHA512 
5d58024ae73d623a2b8fb2ac49e18f047dfe252c9441388f025cf888c0e4b11546b8796cfa559759ee137002b1b31b30ad28b356ae226836454f32591eb835fc
 DIST privoxy-3.0.29-stable-src.tar.gz 1830550 BLAKE2B 
ecd0a78f2c4a3a6006fb229a7115a3c1b5041508233ef36d7995607984e5f9fbf7f117aa4611f384eed4434a6a3204a7f31a33857112d5f1f0a71fddb2134df3
 SHA512 
2f483a37d697738815f4c58a775fbf116a34ac5e0e74d19814252c5ff1572350181066d468327189faf20c92d808d551b0017a9525ec98276330ee539554c1ba
+DIST privoxy-3.0.31-stable-src.tar.gz 1839901 BLAKE2B 
08564fb8de37d334844de10dfecc39b3f10cee996b3931be4e2d7e33eccd7ec115d7487353496de0fd645fc76ea237aa907eda2fb7fa8aad14050280fc083cc7
 SHA512 
0bea9973ac22e594a959452390c8612605dbf1fd55151632d35ecc7fe0ef9ca87cc1694a8bcb0511467445ec414b721b9d33651d917b2a8083768d8905ec68ed

diff --git a/net-proxy/privoxy/privoxy-3.0.31.ebuild 
b/net-proxy/privoxy/privoxy-3.0.31.ebuild
new file mode 100644
index 000..bffdf7a41b7
--- /dev/null
+++ b/net-proxy/privoxy/privoxy-3.0.31.ebuild
@@ -0,0 +1,147 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools systemd toolchain-funcs
+
+[ "${PV##*_}" = "beta" ] &&
+   PRIVOXY_STATUS="beta" ||
+   PRIVOXY_STATUS="stable"
+
+HOMEPAGE="https://www.privoxy.org https://sourceforge.net/projects/ijbswa/;
+DESCRIPTION="A web proxy with advanced filtering capabilities for enhancing 
privacy"
+SRC_URI="mirror://sourceforge/ijbswa/${P%_*}-${PRIVOXY_STATUS}-src.tar.gz"
+
+IUSE="+acl brotli client-tags compression editor extended-host-patterns
+extended-statistics external-filters +fast-redirects +force fuzz
+graceful-termination +image-blocking ipv6 lfs +mbedtls openssl
+png-images selinux ssl +stats +threads toggle tools whitelists
++zlib"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+LICENSE="GPL-2+"
+
+DEPEND="
+   acct-group/privoxy
+   acct-user/privoxy
+   dev-libs/libpcre
+   brotli? ( app-arch/brotli )
+   ssl? (
+   mbedtls? ( net-libs/mbedtls )
+   openssl? ( dev-libs/openssl )
+   )
+   zlib? ( sys-libs/zlib )
+"
+RDEPEND="${DEPEND}
+   extended-host-patterns? ( dev-lang/perl )
+   selinux? ( sec-policy/selinux-privoxy )
+   tools? (
+   net-misc/curl
+   dev-lang/perl
+   )
+"
+REQUIRED_USE="
+   client-tags? ( threads )
+   toggle? ( editor )
+   compression? ( zlib )
+   brotli? ( zlib )
+   fuzz? ( zlib )
+   ssl? ( ^^ ( mbedtls openssl ) threads )
+"
+
+S="${WORKDIR}/${P%_*}-${PRIVOXY_STATUS}"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-3.0.29-gentoo.patch
+   "${FILESDIR}"/${PN}-3.0.28-strip.patch
+)
+
+pkg_pretend() {
+   if ! use threads; then
+   ewarn
+   ewarn "Privoxy may be very slow without threads support, 
consider to enable them."
+   ewarn "See also 
https://www.privoxy.org/faq/trouble.html#GENTOO-RICERS;
+   ewarn
+   fi
+}
+
+src_prepare() {
+   default
+   mv configure.in configure.ac || die
+   sed -i "s|/p\.p/|/config.privoxy.org/|g" 
tools/privoxy-regression-test.pl || die
+
+   # autoreconf needs to be called even if we don't modify any autotools 
source files
+   # See main makefile
+   eautoreconf
+}
+
+src_configure() {
+   local myconf="--without-mbedtls --without-openssl"
+   if use ssl; then
+   myconf="$(use_with mbedtls) $(use_with openssl)"
+   fi
+
+   # --with-debug only enables debug CFLAGS
+   # --with-docbook and --with-db2html and their deps are useless,
+   #   since

[gentoo-commits] repo/gentoo:master commit in: net-proxy/privoxy/, net-proxy/privoxy/files/

2021-01-30 Thread Andrew Savchenko

commit: c1791cb8d661fe7c8916f9787f7772da42e0b435
Author: Andrew Savchenko  gentoo  org>
AuthorDate: Sun Jan 31 02:59:53 2021 +
Commit:     Andrew Savchenko  gentoo  org>
CommitDate: Sun Jan 31 02:59:53 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c1791cb8

net-proxy/privoxy: fix build without threads

Closes: https://bugs.gentoo.org/767166
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Andrew Savchenko  gentoo.org>

 .../privoxy/files/privoxy-3.0.29-pthread.patch  | 21 +
 net-proxy/privoxy/privoxy-3.0.29.ebuild |  5 +++--
 2 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/net-proxy/privoxy/files/privoxy-3.0.29-pthread.patch 
b/net-proxy/privoxy/files/privoxy-3.0.29-pthread.patch
new file mode 100644
index 000..2890b824d7e
--- /dev/null
+++ b/net-proxy/privoxy/files/privoxy-3.0.29-pthread.patch
@@ -0,0 +1,21 @@
+diff --git a/project.h b/project.h
+index ec3c1559..6c744415 100644
+--- a/project.h
 b/project.h
+@@ -54,16 +54,6 @@
+ #define HASH_OF_HOST_BUF_SIZE  16
+ #endif /* FEATURE_HTTPS_INSPECTION */
+ 
+-#ifdef FEATURE_PTHREAD
+-#  include 
+-   typedef pthread_mutex_t privoxy_mutex_t;
+-#else
+-#  ifdef _WIN32
+-# include 
+-#  endif
+-   typedef CRITICAL_SECTION privoxy_mutex_t;
+-#endif
+-
+ #ifdef FEATURE_HTTPS_INSPECTION_MBEDTLS
+ #include "mbedtls/net_sockets.h"
+ #include "mbedtls/entropy.h"

diff --git a/net-proxy/privoxy/privoxy-3.0.29.ebuild 
b/net-proxy/privoxy/privoxy-3.0.29.ebuild
index 966001da72e..ded50272b29 100644
--- a/net-proxy/privoxy/privoxy-3.0.29.ebuild
+++ b/net-proxy/privoxy/privoxy-3.0.29.ebuild
@@ -47,7 +47,7 @@ REQUIRED_USE="
compression? ( zlib )
brotli? ( zlib )
fuzz? ( zlib )
-   ssl? ( ^^ ( mbedtls openssl ) )
+   ssl? ( ^^ ( mbedtls openssl ) threads )
 "
 
 S="${WORKDIR}/${P%_*}-${PRIVOXY_STATUS}"
@@ -57,13 +57,14 @@ PATCHES=(
"${FILESDIR}"/${PN}-3.0.28-chdir.patch
"${FILESDIR}"/${PN}-3.0.28-null-termination.patch
"${FILESDIR}"/${PN}-3.0.28-strip.patch
+   "${FILESDIR}"/${P}-pthread.patch
 )
 
 pkg_pretend() {
if ! use threads; then
ewarn
ewarn "Privoxy may be very slow without threads support, 
consider to enable them."
-   ewarn "See also 
http://www.privoxy.org/faq/trouble.html#GENTOO-RICERS;
+   ewarn "See also 
https://www.privoxy.org/faq/trouble.html#GENTOO-RICERS;
ewarn
fi
 }

[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/prng/

2021-05-18 Thread Andrew Savchenko

commit: ae8b9643fbfaa51122f9f7df199c4b5c5f7232b0
Author: Andrew Savchenko  gentoo  org>
AuthorDate: Tue May 18 22:17:54 2021 +
Commit:     Andrew Savchenko  gentoo  org>
CommitDate: Tue May 18 22:19:15 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ae8b9643

sci-mathematics/prng: cleanup debug code

It has NOOP effect on the resulting library.

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Andrew Savchenko  gentoo.org>

 sci-mathematics/prng/prng-3.0.2-r3.ebuild | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/sci-mathematics/prng/prng-3.0.2-r3.ebuild 
b/sci-mathematics/prng/prng-3.0.2-r3.ebuild
index e4cc42dcc3e..add90f9238c 100644
--- a/sci-mathematics/prng/prng-3.0.2-r3.ebuild
+++ b/sci-mathematics/prng/prng-3.0.2-r3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit autotools flag-o-matic
+inherit autotools
 
 DESCRIPTION="Pseudo-Random Number Generator library"
 HOMEPAGE="http://statmath.wu.ac.at/prng/;
@@ -25,8 +25,6 @@ src_prepare() {
 }
 
 src_configure() {
-   # bug 705318
-   append-cflags -fvisibility-inlines-hidden
econf $(use_enable static-libs static)
 }

[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/prng/files/, sci-mathematics/prng/

2021-05-18 Thread Andrew Savchenko

commit: fcbf9252166ef3f04d46343fb5886aa7e91a58ea
Author: Andrew Savchenko  gentoo  org>
AuthorDate: Tue May 18 21:58:26 2021 +
Commit:     Andrew Savchenko  gentoo  org>
CommitDate: Tue May 18 22:02:47 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fcbf9252

sci-mathematics/prng: fix unresolved symbols

Some symbols were unresolved because functions were inlined.
This caused build failure of other packages like unurun.

Bug: https://bugs.gentoo.org/705318
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Andrew Savchenko  gentoo.org>

 .../prng-3.0.2-fix-all-c99-inline-semantics.patch  | 404 +
 sci-mathematics/prng/prng-3.0.2-r3.ebuild  |  44 +++
 2 files changed, 448 insertions(+)

diff --git 
a/sci-mathematics/prng/files/prng-3.0.2-fix-all-c99-inline-semantics.patch 
b/sci-mathematics/prng/files/prng-3.0.2-fix-all-c99-inline-semantics.patch
new file mode 100644
index 000..e6281704376
--- /dev/null
+++ b/sci-mathematics/prng/files/prng-3.0.2-fix-all-c99-inline-semantics.patch
@@ -0,0 +1,404 @@
+diff '--color=auto' -Naurd prng-3.0.2.orig/src/anti.c prng-3.0.2/src/anti.c
+--- prng-3.0.2.orig/src/anti.c 2001-11-06 22:31:36.0 +0300
 prng-3.0.2/src/anti.c  2021-05-19 00:41:03.400665843 +0300
+@@ -82,7 +82,7 @@
+  *  gen:  Pointer to a struct prng.
+  *
+  */
+-inline double prng_anti_get_next(struct prng *gen)
++double prng_anti_get_next(struct prng *gen)
+ {
+   return (1. - prng_get_next(gen->data.anti_data.prng));
+ }
+@@ -114,7 +114,7 @@
+  *
+  */
+ /*
+-inline prng_num prng_anti_get_next_int(struct prng *gen)
++prng_num prng_anti_get_next_int(struct prng *gen)
+ ... undefined !!!
+ */
+ 
+diff '--color=auto' -Naurd prng-3.0.2.orig/src/compound.c 
prng-3.0.2/src/compound.c
+--- prng-3.0.2.orig/src/compound.c 2001-11-06 22:34:51.0 +0300
 prng-3.0.2/src/compound.c  2021-05-19 00:41:03.395665825 +0300
+@@ -105,7 +105,7 @@
+  *  gen:  Pointer to a struct prng.
+  *
+  */
+-inline double prng_compound_get_next(struct prng *gen)
++double prng_compound_get_next(struct prng *gen)
+ {
+   int i;
+   double sum = 0.0;
+diff '--color=auto' -Naurd prng-3.0.2.orig/src/cons.c prng-3.0.2/src/cons.c
+--- prng-3.0.2.orig/src/cons.c 2001-11-06 22:35:29.0 +0300
 prng-3.0.2/src/cons.c  2021-05-19 00:41:03.392665813 +0300
+@@ -89,7 +89,7 @@
+  *  gen:  Pointer to a struct prng.
+  *
+  */
+-inline double prng_con_get_next(struct prng *gen)
++double prng_con_get_next(struct prng *gen)
+ {
+   return(prng_get_next(gen->data.con_data.prng));
+ }
+@@ -119,7 +119,7 @@
+  *  gen:  Pointer to a struct prng.
+  *
+  */
+-inline prng_num prng_con_get_next_int(struct prng *gen)
++prng_num prng_con_get_next_int(struct prng *gen)
+ {
+   return(prng_get_next_int(gen->data.con_data.prng));
+ }
+diff '--color=auto' -Naurd prng-3.0.2.orig/src/dicg.c prng-3.0.2/src/dicg.c
+--- prng-3.0.2.orig/src/dicg.c 2001-11-06 22:35:50.0 +0300
 prng-3.0.2/src/dicg.c  2021-05-19 00:41:03.398665836 +0300
+@@ -441,7 +441,7 @@
+  * Algorithm by Karin Schaber and Otmar Lendl.
+  *
+  */  
+-inline prng_num prng_dicg_multiply(int k,prng_num c, prng_num d)
++prng_num prng_dicg_multiply(int k,prng_num c, prng_num d)
+ {
+   int i;
+   struct mtable *t;
+@@ -593,7 +593,7 @@
+  *  gen:  Pointer to a struct prng.
+  *
+  */
+-inline prng_num prng_dicg_get_next_int(struct prng *gen) /* DUMMY */
++prng_num prng_dicg_get_next_int(struct prng *gen) /* DUMMY */
+ {
+   s_prng_num inv, current, prod;
+ 
+@@ -619,7 +619,7 @@
+  *  gen:  Pointer to a struct prng.
+  *
+  */
+-inline double prng_dicg_get_next(struct prng *gen)
++double prng_dicg_get_next(struct prng *gen)
+ {
+   return(prng_dicg_get_next_int(gen) * gen->data.dicg_data.inv_p);
+ }
+diff '--color=auto' -Naurd prng-3.0.2.orig/src/eicg.c prng-3.0.2/src/eicg.c
+--- prng-3.0.2.orig/src/eicg.c 2001-11-06 22:36:04.0 +0300
 prng-3.0.2/src/eicg.c  2021-05-19 00:41:03.405665862 +0300
+@@ -120,7 +120,7 @@
+  *  gen:  Pointer to a struct prng.
+  *
+  */
+-inline prng_num prng_eicg_get_next_int(struct prng *gen)
++prng_num prng_eicg_get_next_int(struct prng *gen)
+ {
+   prng_num old;
+ 
+@@ -138,7 +138,7 @@
+  *  gen:  Pointer to a struct prng.
+  *
+  */
+-inline double prng_eicg_get_next(struct prng *gen)
++double prng_eicg_get_next(struct prng *gen)
+ {
+   return(prng_eicg_get_next_int(gen) * gen->data.eicg_data.inv_p);
+ }
+diff '--color=auto' -Naurd prng-3.0.2.orig/src/external.c 
prng-3.0.2/src/external.c
+--- prng-3.0.2.orig/src/external.c 2001-11-06 22:36:35.0 +0300
 prng-3.0.2/src/external.c  2021-05-19 00:41:03.391665810 +0300
+@@ -139,7 +139,7 @@
+  *  gen:  Pointer to a struct prng.
+  *
+  */
+-inline prng_num prng_tt800_get_next_int(struct prng *gen)
++prng_num prng_tt800_get_next_int(struct prng *g

[gentoo-commits] repo/gentoo:master commit in: app-text/sdcv/files/, app-text/sdcv/

2021-05-06 Thread Andrew Savchenko

commit: 8d48c7d979da991bcdb9abf10fccd3672ec6c8dc
Author: Andrew Savchenko  gentoo  org>
AuthorDate: Thu May  6 11:06:43 2021 +
Commit:     Andrew Savchenko  gentoo  org>
CommitDate: Thu May  6 11:09:03 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d48c7d9

app-text/sdcv: drop old

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Andrew Savchenko  gentoo.org>

 app-text/sdcv/Manifest|  1 -
 app-text/sdcv/files/sdcv-t_list.patch | 17 
 app-text/sdcv/sdcv-0.5.2.ebuild   | 74 ---
 3 files changed, 92 deletions(-)

diff --git a/app-text/sdcv/Manifest b/app-text/sdcv/Manifest
index 3800567f539..a57a7f83880 100644
--- a/app-text/sdcv/Manifest
+++ b/app-text/sdcv/Manifest
@@ -1,2 +1 @@
-DIST sdcv-0.5.2.tar.gz 61541 BLAKE2B 
3b86b69c1e781c311ebbd427d09f8e1c8f97a9fc7b72e22f812ec4619fb4f3cd673ea5548cfdd89554e1613877d20676b8830fd5921082d7a13facb761001c00
 SHA512 
8752a225aebcc28cd8911591333410a0da94db9a7718cee744f8fbc6ceeae14bbf13c6d5a02a05652ff032276765537573e216acd49980f80c06319dac7075fb
 DIST sdcv-0.5.3.tar.gz 62105 BLAKE2B 
1424510cff2fa355d17884a31f8136f4c8a7bde071f387dd8a69b1d2d6b9c8e52869cd602b27b9966725370cf128fb62b8628e735f1faa92b78f75215462804f
 SHA512 
73a305baad74d0584912e115d3de7395c8e88745fb69b4e5f1a345061629b0d4e05898bd589e96ce07948d52ba7c508ec4ab77862c8fadca5a2f19c5244e1442

diff --git a/app-text/sdcv/files/sdcv-t_list.patch 
b/app-text/sdcv/files/sdcv-t_list.patch
deleted file mode 100644
index 8bd23892fc7..000
--- a/app-text/sdcv/files/sdcv-t_list.patch
+++ /dev/null
@@ -1,17 +0,0 @@
 sdcv-0.5.2/tests/t_list.orig   2017-08-16 10:14:23.0 +0300
-+++ sdcv-0.5.2/tests/t_list2018-08-26 15:12:31.501052398 +0300
-@@ -1,11 +1,10 @@
- #!/bin/sh
- 
- PATH_TO_SDCV="$1"
--ndicts=`"$PATH_TO_SDCV" -l | wc -l`
-+TEST_DIR="$2"
-+ndicts=`"$PATH_TO_SDCV" --data-dir "${TEST_DIR}" -l | wc -l`
- ndicts=$(($ndicts-1))
--ncom=`find /usr/share/stardict/dic -name "*.ifo" | wc -l`
--nspe=`find "${HOME}"/.stardict/dic -name "*.ifo" | wc -l`
--nmy=$(($ncom+$nspe))
-+nmy=`find "${TEST_DIR}" -name "*.ifo" | wc -l`
- 
- if [ $nmy -ne $ndicts ]; then
-   echo "should be: $nmy, we have: $ndicts" >&2

diff --git a/app-text/sdcv/sdcv-0.5.2.ebuild b/app-text/sdcv/sdcv-0.5.2.ebuild
deleted file mode 100644
index fad5dbbdeee..000
--- a/app-text/sdcv/sdcv-0.5.2.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PLOCALES="cs fr ru sk uk zh_CN zh_TW"
-: ${CMAKE_MAKEFILE_GENERATOR:="ninja"}
-
-inherit cmake-utils l10n
-
-DESCRIPTION="Console version of Stardict program"
-HOMEPAGE="https://dushistov.github.io/sdcv/;
-SRC_URI="https://github.com/Dushistov/${PN}/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="darkterm nls readline test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-   >=dev-libs/glib-2.6.1
-   sys-libs/zlib
-   readline? ( sys-libs/readline:= )
-"
-DEPEND="${RDEPEND}
-   nls? ( >=sys-devel/gettext-0.14.1 )
-   test? ( app-misc/jq )
-"
-
-PATCHES=(
-   "${FILESDIR}/${PN}-t_list.patch"
-   "${FILESDIR}/${PN}-t_interactive.patch"
-)
-
-src_prepare() {
-   if use darkterm; then
-   sed -i 's/;34m/;36m/' src/libwrapper.cpp || die
-   fi
-
-   rm_loc() {
-   rm "po/${1}.po" || die
-   }
-   l10n_for_each_disabled_locale_do rm_loc
-
-   # do not install locale-specific man pages unless asked to
-   if ! has uk ${LINGUAS-uk}; then
-   sed -ni '/share\/man\/uk/!p' CMakeLists.txt || die
-   fi
-
-   cmake-utils_src_prepare
-}
-
-src_configure() {
-   local mycmakeargs=(
-   -DENABLE_NLS="$(usex nls)"
-   -DWITH_READLINE="$(usex readline)"
-   -DBUILD_TESTS="$(usex test ON OFF)"
-   )
-   cmake-utils_src_configure
-}
-
-src_compile() {
-   cmake-utils_src_compile
-   use nls && cmake-utils_src_compile lang
-}
-
-src_install() {
-   # with USE=nls, but empty intersection of LINGUAS and list of
-   # supported translations, this directory is required, see bug 583386
-   mkdir -p "${BUILD_DIR}/locale"
-   cmake-utils_src_install
-   dodoc doc/DICTFILE_FORMAT
-}

[gentoo-commits] repo/gentoo:master commit in: media-libs/svgalib/

2021-05-17 Thread Andrew Savchenko

commit: acb654cb3c7355286a267a56697f77a9325f6bc7
Author: Andrew Savchenko  gentoo  org>
AuthorDate: Mon May 17 11:37:21 2021 +
Commit:     Andrew Savchenko  gentoo  org>
CommitDate: Mon May 17 11:42:27 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=acb654cb

media-libs/svgalib: cleanup old

Bug: https://bugs.gentoo.org/778752
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Andrew Savchenko  gentoo.org>

 media-libs/svgalib/svgalib-1.9.25-r7.ebuild | 129 
 1 file changed, 129 deletions(-)

diff --git a/media-libs/svgalib/svgalib-1.9.25-r7.ebuild 
b/media-libs/svgalib/svgalib-1.9.25-r7.ebuild
deleted file mode 100644
index d6e517631e7..000
--- a/media-libs/svgalib/svgalib-1.9.25-r7.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit flag-o-matic linux-mod toolchain-funcs
-
-DESCRIPTION="A library for running svga graphics on the console"
-HOMEPAGE="http://www.svgalib.org/;
-SRC_URI="http://www.arava.co.il/matan/${PN}/${P}.tar.gz;
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="-* x86"
-IUSE="build +kernel-helper"
-
-MODULE_NAMES="svgalib_helper(misc:${S}/kernel/svgalib_helper)"
-BUILD_TARGETS="default"
-
-PATCHES=(
-   "${FILESDIR}"/${PN}-1.9.25-linux_2.6.patch
-   "${FILESDIR}"/${PN}-1.9.19-pic.patch
-   "${FILESDIR}"/${PN}-1.9.25-build.patch
-   "${FILESDIR}"/${PN}-1.9.25-linux_2.6.28.patch
-   "${FILESDIR}"/${PN}-1.9.25-glibc210.patch
-   "${FILESDIR}"/${PN}-1.9.25-linux_2.6.36-r1.patch
-   "${FILESDIR}"/${PN}-1.9.25-fix_buffer.patch
-   "${FILESDIR}"/${PN}-1.9.25-vga_reset.patch
-   "${FILESDIR}"/${PN}-1.9.25-missing_include.patch
-   "${FILESDIR}"/${PN}-1.9.25-linux_3.4.patch
-   "${FILESDIR}"/${PN}-1.9.25-linux_3.9.patch
-)
-
-pkg_setup() {
-   linux-mod_pkg_setup
-   BUILD_PARAMS="KDIR=${KV_OUT_DIR}"
-}
-
-src_prepare() {
-   default
-   sed -i -e '/linux\/smp_lock.h/d' kernel/svgalib_helper/main.c || die
-}
-
-src_compile() {
-   use kernel-helper || export NO_HELPER=y
-
-   export CC=$(tc-getCC)
-   # C89 extern inlines are needed, see #576260
-   append-cflags -fgnu89-inline
-
-   # First build static
-   emake OPTIMIZE="${CFLAGS}" static
-   # Then build shared ...
-   emake OPTIMIZE="${CFLAGS}" shared
-   # Missing in some cases ...
-   ln -s libvga.so.${PV} sharedlib/libvga.so
-   # Build lrmi and tools ...
-   emake OPTIMIZE="${CFLAGS}" LDFLAGS+=" -L../sharedlib" \
-   textutils lrmi utils
-   # Build the gl stuff tpp
-   emake OPTIMIZE="${CFLAGS}" -C gl
-   emake OPTIMIZE="${CFLAGS}" -C gl libvgagl.so.${PV}
-   # Missing in some cases ...
-   ln -s libvgagl.so.${PV} sharedlib/libvgagl.so
-   emake OPTIMIZE="${CFLAGS}" -C src libvga.so.${PV}
-   cp -pPR src/libvga.so.${PV} sharedlib/
-   # Build threeDKit ...
-   emake OPTIMIZE="${CFLAGS}" LDFLAGS+=" -L../sharedlib" \
-   -C threeDKit lib3dkit.a
-   # Build demo's ...
-   emake OPTIMIZE="${CFLAGS} -I../gl" LDFLAGS+=" -L../sharedlib" \
-   demoprogs
-
-   ! use build && use kernel-helper && linux-mod_src_compile
-}
-
-src_install() {
-   local x
-
-   dodir /etc/svgalib /usr/{include,lib,bin,share/man}
-
-   emake \
-   TOPDIR="${D}" OPTIMIZE="${CFLAGS}" INSTALLMODULE="" \
-   install
-   ! use build && use kernel-helper && linux-mod_src_install
-
-   insinto /usr/include
-   doins gl/vgagl.h
-   dolib.a staticlib/libvga.a
-   dolib.a gl/libvgagl.a
-   dolib.a threeDKit/lib3dkit.a
-   dolib.so gl/libvgagl.so.${PV}
-   local abiver=$(sed -n '/^MAJOR_VER.*=/{s:.*=[ ]*::;p}' Makefile.cfg)
-   for x in lib3dkit libvga libvgagl ; do
-   dosym ${x}.so.${PV} /usr/lib/${x}.so
-   dosym ${x}.so.${PV} /usr/lib/${x}.so.${abiver}
-   done
-
-   insinto /usr/include
-   doins src/vga.h gl/vgagl.h src/mouse/vgamouse.h 
src/joystick/vgajoystick.h
-   doins src/keyboard/vgakeyboard.h kernel/svgalib_helper/svgalib_helper.h
-
-   insinto /lib/udev/rules.d
-   newins "${FILESDIR}"/svgalib.udev.rules.d.2 30-svgalib.rules
-
-   exeinto /usr/lib/svgalib/demos
-   for x in "${S}"/demos/* ; do
-   [[ -x ${x} ]] && doexe ${x}
-   done
-
-   cd "${S}"/threeDKit
-   exeinto /usr/lib/svgalib/threeDKit
-   loc

[gentoo-commits] repo/gentoo:master commit in: app-text/aiksaurus/

2021-05-19 Thread Andrew Savchenko

commit: 14cf309856e5a5a3d5443f33044d9d798a455887
Author: Andrew Savchenko  gentoo  org>
AuthorDate: Wed May 19 06:27:09 2021 +
Commit:     Andrew Savchenko  gentoo  org>
CommitDate: Wed May 19 06:31:30 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=14cf3098

app-text/aiksaurus: use C++14 for build

Closes: https://bugs.gentoo.org/787899
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Andrew Savchenko  gentoo.org>

 app-text/aiksaurus/aiksaurus-1.2.1-r1.ebuild | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app-text/aiksaurus/aiksaurus-1.2.1-r1.ebuild 
b/app-text/aiksaurus/aiksaurus-1.2.1-r1.ebuild
index 9b41a9721e5..3bc1986d9ba 100644
--- a/app-text/aiksaurus/aiksaurus-1.2.1-r1.ebuild
+++ b/app-text/aiksaurus/aiksaurus-1.2.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -32,6 +32,8 @@ src_prepare() {
 
 src_configure() {
filter-flags -fno-exceptions
+   # bug 787899
+   append-cxxflags -std=gnu++14
econf $(use_with gtk)
 }

[gentoo-commits] repo/gentoo:master commit in: media-libs/svgalib/files/, media-libs/svgalib/

2021-05-16 Thread Andrew Savchenko

commit: 69066bcc0d5d5f91d796bbc819e6c7b68a965cff
Author: Andrew Savchenko  gentoo  org>
AuthorDate: Sun May 16 11:15:08 2021 +
Commit:     Andrew Savchenko  gentoo  org>
CommitDate: Sun May 16 11:15:08 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=69066bcc

media-libs/svgalib: fix asm arg width

rorw operates on word-width registers, specify this explicitly via %w0

Closes: https://bugs.gentoo.org/789747
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Andrew Savchenko  gentoo.org>

 .../svgalib/files/svgalib-1.9.25-gl-asm-width.patch   | 15 +++
 media-libs/svgalib/svgalib-1.9.25-r8.ebuild   |  1 +
 2 files changed, 16 insertions(+)

diff --git a/media-libs/svgalib/files/svgalib-1.9.25-gl-asm-width.patch 
b/media-libs/svgalib/files/svgalib-1.9.25-gl-asm-width.patch
new file mode 100644
index 000..8204ea163bd
--- /dev/null
+++ b/media-libs/svgalib/files/svgalib-1.9.25-gl-asm-width.patch
@@ -0,0 +1,15 @@
+https://bugs.gentoo.org/show_bug.cgi?id=789747
+--- svgalib-1.9.25/gl/driver.c.orig2021-05-16 13:24:38.937410767 +0300
 svgalib-1.9.25/gl/driver.c 2021-05-16 13:24:47.263441562 +0300
+@@ -38,9 +38,9 @@
+   ((c >> 8) & 0xff) << 8 |
+   ((c >> 16) & 0xff) << 0;
+ #else
+-  asm("rorw  $8, %0\n"/* 0RGB -> 0RBG */
++  asm("rorw  $8, %w0\n"   /* 0RGB -> 0RBG */
+   "rorl $16, %0\n"/* 0RBG -> BG0R */
+-  "rorw  $8, %0\n"/* BG0R -> BGR0 */
++  "rorw  $8, %w0\n"   /* BG0R -> BGR0 */
+   "shrl  $8, %0\n"/* 0BGR -> 0BGR */
+   : "=q"(c):"0"(c));
+ #endif

diff --git a/media-libs/svgalib/svgalib-1.9.25-r8.ebuild 
b/media-libs/svgalib/svgalib-1.9.25-r8.ebuild
index 87dea240053..6d98ad4c4ef 100644
--- a/media-libs/svgalib/svgalib-1.9.25-r8.ebuild
+++ b/media-libs/svgalib/svgalib-1.9.25-r8.ebuild
@@ -32,6 +32,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-1.9.25-no-man-compression.patch
"${FILESDIR}"/${PN}-1.9.25-wrapdemo-buf-overflow.patch
"${FILESDIR}"/${PN}-1.9.25-ar.patch
+   "${FILESDIR}"/${PN}-1.9.25-gl-asm-width.patch
 )
 
 pkg_setup() {

[gentoo-commits] repo/gentoo:master commit in: sci-physics/lhapdf/

2021-05-23 Thread Andrew Savchenko

commit: 746271db9aab2da22a7f0ba797ddc543c41ac62c
Author: Andrew Savchenko  gentoo  org>
AuthorDate: Sun May 23 13:06:08 2021 +
Commit:     Andrew Savchenko  gentoo  org>
CommitDate: Sun May 23 13:28:54 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=746271db

sci-physics/lhapdf: fix build with /bin/sh != bash

Request CONFIG_SHELL=/bin/bash explicitly, otherwise obscure
configure problems may occur leading to a broken installation.

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Andrew Savchenko  gentoo.org>

 sci-physics/lhapdf/lhapdf-6.2.3.ebuild | 3 ++-
 sci-physics/lhapdf/lhapdf-6.3.0.ebuild | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/sci-physics/lhapdf/lhapdf-6.2.3.ebuild 
b/sci-physics/lhapdf/lhapdf-6.2.3.ebuild
index e67b0b741a9..03e30f85b39 100644
--- a/sci-physics/lhapdf/lhapdf-6.2.3.ebuild
+++ b/sci-physics/lhapdf/lhapdf-6.2.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -37,6 +37,7 @@ BDEPEND="
 S="${WORKDIR}/${MY_PF}"
 
 src_configure() {
+   CONFIG_SHELL="${EPREFIX}/bin/bash" \
econf \
--disable-static \
$(use_enable python)

diff --git a/sci-physics/lhapdf/lhapdf-6.3.0.ebuild 
b/sci-physics/lhapdf/lhapdf-6.3.0.ebuild
index 9fc01878697..30b859ffe8d 100644
--- a/sci-physics/lhapdf/lhapdf-6.3.0.ebuild
+++ b/sci-physics/lhapdf/lhapdf-6.3.0.ebuild
@@ -37,6 +37,7 @@ BDEPEND="
 S="${WORKDIR}/${MY_PF}"
 
 src_configure() {
+   CONFIG_SHELL="${EPREFIX}/bin/bash" \
econf \
--disable-static \
$(use_enable python)

[gentoo-commits] repo/gentoo:master commit in: sci-physics/pythia/files/, sci-physics/pythia/

2021-05-23 Thread Andrew Savchenko

commit: bee5d368529051b293849191a395f2a6604d296e
Author: Andrew Savchenko  gentoo  org>
AuthorDate: Sun May 23 13:26:07 2021 +
Commit:     Andrew Savchenko  gentoo  org>
CommitDate: Sun May 23 13:29:03 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bee5d368

sci-physics/pythia: remove old

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Andrew Savchenko  gentoo.org>

 sci-physics/pythia/Manifest|   1 -
 .../pythia/files/pythia-8.2.26-run-tests.patch |  27 ---
 sci-physics/pythia/pythia-8.2.26-r1.ebuild | 188 -
 3 files changed, 216 deletions(-)

diff --git a/sci-physics/pythia/Manifest b/sci-physics/pythia/Manifest
index f526c4d1d10..b9d8657ca23 100644
--- a/sci-physics/pythia/Manifest
+++ b/sci-physics/pythia/Manifest
@@ -9,5 +9,4 @@ DIST lutp0613man2.pdf 2902047 BLAKE2B 
c2f8e8f9031c843933cd927b32921813b580a18117
 DIST pythia-6.4.18-examples.tar.bz2 36366 BLAKE2B 
ec655014d3904b66da4a1e748a37c366c2adf9e914b9abf8c38968dcbc09129badcccd2705bc9437c05e73ee4489807835383546f55fbc9cd65399fb507e704e
 SHA512 
ba921379a6df4ca417b60ea5b78af506f13135cdf896fa6beeca9713428ad6f298c94c0fe65fca3e583f8f268dcf84ebe4f1f81b46fd865d5f641f7c1e9fa7e1
 DIST pythia-6.4.28.tar.xz 490248 BLAKE2B 
aff9006a4d3a0536d39a5b5161329f058b980554046a57979cc72c80067be96f00b5056dee29fc7f0039ddae074560823427c3a0e24e59f69662f08524fbdcd4
 SHA512 
f9db72658f2132ce08d31c8a9f7fe727466b184ef41cc4b762fe2bde48dbdfd7b5df19b21a869e20a1f107c96e9daec115c980e11592968eb2cad666b7c96bdc
 DIST pythia6-20160413.tar.gz 567976 BLAKE2B 
92ee81e41db46d49706599ee387a650f67d54a0ea165648de0d09d6cec811c2a4b22903c15cca0abaf5f34cf28333d70315a2c71f4ce0ec0bc48757c20114ae7
 SHA512 
2a9ea2ae299e8d49bd9750f8c68f0b7f534fb91254c2eebc60ef40828400bdf5e5c4e0956d61807e773a51db873ab4a036c3ac264f904d0bb2b85f4860e538d3
-DIST pythia8226.tgz 17639842 BLAKE2B 
b80d7c10bd5ccc45fbb2db0df0eff679236b9911958f58987517b475e055959aa494a2199f64117631baedd90c8e2753f996e5d64552e39e54859bfe77274dad
 SHA512 
85db807264f99c27dd87ad0572b98f4ac8d37fed818c3dd1ac89f0ac124ae0a5ee13b290727e515cb04269a6e0be8b386d954bed62309f26d1e60b431f952ca0
 DIST pythia8245.tgz 23737440 BLAKE2B 
74fd060229a342a32ddd33cd1911708c03e23ee0656a23ed91663fa08b35bb015f75bedba2e6ef13cfc9524affde8e8b65653596eb34f1f080781e655b85af5b
 SHA512 
25107eb98474217ac697476143e879c62fcf5653994a2daf61cfca892f91fbaea3c274019fb4469e9ef547e87d69b8842ee28db5fdac6433965a62eeb16ef95a

diff --git a/sci-physics/pythia/files/pythia-8.2.26-run-tests.patch 
b/sci-physics/pythia/files/pythia-8.2.26-run-tests.patch
deleted file mode 100644
index 34c7179fa55..000
--- a/sci-physics/pythia/files/pythia-8.2.26-run-tests.patch
+++ /dev/null
@@ -1,27 +0,0 @@
 examples/Makefile.orig 2017-07-25 11:56:03.545393093 +0200
-+++ examples/Makefile  2017-07-25 11:56:37.468572887 +0200
-@@ -158,6 +158,7 @@
-   rm -f $(LOCAL_EXAMPLE)/weakbosons.lhe
-   rm -f $(LOCAL_EXAMPLE)/Pythia8.promc
-   rm -f $(LOCAL_EXAMPLE)/hist.root
-+  rm main*out *.dat
- 
- # Clean all temporary and generated files.
- distclean: clean
-@@ -168,3 +169,16 @@
-   rm -f $(LOCAL_SHARE)/COPYING
-   rm -f $(LOCAL_SHARE)/GUIDELINES
-   rm -f $(LOCAL_SHARE)/README
-+
-+# Run tests, inject test-specific arguments when needed
-+main%.out: main%
-+  ./$< \
-+  $(if $(findstring $*,16 42 43 $(shell seq 81 89)), main$*.cmnd) 
\
-+  $(if $(findstring $*, $(shell seq 81 83)), 
w+_production_lhc_0.lhe) \
-+  $(if $(findstring $*, 84), 
hepmcout84.dat 2 w+_production_lhc) \
-+  $(if $(findstring $*, $(shell seq 85 88)), 
w_production) \
-+  $(if $(findstring $*,   42 43 $(shell seq 81 89)), 
histout$*.dat) \
-+  > $@
-+
-+main89.out: main89
-+  $(foreach cmd, $(wildcard main89*.cmnd), ./$< $(cmd) histout-$(cmd).dat 
>> $@ || exit;)

diff --git a/sci-physics/pythia/pythia-8.2.26-r1.ebuild 
b/sci-physics/pythia/pythia-8.2.26-r1.ebuild
deleted file mode 100644
index 3c735682cf1..000
--- a/sci-physics/pythia/pythia-8.2.26-r1.ebuild
+++ /dev/null
@@ -1,188 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-MV=$(ver_cut 1)
-MY_P="${PN}${PV//./}"
-LHA_VER="6.1"
-
-DESCRIPTION="Lund Monte Carlo high-energy physics event generator"
-HOMEPAGE="http://pythia8.hepforge.org/;
-SRC_URI="http://home.thep.lu.se/~torbjorn/${PN}${MV}/${MY_P}.tgz
-   test? ( lhapdf? (
-   
https://www.hepforge.org/archive/lhapdf/pdfsets/${LHA_VER}/CT10.tar.gz
-   
https://www.hepforge.org/archive/lhapdf/pdfsets/${LHA_VER}/MRST2007lomod.tar.gz
-   
https://www.hepforge.org/archive/lhapdf/pdfsets/${LHA_VER}/NNPDF23_nlo_as_0119_qed_mc.tar.gz
-

[gentoo-commits] repo/gentoo:master commit in: sci-physics/pythia/

2021-05-23 Thread Andrew Savchenko

commit: ba9d63eca7793d2bd236670186fb16b1ab7cf078
Author: Andrew Savchenko  gentoo  org>
AuthorDate: Sun May 23 13:15:54 2021 +
Commit:     Andrew Savchenko  gentoo  org>
CommitDate: Sun May 23 13:28:59 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba9d63ec

sci-physics/pythia: version bump slot 8

- Update to 8.2.45
  - This fixes build with lhapdf (bug 772923)
- Use '|' instead of ':' as sed separator due to bug 685160

Closes: https://bugs.gentoo.org/710706
Closes: https://bugs.gentoo.org/772923
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Andrew Savchenko  gentoo.org>

 sci-physics/pythia/Manifest |   1 +
 sci-physics/pythia/pythia-8.2.45.ebuild | 187 
 2 files changed, 188 insertions(+)

diff --git a/sci-physics/pythia/Manifest b/sci-physics/pythia/Manifest
index f8c0687c371..f526c4d1d10 100644
--- a/sci-physics/pythia/Manifest
+++ b/sci-physics/pythia/Manifest
@@ -10,3 +10,4 @@ DIST pythia-6.4.18-examples.tar.bz2 36366 BLAKE2B 
ec655014d3904b66da4a1e748a37c3
 DIST pythia-6.4.28.tar.xz 490248 BLAKE2B 
aff9006a4d3a0536d39a5b5161329f058b980554046a57979cc72c80067be96f00b5056dee29fc7f0039ddae074560823427c3a0e24e59f69662f08524fbdcd4
 SHA512 
f9db72658f2132ce08d31c8a9f7fe727466b184ef41cc4b762fe2bde48dbdfd7b5df19b21a869e20a1f107c96e9daec115c980e11592968eb2cad666b7c96bdc
 DIST pythia6-20160413.tar.gz 567976 BLAKE2B 
92ee81e41db46d49706599ee387a650f67d54a0ea165648de0d09d6cec811c2a4b22903c15cca0abaf5f34cf28333d70315a2c71f4ce0ec0bc48757c20114ae7
 SHA512 
2a9ea2ae299e8d49bd9750f8c68f0b7f534fb91254c2eebc60ef40828400bdf5e5c4e0956d61807e773a51db873ab4a036c3ac264f904d0bb2b85f4860e538d3
 DIST pythia8226.tgz 17639842 BLAKE2B 
b80d7c10bd5ccc45fbb2db0df0eff679236b9911958f58987517b475e055959aa494a2199f64117631baedd90c8e2753f996e5d64552e39e54859bfe77274dad
 SHA512 
85db807264f99c27dd87ad0572b98f4ac8d37fed818c3dd1ac89f0ac124ae0a5ee13b290727e515cb04269a6e0be8b386d954bed62309f26d1e60b431f952ca0
+DIST pythia8245.tgz 23737440 BLAKE2B 
74fd060229a342a32ddd33cd1911708c03e23ee0656a23ed91663fa08b35bb015f75bedba2e6ef13cfc9524affde8e8b65653596eb34f1f080781e655b85af5b
 SHA512 
25107eb98474217ac697476143e879c62fcf5653994a2daf61cfca892f91fbaea3c274019fb4469e9ef547e87d69b8842ee28db5fdac6433965a62eeb16ef95a

diff --git a/sci-physics/pythia/pythia-8.2.45.ebuild 
b/sci-physics/pythia/pythia-8.2.45.ebuild
new file mode 100644
index 000..0dc12374459
--- /dev/null
+++ b/sci-physics/pythia/pythia-8.2.45.ebuild
@@ -0,0 +1,187 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+MV=$(ver_cut 1)
+MY_P="${PN}${PV//./}"
+LHA_VER="6.1"
+
+DESCRIPTION="Lund Monte Carlo high-energy physics event generator"
+HOMEPAGE="http://pythia8.hepforge.org/;
+SRC_URI="http://home.thep.lu.se/~torbjorn/${PN}${MV}/${MY_P}.tgz
+   test? ( lhapdf? (
+   
https://www.hepforge.org/archive/lhapdf/pdfsets/${LHA_VER}/CT10.tar.gz
+   
https://www.hepforge.org/archive/lhapdf/pdfsets/${LHA_VER}/MRST2007lomod.tar.gz
+   
https://www.hepforge.org/archive/lhapdf/pdfsets/${LHA_VER}/NNPDF23_nlo_as_0119_qed_mc.tar.gz
+   
https://www.hepforge.org/archive/lhapdf/pdfsets/${LHA_VER}/NNPDF23_nnlo_as_0119_qed_mc.tar.gz
+   
https://www.hepforge.org/archive/lhapdf/pdfsets/${LHA_VER}/cteq66.tar.gz
+   
https://www.hepforge.org/archive/lhapdf/pdfsets/${LHA_VER}/cteq6l1.tar.gz
+   
https://www.hepforge.org/archive/lhapdf/pdfsets/${LHA_VER}/unvalidated/MRST2004qed.tar.gz
+   ) )"
+
+SLOT="8"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc examples fastjet gzip +hepmc lhapdf root test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+   fastjet? ( sci-physics/fastjet )
+   gzip? ( sys-libs/zlib )
+   hepmc? ( sci-physics/hepmc:0= )
+   lhapdf? ( sci-physics/lhapdf:= )"
+# ROOT is used only when building related tests
+DEPEND="${RDEPEND}
+   test? (
+   root? ( sci-physics/root:= )
+   )"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}8209-root-noninteractive.patch
+)
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_pretend() {
+   if use root && ! use test; then
+   ewarn "ROOT support will only affect examples code build during 
test stage."
+   ewarn "Since you have tests disabled, this is a no-op."
+   fi
+}
+
+src_prepare() {
+   PYTHIADIR="/usr/share/pythia8"
+   EPYTHIADIR="${EPREFIX}${PYTHIADIR}"
+
+   default
+   # set datadir for xmldor in include file
+   sed -i \
+   -e "s|../share/Pythia8/xmldoc|${EPYTHIADIR}/xmldoc|" \
+   include/Pythia8/Pythia.h || die
+   # respect libdir,

[gentoo-commits] repo/gentoo:master commit in: media-video/mkvtoolnix/, media-video/mkvtoolnix/files/

2021-05-23 Thread Andrew Savchenko

commit: bae380256f345d9a79a0941b6259b8fb700fbf5e
Author: Andrew Savchenko  gentoo  org>
AuthorDate: Sun May 23 07:16:28 2021 +
Commit:     Andrew Savchenko  gentoo  org>
CommitDate: Sun May 23 07:23:09 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bae38025

media-video/mkvtoolnix: fix OOM during build

Apply upstream patch[1] to drop iso639_language_list.cpp
optimization level to 0 due to special nature of this source file.

[1] https://gitlab.com/mbunkus/mkvtoolnix/-
/commit/ba6db89e24aa84316372d59e6bba4ac88145b32a

Closes: https://bugs.gentoo.org/786978
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Andrew Savchenko  gentoo.org>

 .../mkvtoolnix/files/mkvtoolnix-56.1.0-optlevel.patch | 15 +++
 media-video/mkvtoolnix/mkvtoolnix-56.1.0.ebuild   |  3 ++-
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/media-video/mkvtoolnix/files/mkvtoolnix-56.1.0-optlevel.patch 
b/media-video/mkvtoolnix/files/mkvtoolnix-56.1.0-optlevel.patch
new file mode 100644
index 000..c0f91deed69
--- /dev/null
+++ b/media-video/mkvtoolnix/files/mkvtoolnix-56.1.0-optlevel.patch
@@ -0,0 +1,15 @@
+https://gitlab.com/mbunkus/mkvtoolnix/-/commit/ba6db89e24aa84316372d59e6bba4ac88145b32a
+https://bugs.gentoo.org/786978#c10
+diff --git a/Rakefile b/Rakefile
+index 
8c9487436ac627cc503e5f233d3f9c756f67fd86..ce564127eeb136b1c1784568ad68a4d593d0931a
 100644
+--- a/Rakefile
 b/Rakefile
+@@ -355,7 +355,7 @@ cxx_compiler = lambda do |*args|
+ # Even -O1 causes compilation time & memory usage to skyrocket,
+ # possibly exponentially, with the number of entries to
+ # emplace_back() into the vector.
+-flags.gsub!(%r{ -O\d+ }, ' -O0 ')
++flags.gsub!(%r{(^| )-O[^ ]*}, ' -O0')
+   end
+ 
+   args = [

diff --git a/media-video/mkvtoolnix/mkvtoolnix-56.1.0.ebuild 
b/media-video/mkvtoolnix/mkvtoolnix-56.1.0.ebuild
index c093e341ab9..dbc45d73af8 100644
--- a/media-video/mkvtoolnix/mkvtoolnix-56.1.0.ebuild
+++ b/media-video/mkvtoolnix/mkvtoolnix-56.1.0.ebuild
@@ -64,7 +64,8 @@ BDEPEND="
)
 "
 
-PATCHES=( "${FILESDIR}"/mkvtoolnix-49.0.0-qt5dbus.patch )
+PATCHES=( "${FILESDIR}"/mkvtoolnix-49.0.0-qt5dbus.patch
+   "${FILESDIR}"/mkvtoolnix-56.1.0-optlevel.patch )
 
 src_prepare() {
xdg_src_prepare

[gentoo-commits] repo/gentoo:master commit in: app-mobilephone/gnokii/

2021-05-23 Thread Andrew Savchenko

commit: 06c9a3ec21aad19e064ed7e6d04d33813274164e
Author: Ionen Wolkens  gmail  com>
AuthorDate: Fri Mar 12 07:58:35 2021 +
Commit:     Andrew Savchenko  gentoo  org>
CommitDate: Sun May 23 07:23:04 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=06c9a3ec

app-mobilephone/gnokii: remove my_bool usage

Closes: https://bugs.gentoo.org/775485
Signed-off-by: Ionen Wolkens  gmail.com>
Signed-off-by: Andrew Savchenko  gentoo.org>

 app-mobilephone/gnokii/gnokii-0.6.31-r3.ebuild | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/app-mobilephone/gnokii/gnokii-0.6.31-r3.ebuild 
b/app-mobilephone/gnokii/gnokii-0.6.31-r3.ebuild
index ea8a7db38ad..7052b8e8aa7 100644
--- a/app-mobilephone/gnokii/gnokii-0.6.31-r3.ebuild
+++ b/app-mobilephone/gnokii/gnokii-0.6.31-r3.ebuild
@@ -61,9 +61,12 @@ src_prepare() {
"${FILESDIR}"/${P}-translations.patch
)
 
+   default
+
sed -i -e "s:/usr/local:${EPREFIX}/usr:" Docs/sample/gnokiirc || die
 
-   default
+   # bug 775485
+   sed -i -e "s:my_bool:bool:" smsd/mysql.c || die
 
cp "${FILESDIR}"/${P}-codeset.m4 m4/codeset.m4 || die
mv configure.{in,ac} || die

[gentoo-commits] repo/gentoo:master commit in: app-text/cuneiform/files/, app-text/cuneiform/

2021-05-23 Thread Andrew Savchenko

commit: fd8e596c6a5eab634656e265c3da5241f5ceee8c
Author: Andrew Savchenko  gentoo  org>
AuthorDate: Sun May 23 08:14:00 2021 +
Commit:     Andrew Savchenko  gentoo  org>
CommitDate: Sun May 23 08:32:43 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fd8e596c

app-text/cuneiform: Fix build with g++-11

Closes: https://bugs.gentoo.org/786657
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Andrew Savchenko  gentoo.org>

 app-text/cuneiform/cuneiform-1.1.0-r3.ebuild   |  1 +
 .../cuneiform/files/cuneiform-1.1.0-gcc11.patch| 30 ++
 2 files changed, 31 insertions(+)

diff --git a/app-text/cuneiform/cuneiform-1.1.0-r3.ebuild 
b/app-text/cuneiform/cuneiform-1.1.0-r3.ebuild
index 3874e69f95e..16ad43b3ac4 100644
--- a/app-text/cuneiform/cuneiform-1.1.0-r3.ebuild
+++ b/app-text/cuneiform/cuneiform-1.1.0-r3.ebuild
@@ -33,6 +33,7 @@ PATCHES=(
"${FILESDIR}"/${P}-gcc6.patch
"${FILESDIR}"/${P}-gcc7.patch
"${FILESDIR}"/${P}-typos.patch
+   "${FILESDIR}"/${P}-gcc11.patch
 )
 
 src_prepare() {

diff --git a/app-text/cuneiform/files/cuneiform-1.1.0-gcc11.patch 
b/app-text/cuneiform/files/cuneiform-1.1.0-gcc11.patch
new file mode 100644
index 000..47677507b26
--- /dev/null
+++ b/app-text/cuneiform/files/cuneiform-1.1.0-gcc11.patch
@@ -0,0 +1,30 @@
+--- cuneiform-linux-1.1.0/cuneiform_src/Kern/hh/internal.h.orig
2021-05-23 10:45:12.714043888 +0300
 cuneiform-linux-1.1.0/cuneiform_src/Kern/hh/internal.h 2021-05-23 
10:45:47.233178549 +0300
+@@ -84,6 +84,7 @@
+#endif
+ 
+#if !defined(__MATH_H) && !defined(_INC_MATH)
++  #undef _GLIBCXX_USE_STD_SPEC_FUNCS
+   #include 
+#endif
+ 
+--- 
cuneiform-linux-1.1.0/cuneiform_src/Kern/ced/sources/main/ced_func_rtf.cpp.orig 
   2021-05-23 10:51:00.757379453 +0300
 cuneiform-linux-1.1.0/cuneiform_src/Kern/ced/sources/main/ced_func_rtf.cpp 
2021-05-23 10:51:22.445461911 +0300
+@@ -212,7 +212,7 @@
+ }
+ */
+ // write the text lines
+-  for (;sect>0;sect=sect->next)
++  for (;sect;sect=sect->next)
+   {
+   if (!WriteRtfSection(rtf,sect)) goto WRITE_END; //write section 
properties
+   //  int sectNum=0;
+@@ -897,7 +897,7 @@
+ //if (curChar->fontNum>=rtf->page->fontsUsed || 
(prevChar&>fontNum>=rtf->page->fontsUsed)) return TRUE;
+ 
+ // extract value for comparison
+-if (prevChar>0) {
++if (prevChar) {
+ //   lstrcpy(PrevTypeFace,TerFont[PrevFont].TypeFace);
+PrevFamily=rtf->table[rtf->page->GetFontByNum(prevChar->fontNum)];
+PrevStyle=prevChar->fontAttribs;

[gentoo-commits] repo/gentoo:master commit in: media-video/motiontrack/

2021-05-23 Thread Andrew Savchenko

commit: 65fbe89d1baf3264b2ce07405278c984df5eef11
Author: Andrew Savchenko  gentoo  org>
AuthorDate: Sun May 23 08:30:45 2021 +
Commit:     Andrew Savchenko  gentoo  org>
CommitDate: Sun May 23 08:32:47 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=65fbe89d

media-video/motiontrack: fix build with /bin/sh != bash

When /bin/sh is not bash (e.g. dash), build fails as follows:
./configure: 6043: arithmetic expression: expecting primary: " FORMAT_COUNT++ "

Since configure contains bash-specific code, exclicitly ask
/bin/bash as the CONFIG_SHELL.

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Andrew Savchenko  gentoo.org>

 media-video/motiontrack/motiontrack-0.1.3-r2.ebuild | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/media-video/motiontrack/motiontrack-0.1.3-r2.ebuild 
b/media-video/motiontrack/motiontrack-0.1.3-r2.ebuild
index 36f69311536..58f8ed1713a 100644
--- a/media-video/motiontrack/motiontrack-0.1.3-r2.ebuild
+++ b/media-video/motiontrack/motiontrack-0.1.3-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -28,6 +28,7 @@ src_configure() {
# with GCC 5, bug 570352
append-cflags -std=gnu89
 
+   CONFIG_SHELL="${EPREFIX}/bin/bash" \
econf \
$(use_enable debug) \
$(use_enable !imagemagick gd) \

[gentoo-commits] repo/gentoo:master commit in: media-libs/libcaca/, media-libs/libcaca/files/

2021-05-22 Thread Andrew Savchenko

commit: 9e49df085dded48b58473bc2fd6347f8352f
Author: Andrew Savchenko  gentoo  org>
AuthorDate: Sat May 22 11:36:04 2021 +
Commit:     Andrew Savchenko  gentoo  org>
CommitDate: Sat May 22 11:39:14 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9e49df22

media-libs/libcaca: fix multiple CVEs and docs build failure

CVE fixed (using Debian patchset):
CVE-2018-20544, CVE-2018-20545, CVE-2018-20546,
CVE-2018-20547, CVE-2018-20549, CVE-2021-3410.

Fix docs build failure (doxygen and latex issues) using both Debian
patch and patch from bug 543870#c11.

Install docs into proper path.

Bug: https://bugs.gentoo.org/543870
Bug: https://bugs.gentoo.org/772317
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Andrew Savchenko  gentoo.org>

 media-libs/libcaca/files/100_doxygen.diff  | 170 +++
 media-libs/libcaca/files/CVE-2018-20544.patch  |  45 +
 .../libcaca/files/CVE-2018-20545+20547+20549.patch |  34 
 .../libcaca/files/CVE-2018-20546+20547.patch   |  36 
 ...em-in-the-caca_resize-overflow-detection-.patch | 135 +++
 ...as-fix-an-integer-overflow-in-caca_resize.patch | 141 
 media-libs/libcaca/files/fix-css-path.patch|  12 ++
 media-libs/libcaca/libcaca-0.99_beta19-r4.ebuild   | 182 +
 8 files changed, 755 insertions(+)

diff --git a/media-libs/libcaca/files/100_doxygen.diff 
b/media-libs/libcaca/files/100_doxygen.diff
new file mode 100644
index 000..f537f37b6d3
--- /dev/null
+++ b/media-libs/libcaca/files/100_doxygen.diff
@@ -0,0 +1,170 @@
+Description: Don't mess with Doxygen's output
+Author: Balint Reczey 
+Index: libcaca-0.99.beta19/doc/Makefile.am
+===
+--- libcaca-0.99.beta19.orig/doc/Makefile.am
 libcaca-0.99.beta19/doc/Makefile.am
+@@ -28,10 +28,7 @@ stamp-latex: stamp-doxygen
+ if BUILD_DOCUMENTATION
+ if USE_LATEX
+   rm -f latex/libcaca.tex latex/libcaca.pdf
+-  mv latex/refman.tex latex/libcaca.tex
+-  sed 's/setlength{/renewcommand{/' latex/libcaca.tex \
+-| sed 's/.*usepackage.*times.*//' > latex/refman.tex
+-  cd latex && $(MAKE) $(AM_CFLAGS) refman.pdf || (cat refman.log; exit 1)
++  (cd latex &&  pdflatex refman ; makeindex refman.idx ; pdflatex refman 
; pdflatex refman ; pdflatex refman ; pdflatex refman ; pdflatex refman; echo 
"pdflatex exit code: $$?")
+   mv latex/refman.pdf latex/libcaca.pdf
+   touch stamp-latex
+ endif
+Index: libcaca-0.99.beta19/doc/doxygen.cfg.in
+===
+--- libcaca-0.99.beta19.orig/doc/doxygen.cfg.in
 libcaca-0.99.beta19/doc/doxygen.cfg.in
+@@ -1,4 +1,4 @@
+-# Doxyfile 1.8.6
++# Doxyfile 1.8.7
+ 
+ # This file describes the settings to be used by the documentation system
+ # doxygen (www.doxygen.org) for a project.
+@@ -70,6 +70,14 @@ OUTPUT_DIRECTORY   = .
+ 
+ CREATE_SUBDIRS = NO
+ 
++# If the ALLOW_UNICODE_NAMES tag is set to YES, doxygen will allow non-ASCII
++# characters to appear in the names of generated files. If set to NO, 
non-ASCII
++# characters will be escaped, for example _xE3_x81_x84 will be used for 
Unicode
++# U+3044.
++# The default value is: NO.
++
++ALLOW_UNICODE_NAMES= NO
++
+ # The OUTPUT_LANGUAGE tag is used to specify the language in which all
+ # documentation generated by doxygen is written. Doxygen will use this
+ # information to generate all constant output in the proper language.
+@@ -261,9 +269,12 @@ OPTIMIZE_OUTPUT_VHDL   = NO
+ # extension. Doxygen has a built-in mapping, but you can override or extend it
+ # using this tag. The format is ext=language, where ext is a file extension, 
and
+ # language is one of the parsers supported by doxygen: IDL, Java, Javascript,
+-# C#, C, C++, D, PHP, Objective-C, Python, Fortran, VHDL. For instance to make
+-# doxygen treat .inc files as Fortran files (default is PHP), and .f files as 
C
+-# (default is Fortran), use: inc=Fortran f=C.
++# C#, C, C++, D, PHP, Objective-C, Python, Fortran (fixed format Fortran:
++# FortranFixed, free formatted Fortran: FortranFree, unknown formatted 
Fortran:
++# Fortran. In the later case the parser tries to guess whether the code is 
fixed
++# or free formatted code, this is the default for Fortran type files), VHDL. 
For
++# instance to make doxygen treat .inc files as Fortran files (default is PHP),
++# and .f files as C (default is Fortran), use: inc=Fortran f=C.
+ #
+ # Note For files without extension you can use no_extension as a placeholder.
+ #
+@@ -1242,7 +1253,8 @@ GENERATE_CHI   = NO
+ CHM_INDEX_ENCODING =
+ 
+ # The BINARY_TOC flag controls whether a binary table of contents is 
generated (
+-# YES) or a normal table of contents ( NO) in the .chm file.
++# YES) or a normal table of contents ( NO) in the .chm file. Furthermore it
++# enables the Prev

[gentoo-commits] repo/gentoo:master commit in: net-libs/gnet/

2021-05-21 Thread Andrew Savchenko

commit: c9261c52a34d2026772141a7206a0803261cb320
Author: Andrew Savchenko  gentoo  org>
AuthorDate: Sat May 22 03:36:51 2021 +
Commit:     Andrew Savchenko  gentoo  org>
CommitDate: Sat May 22 03:38:45 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c9261c52

net-libs/gnet: fix build failure with recent dev-libs/check

Drop problematic patch as suggested by Willard Dawson:
https://bugs.gentoo.org/698654#c12

Closes: https://bugs.gentoo.org/698654
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Andrew Savchenko  gentoo.org>

 net-libs/gnet/gnet-2.0.8-r3.ebuild | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/net-libs/gnet/gnet-2.0.8-r3.ebuild 
b/net-libs/gnet/gnet-2.0.8-r3.ebuild
index 40c3a0ad515..27d0d63139f 100644
--- a/net-libs/gnet/gnet-2.0.8-r3.ebuild
+++ b/net-libs/gnet/gnet-2.0.8-r3.ebuild
@@ -31,7 +31,8 @@ src_prepare() {
epatch "${FILESDIR}"/${PN}-2.0.8-context-leak.patch
 
# Fix usage of check framework, bug #296849, from master
-   epatch "${FILESDIR}"/${PN}-2.0.8-check-usage-update.patch
+   # Disable this patch, bug 698654
+   # epatch "${FILESDIR}"/${PN}-2.0.8-check-usage-update.patch
 
# ifdef around network tests code, refs. bug #320759
epatch "${FILESDIR}"/${PN}-2.0.8-network-tests.patch

[gentoo-commits] repo/gentoo:master commit in: media-libs/avidemux-core/

2021-05-21 Thread Andrew Savchenko

commit: 17be1ab306e3682d789cad94c6195b8999af8acf
Author: Andrew Savchenko  gentoo  org>
AuthorDate: Sat May 22 04:24:20 2021 +
Commit:     Andrew Savchenko  gentoo  org>
CommitDate: Sat May 22 04:27:12 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=17be1ab3

media-libs/avidemux-core: fix build with gcc-11

Stay on C++14 stardard (GNU variant)

Closes: https://bugs.gentoo.org/768210
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Andrew Savchenko  gentoo.org>

 media-libs/avidemux-core/avidemux-core-2.7.6.ebuild | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/media-libs/avidemux-core/avidemux-core-2.7.6.ebuild 
b/media-libs/avidemux-core/avidemux-core-2.7.6.ebuild
index a43ad8aca26..6f2b5d5eb4b 100644
--- a/media-libs/avidemux-core/avidemux-core-2.7.6.ebuild
+++ b/media-libs/avidemux-core/avidemux-core-2.7.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -75,6 +75,8 @@ src_prepare() {
 src_configure() {
# See bug 432322.
use x86 && replace-flags -O0 -O1
+   # Bug 768210
+   append-cxxflags -std=gnu++14
 
local mycmakeargs=(
-DAVIDEMUX_SOURCE_DIR='${S}'

[gentoo-commits] repo/gentoo:master commit in: media-libs/lasi/

2021-05-19 Thread Andrew Savchenko

commit: a10af478c0bf6cc51d83b7459371c5623186e23c
Author: Andrew Savchenko  gentoo  org>
AuthorDate: Wed May 19 20:14:37 2021 +
Commit:     Andrew Savchenko  gentoo  org>
CommitDate: Wed May 19 20:18:30 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a10af478

media-libs/lasi: fix build with gcc-11

This package requires dynamic exceptions, so stay on gnu++14 to
avoid major code rewrite.

Closes: https://bugs.gentoo.org/788766
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Andrew Savchenko  gentoo.org>

 media-libs/lasi/lasi-1.1.3.ebuild | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/media-libs/lasi/lasi-1.1.3.ebuild 
b/media-libs/lasi/lasi-1.1.3.ebuild
index c2f08f49bcb..df41f56e078 100644
--- a/media-libs/lasi/lasi-1.1.3.ebuild
+++ b/media-libs/lasi/lasi-1.1.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake
+inherit cmake flag-o-matic
 
 MY_PN=libLASi
 MY_P=${MY_PN}-${PV}
@@ -49,6 +49,8 @@ src_prepare() {
 }
 
 src_configure() {
+   # 788766
+   append-cxxflags -std=gnu++14
# doesn't like CMAKE_BUILD_TYPE = Gentoo
CMAKE_BUILD_TYPE=None
local mycmakeargs=(

[gentoo-commits] repo/gentoo:master commit in: media-libs/libafterimage/, media-libs/libafterimage/files/

2021-05-19 Thread Andrew Savchenko

commit: b22db36af30264f2cde7c55e627cae4a125c0af9
Author: Andrew Savchenko  gentoo  org>
AuthorDate: Wed May 19 21:04:23 2021 +
Commit:     Andrew Savchenko  gentoo  org>
CommitDate: Wed May 19 21:13:15 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b22db36a

media-libs/libafterimage: fix multiple bugs

- Update to EAPI 7
- Use $(AR) if any, fallback to direct ar, bug 731044
- Drop non-standard 'l' from ar args, bug 784182
- Properly detect freetype: use pkg-config, bug 783375

Bug: https://bugs.gentoo.org/784182
Bug: https://bugs.gentoo.org/731044
Bug: https://bugs.gentoo.org/783375
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Andrew Savchenko  gentoo.org>

 .../libafterimage/files/libafterimage-ar.patch |  39 
 .../files/libafterimage-freetype.patch |  23 +
 .../libafterimage/libafterimage-1.20-r4.ebuild | 110 +
 3 files changed, 172 insertions(+)

diff --git a/media-libs/libafterimage/files/libafterimage-ar.patch 
b/media-libs/libafterimage/files/libafterimage-ar.patch
new file mode 100644
index 000..6e8d0bb8cd4
--- /dev/null
+++ b/media-libs/libafterimage/files/libafterimage-ar.patch
@@ -0,0 +1,39 @@
+diff '--color=auto' -Naurd libAfterImage-1.20.orig/Makefile.in 
libAfterImage-1.20/Makefile.in
+--- libAfterImage-1.20.orig/Makefile.in2011-01-15 08:52:22.0 
+0300
 libAfterImage-1.20/Makefile.in 2021-05-19 23:32:32.793826120 +0300
+@@ -78,7 +78,8 @@
+ EXTRA_DEFINES = @DEFINE_XLOCALE@
+ 
+ RANLIB= @RANLIB@
+-AR= ar clq
++AR?= ar
++AR+= cq
+ CP= @CP@
+ MV= @MV@
+ RM= @RM@
+diff '--color=auto' -Naurd libAfterImage-1.20.orig/aftershow/Makefile.in 
libAfterImage-1.20/aftershow/Makefile.in
+--- libAfterImage-1.20.orig/aftershow/Makefile.in  2011-01-15 
08:52:22.0 +0300
 libAfterImage-1.20/aftershow/Makefile.in   2021-05-19 23:32:53.158905472 
+0300
+@@ -11,7 +11,8 @@
+ EXTRA_DEFINES = @DEFINE_XLOCALE@
+ 
+ RANLIB= @RANLIB@
+-AR= ar clq
++AR?= ar
++AR+= cq
+ CP= @CP@
+ MV= @MV@
+ RM= @RM@
+diff '--color=auto' -Naurd libAfterImage-1.20.orig/apps/Makefile.in 
libAfterImage-1.20/apps/Makefile.in
+--- libAfterImage-1.20.orig/apps/Makefile.in   2011-01-15 08:52:22.0 
+0300
 libAfterImage-1.20/apps/Makefile.in2021-05-19 23:33:15.769993568 
+0300
+@@ -8,7 +8,8 @@
+ EXTRA_DEFINES = @DEFINE_XLOCALE@
+ 
+ RANLIB= @RANLIB@
+-AR= ar clq
++AR?= ar
++AR+= cq
+ CP= @CP@
+ MV= @MV@
+ RM= @RM@

diff --git a/media-libs/libafterimage/files/libafterimage-freetype.patch 
b/media-libs/libafterimage/files/libafterimage-freetype.patch
new file mode 100644
index 000..575a68fd7ca
--- /dev/null
+++ b/media-libs/libafterimage/files/libafterimage-freetype.patch
@@ -0,0 +1,23 @@
+--- libAfterImage-1.20.orig/configure.in   2011-01-15 08:52:22.0 
+0300
 libAfterImage-1.20/configure.in2021-05-19 23:40:50.359764859 +0300
+@@ -561,9 +561,9 @@
+ else
+   if test "x$ttf_includes" = "xno"; then
+ AC_MSG_CHECKING(headers required by TTF support)
+-if freetype-config --cflags >/dev/null  ;then
++if pkg-config freetype2 --cflags >/dev/null  ;then
+ present_incs="$CCFLAGS $x_includes";
+-for l in `freetype-config --cflags` ; do
++for l in `pkg-config freetype2 --cflags` ;do
+   inc_found=no
+   for p in `echo "$present_incs"` ; do
+   if test "x$l" = "x$p" ; then
+@@ -636,7 +636,7 @@
+ have_ttf=yes
+   fi
+   if test "$have_ttf" = yes; then
+-AFTERIMAGE_LIBS="`freetype-config --libs` $AFTERIMAGE_LIBS"
++AFTERIMAGE_LIBS="`pkg-config freetype2 --libs` $AFTERIMAGE_LIBS"
+   fi
+ fi;
+ AC_SUBST(TTF_INCLUDES)

diff --git a/media-libs/libafterimage/libafterimage-1.20-r4.ebuild 
b/media-libs/libafterimage/libafterimage-1.20-r4.ebuild
new file mode 100644
index 000..33cb313ecb7
--- /dev/null
+++ b/media-libs/libafterimage/libafterimage-1.20-r4.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools
+
+MY_PN=libAfterImage
+
+DESCRIPTION="Afterstep's standalone generic image manipulation library"
+HOMEPAGE="http://www.afterstep.org/afterimage/index.php;
+SRC_URI="ftp://ftp.afterstep.org/stable/${MY_PN}/${MY_PN}-${PV}.tar.bz2;
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux 
~x86-linux"
+IUSE="+X cpu_flags_x86_mmx examples gif jpeg nls png static-libs shm +shaping 
svg tiff truetype"
+
+

[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/prng/, sci-mathematics/prng/files/

2021-05-19 Thread Andrew Savchenko

commit: f478c4901cfca32cca3a8c32d2988b373a2b32cb
Author: Andrew Savchenko  gentoo  org>
AuthorDate: Wed May 19 21:36:07 2021 +
Commit:     Andrew Savchenko  gentoo  org>
CommitDate: Wed May 19 21:36:07 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f478c490

sci-mathematics/prng: cleanup old

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Andrew Savchenko  gentoo.org>

 .../prng-3.0.2-fix-c99-inline-semantics.patch  | 146 -
 sci-mathematics/prng/prng-3.0.2-r2.ebuild  |  42 --
 2 files changed, 188 deletions(-)

diff --git 
a/sci-mathematics/prng/files/prng-3.0.2-fix-c99-inline-semantics.patch 
b/sci-mathematics/prng/files/prng-3.0.2-fix-c99-inline-semantics.patch
deleted file mode 100644
index c84a288d47d..000
--- a/sci-mathematics/prng/files/prng-3.0.2-fix-c99-inline-semantics.patch
+++ /dev/null
@@ -1,146 +0,0 @@
-Use portable 'static inline' semantics that work in GNU89 and C99
-See also: http://www.greenend.org.uk/rjk/tech/inline.html
-
 a/src/dicg.c
-+++ b/src/dicg.c
-@@ -441,7 +441,7 @@
-  * Algorithm by Karin Schaber and Otmar Lendl.
-  *
-  */  
--inline prng_num prng_dicg_multiply(int k,prng_num c, prng_num d)
-+prng_num prng_dicg_multiply(int k,prng_num c, prng_num d)
- {
-   int i;
-   struct mtable *t;
 a/src/external.c
-+++ b/src/external.c
-@@ -139,7 +139,7 @@
-  *  gen:  Pointer to a struct prng.
-  *
-  */
--inline prng_num prng_tt800_get_next_int(struct prng *gen)
-+prng_num prng_tt800_get_next_int(struct prng *gen)
- {
- unsigned int y;
- struct tt800_state *g;
 a/src/icg.c
-+++ b/src/icg.c
-@@ -110,7 +110,7 @@
-  *  gen:  Pointer to a struct prng.
-  *
-  */
--inline prng_num prng_icg_get_next_int(struct prng *gen)
-+prng_num prng_icg_get_next_int(struct prng *gen)
- {
-   s_prng_num inv, current, prod;
-   
 a/src/lcg.c
-+++ b/src/lcg.c
-@@ -111,7 +111,7 @@
-  *  gen:  Pointer to a struct prng.
-  *
-  */
--inline prng_num prng_lcg_get_next_int(struct prng *gen)
-+prng_num prng_lcg_get_next_int(struct prng *gen)
- {
-   s_prng_num ax, current;
- 
 a/src/meicg.c
-+++ b/src/meicg.c
-@@ -106,7 +106,7 @@
-  *  gen:  Pointer to a struct prng.
-  *
-  */
--inline prng_num prng_meicg_get_next_int(struct prng *gen)
-+prng_num prng_meicg_get_next_int(struct prng *gen)
- {
-   s_prng_num an, sum, inv, n;
- 
 a/src/mt19937.c
-+++ b/src/mt19937.c
-@@ -172,7 +172,7 @@
-  *  gen:  Pointer to a struct prng.
-  *
-  */
--inline prng_num prng_mt19937_get_next_int(struct prng *gen)
-+prng_num prng_mt19937_get_next_int(struct prng *gen)
- {
- #define MT  gen->data.mt19937_data.mt
- #define MTI gen->data.mt19937_data.mti
 a/src/prng.h
-+++ b/src/prng.h
-@@ -406,7 +406,7 @@
- /* INLINE fnk def. for mult_mod, I don't know if this works for non-GCC */
- 
- #ifdef __GNUC__
--extern __inline__ prng_num mult_mod(prng_num s,struct mult_mod_struct *mm)
-+static inline prng_num mult_mod(prng_num s,struct mult_mod_struct *mm)
- {
- s_prng_num s_tmp;
- 
 a/src/qcg.c
-+++ b/src/qcg.c
-@@ -107,7 +107,7 @@
-  *  gen:  Pointer to a struct prng.
-  *
-  */
--inline prng_num prng_qcg_get_next_int(struct prng *gen)
-+prng_num prng_qcg_get_next_int(struct prng *gen)
- {
-   s_prng_num current, sum, square, q_term, l_term;
- 
 a/src/support.c
-+++ b/src/support.c
-@@ -449,52 +449,6 @@
-   }
- }
- 
--#ifndef __cplusplus
--/* 
-- * Modular Multiplication. Uses the precalculated values from mult_mod_setup.
-- *
-- *
-- * Input: 
-- *s   An prng_num. 
-- *mm  pointer to a struct mult_mod_struct initialized 
-- *by mult_mod_setup.
-- *
-- * Output:
-- *  (mm->a*s) mod mm->p
-- *
-- */
--prng_num mult_mod(prng_num s,struct mult_mod_struct *mm)
--{
--s_prng_num s_tmp;
--
--switch(mm->algorithm)
--  {
--  case PRNG_MM_ZERO:  return(0);
--  break;
--  case PRNG_MM_ONE:   return(s);
--  break;
--  case PRNG_MM_SIMPLE: return((s * mm->a) % mm->p );
--  break;
--  case PRNG_MM_SCHRAGE:
--  s_tmp = mm->a * ( s % mm->q ) - 
--  mm->r * ( s / mm->q );
--  if (s_tmp < 0) s_tmp += mm->p;
--  return(s_tmp);
--  break;
--  case PRNG_MM_DECOMP: return(mult_mod_generic(s,mm->a,mm->p)); 
--  break;
--#ifdef HAVE_LONGLONG
--  case PRNG_MM_LL:return(mult_mod_ll(s,mm->a,mm->p));
--  break;
--#endif
--  case PRNG_MM_POW2:  return((s*mm->a) & mm->mask);
--  break;
--  }
--/* not reached */
--return(0);
--}
--#endif
--
- 
- /* 
-  * Modular Multiplication: Decomposition method (from L'Ecuyer & Cote)

diff --git a/sci-mathematics/prng/prng-3.0.2-r2.eb

[gentoo-commits] repo/gentoo:master commit in: media-libs/libafterimage/

2021-05-19 Thread Andrew Savchenko

commit: 75080953d8137f77bdd110e9eedd3318d6d6017b
Author: Andrew Savchenko  gentoo  org>
AuthorDate: Wed May 19 21:32:29 2021 +
Commit:     Andrew Savchenko  gentoo  org>
CommitDate: Wed May 19 21:32:29 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=75080953

media-libs/libafterimage: cleanup old

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Andrew Savchenko  gentoo.org>

 .../libafterimage/libafterimage-1.20-r2.ebuild | 107 -
 1 file changed, 107 deletions(-)

diff --git a/media-libs/libafterimage/libafterimage-1.20-r2.ebuild 
b/media-libs/libafterimage/libafterimage-1.20-r2.ebuild
deleted file mode 100644
index f66921efd7c..000
--- a/media-libs/libafterimage/libafterimage-1.20-r2.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools
-
-MY_PN=libAfterImage
-
-DESCRIPTION="Afterstep's standalone generic image manipulation library"
-HOMEPAGE="http://www.afterstep.org/afterimage/index.php;
-SRC_URI="ftp://ftp.afterstep.org/stable/${MY_PN}/${MY_PN}-${PV}.tar.bz2;
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="+X cpu_flags_x86_mmx examples gif jpeg nls opengl png static-libs shm 
+shaping svg tiff truetype"
-
-RDEPEND="
-   X?  ( x11-libs/libSM
- x11-libs/libXext
- x11-libs/libXrender )
-   gif?( media-libs/giflib:0= )
-   jpeg?   ( virtual/jpeg:0 )
-   opengl? ( virtual/opengl )
-   png?( >=media-libs/libpng-1.4:0= )
-   svg?( gnome-base/librsvg:2 )
-   tiff?   ( media-libs/tiff:0 )
-   truetype? ( media-libs/freetype )"
-DEPEND="${RDEPEND}
-   X?  ( x11-base/xorg-proto )
-   virtual/pkgconfig
-   !!x11-wm/afterstep"
-REQUIRED_USE="
-   opengl?  ( X )
-   shaping? ( X )
-   shm? ( X )"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_prepare() {
-   default
-
-   # fix some ldconfig problem in makefile.in
-   eapply -p0 "${FILESDIR}"/${PN}-makefile.in.patch
-   # fix lib paths in afterimage-config
-   eapply -p0 "${FILESDIR}"/${PN}-config.patch
-   # fix gif unbundle
-   eapply -p0 "${FILESDIR}"/${PN}-gif.patch
-   # fix for libpng15 compability
-   eapply -p0 "${FILESDIR}"/${PN}-libpng15.patch
-   # add giflib-5 API support, bug 571654
-   eapply "${FILESDIR}"/${PN}-giflib5-v2.patch
-   # do not build examples
-   use examples || sed -i \
-   -e '/^all:/s/apps//' \
-   -e '/^install:/s/install.apps//' \
-   Makefile.in || die "sed failed"
-   # remove forced flags
-   sed -i \
-   -e 's/CFLAGS="-O3"//' \
-   -e 's/ -rdynamic//' \
-   configure.in || die "sed failed"
-
-   mv configure.in configure.ac || die
-   eautoreconf
-}
-
-src_configure() {
-   econf \
-   $(use_enable cpu_flags_x86_mmx mmx-optimization) \
-   $(use_enable opengl glx) \
-   $(use_enable nls i18n) \
-   $(use_enable shaping) \
-   $(use_enable shm shmimage ) \
-   $(use_enable static-libs staticlibs) \
-   $(use_with X x) \
-   $(use_with gif) \
-   $(use_with jpeg) \
-   $(use_with png) \
-   $(use_with svg) \
-   $(use_with tiff) \
-   $(use_with truetype ttf) \
-   --enable-sharedlibs \
-   --with-xpm \
-   --without-builtin-gif \
-   --without-builtin-jpeg \
-   --without-builtin-png \
-   --without-builtin-zlib \
-   --without-afterbase
-}
-
-src_install() {
-   emake \
-   DESTDIR="${D}" \
-   AFTER_DOC_DIR="${ED}/usr/share/doc/${PF}" \
-   install
-   dodoc ChangeLog README
-   if use examples; then
-   cd apps || die
-   mv ascompose.man ascompose.1 || die
-   doman ascompose.1
-   emake clean
-   rm Makefile* ascompose.1 || die
-   insinto /usr/share/doc/${PF}/examples
-   doins *
-   fi
-}

[gentoo-commits] repo/gentoo:master commit in: sci-physics/fastjet/

2021-05-19 Thread Andrew Savchenko

commit: 9032b73ff8422d412dc33a05f9cdabe889bb003f
Author: Andrew Savchenko  gentoo  org>
AuthorDate: Wed May 19 22:40:26 2021 +
Commit:     Andrew Savchenko  gentoo  org>
CommitDate: Wed May 19 22:40:26 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9032b73f

sci-physics/fastjet: fix build with dash as /bin/sh

configure.ac is full of bash-specific code, so request /bin/bash as
configure shell explicitly.

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Andrew Savchenko  gentoo.org>

 sci-physics/fastjet/fastjet-3.0.6-r2.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/sci-physics/fastjet/fastjet-3.0.6-r2.ebuild 
b/sci-physics/fastjet/fastjet-3.0.6-r2.ebuild
index c6472206f84..59084ef062c 100644
--- a/sci-physics/fastjet/fastjet-3.0.6-r2.ebuild
+++ b/sci-physics/fastjet/fastjet-3.0.6-r2.ebuild
@@ -33,6 +33,7 @@ src_configure() {
use cgal && \
has_version 'sci-mathematics/cgal[gmp]' && append-libs -lgmp
 
+   CONFIG_SHELL="${EPREFIX}/bin/bash" \
econf \
--disable-static \
$(use_enable cgal) \

[gentoo-commits] repo/gentoo:master commit in: media-libs/libafterimage/

2021-05-19 Thread Andrew Savchenko

commit: d09ef4a5dc46b501ab7e7cdb4162980fb35fa2d9
Author: Andrew Savchenko  gentoo  org>
AuthorDate: Wed May 19 23:09:37 2021 +
Commit:     Andrew Savchenko  gentoo  org>
CommitDate: Wed May 19 23:12:01 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d09ef4a5

media-libs/libafterimage: fix minor qa issues

https://qa-reports.gentoo.org/output/gentoo-ci/75fab47/output.html;pkg=media-libs:libafterimage

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Andrew Savchenko  gentoo.org>

 media-libs/libafterimage/libafterimage-1.20-r4.ebuild | 9 -
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/media-libs/libafterimage/libafterimage-1.20-r4.ebuild 
b/media-libs/libafterimage/libafterimage-1.20-r4.ebuild
index 33cb313ecb7..a682ba6f4ee 100644
--- a/media-libs/libafterimage/libafterimage-1.20-r4.ebuild
+++ b/media-libs/libafterimage/libafterimage-1.20-r4.ebuild
@@ -26,8 +26,7 @@ RDEPEND="
tiff?   ( media-libs/tiff:0 )
truetype? ( media-libs/freetype )"
 DEPEND="${RDEPEND}
-   X?  ( x11-base/xorg-proto )
-   !!x11-wm/afterstep"
+   X?  ( x11-base/xorg-proto )"
 BDEPEND="
virtual/pkgconfig"
 REQUIRED_USE="
@@ -49,7 +48,7 @@ src_prepare() {
eapply -p0 "${FILESDIR}"/${PN}-libpng15.patch
# add giflib-5 API support, bug 571654
eapply "${FILESDIR}"/${PN}-giflib5-v2.patch
-   # fix ar: respect $(AR), bug 731044 and drop 'l' flag, bug 784182 
+   # fix ar: respect $(AR), bug 731044 and drop 'l' flag, bug 784182
eapply "${FILESDIR}"/${PN}-ar.patch
# detect freetype properly, bug 783375
eapply "${FILESDIR}"/${PN}-freetype.patch
@@ -104,7 +103,7 @@ src_install() {
doman ascompose.1
emake clean
rm Makefile* ascompose.1 || die
-   insinto /usr/share/doc/${PF}/examples
-   doins *
+   docinto examples
+   dodoc *
fi
 }

[gentoo-commits] repo/gentoo:master commit in: dev-util/oprofile/

2021-05-02 Thread Andrew Savchenko

commit: 7c628db20bf468ed83dd10cef40d3a7577e4f464
Author: Andrew Savchenko  gentoo  org>
AuthorDate: Sun May  2 13:27:03 2021 +
Commit:     Andrew Savchenko  gentoo  org>
CommitDate: Sun May  2 13:28:48 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7c628db2

dev-util/oprofile: update jdk version requirement

As requisted in the bug 787371.
Oprofile builds fine with 1.8.
No need to revbump due to := revdep rebuild requirement.

Bug: https://bugs.gentoo.org/787371
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Andrew Savchenko  gentoo.org>

 dev-util/oprofile/oprofile-1.4.0.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-util/oprofile/oprofile-1.4.0.ebuild 
b/dev-util/oprofile/oprofile-1.4.0.ebuild
index c44a69cfe3d..010b73f8d51 100644
--- a/dev-util/oprofile/oprofile-1.4.0.ebuild
+++ b/dev-util/oprofile/oprofile-1.4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ IUSE="apidoc java pch static-libs"
 
 BDEPEND="
apidoc? ( app-doc/doxygen[dot] )
-   java? ( >=virtual/jdk-1.5:= )
+   java? ( >=virtual/jdk-1.8:= )
 "
 CDEPEND="
>=dev-libs/popt-1.7-r1

[gentoo-commits] repo/gentoo:master commit in: net-proxy/privoxy/files/, net-proxy/privoxy/

2021-04-03 Thread Andrew Savchenko

commit: 321320060479e4a9d76ff5a79ce56ba860972c67
Author: Andrew Savchenko  gentoo  org>
AuthorDate: Sat Apr  3 15:31:00 2021 +
Commit:     Andrew Savchenko  gentoo  org>
CommitDate: Sat Apr  3 15:31:00 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=32132006

net-proxy/privoxy: remove old version

Bug: https://bugs.gentoo.org/771960
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Andrew Savchenko  gentoo.org>

 net-proxy/privoxy/Manifest |   1 -
 .../privoxy/files/privoxy-3.0.29-gentoo.patch  | 118 -
 net-proxy/privoxy/privoxy-3.0.31.ebuild| 147 -
 3 files changed, 266 deletions(-)

diff --git a/net-proxy/privoxy/Manifest b/net-proxy/privoxy/Manifest
index ca5d8acc7e5..2bb3d36bce4 100644
--- a/net-proxy/privoxy/Manifest
+++ b/net-proxy/privoxy/Manifest
@@ -1,2 +1 @@
-DIST privoxy-3.0.31-stable-src.tar.gz 1839901 BLAKE2B 
08564fb8de37d334844de10dfecc39b3f10cee996b3931be4e2d7e33eccd7ec115d7487353496de0fd645fc76ea237aa907eda2fb7fa8aad14050280fc083cc7
 SHA512 
0bea9973ac22e594a959452390c8612605dbf1fd55151632d35ecc7fe0ef9ca87cc1694a8bcb0511467445ec414b721b9d33651d917b2a8083768d8905ec68ed
 DIST privoxy-3.0.32-stable-src.tar.gz 1834528 BLAKE2B 
c846dada5fd34b80be9f7a75dc4177f3907241f6cf28b4120929687523d449d73b6a78bfe73f0a1086fbb3a8388103beb1e5a62becdffa24bf57d34cbb6cda56
 SHA512 
da41c0045bf593219df64718645eff984b5df43737811cc0fa12fce7e8ae1ab59eefbe20f23d6ce8f62216cfd81f1a9c319688d15693c25eed36010f3e1d5ffd

diff --git a/net-proxy/privoxy/files/privoxy-3.0.29-gentoo.patch 
b/net-proxy/privoxy/files/privoxy-3.0.29-gentoo.patch
deleted file mode 100644
index 572d03439b9..000
--- a/net-proxy/privoxy/files/privoxy-3.0.29-gentoo.patch
+++ /dev/null
@@ -1,118 +0,0 @@
-diff '--color=auto' -Naur privoxy-3.0.29-stable.orig/config 
privoxy-3.0.29-stable/config
 privoxy-3.0.29-stable.orig/config  2020-11-28 13:19:00.0 +0300
-+++ privoxy-3.0.29-stable/config   2021-01-06 19:44:52.824746891 +0300
-@@ -259,7 +259,7 @@
- #
- #  No trailing "/", please.
- #
--confdir .
-+confdir /etc/privoxy
- #
- #  2.2. templdir
- #  ==
-@@ -344,7 +344,7 @@
- #
- #  No trailing "/", please.
- #
--logdir .
-+logdir /var/log/privoxy
- #
- #  2.5. actionsfile
- #  =
-@@ -477,7 +477,7 @@
- #  require additional software to do it. For details, please
- #  refer to the documentation for your operating system.
- #
--logfile logfile
-+logfile privoxy.log
- #
- #  2.8. trustfile
- #  ===
-diff '--color=auto' -Naur privoxy-3.0.29-stable.orig/default.action.master 
privoxy-3.0.29-stable/default.action.master
 privoxy-3.0.29-stable.orig/default.action.master   2020-11-28 
13:19:00.0 +0300
-+++ privoxy-3.0.29-stable/default.action.master2021-01-06 
19:44:52.825746892 +0300
-@@ -559,7 +559,7 @@
- +client-header-tagger{image-requests} \
- +client-header-tagger{range-requests} \
- +hide-from-header{block} \
--+set-image-blocker{pattern} \
-++set-image-blocker{blank} \
- }
- standard.Cautious
- 
-@@ -582,7 +582,7 @@
- +hide-from-header{block} \
- +hide-referrer{conditional-block} \
- +session-cookies-only \
--+set-image-blocker{pattern} \
-++set-image-blocker{blank} \
- }
- standard.Medium
- 
-@@ -622,7 +622,7 @@
- +hide-referrer{conditional-block} \
- +limit-connect{,} \
- +overwrite-last-modified{randomize} \
--+set-image-blocker{pattern} \
-++set-image-blocker{blank} \
- }
- standard.Advanced
- 
-diff '--color=auto' -Naur privoxy-3.0.29-stable.orig/GNUmakefile.in 
privoxy-3.0.29-stable/GNUmakefile.in
 privoxy-3.0.29-stable.orig/GNUmakefile.in  2020-11-28 13:19:00.0 
+0300
-+++ privoxy-3.0.29-stable/GNUmakefile.in   2021-01-06 19:45:20.535798829 
+0300
-@@ -62,8 +62,8 @@
- MAN_DEST = $(MAN_DIR)/man1
- MAN_PAGE = privoxy.1
- SHARE_DEST   = @datadir@
--DOC_DEST = $(SHARE_DEST)/doc/privoxy
--VAR_DEST = @localstatedir@
-+DOC_DEST = @docdir@
-+VAR_DEST = /var
- LOGS_DEST= $(VAR_DEST)/log/privoxy
- PIDS_DEST= $(VAR_DEST)/run
- 
-@@ -890,8 +890,6 @@
-   $(INSTALL) $(INSTALL_T) $(DOK_WEB)/man-page/*html 
$(DESTDIR)$$DOC/man-page;\
-   $(INSTALL) $(INSTALL_T) $(DOK_WEB)/privoxy-index.html 
$(DESTDIR)$$DOC/index.html;\
-   $(INSTALL) $(INSTALL_T) AUTHORS $(DESTDIR)$$DOC;\
--  $(INSTALL) $(INSTALL_T) LICENSE $(DESTDIR)$$DOC;\
--  $(INSTALL) $(INSTALL_T) LICENSE.GPLv3 $(DESTDIR)$$DOC;\
-   $(INSTALL) $(INSTALL_T) README $(DESTDIR)$$DOC;\
-   $(INSTALL) $(INSTALL_T) ChangeLog $(DESTDIR)$$DOC;\
-   $(INSTALL) $(INSTALL_T) $(DOK_WEB)/p_doc.css $(DESTDIR)$$DOC;\
-@@ -962,34 +960,8 @@
-   fi ;\
-   $(ECHO) Installing configuration files to $(DESTDIR)$(CONF_DEST);\
-   for i in $(CONFIGS); do \
--  if [ "$$i" = "de

[gentoo-commits] repo/gentoo:master commit in: app-text/sdcv/files/, app-text/sdcv/

2021-04-03 Thread Andrew Savchenko

commit: beb002c292228709cf437afc2c31f2b1af1be71b
Author: Andrew Savchenko  gentoo  org>
AuthorDate: Sat Apr  3 19:14:53 2021 +
Commit:     Andrew Savchenko  gentoo  org>
CommitDate: Sat Apr  3 19:18:43 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=beb002c2

app-text/sdcv: version bump

- Update to 0.5.3
- Bump to EAPI 7
- Migrate to cmake.eclass
- Pick up upstream patchset for binsearch speedup

Closes: https://bugs.gentoo.org/774510
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Andrew Savchenko  gentoo.org>

 app-text/sdcv/Manifest |   1 +
 app-text/sdcv/files/sdcv-0.5.3-t_list.patch|  19 
 app-text/sdcv/files/sdcv-synonyms-bin-search.patch | 112 +
 app-text/sdcv/sdcv-0.5.3.ebuild|  74 ++
 4 files changed, 206 insertions(+)

diff --git a/app-text/sdcv/Manifest b/app-text/sdcv/Manifest
index c30f650ef31..3800567f539 100644
--- a/app-text/sdcv/Manifest
+++ b/app-text/sdcv/Manifest
@@ -1 +1,2 @@
 DIST sdcv-0.5.2.tar.gz 61541 BLAKE2B 
3b86b69c1e781c311ebbd427d09f8e1c8f97a9fc7b72e22f812ec4619fb4f3cd673ea5548cfdd89554e1613877d20676b8830fd5921082d7a13facb761001c00
 SHA512 
8752a225aebcc28cd8911591333410a0da94db9a7718cee744f8fbc6ceeae14bbf13c6d5a02a05652ff032276765537573e216acd49980f80c06319dac7075fb
+DIST sdcv-0.5.3.tar.gz 62105 BLAKE2B 
1424510cff2fa355d17884a31f8136f4c8a7bde071f387dd8a69b1d2d6b9c8e52869cd602b27b9966725370cf128fb62b8628e735f1faa92b78f75215462804f
 SHA512 
73a305baad74d0584912e115d3de7395c8e88745fb69b4e5f1a345061629b0d4e05898bd589e96ce07948d52ba7c508ec4ab77862c8fadca5a2f19c5244e1442

diff --git a/app-text/sdcv/files/sdcv-0.5.3-t_list.patch 
b/app-text/sdcv/files/sdcv-0.5.3-t_list.patch
new file mode 100644
index 000..c26a93522bd
--- /dev/null
+++ b/app-text/sdcv/files/sdcv-0.5.3-t_list.patch
@@ -0,0 +1,19 @@
+diff --git a/tests/t_list b/tests/t_list
+index a8c92c4..c410cf2 100755
+--- a/tests/t_list
 b/tests/t_list
+@@ -1,11 +1,10 @@
+ #!/bin/sh
+ 
+ PATH_TO_SDCV="$1"
+-ndicts=`"$PATH_TO_SDCV" -l | wc -l`
++TEST_DIR="$2"
++ndicts=`"$PATH_TO_SDCV" --data-dir "${TEST_DIR}" -l | wc -l`
+ ndicts=$(($ndicts-1))
+-ncom=`find /usr/share/stardict/dic -name "*.ifo" | wc -l`
+-nspe=`find "${XDG_DATA_HOME:-$HOME/.local/share}"/stardict/dic -name "*.ifo" 
| wc -l`
+-nmy=$(($ncom+$nspe))
++nmy=`find "${TEST_DIR}" -name "*.ifo" | wc -l`
+ 
+ if [ $nmy -ne $ndicts ]; then
+   echo "should be: $nmy, we have: $ndicts" >&2

diff --git a/app-text/sdcv/files/sdcv-synonyms-bin-search.patch 
b/app-text/sdcv/files/sdcv-synonyms-bin-search.patch
new file mode 100644
index 000..e3583b1a5fb
--- /dev/null
+++ b/app-text/sdcv/files/sdcv-synonyms-bin-search.patch
@@ -0,0 +1,112 @@
+ommit 4ae420734990ab9f5ccc038262368256b9323f4a
+Merge: b66799f 994c1c7
+Author: Evgeniy Dushistov 
+Date:   Wed Dec 23 04:30:13 2020 +0300
+
+Merge pull request #67 from doozan/master
+
+Use binary search for synonyms, fixes #31
+
+diff --git a/src/stardict_lib.cpp b/src/stardict_lib.cpp
+index 0af4304..6b1f92b 100644
+--- a/src/stardict_lib.cpp
 b/src/stardict_lib.cpp
+@@ -833,21 +833,23 @@ bool SynFile::load(const std::string , gulong wc)
+ {
+ struct stat stat_buf;
+ if (!stat(url.c_str(), _buf)) {
+-MapFile syn;
+-if (!syn.open(url.c_str(), stat_buf.st_size))
++
++if (!synfile.open(url.c_str(), stat_buf.st_size))
+ return false;
+-const gchar *current = syn.begin();
++
++synlist.resize(wc + 1);
++gchar *p1 = synfile.begin();
++
+ for (unsigned long i = 0; i < wc; i++) {
+ // each entry in a syn-file is:
+ // - 0-terminated string
+ // 4-byte index into .dict file in network byte order
+-glib::CharStr lower_string{ g_utf8_casefold(current, -1) };
+-std::string synonym{ get_impl(lower_string) };
+-current += synonym.length() + 1;
+-const guint32 idx = g_ntohl(get_uint32(current));
+-current += sizeof(idx);
+-synonyms[synonym] = idx;
++
++synlist[i] = p1;
++p1 += strlen(p1) + 1 + 4;
+ }
++synlist[wc] = p1;
++
+ return true;
+ } else {
+ return false;
+@@ -856,13 +858,38 @@ bool SynFile::load(const std::string , gulong wc)
+ 
+ bool SynFile::lookup(const char *str, glong )
+ {
+-glib::CharStr lower_string{ g_utf8_casefold(str, -1) };
+-auto it = synonyms.find(get_impl(lower_string));
+-if (it != synonyms.end()) {
+-idx = it->second;
+-return true;
++bool bFound = false;
++glong iTo = synlist.size() - 2;
++if (iTo <0) return false;
++
++if (stardict_strcmp(str, get_key(0)) < 0) {
++idx = 0;
++} else if (stardict_strcmp(str, get_key(i

[gentoo-commits] repo/gentoo:master commit in: net-proxy/privoxy/, net-proxy/privoxy/files/

2021-02-27 Thread Andrew Savchenko

commit: 3e03f00b6df257facc1c17b38b84a87f23d22aae
Author: Andrew Savchenko  gentoo  org>
AuthorDate: Sat Feb 27 16:14:53 2021 +
Commit:     Andrew Savchenko  gentoo  org>
CommitDate: Sat Feb 27 16:21:17 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3e03f00b

net-proxy/privoxy: version bump

Update to version 3.0.32

Fixes: OVE-20210203-0001, OVE-20210205-0001, OVE-20210206-0001,
   OVE-20210207-0001, OVE-20210222-0001.

Bug: https://bugs.gentoo.org/771960
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Andrew Savchenko  gentoo.org>

 net-proxy/privoxy/Manifest |   1 +
 .../privoxy/files/privoxy-3.0.32-gentoo.patch  | 121 +
 net-proxy/privoxy/privoxy-3.0.32.ebuild| 148 +
 3 files changed, 270 insertions(+)

diff --git a/net-proxy/privoxy/Manifest b/net-proxy/privoxy/Manifest
index 0aaec43c89b..ca5d8acc7e5 100644
--- a/net-proxy/privoxy/Manifest
+++ b/net-proxy/privoxy/Manifest
@@ -1 +1,2 @@
 DIST privoxy-3.0.31-stable-src.tar.gz 1839901 BLAKE2B 
08564fb8de37d334844de10dfecc39b3f10cee996b3931be4e2d7e33eccd7ec115d7487353496de0fd645fc76ea237aa907eda2fb7fa8aad14050280fc083cc7
 SHA512 
0bea9973ac22e594a959452390c8612605dbf1fd55151632d35ecc7fe0ef9ca87cc1694a8bcb0511467445ec414b721b9d33651d917b2a8083768d8905ec68ed
+DIST privoxy-3.0.32-stable-src.tar.gz 1834528 BLAKE2B 
c846dada5fd34b80be9f7a75dc4177f3907241f6cf28b4120929687523d449d73b6a78bfe73f0a1086fbb3a8388103beb1e5a62becdffa24bf57d34cbb6cda56
 SHA512 
da41c0045bf593219df64718645eff984b5df43737811cc0fa12fce7e8ae1ab59eefbe20f23d6ce8f62216cfd81f1a9c319688d15693c25eed36010f3e1d5ffd

diff --git a/net-proxy/privoxy/files/privoxy-3.0.32-gentoo.patch 
b/net-proxy/privoxy/files/privoxy-3.0.32-gentoo.patch
new file mode 100644
index 000..4199b6e2a9c
--- /dev/null
+++ b/net-proxy/privoxy/files/privoxy-3.0.32-gentoo.patch
@@ -0,0 +1,121 @@
+diff --git a/GNUmakefile.in b/GNUmakefile.in
+index fcd44c4f..8cf2364a 100644
+--- a/GNUmakefile.in
 b/GNUmakefile.in
+@@ -62,8 +62,8 @@ MAN_DIR  = @mandir@
+ MAN_DEST = $(MAN_DIR)/man8
+ MAN_PAGE = privoxy.8
+ SHARE_DEST   = @datadir@
+-DOC_DEST = $(SHARE_DEST)/doc/privoxy
+-VAR_DEST = @localstatedir@
++DOC_DEST = @docdir@
++VAR_DEST = /var
+ LOGS_DEST= $(VAR_DEST)/log/privoxy
+ PIDS_DEST= $(VAR_DEST)/run
+ 
+@@ -892,8 +892,6 @@ install: CONF_DEST LOG_DEST PID_DEST check_doc GROUP_T
+   $(INSTALL) $(INSTALL_T) $(DOK_WEB)/man-page/*html 
$(DESTDIR)$$DOC/man-page;\
+   $(INSTALL) $(INSTALL_T) $(DOK_WEB)/privoxy-index.html 
$(DESTDIR)$$DOC/index.html;\
+   $(INSTALL) $(INSTALL_T) AUTHORS $(DESTDIR)$$DOC;\
+-  $(INSTALL) $(INSTALL_T) LICENSE $(DESTDIR)$$DOC;\
+-  $(INSTALL) $(INSTALL_T) LICENSE.GPLv3 $(DESTDIR)$$DOC;\
+   $(INSTALL) $(INSTALL_T) README $(DESTDIR)$$DOC;\
+   $(INSTALL) $(INSTALL_T) ChangeLog $(DESTDIR)$$DOC;\
+   $(INSTALL) $(INSTALL_T) $(DOK_WEB)/p_doc.css $(DESTDIR)$$DOC;\
+@@ -964,34 +962,8 @@ install: CONF_DEST LOG_DEST PID_DEST check_doc GROUP_T
+   fi ;\
+   $(ECHO) Installing configuration files to $(DESTDIR)$(CONF_DEST);\
+   for i in $(CONFIGS); do \
+-  if [ "$$i" = "default.action" ] || [ "$$i" = "default.filter" ] 
; then \
+-  $(RM) $(DESTDIR)$(CONF_DEST)/$$i ;\
+-  $(ECHO) Installing fresh $$i;\
+   $(INSTALL) $$INSTALL_CONF $$i $(DESTDIR)$(CONF_DEST) || 
exit 1;\
+-  elif [ -s "$(DESTDIR)$(CONF_DEST)/$$i" ]; then \
+-  $(ECHO) Installing $$i as $$i.new ;\
+-  $(INSTALL) $$INSTALL_CONF $$i 
$(DESTDIR)$(CONF_DEST)/$$i.new || exit 1;\
+-  NEW=1;\
+-  else \
+-  $(INSTALL) $$INSTALL_CONF $$i $(DESTDIR)$(CONF_DEST) || 
exit 1;\
+-  fi ;\
+   done ;\
+-  if [ -n "$$NEW" ]; then \
+-  $(CHMOD) $(RWD_MODE) $(DESTDIR)$(CONF_DEST)/*.new || exit 1 ;\
+-  $(ECHO) "Warning: Older config files are preserved. Check new 
versions for changes!" ;\
+-  fi ;\
+-  [ ! -f $(DESTDIR)$(LOG_DEST)/logfile ] && $(ECHO) Creating logfiles in 
$(DESTDIR)$(LOG_DEST) || \
+-  $(ECHO) Checking logfiles in $(DESTDIR)$(LOG_DEST) ;\
+-  $(TOUCH) $(DESTDIR)$(LOG_DEST)/logfile || exit 1 ;\
+-  if [ x$$USER != x ]; then \
+-  $(CHOWN) $$USER $(DESTDIR)$(LOG_DEST)/logfile || \
+-  $(ECHO) "** WARNING ** current install user different from 
configured user. Logging may fail!!" ;\
+-  fi ;\
+-  if [ x$$GROUP_T != x ]; then \
+-  $(CHGRP) $$GROUP_T $(DESTDIR)$(LOG_DEST)/logfile || \
+-  $(ECHO) "** WARNING ** current install user different from 
configured

[gentoo-commits] repo/gentoo:master commit in: media-libs/svgalib/, media-libs/svgalib/files/

2021-04-21 Thread Andrew Savchenko

commit: d30a7db82744709b7ad01828b15e4787318848aa
Author: Andrew Savchenko  gentoo  org>
AuthorDate: Wed Apr 21 13:00:13 2021 +
Commit:     Andrew Savchenko  gentoo  org>
CommitDate: Wed Apr 21 13:02:52 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d30a7db8

media-libs/svgalib: use $AR if set

Closes: https://bugs.gentoo.org/724714
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Andrew Savchenko  gentoo.org>

 media-libs/svgalib/files/svgalib-1.9.25-ar.patch | 12 
 media-libs/svgalib/svgalib-1.9.25-r8.ebuild  |  3 ++-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/media-libs/svgalib/files/svgalib-1.9.25-ar.patch 
b/media-libs/svgalib/files/svgalib-1.9.25-ar.patch
new file mode 100644
index 000..1f48481f781
--- /dev/null
+++ b/media-libs/svgalib/files/svgalib-1.9.25-ar.patch
@@ -0,0 +1,12 @@
+https://bugs.gentoo.org/724714
+--- svgalib-1.9.25/Makefile.cfg.orig   2021-04-21 15:27:13.0 +0300
 svgalib-1.9.25/Makefile.cfg2021-04-21 15:47:57.152922480 +0300
+@@ -318,7 +318,7 @@
+ DLLFLAGS = -fPIC -DPIC
+ 
+ # Utilites used.
+-AR  = ar
++AR  ?= ar
+ INSTALL_PROGRAM   = install -m755
+ INSTALL_SCRIPT= install -m755
+ INSTALL_SHLIB = install -m755

diff --git a/media-libs/svgalib/svgalib-1.9.25-r8.ebuild 
b/media-libs/svgalib/svgalib-1.9.25-r8.ebuild
index 55f0bb10dda..87dea240053 100644
--- a/media-libs/svgalib/svgalib-1.9.25-r8.ebuild
+++ b/media-libs/svgalib/svgalib-1.9.25-r8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -31,6 +31,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-1.9.25-linux_3.9.patch
"${FILESDIR}"/${PN}-1.9.25-no-man-compression.patch
"${FILESDIR}"/${PN}-1.9.25-wrapdemo-buf-overflow.patch
+   "${FILESDIR}"/${PN}-1.9.25-ar.patch
 )
 
 pkg_setup() {

[gentoo-commits] repo/gentoo:master commit in: net-proxy/privoxy/, net-proxy/privoxy/files/

2021-02-14 Thread Andrew Savchenko

commit: 8bd0a1cca8d26af615e8554e6da1582cc082c038
Author: Andrew Savchenko  gentoo  org>
AuthorDate: Sun Feb 14 14:16:25 2021 +
Commit:     Andrew Savchenko  gentoo  org>
CommitDate: Sun Feb 14 14:45:22 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8bd0a1cc

net-proxy/privoxy: remove old and vulnerable versions

Bug: https://bugs.gentoo.org/768096
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Andrew Savchenko  gentoo.org>

 net-proxy/privoxy/Manifest |   2 -
 .../privoxy/files/privoxy-3.0.19-gentoo.patch  | 114 
 net-proxy/privoxy/files/privoxy-3.0.28-chdir.patch |  15 ---
 .../files/privoxy-3.0.28-null-termination.patch|  13 --
 .../privoxy/files/privoxy-3.0.29-pthread.patch |  21 ---
 net-proxy/privoxy/privoxy-3.0.28-r1.ebuild | 133 --
 net-proxy/privoxy/privoxy-3.0.29.ebuild| 150 -
 7 files changed, 448 deletions(-)

diff --git a/net-proxy/privoxy/Manifest b/net-proxy/privoxy/Manifest
index e37cde2c908..0aaec43c89b 100644
--- a/net-proxy/privoxy/Manifest
+++ b/net-proxy/privoxy/Manifest
@@ -1,3 +1 @@
-DIST privoxy-3.0.28-stable-src.tar.gz 1753809 BLAKE2B 
1ea0d6339c96bd294eadc124ebac252c43dcdc062709868668959bdb4f959267afb2ec7f27fc0d58db3655102f2412f1c8acb273267d447271465ac21f7a9be4
 SHA512 
5d58024ae73d623a2b8fb2ac49e18f047dfe252c9441388f025cf888c0e4b11546b8796cfa559759ee137002b1b31b30ad28b356ae226836454f32591eb835fc
-DIST privoxy-3.0.29-stable-src.tar.gz 1830550 BLAKE2B 
ecd0a78f2c4a3a6006fb229a7115a3c1b5041508233ef36d7995607984e5f9fbf7f117aa4611f384eed4434a6a3204a7f31a33857112d5f1f0a71fddb2134df3
 SHA512 
2f483a37d697738815f4c58a775fbf116a34ac5e0e74d19814252c5ff1572350181066d468327189faf20c92d808d551b0017a9525ec98276330ee539554c1ba
 DIST privoxy-3.0.31-stable-src.tar.gz 1839901 BLAKE2B 
08564fb8de37d334844de10dfecc39b3f10cee996b3931be4e2d7e33eccd7ec115d7487353496de0fd645fc76ea237aa907eda2fb7fa8aad14050280fc083cc7
 SHA512 
0bea9973ac22e594a959452390c8612605dbf1fd55151632d35ecc7fe0ef9ca87cc1694a8bcb0511467445ec414b721b9d33651d917b2a8083768d8905ec68ed

diff --git a/net-proxy/privoxy/files/privoxy-3.0.19-gentoo.patch 
b/net-proxy/privoxy/files/privoxy-3.0.19-gentoo.patch
deleted file mode 100644
index 4571e24e1f0..000
--- a/net-proxy/privoxy/files/privoxy-3.0.19-gentoo.patch
+++ /dev/null
@@ -1,114 +0,0 @@
 a/GNUmakefile.in
-+++ b/GNUmakefile.in
-@@ -62,8 +62,8 @@
- MAN_DEST = $(MAN_DIR)/man1
- MAN_PAGE = privoxy.1
- SHARE_DEST   = @datadir@
--DOC_DEST = $(SHARE_DEST)/doc/privoxy
--VAR_DEST = @localstatedir@
-+DOC_DEST = @docdir@
-+VAR_DEST = /var
- LOGS_DEST= $(VAR_DEST)/log/privoxy
- PIDS_DEST= $(VAR_DEST)/run
- 
-@@ -852,7 +852,6 @@
-   $(INSTALL) $(INSTALL_T) $(DOK_WEB)/man-page/*html 
$(DESTDIR)$$DOC/man-page;\
-   $(INSTALL) $(INSTALL_T) $(DOK_WEB)/privoxy-index.html 
$(DESTDIR)$$DOC/index.html;\
-   $(INSTALL) $(INSTALL_T) AUTHORS $(DESTDIR)$$DOC;\
--  $(INSTALL) $(INSTALL_T) LICENSE $(DESTDIR)$$DOC;\
-   $(INSTALL) $(INSTALL_T) README $(DESTDIR)$$DOC;\
-   $(INSTALL) $(INSTALL_T) ChangeLog $(DESTDIR)$$DOC;\
-   $(INSTALL) $(INSTALL_T) $(DOK_WEB)/p_doc.css $(DESTDIR)$$DOC;\
-@@ -923,34 +922,8 @@
-   fi ;\
-   $(ECHO) Installing configuration files to $(DESTDIR)$(CONF_DEST);\
-   for i in $(CONFIGS); do \
--  if [ "$$i" = "default.action" ] || [ "$$i" = "default.filter" ] 
; then \
--  $(RM) $(DESTDIR)$(CONF_DEST)/$$i ;\
--  $(ECHO) Installing fresh $$i;\
-   $(INSTALL) $$INSTALL_CONF $$i $(DESTDIR)$(CONF_DEST) || 
exit 1;\
--  elif [ -s "$(CONF_DEST)/$$i" ]; then \
--  $(ECHO) Installing $$i as $$i.new ;\
--  $(INSTALL) $$INSTALL_CONF $$i 
$(DESTDIR)$(CONF_DEST)/$$i.new || exit 1;\
--  NEW=1;\
--  else \
--  $(INSTALL) $$INSTALL_CONF $$i $(DESTDIR)$(CONF_DEST) || 
exit 1;\
--  fi ;\
-   done ;\
--  if [ -n "$$NEW" ]; then \
--  $(CHMOD) $(RWD_MODE) $(DESTDIR)$(CONF_DEST)/*.new || exit 1 ;\
--  $(ECHO) "Warning: Older config files are preserved. Check new 
versions for changes!" ;\
--  fi ;\
--  [ ! -f $(DESTDIR)$(LOG_DEST)/logfile ] && $(ECHO) Creating logfiles in 
$(DESTDIR)$(LOG_DEST) || \
--  $(ECHO) Checking logfiles in $(DESTDIR)$(LOG_DEST) ;\
--  $(TOUCH) $(DESTDIR)$(LOG_DEST)/logfile || exit 1 ;\
--  if [ x$$USER != x ]; then \
--  $(CHOWN) $$USER $(DESTDIR)$(LOG_DEST)/logfile || \
--  $(ECHO) "** WARNING ** current install user different from 
configured user. Logging may fail!!" ;\
--  fi ;\
--

< 3 4 5 6 7 8 9 10 11 >

701 - 800 of 1049 matches

Mail list logo