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

2020-12-06 Thread Joonas Niilola
commit: 25c570c020b633351bb713eb333a765c1507b8d3
Author: Joonas Niilola  gentoo  org>
AuthorDate: Mon Dec  7 07:19:22 2020 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Mon Dec  7 07:19:22 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=25c570c0

dev-libs/efl: sync lua-masked ebuild

Signed-off-by: Joonas Niilola  gentoo.org>

 dev-libs/efl/efl-1.25.1-r10.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-libs/efl/efl-1.25.1-r10.ebuild 
b/dev-libs/efl/efl-1.25.1-r10.ebuild
index 7c1c12329f4..d6f621178a8 100644
--- a/dev-libs/efl/efl-1.25.1-r10.ebuild
+++ b/dev-libs/efl/efl-1.25.1-r10.ebuild
@@ -146,7 +146,7 @@ src_prepare() {
fi
 
# Fixup Doxyfile
-   pushd "${DOCS_DIR}"
+   pushd "${DOCS_DIR}" || die
cp Doxyfile.in Doxyfile || die
sed -i \
-e "s/@PACKAGE_VERSION@/${PV}/g" \
@@ -154,7 +154,7 @@ src_prepare() {
-e "s/@top_srcdir@/../g" \
-e "s/@srcdir@/./g" \
Doxyfile || die
-   popd
+   popd || die
 }
 
 src_configure() {



[gentoo-commits] repo/gentoo:master commit in: sys-boot/refind/

2020-12-06 Thread Joonas Niilola
commit: dedfa2346704558dca52c69d65c96adecd932f85
Author: Theo Anderson  posteo  de>
AuthorDate: Fri Nov 27 10:51:25 2020 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Mon Dec  7 07:30:20 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dedfa234

sys-boot/refind: drop old

Package-Manager: Portage-3.0.10, Repoman-3.0.2
Signed-off-by: Theo Anderson  posteo.de>
Closes: https://github.com/gentoo/gentoo/pull/18426
Signed-off-by: Joonas Niilola  gentoo.org>

 sys-boot/refind/refind-0.12.0.ebuild | 168 ---
 1 file changed, 168 deletions(-)

diff --git a/sys-boot/refind/refind-0.12.0.ebuild 
b/sys-boot/refind/refind-0.12.0.ebuild
deleted file mode 100644
index 9091a88cfcb..000
--- a/sys-boot/refind/refind-0.12.0.ebuild
+++ /dev/null
@@ -1,168 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multiprocessing toolchain-funcs
-
-DESCRIPTION="The UEFI Boot Manager by Rod Smith"
-HOMEPAGE="https://www.rodsbooks.com/refind/;
-SRC_URI="mirror://sourceforge/project/${PN}/${PV}/${PN}-src-${PV}.tar.gz"
-
-LICENSE="BSD GPL-2 GPL-3 FDL-1.3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-FS_USE="btrfs +ext2 +ext4 hfs +iso9660 ntfs reiserfs"
-IUSE="${FS_USE} custom-cflags doc gnuefi"
-
-DEPEND="gnuefi? ( >=sys-boot/gnu-efi-3.0.2 )
-   !gnuefi? ( >=sys-boot/udk-2018-r1 )"
-
-DOCS=(README.txt)
-PATCHES=("${FILESDIR}/makefile.patch")
-UDK_WORKSPACE="${T}/udk"
-
-pkg_pretend() {
-   if use custom-cflags; then
-   ewarn
-   ewarn "You have enabled building with USE=custom-cflags. Be 
aware that"
-   ewarn "using this can result in EFI binaries that fail to run 
and may"
-   ewarn "fail to build at all. This is strongly advised against 
by upstream."
-   ewarn
-   ewarn "See https://bugs.gentoo.org/598587#c3 for more 
information"
-   ewarn
-   fi
-}
-
-pkg_setup() {
-   if use x86; then
-   export EFIARCH=ia32
-   export BUILDARCH=ia32
-   elif use amd64; then
-   export EFIARCH=x64
-   export BUILDARCH=x86_64
-   fi
-}
-
-src_prepare() {
-   default
-
-   # bug 598647 - PIE not supported
-   sed -e '/^CFLAGS/s:$: -fno-PIE:' -i Make.common || die
-
-   # Prepare UDK workspace
-   if ! use gnuefi; then
-   mkdir "${UDK_WORKSPACE}" || die
-   ln -s "${EPREFIX}/usr/lib/udk/"{Mde,IntelFramework}{,Module}Pkg 
\
-   "${UDK_WORKSPACE}" || die "Could not link UDK files"
-   fi
-}
-
-src_configure() {
-   if ! use gnuefi; then
-   # Use the side effect of the script which will create 
configuration files
-   (. udk-workspace "${UDK_WORKSPACE}" || die)
-   sed -e "s:^#\?\s*\(MAX_CONCURRENT_THREAD_NUMBER\s*=\).*$:\1 
$(makeopts_jobs):" \
-   -i "${UDK_WORKSPACE}/Conf/target.txt" || die "Failed to 
configure target file"
-   sed -e 
"s:\(_\(CC\|ASM\|PP\|VFRPP\|ASLCC\|ASLPP\|DLINK\)_PATH\s*=\).*$:\1 
$(tc-getCC):" \
-   -e "s:\(_ASLDLINK_PATH\s*=\).*$:\1 $(tc-getLD):" \
-   -e "s:\(_OBJCOPY_PATH\s*=\).*$:\1 $(tc-getOBJCOPY):" \
-   -e "s:\(_RC_PATH\s*=\).*$:\1 $(tc-getOBJCOPY):" \
-   -e "s:\(_SLINK_PATH\s*=\).*$:\1 $(tc-getAR):" \
-   -e "s:-Werror::" \
-   -i "${UDK_WORKSPACE}/Conf/tools_def.txt" \
-   || die "Failed to prepare tools definition file"
-   fi
-}
-
-src_compile() {
-   # Update fs targets depending on uses
-   local fs fs_names=()
-   for fs in ${FS_USE}; do
-   fs=${fs#+}
-   if use "${fs}"; then
-   fs_names+=(${fs})
-   fi
-   done
-   use gnuefi && fs_names=("${fs_names[@]/%/_gnuefi}")
-
-   # Prepare flags
-   local make_flags=(
-   ARCH="${BUILDARCH}"
-   CC="$(tc-getCC)"
-   AS="$(tc-getAS)"
-   LD="$(tc-getLD)"
-   AR="$(tc-getAR)"
-   RANLIB="$(tc-getRANLIB)"
-   OBJCOPY="$(tc-getOBJCOPY)"
-   GNUEFILIB="/usr/$(get_libdir)"
-   EFILIB="/usr/$(get_libdir)"
-   EFICRT0="/usr/$(get_libdir)"
-   EDK2BASE="${UDK_WORKSPACE}"
-   EDK2_DRIVER_BASENAMES="${fs_names[@]}"
-   FILESYSTEMS="${fs_names[@]}"
-   FILESYSTEMS_GNUEFI="${fs_names[@]}"
-   )
-   if use custom-cflags; then
-   make_flags=(CFLAGS="${CFLAGS}" "${make_flags[@]}")
-   fi
-
-   emake "${make_flags[@]}" all_$(usex gnuefi gnuefi edk2)
-}
-
-src_install() {
-   exeinto "/usr/lib/${PN}"
-   doexe refind-install
-   dosym "../lib/${PN}/refind-install" "/usr/sbin/refind-install"
-
-   if 

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

2020-12-06 Thread Joonas Niilola
commit: 7f4154e12c8c4aaf1be20ec5475e57a0e717760f
Author: Andrew Ammerlaan  riseup  net>
AuthorDate: Sun Dec  6 15:10:57 2020 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Mon Dec  7 07:18:29 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f4154e1

eclass/docs: quick fix with doxygen

Package-Manager: Portage-3.0.11, Repoman-3.0.2
Signed-off-by: Andrew Ammerlaan  riseup.net>
Closes: https://github.com/gentoo/gentoo/pull/18530
Signed-off-by: Joonas Niilola  gentoo.org>

 eclass/docs.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/docs.eclass b/eclass/docs.eclass
index 2f26b45695d..73c9ec99ca5 100644
--- a/eclass/docs.eclass
+++ b/eclass/docs.eclass
@@ -283,7 +283,7 @@ doxygen_compile() {
mkdir -p "${DOCS_OUTDIR}" || die
 
pushd "${DOCS_DIR}" || die
-   (cat "${doxyfile}" ; echo "HTML_OUTPUT=${DOCS_OUTDIR}") | doxygen 
"${DOCS_EXTRA_ARGS}" - || die "${FUNCNAME}: doxygen failed"
+   (cat "${DOCS_CONFIG_NAME}" ; echo "HTML_OUTPUT=${DOCS_OUTDIR}") | 
doxygen - "${DOCS_EXTRA_ARGS}" || die "${FUNCNAME}: doxygen failed"
popd || die
 }
 



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

2020-12-06 Thread Joonas Niilola
commit: 10d026e0af2445f2a4b6f922486795ede8ef4907
Author: Alexander Tsoy  tsoy  me>
AuthorDate: Fri Nov 27 16:50:50 2020 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Mon Dec  7 07:34:45 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=10d026e0

x11-misc/x11vnc: security bump for CVE-2020-29074

Bug: https://bugs.gentoo.org/756841
Signed-off-by: Alexander Tsoy  tsoy.me>
Closes: https://github.com/gentoo/gentoo/pull/18432
Signed-off-by: Joonas Niilola  gentoo.org>

 .../files/x11vnc-0.9.16-CVE-2020-29074.patch   | 25 +++
 x11-misc/x11vnc/x11vnc-0.9.16-r4.ebuild| 81 ++
 2 files changed, 106 insertions(+)

diff --git a/x11-misc/x11vnc/files/x11vnc-0.9.16-CVE-2020-29074.patch 
b/x11-misc/x11vnc/files/x11vnc-0.9.16-CVE-2020-29074.patch
new file mode 100644
index 000..12f65b94fb6
--- /dev/null
+++ b/x11-misc/x11vnc/files/x11vnc-0.9.16-CVE-2020-29074.patch
@@ -0,0 +1,25 @@
+From 69eeb9f7baa14ca03b16c9de821f9876def7a36a Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Gu=C3=A9nal=20DAVALAN?= 
+Date: Wed, 18 Nov 2020 08:40:45 +0100
+Subject: [PATCH] scan: limit access to shared memory segments to current user
+
+---
+ src/scan.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/scan.c b/src/scan.c
+index 43e00d2..12994d5 100644
+--- a/src/scan.c
 b/src/scan.c
+@@ -320,7 +320,7 @@ static int shm_create(XShmSegmentInfo *shm, XImage 
**ximg_ptr, int w, int h,
+ 
+ #if HAVE_XSHM
+   shm->shmid = shmget(IPC_PRIVATE,
+-  xim->bytes_per_line * xim->height, IPC_CREAT | 0777);
++  xim->bytes_per_line * xim->height, IPC_CREAT | 0600);
+ 
+   if (shm->shmid == -1) {
+   rfbErr("shmget(%s) failed.\n", name);
+-- 
+2.26.2
+

diff --git a/x11-misc/x11vnc/x11vnc-0.9.16-r4.ebuild 
b/x11-misc/x11vnc/x11vnc-0.9.16-r4.ebuild
new file mode 100644
index 000..31f1ea9b8f1
--- /dev/null
+++ b/x11-misc/x11vnc/x11vnc-0.9.16-r4.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="VNC server for real X displays"
+HOMEPAGE="https://libvnc.github.io/;
+SRC_URI="https://github.com/LibVNC/x11vnc/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+-with-openssl-exception"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc 
~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="crypt fbcon libressl ssl +xcomposite +xdamage +xfixes xinerama +xrandr 
zeroconf"
+
+COMMON_DEPEND="
+   >=net-libs/libvncserver-0.9.8[ssl=]
+   x11-libs/libX11
+   x11-libs/libXcursor
+   x11-libs/libXext
+   >=x11-libs/libXtst-1.1.0
+   ssl? (
+   !libressl? ( dev-libs/openssl:0= )
+   libressl? ( dev-libs/libressl:= )
+   )
+   xcomposite? ( x11-libs/libXcomposite )
+   xdamage? ( x11-libs/libXdamage )
+   xfixes? ( x11-libs/libXfixes )
+   xinerama? ( x11-libs/libXinerama )
+   xrandr? ( x11-libs/libXrandr )
+   zeroconf? ( >=net-dns/avahi-0.6.4 )
+"
+DEPEND="${COMMON_DEPEND}
+   x11-base/xorg-proto
+   x11-libs/libXt
+"
+# https://bugzilla.redhat.com/show_bug.cgi?id=920554
+RDEPEND="${COMMON_DEPEND}
+   dev-lang/tk:0
+"
+
+PATCHES=(
+   "${FILESDIR}"/${P}-crypto.patch # 
https://github.com/LibVNC/x11vnc/issues/86
+   "${FILESDIR}"/${P}-anonymous-ssl.patch # 
https://github.com/LibVNC/x11vnc/pull/85
+   "${FILESDIR}"/${P}-libressl.patch
+   "${FILESDIR}"/${P}-fno-common.patch
+   "${FILESDIR}"/${P}-CVE-2020-29074.patch
+)
+
+src_prepare() {
+   default
+   eautoreconf
+}
+
+src_configure() {
+   # --without-v4l because of missing video4linux 2.x support wrt #389079
+   local myconf=(
+   --without-v4l
+   --without-xkeyboard
+   --without-fbpm
+   --without-dpms
+   $(use_with crypt)
+   $(use_with fbcon fbdev)
+   $(use_with ssl)
+   $(use_with ssl crypto)
+   $(use_with xcomposite)
+   $(use_with xdamage)
+   $(use_with xfixes)
+   $(use_with xinerama)
+   $(use_with xrandr)
+   $(use_with zeroconf avahi)
+   )
+   econf "${myconf[@]}"
+}
+
+src_install() {
+   default
+   newinitd "${FILESDIR}/x11vnc.init.d" x11vnc
+   newconfd "${FILESDIR}/x11vnc.conf.d" x11vnc
+}



[gentoo-commits] repo/gentoo:master commit in: app-misc/trash-cli/

2020-12-06 Thread Joonas Niilola
commit: eda587091c09495fb72314480b2fc07d982e8c3c
Author: Joonas Niilola  gentoo  org>
AuthorDate: Mon Dec  7 07:27:47 2020 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Mon Dec  7 07:27:47 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eda58709

app-misc/trash-cli: add psutil as test dep

Signed-off-by: Joonas Niilola  gentoo.org>

 app-misc/trash-cli/trash-cli-0.20.11.23.ebuild | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/app-misc/trash-cli/trash-cli-0.20.11.23.ebuild 
b/app-misc/trash-cli/trash-cli-0.20.11.23.ebuild
index c8dca292c57..a6a57141736 100644
--- a/app-misc/trash-cli/trash-cli-0.20.11.23.ebuild
+++ b/app-misc/trash-cli/trash-cli-0.20.11.23.ebuild
@@ -15,12 +15,11 @@ 
SRC_URI="https://github.com/andreafrancia/${PN}/archive/${PV}.tar.gz -> ${P}.tar
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
 
-DEPEND="
+BDEPEND="
test? (
dev-python/mock[${PYTHON_USEDEP}]
+   dev-python/psutil[${PYTHON_USEDEP}]
)"
 
 distutils_enable_tests nose



[gentoo-commits] repo/gentoo:master commit in: sys-boot/refind/files/, sys-boot/refind/

2020-12-06 Thread Joonas Niilola
commit: 1aa0c940ee1fc5a5efc5800ee69f676e3710d24a
Author: Theo Anderson  posteo  de>
AuthorDate: Fri Nov 27 10:51:00 2020 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Mon Dec  7 07:30:20 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1aa0c940

sys-boot/refind: add GCC 10 patch / custom-cflags fix

Closes: https://bugs.gentoo.org/723244
Package-Manager: Portage-3.0.10, Repoman-3.0.2
Signed-off-by: Theo Anderson  posteo.de>
Signed-off-by: Joonas Niilola  gentoo.org>

 sys-boot/refind/files/refind-0.12.0-gcc10.patch | 11 +++
 sys-boot/refind/refind-0.12.0-r1.ebuild | 12 
 2 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/sys-boot/refind/files/refind-0.12.0-gcc10.patch 
b/sys-boot/refind/files/refind-0.12.0-gcc10.patch
new file mode 100644
index 000..1f2e2bc0a5d
--- /dev/null
+++ b/sys-boot/refind/files/refind-0.12.0-gcc10.patch
@@ -0,0 +1,11 @@
+--- a/Make.common
 b/Make.common
+@@ -60,7 +60,7 @@
+ #
+ 
+ # ...for both GNU-EFI and TianoCore
+-OPTIMFLAGS  = -Os -fno-strict-aliasing
++OPTIMFLAGS  = -Os -fno-strict-aliasing -fno-tree-loop-distribute-patterns
+ CFLAGS  = $(OPTIMFLAGS) -fno-stack-protector -fshort-wchar -Wall
+ 
+ # ...for GNU-EFI

diff --git a/sys-boot/refind/refind-0.12.0-r1.ebuild 
b/sys-boot/refind/refind-0.12.0-r1.ebuild
index b595a111e7e..f63a0cbd324 100644
--- a/sys-boot/refind/refind-0.12.0-r1.ebuild
+++ b/sys-boot/refind/refind-0.12.0-r1.ebuild
@@ -15,10 +15,14 @@ KEYWORDS="~amd64 ~x86"
 FS_USE="btrfs +ext2 +ext4 hfs +iso9660 ntfs reiserfs"
 IUSE="${FS_USE} custom-cflags doc"
 
-DEPEND=">=sys-boot/gnu-efi-3.0.2"
+DEPEND="sys-boot/gnu-efi"
 
-DOCS=(README.txt)
-PATCHES=("${FILESDIR}/makefile.patch")
+PATCHES=(
+   "${FILESDIR}/makefile.patch"
+   "${FILESDIR}/${P}-gcc10.patch" # Bug 723244
+)
+
+DOCS=( README.txt )
 
 pkg_pretend() {
if use custom-cflags; then
@@ -78,7 +82,7 @@ src_compile() {
FILESYSTEMS_GNUEFI="${fs_names[@]}"
)
if use custom-cflags; then
-   make_flags=(CFLAGS="${CFLAGS}" "${make_flags[@]}")
+   make_flags=(CFLAGS="${CFLAGS} 
-fno-tree-loop-distribute-patterns" "${make_flags[@]}")
fi
 
emake "${make_flags[@]}" all_gnuefi



[gentoo-commits] repo/gentoo:master commit in: app-misc/trash-cli/

2020-12-06 Thread Joonas Niilola
commit: 89f2eccd3315c27f1ec944e66062103c31aa1eab
Author: Zoltan Puskas  sinustrom  info>
AuthorDate: Fri Nov 27 05:52:45 2020 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Mon Dec  7 07:26:52 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=89f2eccd

app-misc/trash-cli: Bump to 0.20.11.23

Package-Manager: Portage-3.0.10, Repoman-3.0.2
Signed-off-by: Zoltan Puskas  sinustrom.info>
Closes: https://github.com/gentoo/gentoo/pull/18423
Signed-off-by: Joonas Niilola  gentoo.org>

 app-misc/trash-cli/Manifest|  1 +
 app-misc/trash-cli/trash-cli-0.20.11.23.ebuild | 26 ++
 2 files changed, 27 insertions(+)

diff --git a/app-misc/trash-cli/Manifest b/app-misc/trash-cli/Manifest
index dd508f1ab94..88b99eed046 100644
--- a/app-misc/trash-cli/Manifest
+++ b/app-misc/trash-cli/Manifest
@@ -1 +1,2 @@
 DIST trash-cli-0.17.1.14_p20170816.tar.gz 69713 BLAKE2B 
f995c22ba0704eba96abac2c130f9118cc98ad5c5f21903601ea60ee1f52c594b7f8b16ebcaabb4b34086f5f9f66ad02cd628c379ed5139bcb1f691016b435ab
 SHA512 
9d35620b55c63b53b7255179a6304f4d7190c2a90f68c102f64b9616ee897460939633e9c77826968a1682fc5fa090b0f3ea1daad82a44cc96704dc54da45dcd
+DIST trash-cli-0.20.11.23.tar.gz 69229 BLAKE2B 
f3650a037f00e6ce8cd7bd1ff5f3e11c794ceb09563193e2930eb9b81cd40120dd48f117e8c96d900a8221db9a68360ff633e591367bd544ad07045b1a505304
 SHA512 
d370687da706677de61c0d234d4cb4db4ff4d9da8cde60c361d11eaccf319e2e418969a7d49ec6edd456524b1275b63d1fcd49bc9a9012afabda1c7a8ad7de78

diff --git a/app-misc/trash-cli/trash-cli-0.20.11.23.ebuild 
b/app-misc/trash-cli/trash-cli-0.20.11.23.ebuild
new file mode 100644
index 000..c8dca292c57
--- /dev/null
+++ b/app-misc/trash-cli/trash-cli-0.20.11.23.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+DISTUTILS_USE_SETUPTOOLS=no
+
+inherit distutils-r1
+
+DESCRIPTION="Python scripts to manipulate trash cans via the command line"
+HOMEPAGE="https://github.com/andreafrancia/trash-cli;
+SRC_URI="https://github.com/andreafrancia/${PN}/archive/${PV}.tar.gz -> 
${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+   test? (
+   dev-python/mock[${PYTHON_USEDEP}]
+   )"
+
+distutils_enable_tests nose



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

2020-12-06 Thread Joonas Niilola
commit: 035fc427623a8aa1cef2a05fb33f83128ed98f85
Author: Andrew Ammerlaan  riseup  net>
AuthorDate: Sun Dec  6 11:27:03 2020 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Mon Dec  7 07:18:24 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=035fc427

dev-libs/efl: use docs.eclass for building docs

As requested by Juippis, an example on how to use
the new docs.eclass with doxygen

See-Also: https://github.com/gentoo/gentoo/pull/16366
Package-Manager: Portage-3.0.11, Repoman-3.0.2
Signed-off-by: Andrew Ammerlaan  riseup.net>
Signed-off-by: Joonas Niilola  gentoo.org>

 dev-libs/efl/efl-1.25.1-r10.ebuild | 26 +-
 dev-libs/efl/efl-1.25.1-r2.ebuild  | 26 +-
 2 files changed, 34 insertions(+), 18 deletions(-)

diff --git a/dev-libs/efl/efl-1.25.1-r10.ebuild 
b/dev-libs/efl/efl-1.25.1-r10.ebuild
index fb4e7962912..7c1c12329f4 100644
--- a/dev-libs/efl/efl-1.25.1-r10.ebuild
+++ b/dev-libs/efl/efl-1.25.1-r10.ebuild
@@ -5,7 +5,10 @@ EAPI=7
 
 LUA_COMPAT=( lua5-{1..3} luajit )
 
-inherit lua-single meson xdg-utils
+DOCS_BUILDER="doxygen"
+DOCS_DIR="${S}/doc"
+
+inherit docs lua-single meson xdg-utils
 
 DESCRIPTION="Enlightenment Foundation Libraries all-in-one package"
 HOMEPAGE="https://www.enlightenment.org;
@@ -14,7 +17,7 @@ 
SRC_URI="https://download.enlightenment.org/rel/libs/${PN}/${P}.tar.xz;
 LICENSE="BSD-2 GPL-2 LGPL-2.1 ZLIB"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
-IUSE="+X avif bmp connman cpu_flags_arm_neon dds debug doc drm +eet efl-one 
elogind examples fbcon
+IUSE="+X avif bmp connman cpu_flags_arm_neon dds debug drm +eet efl-one 
elogind examples fbcon
+fontconfig fribidi gif gles2-only gnutls glib +gstreamer harfbuzz 
hyphen ibus ico libressl
jpeg2k json nls mono opengl +pdf physics pmaps postscript psd 
pulseaudio raw scim
sdl +sound +ssl +svg +system-lz4 systemd tga tgv tiff tslib unwind v4l 
vnc wayland webp xcf
@@ -125,7 +128,6 @@ RDEPEND="${LUA_DEPS}
zeroconf? ( net-dns/avahi )"
 DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig
-   doc? ( app-doc/doxygen )
nls? ( sys-devel/gettext )"
 
 pkg_setup() {
@@ -142,6 +144,17 @@ src_prepare() {
sed -i "/config_h.set('HAVE_UNWIND/,/eina_ext_deps += unwind/d" 
src/lib/eina/meson.build ||
die "Failed to remove libunwind dep"
fi
+
+   # Fixup Doxyfile
+   pushd "${DOCS_DIR}"
+   cp Doxyfile.in Doxyfile || die
+   sed -i \
+   -e "s/@PACKAGE_VERSION@/${PV}/g" \
+   -e "s/@top_builddir@/../g" \
+   -e "s/@top_srcdir@/../g" \
+   -e "s/@srcdir@/./g" \
+   Doxyfile || die
+   popd
 }
 
 src_configure() {
@@ -273,16 +286,11 @@ src_configure() {
 }
 
 src_compile() {
+   docs_compile
meson_src_compile
-
-   if use doc; then
-   cd doc/ || die "Failed to switch into doc/ dir."
-   doxygen . || die "Doxygen failed to run."
-   fi
 }
 
 src_install() {
-   use doc && local HTML_DOCS=( "${S}"/doc/html/. )
meson_src_install
 
if use examples; then

diff --git a/dev-libs/efl/efl-1.25.1-r2.ebuild 
b/dev-libs/efl/efl-1.25.1-r2.ebuild
index 6ed496789b7..6e7cddf0d29 100644
--- a/dev-libs/efl/efl-1.25.1-r2.ebuild
+++ b/dev-libs/efl/efl-1.25.1-r2.ebuild
@@ -3,7 +3,10 @@
 
 EAPI=7
 
-inherit meson xdg-utils
+DOCS_BUILDER="doxygen"
+DOCS_DIR="${S}/doc"
+
+inherit docs meson xdg-utils
 
 DESCRIPTION="Enlightenment Foundation Libraries all-in-one package"
 HOMEPAGE="https://www.enlightenment.org;
@@ -12,7 +15,7 @@ 
SRC_URI="https://download.enlightenment.org/rel/libs/${PN}/${P}.tar.xz;
 LICENSE="BSD-2 GPL-2 LGPL-2.1 ZLIB"
 SLOT="0"
 KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 x86"
-IUSE="+X avif bmp connman cpu_flags_arm_neon dds debug doc drm +eet efl-one 
elogind examples fbcon
+IUSE="+X avif bmp connman cpu_flags_arm_neon dds debug drm +eet efl-one 
elogind examples fbcon
+fontconfig fribidi gif gles2-only gnutls glib +gstreamer harfbuzz 
hyphen ibus ico libressl
lua +luajit jpeg2k json nls mono opengl +pdf physics pmaps postscript 
psd pulseaudio raw scim
sdl +sound +ssl +svg +system-lz4 systemd tga tgv tiff tslib unwind v4l 
vnc wayland webp xcf
@@ -128,7 +131,6 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig
-   doc? ( app-doc/doxygen )
nls? ( sys-devel/gettext )"
 
 pkg_setup() {
@@ -145,6 +147,17 @@ src_prepare() {
sed -i "/config_h.set('HAVE_UNWIND/,/eina_ext_deps += unwind/d" 
src/lib/eina/meson.build ||
die "Failed to remove libunwind dep"
fi
+
+   # Fixup Doxyfile
+   pushd "${DOCS_DIR}"
+   cp Doxyfile.in Doxyfile || die
+   sed -i \
+   -e "s/@PACKAGE_VERSION@/${PV}/g" \
+   -e "s/@top_builddir@/../g" \
+   -e "s/@top_srcdir@/../g" \
+   -e 

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

2020-12-06 Thread Joonas Niilola
commit: 5be400e6334506a58dd8c02cd14d3dbb9463d119
Author: Joonas Niilola  gentoo  org>
AuthorDate: Mon Dec  7 07:19:00 2020 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Mon Dec  7 07:19:00 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5be400e6

dev-libs/efl: add missing die commands on 1.25.1-r2

Signed-off-by: Joonas Niilola  gentoo.org>

 dev-libs/efl/efl-1.25.1-r2.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-libs/efl/efl-1.25.1-r2.ebuild 
b/dev-libs/efl/efl-1.25.1-r2.ebuild
index 6e7cddf0d29..0bd9f6753f5 100644
--- a/dev-libs/efl/efl-1.25.1-r2.ebuild
+++ b/dev-libs/efl/efl-1.25.1-r2.ebuild
@@ -149,7 +149,7 @@ src_prepare() {
fi
 
# Fixup Doxyfile
-   pushd "${DOCS_DIR}"
+   pushd "${DOCS_DIR}" || die
cp Doxyfile.in Doxyfile || die
sed -i \
-e "s/@PACKAGE_VERSION@/${PV}/g" \
@@ -157,7 +157,7 @@ src_prepare() {
-e "s/@top_srcdir@/../g" \
-e "s/@srcdir@/./g" \
Doxyfile || die
-   popd
+   popd || die
 }
 
 src_configure() {



[gentoo-commits] repo/gentoo:master commit in: app-misc/trash-cli/

2020-12-06 Thread Joonas Niilola
commit: 52f5ad0f3adf12d40b57d9817a7df43729d5d965
Author: Zoltan Puskas  sinustrom  info>
AuthorDate: Fri Nov 27 05:42:03 2020 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Mon Dec  7 07:26:52 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=52f5ad0f

app-misc/trash-cli: Drop 0.17.1.14_p20170816

app-misc/trash-cli-0.17.1.14_p20170816-r1 is also stable, thus dropping
old stable version.

Package-Manager: Portage-3.0.10, Repoman-3.0.2
Signed-off-by: Zoltan Puskas  sinustrom.info>
Signed-off-by: Joonas Niilola  gentoo.org>

 .../trash-cli/trash-cli-0.17.1.14_p20170816.ebuild | 30 --
 1 file changed, 30 deletions(-)

diff --git a/app-misc/trash-cli/trash-cli-0.17.1.14_p20170816.ebuild 
b/app-misc/trash-cli/trash-cli-0.17.1.14_p20170816.ebuild
deleted file mode 100644
index c32b7c75024..000
--- a/app-misc/trash-cli/trash-cli-0.17.1.14_p20170816.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1 vcs-snapshot
-
-GIT_REF=5abecd53e1d84f2a5fd3fc60d2f5d71e518826c5
-
-DESCRIPTION="Python scripts to manipulate trash cans via the command line"
-HOMEPAGE="https://github.com/andreafrancia/trash-cli;
-SRC_URI="https://github.com/andreafrancia/${PN}/archive/${GIT_REF}.tar.gz -> 
${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-   test? (
-   dev-python/nose[${PYTHON_USEDEP}]
-   dev-python/mock[${PYTHON_USEDEP}]
-   )"
-
-python_test() {
-   nosetests -v || die
-}



[gentoo-commits] repo/gentoo:master commit in: x11-base/xorg-server/

2020-12-06 Thread Sam James
commit: 0e1c29e834ba50754d3953f3b18b4996fbd37b38
Author: Sam James  gentoo  org>
AuthorDate: Mon Dec  7 05:32:41 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Dec  7 05:32:41 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e1c29e8

x11-base/xorg-server: Stabilize 1.20.10 arm, #757882

Signed-off-by: Sam James  gentoo.org>

 x11-base/xorg-server/xorg-server-1.20.10.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-base/xorg-server/xorg-server-1.20.10.ebuild 
b/x11-base/xorg-server/xorg-server-1.20.10.ebuild
index f4c2c6bbe59..d36562f2d7f 100644
--- a/x11-base/xorg-server/xorg-server-1.20.10.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.20.10.ebuild
@@ -10,7 +10,7 @@ 
EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/xserver.git;
 DESCRIPTION="X.Org X servers"
 SLOT="0/${PV}"
 if [[ ${PV} != * ]]; then
-   KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 
~sparc x86 ~amd64-linux ~x86-linux"
+   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 
~sparc x86 ~amd64-linux ~x86-linux"
 fi
 
 IUSE_SERVERS="dmx kdrive wayland xephyr xnest xorg xvfb"



[gentoo-commits] repo/gentoo:master commit in: dev-python/ipython/

2020-12-06 Thread Sam James
commit: ee433fdaa0f4fcf790dcb5e249fc9dbe51e0caad
Author: Sam James  gentoo  org>
AuthorDate: Mon Dec  7 05:27:27 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Dec  7 05:27:27 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ee433fda

dev-python/ipython: Stabilize 7.19.0 ALLARCHES, #758509

Signed-off-by: Sam James  gentoo.org>

 dev-python/ipython/ipython-7.19.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-python/ipython/ipython-7.19.0.ebuild 
b/dev-python/ipython/ipython-7.19.0.ebuild
index dfdb4d403f3..b963c464a38 100644
--- a/dev-python/ipython/ipython-7.19.0.ebuild
+++ b/dev-python/ipython/ipython-7.19.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples matplotlib notebook nbconvert qt5 +smp test"
 RESTRICT="!test? ( test )"
 



[gentoo-commits] repo/gentoo:master commit in: net-print/gutenprint/

2020-12-06 Thread Sam James
commit: 62aeef1b7dcd0d575ae23d43cb1c44b56fbea05d
Author: Sam James  gentoo  org>
AuthorDate: Mon Dec  7 05:23:27 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Dec  7 05:23:27 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=62aeef1b

net-print/gutenprint: Stabilize 5.3.3-r2 arm, #757834

Signed-off-by: Sam James  gentoo.org>

 net-print/gutenprint/gutenprint-5.3.3-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-print/gutenprint/gutenprint-5.3.3-r2.ebuild 
b/net-print/gutenprint/gutenprint-5.3.3-r2.ebuild
index c24a1a8bfff..23db55b2d1e 100644
--- a/net-print/gutenprint/gutenprint-5.3.3-r2.ebuild
+++ b/net-print/gutenprint/gutenprint-5.3.3-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/gimp-print/${MY_P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha ~amd64 arm ~hppa ~ia64 ppc ppc64 ~sparc x86"
 
 IUSE="cups gimp gtk nls readline ppds static-libs"
 REQUIRED_USE="gimp? ( gtk )"



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

2020-12-06 Thread Sam James
commit: 9a198100db05e533748b8c58f7907f84d7388b97
Author: Sam James  gentoo  org>
AuthorDate: Mon Dec  7 05:21:33 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Dec  7 05:21:33 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9a198100

dev-util/glslang: Stabilize 10.11.0.0_pre20200924 arm, #758680

Signed-off-by: Sam James  gentoo.org>

 dev-util/glslang/glslang-10.11.0.0_pre20200924.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/glslang/glslang-10.11.0.0_pre20200924.ebuild 
b/dev-util/glslang/glslang-10.11.0.0_pre20200924.ebuild
index d0147b80cec..ce77aaad4c9 100644
--- a/dev-util/glslang/glslang-10.11.0.0_pre20200924.ebuild
+++ b/dev-util/glslang/glslang-10.11.0.0_pre20200924.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == ** ]]; then
 else
SNAPSHOT_COMMIT="bacaef3237c515e40d1a24722be48c0a0b30f75f"

SRC_URI="https://github.com/KhronosGroup/${PN}/archive/${SNAPSHOT_COMMIT}.tar.gz
 -> ${P}.tar.gz"
-   KEYWORDS="~amd64 ~arm arm64 ~ppc ~ppc64 ~riscv x86"
+   KEYWORDS="~amd64 arm arm64 ~ppc ~ppc64 ~riscv x86"
S="${WORKDIR}/${PN}-${SNAPSHOT_COMMIT}"
 fi
 



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

2020-12-06 Thread Sam James
commit: fa286a27f4663c6db3b5fb02d7cd27ca974bc7a6
Author: Sam James  gentoo  org>
AuthorDate: Mon Dec  7 05:21:34 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Dec  7 05:21:34 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fa286a27

dev-util/spirv-headers: Stabilize 1.5.4 arm, #758680

Signed-off-by: Sam James  gentoo.org>

 dev-util/spirv-headers/spirv-headers-1.5.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/spirv-headers/spirv-headers-1.5.4.ebuild 
b/dev-util/spirv-headers/spirv-headers-1.5.4.ebuild
index acc3c4f68af..6bca0898664 100644
--- a/dev-util/spirv-headers/spirv-headers-1.5.4.ebuild
+++ b/dev-util/spirv-headers/spirv-headers-1.5.4.ebuild
@@ -12,6 +12,6 @@ 
SRC_URI="https://github.com/KhronosGroup/SPIRV-Headers/archive/${EGIT_COMMIT}.ta
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm arm64 ~ppc ~ppc64 ~riscv x86"
+KEYWORDS="~amd64 arm arm64 ~ppc ~ppc64 ~riscv x86"
 
 S="${WORKDIR}/SPIRV-Headers-${EGIT_COMMIT}"



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

2020-12-06 Thread Sam James
commit: 21ef7f86738c17bf7fc8043b0405b8dc34e1cdf8
Author: Sam James  gentoo  org>
AuthorDate: Mon Dec  7 05:21:36 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Dec  7 05:21:36 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=21ef7f86

media-libs/vulkan-loader: Stabilize 1.2.154 arm, #758680

Signed-off-by: Sam James  gentoo.org>

 media-libs/vulkan-loader/vulkan-loader-1.2.154.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/vulkan-loader/vulkan-loader-1.2.154.ebuild 
b/media-libs/vulkan-loader/vulkan-loader-1.2.154.ebuild
index d91bf4ebf04..d5432e6d797 100644
--- a/media-libs/vulkan-loader/vulkan-loader-1.2.154.ebuild
+++ b/media-libs/vulkan-loader/vulkan-loader-1.2.154.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == ** ]]; then
inherit git-r3
 else
SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz 
-> ${P}.tar.gz"
-   KEYWORDS="~amd64 ~arm arm64 ~ppc ~ppc64 ~riscv x86"
+   KEYWORDS="~amd64 arm arm64 ~ppc ~ppc64 ~riscv x86"
S="${WORKDIR}"/${MY_PN}-${PV}
 fi
 



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

2020-12-06 Thread Sam James
commit: c96bd7b3524f1283d6ed9fbf9ff0ae3af02c9eae
Author: Sam James  gentoo  org>
AuthorDate: Mon Dec  7 05:19:47 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Dec  7 05:19:47 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c96bd7b3

media-libs/vulkan-loader: Stabilize 1.2.154 arm64, #758680

Signed-off-by: Sam James  gentoo.org>

 media-libs/vulkan-loader/vulkan-loader-1.2.154.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/vulkan-loader/vulkan-loader-1.2.154.ebuild 
b/media-libs/vulkan-loader/vulkan-loader-1.2.154.ebuild
index 5b49dd6a4d6..d91bf4ebf04 100644
--- a/media-libs/vulkan-loader/vulkan-loader-1.2.154.ebuild
+++ b/media-libs/vulkan-loader/vulkan-loader-1.2.154.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == ** ]]; then
inherit git-r3
 else
SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz 
-> ${P}.tar.gz"
-   KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv x86"
+   KEYWORDS="~amd64 ~arm arm64 ~ppc ~ppc64 ~riscv x86"
S="${WORKDIR}"/${MY_PN}-${PV}
 fi
 



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

2020-12-06 Thread Sam James
commit: 84a0802ee01326bd60bd7f059d999ed80f955b5d
Author: Sam James  gentoo  org>
AuthorDate: Mon Dec  7 05:21:35 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Dec  7 05:21:35 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=84a0802e

dev-util/vulkan-headers: Stabilize 1.2.154 arm, #758680

Signed-off-by: Sam James  gentoo.org>

 dev-util/vulkan-headers/vulkan-headers-1.2.154.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/vulkan-headers/vulkan-headers-1.2.154.ebuild 
b/dev-util/vulkan-headers/vulkan-headers-1.2.154.ebuild
index 985bff4080b..64a98c61a55 100644
--- a/dev-util/vulkan-headers/vulkan-headers-1.2.154.ebuild
+++ b/dev-util/vulkan-headers/vulkan-headers-1.2.154.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == ** ]]; then
inherit git-r3
 else
SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz 
-> ${P}.tar.gz"
-   KEYWORDS="~amd64 ~arm arm64 ~ppc ~ppc64 ~riscv x86"
+   KEYWORDS="~amd64 arm arm64 ~ppc ~ppc64 ~riscv x86"
S="${WORKDIR}"/${MY_PN}-${PV}
 fi
 



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

2020-12-06 Thread Sam James
commit: 31feb65e9b259475dd37d6367fb1fd345dfbd204
Author: Sam James  gentoo  org>
AuthorDate: Mon Dec  7 05:21:34 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Dec  7 05:21:34 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=31feb65e

dev-util/spirv-tools: Stabilize 2020.5_pre20201107 arm, #758680

Signed-off-by: Sam James  gentoo.org>

 dev-util/spirv-tools/spirv-tools-2020.5_pre20201107.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/spirv-tools/spirv-tools-2020.5_pre20201107.ebuild 
b/dev-util/spirv-tools/spirv-tools-2020.5_pre20201107.ebuild
index 9669d51770f..dec0eb24a04 100644
--- a/dev-util/spirv-tools/spirv-tools-2020.5_pre20201107.ebuild
+++ b/dev-util/spirv-tools/spirv-tools-2020.5_pre20201107.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == ** ]]; then
 else
EGIT_COMMIT="a61d07a72763c1eb200de0a2c316703643a0d1d9"

SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/${EGIT_COMMIT}.tar.gz 
-> ${P}.tar.gz"
-   KEYWORDS="~amd64 ~arm arm64 ~ppc ~ppc64 ~riscv x86"
+   KEYWORDS="~amd64 arm arm64 ~ppc ~ppc64 ~riscv x86"
S="${WORKDIR}"/${MY_PN}-${EGIT_COMMIT}
 fi
 



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

2020-12-06 Thread Sam James
commit: f6f7b490a1e1cff09eb81f3447c793eabab47bab
Author: Sam James  gentoo  org>
AuthorDate: Mon Dec  7 05:21:35 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Dec  7 05:21:35 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f6f7b490

media-libs/vulkan-layers: Stabilize 1.2.154 arm, #758680

Signed-off-by: Sam James  gentoo.org>

 media-libs/vulkan-layers/vulkan-layers-1.2.154.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/vulkan-layers/vulkan-layers-1.2.154.ebuild 
b/media-libs/vulkan-layers/vulkan-layers-1.2.154.ebuild
index 10569d86a64..dde95566abc 100644
--- a/media-libs/vulkan-layers/vulkan-layers-1.2.154.ebuild
+++ b/media-libs/vulkan-layers/vulkan-layers-1.2.154.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == ** ]]; then
inherit git-r3
 else
SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz 
-> ${P}.tar.gz"
-   KEYWORDS="~amd64 ~arm arm64 ~ppc ~ppc64 ~riscv x86"
+   KEYWORDS="~amd64 arm arm64 ~ppc ~ppc64 ~riscv x86"
S="${WORKDIR}"/${MY_PN}-${PV}
 fi
 



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

2020-12-06 Thread Sam James
commit: 9018a7664d270193886d31855456cbf82c4ae944
Author: Sam James  gentoo  org>
AuthorDate: Mon Dec  7 05:19:47 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Dec  7 05:19:47 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9018a766

media-libs/vulkan-layers: Stabilize 1.2.154 arm64, #758680

Signed-off-by: Sam James  gentoo.org>

 media-libs/vulkan-layers/vulkan-layers-1.2.154.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/vulkan-layers/vulkan-layers-1.2.154.ebuild 
b/media-libs/vulkan-layers/vulkan-layers-1.2.154.ebuild
index c3359156271..10569d86a64 100644
--- a/media-libs/vulkan-layers/vulkan-layers-1.2.154.ebuild
+++ b/media-libs/vulkan-layers/vulkan-layers-1.2.154.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == ** ]]; then
inherit git-r3
 else
SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz 
-> ${P}.tar.gz"
-   KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv x86"
+   KEYWORDS="~amd64 ~arm arm64 ~ppc ~ppc64 ~riscv x86"
S="${WORKDIR}"/${MY_PN}-${PV}
 fi
 



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

2020-12-06 Thread Sam James
commit: c6a2b188a5654cc4d3bbb3d4ec56fe10f8845060
Author: Sam James  gentoo  org>
AuthorDate: Mon Dec  7 05:19:45 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Dec  7 05:19:45 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c6a2b188

dev-util/glslang: Stabilize 10.11.0.0_pre20200924 arm64, #758680

Signed-off-by: Sam James  gentoo.org>

 dev-util/glslang/glslang-10.11.0.0_pre20200924.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/glslang/glslang-10.11.0.0_pre20200924.ebuild 
b/dev-util/glslang/glslang-10.11.0.0_pre20200924.ebuild
index df3a07815d1..d0147b80cec 100644
--- a/dev-util/glslang/glslang-10.11.0.0_pre20200924.ebuild
+++ b/dev-util/glslang/glslang-10.11.0.0_pre20200924.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == ** ]]; then
 else
SNAPSHOT_COMMIT="bacaef3237c515e40d1a24722be48c0a0b30f75f"

SRC_URI="https://github.com/KhronosGroup/${PN}/archive/${SNAPSHOT_COMMIT}.tar.gz
 -> ${P}.tar.gz"
-   KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv x86"
+   KEYWORDS="~amd64 ~arm arm64 ~ppc ~ppc64 ~riscv x86"
S="${WORKDIR}/${PN}-${SNAPSHOT_COMMIT}"
 fi
 



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

2020-12-06 Thread Sam James
commit: 11a87d29b46f90541d2cd958ae755eb4ded20657
Author: Sam James  gentoo  org>
AuthorDate: Mon Dec  7 05:19:46 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Dec  7 05:19:46 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=11a87d29

dev-util/vulkan-headers: Stabilize 1.2.154 arm64, #758680

Signed-off-by: Sam James  gentoo.org>

 dev-util/vulkan-headers/vulkan-headers-1.2.154.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/vulkan-headers/vulkan-headers-1.2.154.ebuild 
b/dev-util/vulkan-headers/vulkan-headers-1.2.154.ebuild
index 64c2da67dd4..985bff4080b 100644
--- a/dev-util/vulkan-headers/vulkan-headers-1.2.154.ebuild
+++ b/dev-util/vulkan-headers/vulkan-headers-1.2.154.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == ** ]]; then
inherit git-r3
 else
SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz 
-> ${P}.tar.gz"
-   KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv x86"
+   KEYWORDS="~amd64 ~arm arm64 ~ppc ~ppc64 ~riscv x86"
S="${WORKDIR}"/${MY_PN}-${PV}
 fi
 



[gentoo-commits] repo/gentoo:master commit in: x11-libs/libXau/

2020-12-06 Thread Sam James
commit: cd490e271accafb092b985d3f6d3d7f0136a847f
Author: Sam James  gentoo  org>
AuthorDate: Mon Dec  7 05:12:27 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Dec  7 05:12:27 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cd490e27

x11-libs/libXau: Stabilize 1.0.9-r1 arm64, #758461

Signed-off-by: Sam James  gentoo.org>

 x11-libs/libXau/libXau-1.0.9-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-libs/libXau/libXau-1.0.9-r1.ebuild 
b/x11-libs/libXau/libXau-1.0.9-r1.ebuild
index 222eb2d7035..5570b864800 100644
--- a/x11-libs/libXau/libXau-1.0.9-r1.ebuild
+++ b/x11-libs/libXau/libXau-1.0.9-r1.ebuild
@@ -8,6 +8,6 @@ inherit xorg-3
 
 DESCRIPTION="X.Org X authorization library"
 
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 
~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 
~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 
 DEPEND="x11-base/xorg-proto"



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

2020-12-06 Thread Sam James
commit: 485dcc4a0bbe0d3bdeaa41f387fb855a840bb4fe
Author: Sam James  gentoo  org>
AuthorDate: Mon Dec  7 05:19:46 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Dec  7 05:19:46 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=485dcc4a

dev-util/spirv-tools: Stabilize 2020.5_pre20201107 arm64, #758680

Signed-off-by: Sam James  gentoo.org>

 dev-util/spirv-tools/spirv-tools-2020.5_pre20201107.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/spirv-tools/spirv-tools-2020.5_pre20201107.ebuild 
b/dev-util/spirv-tools/spirv-tools-2020.5_pre20201107.ebuild
index 70745531f73..9669d51770f 100644
--- a/dev-util/spirv-tools/spirv-tools-2020.5_pre20201107.ebuild
+++ b/dev-util/spirv-tools/spirv-tools-2020.5_pre20201107.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == ** ]]; then
 else
EGIT_COMMIT="a61d07a72763c1eb200de0a2c316703643a0d1d9"

SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/${EGIT_COMMIT}.tar.gz 
-> ${P}.tar.gz"
-   KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv x86"
+   KEYWORDS="~amd64 ~arm arm64 ~ppc ~ppc64 ~riscv x86"
S="${WORKDIR}"/${MY_PN}-${EGIT_COMMIT}
 fi
 



[gentoo-commits] repo/gentoo:master commit in: x11-libs/libxshmfence/

2020-12-06 Thread Sam James
commit: 9909e341d21bf079517b21efd675a706b1ad83c6
Author: Sam James  gentoo  org>
AuthorDate: Mon Dec  7 05:12:28 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Dec  7 05:12:28 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9909e341

x11-libs/libxshmfence: Stabilize 1.3-r2 arm64, #758461

Signed-off-by: Sam James  gentoo.org>

 x11-libs/libxshmfence/libxshmfence-1.3-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-libs/libxshmfence/libxshmfence-1.3-r2.ebuild 
b/x11-libs/libxshmfence/libxshmfence-1.3-r2.ebuild
index 2b54c24a224..b0897faaabd 100644
--- a/x11-libs/libxshmfence/libxshmfence-1.3-r2.ebuild
+++ b/x11-libs/libxshmfence/libxshmfence-1.3-r2.ebuild
@@ -8,6 +8,6 @@ inherit xorg-3
 
 DESCRIPTION="Shared memory fences using futexes"
 
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 
~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 
~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 DEPEND="x11-base/xorg-proto"



[gentoo-commits] repo/gentoo:master commit in: x11-libs/libxkbcommon/

2020-12-06 Thread Sam James
commit: 718d3cf08fbf35a9392b7f3a00e9f1eed72fd31d
Author: Sam James  gentoo  org>
AuthorDate: Mon Dec  7 05:12:28 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Dec  7 05:12:28 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=718d3cf0

x11-libs/libxkbcommon: Stabilize 1.0.3 arm64, #758461

Signed-off-by: Sam James  gentoo.org>

 x11-libs/libxkbcommon/libxkbcommon-1.0.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-libs/libxkbcommon/libxkbcommon-1.0.3.ebuild 
b/x11-libs/libxkbcommon/libxkbcommon-1.0.3.ebuild
index fc547c44ea6..a6a0a5f581f 100644
--- a/x11-libs/libxkbcommon/libxkbcommon-1.0.3.ebuild
+++ b/x11-libs/libxkbcommon/libxkbcommon-1.0.3.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} = ** ]]; then
EGIT_REPO_URI="https://github.com/xkbcommon/${PN};
 else
SRC_URI="https://xkbcommon.org/download/${P}.tar.xz;
-   KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 
~sparc ~x86"
+   KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 
~sparc ~x86"
 fi
 
 inherit meson multilib-minimal ${GIT_ECLASS}



[gentoo-commits] repo/gentoo:master commit in: x11-misc/compose-tables/

2020-12-06 Thread Sam James
commit: 6dd045a13d488d3d00904c0e8b050f492107f498
Author: Sam James  gentoo  org>
AuthorDate: Mon Dec  7 05:12:29 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Dec  7 05:12:29 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6dd045a1

x11-misc/compose-tables: Stabilize 1.7.0 arm64, #758461

Signed-off-by: Sam James  gentoo.org>

 x11-misc/compose-tables/compose-tables-1.7.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-misc/compose-tables/compose-tables-1.7.0.ebuild 
b/x11-misc/compose-tables/compose-tables-1.7.0.ebuild
index 73e016e53e3..f86d5c6b554 100644
--- a/x11-misc/compose-tables/compose-tables-1.7.0.ebuild
+++ b/x11-misc/compose-tables/compose-tables-1.7.0.ebuild
@@ -12,7 +12,7 @@ 
SRC_URI="${XORG_BASE_INDIVIDUAL_URI}/lib/libX11-${PV}.tar.${XORG_TARBALL_SUFFIX}
 S="${WORKDIR}/libX11-${PV}/"
 
 DESCRIPTION="X.Org Compose Key tables from libX11"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc 
~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc 
~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 
 # Only needed by configure
 DEPEND="



[gentoo-commits] repo/gentoo:master commit in: dev-lang/php/

2020-12-06 Thread Sam James
commit: 90e70a01d1f32259aa2e58e7fc897da8c858d1c4
Author: Sam James  gentoo  org>
AuthorDate: Mon Dec  7 05:17:56 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Dec  7 05:17:56 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=90e70a01

dev-lang/php: Stabilize 7.4.13 arm, #756775

Signed-off-by: Sam James  gentoo.org>

 dev-lang/php/php-7.4.13.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-lang/php/php-7.4.13.ebuild b/dev-lang/php/php-7.4.13.ebuild
index f75fa1886ab..48460b25f65 100644
--- a/dev-lang/php/php-7.4.13.ebuild
+++ b/dev-lang/php/php-7.4.13.ebuild
@@ -21,7 +21,7 @@ LICENSE="PHP-3.01
unicode? ( BSD-2 LGPL-2.1 )"
 
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc 
x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86 
~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 
 S="${WORKDIR}/${PN}-${MY_PV}"
 



[gentoo-commits] repo/gentoo:master commit in: x11-misc/xkeyboard-config/

2020-12-06 Thread Sam James
commit: d735f4732c4ac211c1b93f15bdb80dd95f6ac808
Author: Sam James  gentoo  org>
AuthorDate: Mon Dec  7 05:12:29 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Dec  7 05:12:29 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d735f473

x11-misc/xkeyboard-config: Stabilize 2.31 arm64, #758461

Signed-off-by: Sam James  gentoo.org>

 x11-misc/xkeyboard-config/xkeyboard-config-2.31.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-2.31.ebuild 
b/x11-misc/xkeyboard-config/xkeyboard-config-2.31.ebuild
index 6cb4a075e7e..d04dea966d0 100644
--- a/x11-misc/xkeyboard-config/xkeyboard-config-2.31.ebuild
+++ b/x11-misc/xkeyboard-config/xkeyboard-config-2.31.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} ==  ]]; then
LIVE_DEPEND=">=x11-misc/util-macros-1.18"
 else
SRC_URI="https://www.x.org/releases/individual/data/${PN}/${P}.tar.bz2;
-   KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris 
~x86-solaris"
+   KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris 
~x86-solaris"
 fi
 
 LICENSE="MIT"



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

2020-12-06 Thread Sam James
commit: d034ad8754383b308208cbf1d6dcc36b3e2c0bb1
Author: Sam James  gentoo  org>
AuthorDate: Mon Dec  7 05:19:45 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Dec  7 05:19:45 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d034ad87

dev-util/spirv-headers: Stabilize 1.5.4 arm64, #758680

Signed-off-by: Sam James  gentoo.org>

 dev-util/spirv-headers/spirv-headers-1.5.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/spirv-headers/spirv-headers-1.5.4.ebuild 
b/dev-util/spirv-headers/spirv-headers-1.5.4.ebuild
index 3671f2d8e23..acc3c4f68af 100644
--- a/dev-util/spirv-headers/spirv-headers-1.5.4.ebuild
+++ b/dev-util/spirv-headers/spirv-headers-1.5.4.ebuild
@@ -12,6 +12,6 @@ 
SRC_URI="https://github.com/KhronosGroup/SPIRV-Headers/archive/${EGIT_COMMIT}.ta
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv x86"
+KEYWORDS="~amd64 ~arm arm64 ~ppc ~ppc64 ~riscv x86"
 
 S="${WORKDIR}/SPIRV-Headers-${EGIT_COMMIT}"



[gentoo-commits] repo/gentoo:master commit in: dev-lang/php/

2020-12-06 Thread Sam James
commit: 33afd024f33de6aed01915eb551f7188546bc632
Author: Sam James  gentoo  org>
AuthorDate: Mon Dec  7 05:17:56 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Dec  7 05:17:56 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=33afd024

dev-lang/php: Stabilize 7.3.25 arm, #756775

Signed-off-by: Sam James  gentoo.org>

 dev-lang/php/php-7.3.25.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-lang/php/php-7.3.25.ebuild b/dev-lang/php/php-7.3.25.ebuild
index a714b65929e..a29e8ad9230 100644
--- a/dev-lang/php/php-7.3.25.ebuild
+++ b/dev-lang/php/php-7.3.25.ebuild
@@ -19,7 +19,7 @@ LICENSE="PHP-3.01
unicode? ( BSD-2 LGPL-2.1 )"
 
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc 
x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86 
~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 
 S="${WORKDIR}/${PN}-${MY_PV}"
 



[gentoo-commits] repo/gentoo:master commit in: x11-libs/libdrm/

2020-12-06 Thread Sam James
commit: 8ae68d7c03d5dc58e1d22b610e880aa635c0698d
Author: Sam James  gentoo  org>
AuthorDate: Mon Dec  7 05:12:27 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Dec  7 05:12:27 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8ae68d7c

x11-libs/libdrm: Stabilize 2.4.103 arm64, #758461

Signed-off-by: Sam James  gentoo.org>

 x11-libs/libdrm/libdrm-2.4.103.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-libs/libdrm/libdrm-2.4.103.ebuild 
b/x11-libs/libdrm/libdrm-2.4.103.ebuild
index 9ca25df2714..23f115cdc10 100644
--- a/x11-libs/libdrm/libdrm-2.4.103.ebuild
+++ b/x11-libs/libdrm/libdrm-2.4.103.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} = * ]]; then
SRC_URI=""
 else
SRC_URI="https://dri.freedesktop.org/libdrm/${P}.tar.xz;
-   KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+   KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 fi
 
 VIDEO_CARDS="amdgpu exynos freedreno intel nouveau omap radeon tegra vc4 
vivante vmware"



[gentoo-commits] repo/gentoo:master commit in: x11-base/xcb-proto/

2020-12-06 Thread Sam James
commit: a6b40c4e40a939d4922cfda7ddf624eff0b6292a
Author: Sam James  gentoo  org>
AuthorDate: Mon Dec  7 05:12:26 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Dec  7 05:12:26 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a6b40c4e

x11-base/xcb-proto: Stabilize 1.14.1 arm64, #758461

Signed-off-by: Sam James  gentoo.org>

 x11-base/xcb-proto/xcb-proto-1.14.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-base/xcb-proto/xcb-proto-1.14.1.ebuild 
b/x11-base/xcb-proto/xcb-proto-1.14.1.ebuild
index 6c07eb3730d..11b927455d8 100644
--- a/x11-base/xcb-proto/xcb-proto-1.14.1.ebuild
+++ b/x11-base/xcb-proto/xcb-proto-1.14.1.ebuild
@@ -15,7 +15,7 @@ DESCRIPTION="X C-language Bindings protocol headers"
 HOMEPAGE="https://xcb.freedesktop.org/ 
https://gitlab.freedesktop.org/xorg/proto/xcbproto;
 EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/proto/xcbproto.git;
 
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc 
~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc 
~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 



[gentoo-commits] repo/gentoo:master commit in: x11-libs/libXtst/

2020-12-06 Thread Sam James
commit: 65794991df49a6a970713215051ce011687b1ad0
Author: Sam James  gentoo  org>
AuthorDate: Mon Dec  7 05:12:27 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Dec  7 05:12:27 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=65794991

x11-libs/libXtst: Stabilize 1.2.3-r2 arm64, #758461

Signed-off-by: Sam James  gentoo.org>

 x11-libs/libXtst/libXtst-1.2.3-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-libs/libXtst/libXtst-1.2.3-r2.ebuild 
b/x11-libs/libXtst/libXtst-1.2.3-r2.ebuild
index 7540767345d..45ef1a3e3cc 100644
--- a/x11-libs/libXtst/libXtst-1.2.3-r2.ebuild
+++ b/x11-libs/libXtst/libXtst-1.2.3-r2.ebuild
@@ -9,7 +9,7 @@ inherit xorg-3
 
 DESCRIPTION="X.Org Xlib-based client API for the XTEST & RECORD extensions 
library"
 
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 
~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris 
~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 
~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris 
~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 
 RDEPEND=">=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]



[gentoo-commits] repo/gentoo:master commit in: x11-apps/xprop/

2020-12-06 Thread Sam James
commit: 352e371e1e62c5ca073dee3a9b372becdf3abe07
Author: Sam James  gentoo  org>
AuthorDate: Mon Dec  7 05:12:25 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Dec  7 05:12:25 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=352e371e

x11-apps/xprop: Stabilize 1.2.5 arm64, #758461

Signed-off-by: Sam James  gentoo.org>

 x11-apps/xprop/xprop-1.2.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-apps/xprop/xprop-1.2.5.ebuild 
b/x11-apps/xprop/xprop-1.2.5.ebuild
index f6520c7c075..efd91a65275 100644
--- a/x11-apps/xprop/xprop-1.2.5.ebuild
+++ b/x11-apps/xprop/xprop-1.2.5.ebuild
@@ -7,7 +7,7 @@ inherit xorg-3
 
 DESCRIPTION="property displayer for X"
 
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc 
~x86 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris 
~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc 
~x86 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris 
~x86-solaris"
 
 RDEPEND="x11-libs/libX11"
 DEPEND="${RDEPEND}



[gentoo-commits] repo/gentoo:master commit in: x11-libs/libX11/

2020-12-06 Thread Sam James
commit: 6c9078448c3ee6225d3ebddf43ff51b759485b3f
Author: Sam James  gentoo  org>
AuthorDate: Mon Dec  7 05:12:26 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Dec  7 05:12:26 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6c907844

x11-libs/libX11: Stabilize 1.7.0 arm64, #758461

Signed-off-by: Sam James  gentoo.org>

 x11-libs/libX11/libX11-1.7.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-libs/libX11/libX11-1.7.0.ebuild 
b/x11-libs/libX11/libX11-1.7.0.ebuild
index ba0435db6cf..bfdb0ca517f 100644
--- a/x11-libs/libX11/libX11-1.7.0.ebuild
+++ b/x11-libs/libX11/libX11-1.7.0.ebuild
@@ -9,7 +9,7 @@ inherit toolchain-funcs xorg-3
 
 DESCRIPTION="X.Org X11 library"
 
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc 
~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc 
~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="ipv6 test"
 RESTRICT="!test? ( test )"
 



[gentoo-commits] repo/gentoo:master commit in: dev-vcs/git/

2020-12-06 Thread Robin H. Johnson
commit: 1a30f566029c364eed607d6a049abd72f54e44cc
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Mon Dec  7 04:42:15 2020 +
Commit: Robin H. Johnson  gentoo  org>
CommitDate: Mon Dec  7 04:46:27 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a30f566

dev-vcs/git: support git-send-email STARTTLS

Closes: https://bugs.gentoo.org/739452
Package-Manager: Portage-3.0.10, Repoman-2.3.22
Signed-off-by: Robin H. Johnson  gentoo.org>

 dev-vcs/git/git-2.29.2.ebuild  | 1 +
 dev-vcs/git/git--r1.ebuild | 1 +
 dev-vcs/git/git--r2.ebuild | 1 +
 dev-vcs/git/git--r3.ebuild | 1 +
 dev-vcs/git/git-.ebuild| 1 +
 5 files changed, 5 insertions(+)

diff --git a/dev-vcs/git/git-2.29.2.ebuild b/dev-vcs/git/git-2.29.2.ebuild
index ca7a5942fda..ce04e5f8d0e 100644
--- a/dev-vcs/git/git-2.29.2.ebuild
+++ b/dev-vcs/git/git-2.29.2.ebuild
@@ -79,6 +79,7 @@ RDEPEND="${DEPEND}
dev-perl/Error
dev-perl/MailTools
dev-perl/Authen-SASL
+   >=virtual/perl-libnet-3.110.0-r4[ssl]
cgi? (
dev-perl/CGI
highlight? ( app-text/highlight )

diff --git a/dev-vcs/git/git--r1.ebuild b/dev-vcs/git/git--r1.ebuild
index 6e5c5a74a12..464313d7a4d 100644
--- a/dev-vcs/git/git--r1.ebuild
+++ b/dev-vcs/git/git--r1.ebuild
@@ -79,6 +79,7 @@ RDEPEND="${DEPEND}
dev-perl/Error
dev-perl/MailTools
dev-perl/Authen-SASL
+   >=virtual/perl-libnet-3.110.0-r4[ssl]
cgi? (
dev-perl/CGI
highlight? ( app-text/highlight )

diff --git a/dev-vcs/git/git--r2.ebuild b/dev-vcs/git/git--r2.ebuild
index 6e5c5a74a12..464313d7a4d 100644
--- a/dev-vcs/git/git--r2.ebuild
+++ b/dev-vcs/git/git--r2.ebuild
@@ -79,6 +79,7 @@ RDEPEND="${DEPEND}
dev-perl/Error
dev-perl/MailTools
dev-perl/Authen-SASL
+   >=virtual/perl-libnet-3.110.0-r4[ssl]
cgi? (
dev-perl/CGI
highlight? ( app-text/highlight )

diff --git a/dev-vcs/git/git--r3.ebuild b/dev-vcs/git/git--r3.ebuild
index ca7a5942fda..ce04e5f8d0e 100644
--- a/dev-vcs/git/git--r3.ebuild
+++ b/dev-vcs/git/git--r3.ebuild
@@ -79,6 +79,7 @@ RDEPEND="${DEPEND}
dev-perl/Error
dev-perl/MailTools
dev-perl/Authen-SASL
+   >=virtual/perl-libnet-3.110.0-r4[ssl]
cgi? (
dev-perl/CGI
highlight? ( app-text/highlight )

diff --git a/dev-vcs/git/git-.ebuild b/dev-vcs/git/git-.ebuild
index 6e5c5a74a12..464313d7a4d 100644
--- a/dev-vcs/git/git-.ebuild
+++ b/dev-vcs/git/git-.ebuild
@@ -79,6 +79,7 @@ RDEPEND="${DEPEND}
dev-perl/Error
dev-perl/MailTools
dev-perl/Authen-SASL
+   >=virtual/perl-libnet-3.110.0-r4[ssl]
cgi? (
dev-perl/CGI
highlight? ( app-text/highlight )



[gentoo-commits] repo/gentoo:master commit in: dev-lang/go/

2020-12-06 Thread William Hubbs
commit: f7e6af7c452899aa9ffaca559efd2209cf6fe3d6
Author: William Hubbs  gentoo  org>
AuthorDate: Mon Dec  7 04:32:52 2020 +
Commit: William Hubbs  gentoo  org>
CommitDate: Mon Dec  7 04:35:01 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f7e6af7c

dev-lang/go: remove old

Signed-off-by: William Hubbs  gentoo.org>

 dev-lang/go/go-1.14.13.ebuild | 203 --
 dev-lang/go/go-1.15.6.ebuild  | 203 --
 2 files changed, 406 deletions(-)

diff --git a/dev-lang/go/go-1.14.13.ebuild b/dev-lang/go/go-1.14.13.ebuild
deleted file mode 100644
index c81e94e1235..000
--- a/dev-lang/go/go-1.14.13.ebuild
+++ /dev/null
@@ -1,203 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-export CBUILD=${CBUILD:-${CHOST}}
-export CTARGET=${CTARGET:-${CHOST}}
-
-MY_PV=${PV/_/}
-
-inherit toolchain-funcs
-
-case ${PV}  in
-**)
-   EGIT_REPO_URI="https://github.com/golang/go.git;
-   inherit git-r3
-   ;;
-*)
-   SRC_URI="https://storage.googleapis.com/golang/go${MY_PV}.src.tar.gz "
-   S="${WORKDIR}"/go
-   case ${PV} in
-   *_beta*|*_rc*) ;;
-   *)
-   KEYWORDS="-* ~amd64 ~arm ~arm64 ~ppc64 ~s390 ~x86 ~amd64-linux 
~x86-linux ~x64-macos ~x64-solaris"
-   ;;
-   esac
-esac
-
-DESCRIPTION="A concurrent garbage collected and typesafe programming language"
-HOMEPAGE="https://golang.org;
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-
-BDEPEND="|| (
-   dev-lang/go
-   dev-lang/go-bootstrap )"
-RDEPEND="!https://golang.org/issue/2775
-   #
-   # deliberately use cp to retain permissions
-   cp -R api bin doc lib pkg misc src test "${ED}"/usr/lib/go
-   # testdata directories are not needed on the installed system
-   rm -fr $(find "${ED}"/usr/lib/go -iname testdata -type d -print)
-   if go_cross_compile; then
-   bin_path="bin/$(go_tuple)"
-   else
-   bin_path=bin
-   fi
-   for x in ${bin_path}/*; do
-   f=${x##*/}
-   dosym ../lib/go/${bin_path}/${f} /usr/bin/${f}
-   done
-   einstalldocs
-
-   if [[ ${CHOST} == *-darwin* ]] ; then
-   # fix install_name for test object (binutils_test) on Darwin, it
-   # is never used in real circumstances
-   local 
libmac64="${EPREFIX}"/usr/lib/go/src/cmd/vendor/github.com/
- 
libmac64+=google/pprof/internal/binutils/testdata/lib_mac_64
-   install_name_tool -id "${libmac64}" "${D}${libmac64}"
-   fi
-}
-
-pkg_postinst() {
-   [[ -z ${REPLACING_VERSIONS} ]] && return
-   has_version "https://bugs.gentoo.org/752153 for more info"
-}

diff --git a/dev-lang/go/go-1.15.6.ebuild b/dev-lang/go/go-1.15.6.ebuild
deleted file mode 100644
index c81e94e1235..000
--- a/dev-lang/go/go-1.15.6.ebuild
+++ /dev/null
@@ -1,203 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-export CBUILD=${CBUILD:-${CHOST}}
-export CTARGET=${CTARGET:-${CHOST}}
-
-MY_PV=${PV/_/}
-
-inherit toolchain-funcs
-
-case ${PV}  in
-**)
-   EGIT_REPO_URI="https://github.com/golang/go.git;
-   inherit git-r3
-   ;;
-*)
-   SRC_URI="https://storage.googleapis.com/golang/go${MY_PV}.src.tar.gz "
-   S="${WORKDIR}"/go
-   case ${PV} in
-   *_beta*|*_rc*) ;;
-   *)
-   KEYWORDS="-* ~amd64 ~arm ~arm64 ~ppc64 ~s390 ~x86 ~amd64-linux 
~x86-linux ~x64-macos ~x64-solaris"
-   ;;
-   esac
-esac
-
-DESCRIPTION="A concurrent garbage collected and typesafe programming language"
-HOMEPAGE="https://golang.org;
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-
-BDEPEND="|| (
-   dev-lang/go
-   dev-lang/go-bootstrap )"
-RDEPEND="!https://golang.org/issue/2775
-   #
-   # deliberately use cp to retain permissions
-   cp -R api bin doc lib pkg misc src test "${ED}"/usr/lib/go
-   # testdata directories are not needed on the installed system
-   rm -fr $(find "${ED}"/usr/lib/go -iname testdata -type d -print)
-   if go_cross_compile; then
-   bin_path="bin/$(go_tuple)"
-   else
-   bin_path=bin
-   fi
-   for x in ${bin_path}/*; do
-   f=${x##*/}
-   dosym ../lib/go/${bin_path}/${f} /usr/bin/${f}
-   done
-   einstalldocs
-
-   if [[ ${CHOST} == *-darwin* ]] ; then
-   # fix install_name for test object (binutils_test) on Darwin, it
-   # is never used in real circumstances
-   local 
libmac64="${EPREFIX}"/usr/lib/go/src/cmd/vendor/github.com/
- 
libmac64+=google/pprof/internal/binutils/testdata/lib_mac_64
-   install_name_tool -id "${libmac64}" "${D}${libmac64}"
-   fi
-}
-
-pkg_postinst() {

[gentoo-commits] repo/gentoo:master commit in: dev-python/isort/

2020-12-06 Thread Matt Turner
commit: d0f7489be44057f7166ae6a5c161b6064a0d33f0
Author: Matt Turner  gentoo  org>
AuthorDate: Mon Dec  7 04:30:52 2020 +
Commit: Matt Turner  gentoo  org>
CommitDate: Mon Dec  7 04:30:52 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d0f7489b

dev-python/isort: Keyword 5.6.3 alpha, #747850

Signed-off-by: Matt Turner  gentoo.org>

 dev-python/isort/isort-5.6.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-python/isort/isort-5.6.3.ebuild 
b/dev-python/isort/isort-5.6.3.ebuild
index 65d91d48b06..ca16c6fca6f 100644
--- a/dev-python/isort/isort-5.6.3.ebuild
+++ b/dev-python/isort/isort-5.6.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ia64 ~x86 ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm64 ~ia64 ~x86 ~x64-macos"
 
 BDEPEND="
test? (



[gentoo-commits] repo/gentoo:master commit in: dev-python/pydocstyle/

2020-12-06 Thread Matt Turner
commit: 615ef665cef00b2764216844409255982b347707
Author: Matt Turner  gentoo  org>
AuthorDate: Mon Dec  7 04:27:30 2020 +
Commit: Matt Turner  gentoo  org>
CommitDate: Mon Dec  7 04:27:30 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=615ef665

dev-python/pydocstyle: Keyword 5.1.1 alpha, #747850

Signed-off-by: Matt Turner  gentoo.org>

 dev-python/pydocstyle/pydocstyle-5.1.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-python/pydocstyle/pydocstyle-5.1.1.ebuild 
b/dev-python/pydocstyle/pydocstyle-5.1.1.ebuild
index 028d2af436d..edab38a6a87 100644
--- a/dev-python/pydocstyle/pydocstyle-5.1.1.ebuild
+++ b/dev-python/pydocstyle/pydocstyle-5.1.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/PyCQA/${PN}/archive/${PV}.tar.gz 
-> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm64 ~ia64 ~sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm64 ~ia64 ~sparc x86 ~x64-macos"
 
 RDEPEND="dev-python/snowballstemmer[${PYTHON_USEDEP}]"
 



[gentoo-commits] repo/gentoo:master commit in: dev-python/mypy/

2020-12-06 Thread Matt Turner
commit: b1677266d9e85544ec1749b6519e4b027140a48c
Author: Matt Turner  gentoo  org>
AuthorDate: Mon Dec  7 04:27:29 2020 +
Commit: Matt Turner  gentoo  org>
CommitDate: Mon Dec  7 04:27:29 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b1677266

dev-python/mypy: Keyword 0.790 alpha, #747850

Signed-off-by: Matt Turner  gentoo.org>

 dev-python/mypy/mypy-0.790.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-python/mypy/mypy-0.790.ebuild 
b/dev-python/mypy/mypy-0.790.ebuild
index f2b26d130ce..32b70948b95 100644
--- a/dev-python/mypy/mypy-0.790.ebuild
+++ b/dev-python/mypy/mypy-0.790.ebuild
@@ -22,7 +22,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ia64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm64 ~ia64 ~x86"
 
 # stubgen collides with this package: https://bugs.gentoo.org/585594
 RDEPEND="



[gentoo-commits] repo/gentoo:master commit in: dev-python/pylama/

2020-12-06 Thread Matt Turner
commit: 8215f0d711a99726a0cee8a98eb1958f63520562
Author: Matt Turner  gentoo  org>
AuthorDate: Mon Dec  7 04:27:30 2020 +
Commit: Matt Turner  gentoo  org>
CommitDate: Mon Dec  7 04:27:30 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8215f0d7

dev-python/pylama: Keyword 7.7.1-r1 alpha, #747850

Signed-off-by: Matt Turner  gentoo.org>

 dev-python/pylama/pylama-7.7.1-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-python/pylama/pylama-7.7.1-r1.ebuild 
b/dev-python/pylama/pylama-7.7.1-r1.ebuild
index 87655172923..fb5828bafb8 100644
--- a/dev-python/pylama/pylama-7.7.1-r1.ebuild
+++ b/dev-python/pylama/pylama-7.7.1-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/klen/pylama/archive/${PV}.tar.gz 
-> ${P}.tar.gz"
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ia64 ~x86 ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm64 ~ia64 ~x86 ~x64-macos"
 
 RDEPEND="
>=dev-python/mccabe-0.5.2[${PYTHON_USEDEP}]



[gentoo-commits] repo/gentoo:master commit in: dev-python/flake8/

2020-12-06 Thread Matt Turner
commit: 7112d613d26ba20075ee68c557fb9bd8ea344f83
Author: Matt Turner  gentoo  org>
AuthorDate: Mon Dec  7 04:26:11 2020 +
Commit: Matt Turner  gentoo  org>
CommitDate: Mon Dec  7 04:26:56 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7112d613

dev-python/flake8: Keyword 3.8.4 alpha, #746137

Signed-off-by: Matt Turner  gentoo.org>

 dev-python/flake8/flake8-3.8.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-python/flake8/flake8-3.8.4.ebuild 
b/dev-python/flake8/flake8-3.8.4.ebuild
index 166e5b0cabd..c3d63314f8b 100644
--- a/dev-python/flake8/flake8-3.8.4.ebuild
+++ b/dev-python/flake8/flake8-3.8.4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 
~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc 
~x86 ~x64-macos"
 
 # requires.txt inc. mccabe however that creates a circular dep
 RDEPEND="



[gentoo-commits] repo/gentoo:master commit in: dev-python/sphinx-prompt/

2020-12-06 Thread Matt Turner
commit: fed108756b094aa425c473232e222b850cec4e37
Author: Matt Turner  gentoo  org>
AuthorDate: Mon Dec  7 04:26:10 2020 +
Commit: Matt Turner  gentoo  org>
CommitDate: Mon Dec  7 04:26:56 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fed10875

dev-python/sphinx-prompt: Keyword 1.3.0 alpha, #746137

Signed-off-by: Matt Turner  gentoo.org>

 dev-python/sphinx-prompt/sphinx-prompt-1.3.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-python/sphinx-prompt/sphinx-prompt-1.3.0.ebuild 
b/dev-python/sphinx-prompt/sphinx-prompt-1.3.0.ebuild
index bb8ae58962b..a2d48c1c62b 100644
--- a/dev-python/sphinx-prompt/sphinx-prompt-1.3.0.ebuild
+++ b/dev-python/sphinx-prompt/sphinx-prompt-1.3.0.ebuild
@@ -13,7 +13,7 @@ 
SRC_URI="https://github.com/sbrunner/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86"
 
 RDEPEND="
dev-python/sphinx[${PYTHON_USEDEP}]



[gentoo-commits] repo/gentoo:master commit in: dev-python/mccabe/

2020-12-06 Thread Matt Turner
commit: 5b5eca25fc6ea894bf60e914daee133820f8757d
Author: Matt Turner  gentoo  org>
AuthorDate: Mon Dec  7 04:26:11 2020 +
Commit: Matt Turner  gentoo  org>
CommitDate: Mon Dec  7 04:26:56 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b5eca25

dev-python/mccabe: Keyword 0.6.1-r2 alpha, #746137

Signed-off-by: Matt Turner  gentoo.org>

 dev-python/mccabe/mccabe-0.6.1-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-python/mccabe/mccabe-0.6.1-r2.ebuild 
b/dev-python/mccabe/mccabe-0.6.1-r2.ebuild
index 71e71d8c8e7..d32055af445 100644
--- a/dev-python/mccabe/mccabe-0.6.1-r2.ebuild
+++ b/dev-python/mccabe/mccabe-0.6.1-r2.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="flake8 plugin: McCabe complexity checker"
 HOMEPAGE="https://github.com/PyCQA/mccabe;
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 
~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris 
~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 
~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris 
~x64-solaris ~x86-solaris"
 LICENSE="MIT"
 SLOT="0"
 



[gentoo-commits] repo/gentoo:master commit in: dev-lang/go/

2020-12-06 Thread William Hubbs
commit: b24efbe8573c6b70c84670bc1e23d32c6a261b57
Author: William Hubbs  gentoo  org>
AuthorDate: Mon Dec  7 04:14:17 2020 +
Commit: William Hubbs  gentoo  org>
CommitDate: Mon Dec  7 04:25:38 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b24efbe8

dev-lang/go: 1.14.13-r1 and 1.15.6-r1 bumps

These bumps install the @golang-rebuild set for portage.

Signed-off-by: William Hubbs  gentoo.org>

 dev-lang/go/go-1.14.13-r1.ebuild | 205 +++
 dev-lang/go/go-1.15.6-r1.ebuild  | 205 +++
 2 files changed, 410 insertions(+)

diff --git a/dev-lang/go/go-1.14.13-r1.ebuild b/dev-lang/go/go-1.14.13-r1.ebuild
new file mode 100644
index 000..6bb792691ce
--- /dev/null
+++ b/dev-lang/go/go-1.14.13-r1.ebuild
@@ -0,0 +1,205 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+export CBUILD=${CBUILD:-${CHOST}}
+export CTARGET=${CTARGET:-${CHOST}}
+
+MY_PV=${PV/_/}
+
+inherit toolchain-funcs
+
+case ${PV}  in
+**)
+   EGIT_REPO_URI="https://github.com/golang/go.git;
+   inherit git-r3
+   ;;
+*)
+   SRC_URI="https://storage.googleapis.com/golang/go${MY_PV}.src.tar.gz "
+   S="${WORKDIR}"/go
+   case ${PV} in
+   *_beta*|*_rc*) ;;
+   *)
+   KEYWORDS="-* ~amd64 ~arm ~arm64 ~ppc64 ~s390 ~x86 ~amd64-linux 
~x86-linux ~x64-macos ~x64-solaris"
+   ;;
+   esac
+esac
+
+DESCRIPTION="A concurrent garbage collected and typesafe programming language"
+HOMEPAGE="https://golang.org;
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+
+BDEPEND="|| (
+   dev-lang/go
+   dev-lang/go-bootstrap )"
+RDEPEND="!https://golang.org/issue/2775
+   dodir /usr/lib/go
+   cp -R api bin doc lib pkg misc src test "${ED}"/usr/lib/go
+   einstalldocs
+
+   # testdata directories are not needed on the installed system
+   rm -fr $(find "${ED}"/usr/lib/go -iname testdata -type d -print)
+
+   local bin_path
+   if go_cross_compile; then
+   bin_path="bin/$(go_tuple)"
+   else
+   bin_path=bin
+   fi
+   local f x
+   for x in ${bin_path}/*; do
+   f=${x##*/}
+   dosym ../lib/go/${bin_path}/${f} /usr/bin/${f}
+   done
+
+   # install the @golang-rebuild set for Portage
+   insinto /usr/share/portage/config/sets
+   newins "${FILESDIR}"/go-sets.conf go.conf
+
+   # fix install_name for test object (binutils_test) on Darwin, it
+   # is never used in real circumstances
+   if [[ ${CHOST} == *-darwin* ]] ; then
+   local 
libmac64="${EPREFIX}"/usr/lib/go/src/cmd/vendor/github.com/
+ 
libmac64+=google/pprof/internal/binutils/testdata/lib_mac_64
+   install_name_tool -id "${libmac64}" "${D}${libmac64}"
+   fi
+}
+
+pkg_postinst() {
+   [[ -z ${REPLACING_VERSIONS} ]] && return
+   einfo "After ${CATEGORY}/${PN} is updated it is recommended to rebuild"
+   einfo "all packages compiled with previous versions of 
${CATEGORY}/${PN}"
+   einfo "due to the static linking nature of go."
+   einfo "If this is not done, the packages compiled with the older"
+   einfo "version of the compiler will not be updated until they are"
+   einfo "updated individually, which could mean they will have"
+   einfo "vulnerabilities."
+   einfo "Run 'emerge @golang-rebuild' to rebuild all 'go' packages"
+   einfo "See https://bugs.gentoo.org/752153 for more info"
+}

diff --git a/dev-lang/go/go-1.15.6-r1.ebuild b/dev-lang/go/go-1.15.6-r1.ebuild
new file mode 100644
index 000..6bb792691ce
--- /dev/null
+++ b/dev-lang/go/go-1.15.6-r1.ebuild
@@ -0,0 +1,205 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+export CBUILD=${CBUILD:-${CHOST}}
+export CTARGET=${CTARGET:-${CHOST}}
+
+MY_PV=${PV/_/}
+
+inherit toolchain-funcs
+
+case ${PV}  in
+**)
+   EGIT_REPO_URI="https://github.com/golang/go.git;
+   inherit git-r3
+   ;;
+*)
+   SRC_URI="https://storage.googleapis.com/golang/go${MY_PV}.src.tar.gz "
+   S="${WORKDIR}"/go
+   case ${PV} in
+   *_beta*|*_rc*) ;;
+   *)
+   KEYWORDS="-* ~amd64 ~arm ~arm64 ~ppc64 ~s390 ~x86 ~amd64-linux 
~x86-linux ~x64-macos ~x64-solaris"
+   ;;
+   esac
+esac
+
+DESCRIPTION="A concurrent garbage collected and typesafe programming language"
+HOMEPAGE="https://golang.org;
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+
+BDEPEND="|| (
+   dev-lang/go
+   dev-lang/go-bootstrap )"
+RDEPEND="!https://golang.org/issue/2775
+   dodir /usr/lib/go
+   cp -R api bin doc lib pkg misc src test "${ED}"/usr/lib/go
+   einstalldocs
+
+   # testdata directories are not needed on the installed system
+   rm -fr $(find "${ED}"/usr/lib/go -iname 

[gentoo-commits] repo/gentoo:master commit in: dev-python/aiohttp/

2020-12-06 Thread Matt Turner
commit: e98264d2a16b847fa0854112160395154155480f
Author: Matt Turner  gentoo  org>
AuthorDate: Mon Dec  7 04:00:22 2020 +
Commit: Matt Turner  gentoo  org>
CommitDate: Mon Dec  7 04:00:22 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e98264d2

dev-python/aiohttp: Keyword 3.7.3 alpha, #752228

Signed-off-by: Matt Turner  gentoo.org>

 dev-python/aiohttp/aiohttp-3.7.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-python/aiohttp/aiohttp-3.7.3.ebuild 
b/dev-python/aiohttp/aiohttp-3.7.3.ebuild
index 9e8be6e734f..6ad99a03e91 100644
--- a/dev-python/aiohttp/aiohttp-3.7.3.ebuild
+++ b/dev-python/aiohttp/aiohttp-3.7.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
 RDEPEND="
>=dev-python/async_timeout-3.0.0[${PYTHON_USEDEP}]



[gentoo-commits] repo/gentoo:master commit in: dev-python/re-assert/

2020-12-06 Thread Matt Turner
commit: 9ff101281d435c3bdb87c4755d3691d731de611a
Author: Matt Turner  gentoo  org>
AuthorDate: Mon Dec  7 04:00:21 2020 +
Commit: Matt Turner  gentoo  org>
CommitDate: Mon Dec  7 04:00:21 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ff10128

dev-python/re-assert: Keyword 1.1.0 alpha, #752228

Signed-off-by: Matt Turner  gentoo.org>

 dev-python/re-assert/re-assert-1.1.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-python/re-assert/re-assert-1.1.0.ebuild 
b/dev-python/re-assert/re-assert-1.1.0.ebuild
index b608989851e..e4cc4c60682 100644
--- a/dev-python/re-assert/re-assert-1.1.0.ebuild
+++ b/dev-python/re-assert/re-assert-1.1.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 
~x64-macos"
 
 RDEPEND="dev-python/regex[${PYTHON_USEDEP}]"
 



[gentoo-commits] proj/releng:master commit in: releases/specs/ppc/ppc64le/

2020-12-06 Thread Matt Turner
commit: 7393b43a21542e44cc9aff2a65cff419409a2b87
Author: Matt Turner  gentoo  org>
AuthorDate: Mon Dec  7 04:13:09 2020 +
Commit: Matt Turner  gentoo  org>
CommitDate: Mon Dec  7 04:13:09 2020 +
URL:https://gitweb.gentoo.org/proj/releng.git/commit/?id=7393b43a

specs/ppc64le: Set rel_type: musl-hardened

Signed-off-by: Matt Turner  gentoo.org>

 releases/specs/ppc/ppc64le/musl-hardened-stage1.spec | 2 +-
 releases/specs/ppc/ppc64le/musl-hardened-stage3.spec | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/releases/specs/ppc/ppc64le/musl-hardened-stage1.spec 
b/releases/specs/ppc/ppc64le/musl-hardened-stage1.spec
index a8ef7151..82603db5 100644
--- a/releases/specs/ppc/ppc64le/musl-hardened-stage1.spec
+++ b/releases/specs/ppc/ppc64le/musl-hardened-stage1.spec
@@ -1,7 +1,7 @@
 subarch: ppc64le
 target: stage1
 version_stamp: musl-hardened-@TIMESTAMP@
-rel_type: default
+rel_type: musl-hardened
 profile: default/linux/ppc64le/17.0/musl/hardened
 snapshot: @TIMESTAMP@
 source_subpath: default/stage3-ppc64le-musl-hardened-latest

diff --git a/releases/specs/ppc/ppc64le/musl-hardened-stage3.spec 
b/releases/specs/ppc/ppc64le/musl-hardened-stage3.spec
index 8d5a4047..9ae262a1 100644
--- a/releases/specs/ppc/ppc64le/musl-hardened-stage3.spec
+++ b/releases/specs/ppc/ppc64le/musl-hardened-stage3.spec
@@ -1,7 +1,7 @@
 subarch: ppc64le
 target: stage3
 version_stamp: musl-hardened-@TIMESTAMP@
-rel_type: default
+rel_type: musl-hardened
 profile: default/linux/ppc64le/17.0/musl/hardened
 snapshot: @TIMESTAMP@
 source_subpath: default/stage1-ppc64le-musl-hardened-@TIMESTAMP@



[gentoo-commits] repo/gentoo:master commit in: dev-python/backports-zoneinfo/

2020-12-06 Thread Matt Turner
commit: 4716507c078ca303ff59df82b0bb53d48e0a5ae2
Author: Matt Turner  gentoo  org>
AuthorDate: Mon Dec  7 03:59:18 2020 +
Commit: Matt Turner  gentoo  org>
CommitDate: Mon Dec  7 03:59:40 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4716507c

dev-python/backports-zoneinfo: Keyword 0.2.1 alpha, #758224

Signed-off-by: Matt Turner  gentoo.org>

 dev-python/backports-zoneinfo/backports-zoneinfo-0.2.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-python/backports-zoneinfo/backports-zoneinfo-0.2.1.ebuild 
b/dev-python/backports-zoneinfo/backports-zoneinfo-0.2.1.ebuild
index 9e808e2ba7c..089a4c0c477 100644
--- a/dev-python/backports-zoneinfo/backports-zoneinfo-0.2.1.ebuild
+++ b/dev-python/backports-zoneinfo/backports-zoneinfo-0.2.1.ebuild
@@ -16,7 +16,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos"
 
 RDEPEND="
$(python_gen_cond_dep '



[gentoo-commits] repo/gentoo:master commit in: dev-python/Babel/

2020-12-06 Thread Matt Turner
commit: 77aadae01cac4b8cd65f2d5bdee01d3df36121d5
Author: Matt Turner  gentoo  org>
AuthorDate: Mon Dec  7 03:59:18 2020 +
Commit: Matt Turner  gentoo  org>
CommitDate: Mon Dec  7 03:59:41 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=77aadae0

dev-python/Babel: Keyword 2.9.0 alpha, #758224

Signed-off-by: Matt Turner  gentoo.org>

 dev-python/Babel/Babel-2.9.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-python/Babel/Babel-2.9.0.ebuild 
b/dev-python/Babel/Babel-2.9.0.ebuild
index 22b9bb9a680..8bad8196130 100644
--- a/dev-python/Babel/Babel-2.9.0.ebuild
+++ b/dev-python/Babel/Babel-2.9.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos"
 
 RDEPEND="dev-python/pytz[${PYTHON_USEDEP}]
$(python_gen_cond_dep '



[gentoo-commits] repo/gentoo:master commit in: sci-libs/tensorflow/

2020-12-06 Thread Jason Zaman
commit: 7b49d73c85b1f4cf8ce6524b04ad2520ff41dde4
Author: Jason Zaman  gentoo  org>
AuthorDate: Mon Dec  7 03:55:30 2020 +
Commit: Jason Zaman  gentoo  org>
CommitDate: Mon Dec  7 03:58:09 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7b49d73c

sci-libs/tensorflow: bump 2.4.0_rc4

Signed-off-by: Jason Zaman  gentoo.org>

 sci-libs/tensorflow/Manifest|   2 +
 sci-libs/tensorflow/tensorflow-2.4.0_rc4.ebuild | 406 
 2 files changed, 408 insertions(+)

diff --git a/sci-libs/tensorflow/Manifest b/sci-libs/tensorflow/Manifest
index 91314ce8e9a..30c85e81acf 100644
--- a/sci-libs/tensorflow/Manifest
+++ b/sci-libs/tensorflow/Manifest
@@ -36,5 +36,7 @@ DIST 
sobol_data-835a7d7b1ee3bc83e575e302a985c66ec4b65249.tar.gz 2569603 BLAKE2B
 DIST tensorflow-1.15.0-python-license.rst.txt 45132 BLAKE2B 
8a8ace4b64fd9eda1932272704dd4fea002d2562cd9c2c94470d3ff5de58bb171ff849d3f998ea90cd779d1084d39af1267aca8400b74b701205d2e76e6a2628
 SHA512 
c79c42f4ceecf33c8f8778ca17b53595b75d5d0bdf30b11058cf01dd70a6351f530ca9dd846460aba14edc1d5876f7bf6fa0f9f49f7915590b0f54d267ce3856
 DIST tensorflow-2.3.1.tar.gz 46544608 BLAKE2B 
c3cb0954fcd060b95d63895cbeeca20f6af29ade999dc43db5fe010d6b33b6f650047d529f174a1663c23440a56e057e2f97c503a4a40bcdac9374b549f3220e
 SHA512 
e497ef4564f50abf9f918be4522cf702f4cf945cb1ebf83af1386ac4ddc7373b3ba70c7f803f8ca06faf2c6b5396e60b1e0e9b97bfbd667e733b08b6e6d70ef0
 DIST tensorflow-2.4.0_rc3.tar.gz 53251141 BLAKE2B 
45a05fc1bc6f5f940487ecfd53a5dd37718a39a2a3dfd536cb6e41ba1da9fbac9e166aeb288ad122adc6474af94c13a2370779c37aa7162de3cb0c015acd5c44
 SHA512 
c02901fb41aa996a4d3c4a118cd76c62502e99be64f6ecf98208b2c65ed9f8c87c4060dcc983f6fe8280207b3bfa967e5f325e2d926aa1b4429f99fc0153c2e1
+DIST tensorflow-2.4.0_rc4.tar.gz 53246897 BLAKE2B 
4020cfa0ac72e4c06ee0ce69f44b3560132d2e885fd828bfcba9a951bc968d779c8de1507e888e36a3094510a973efc9e97304448b60f7b9847fab052de8e234
 SHA512 
fe69642a5cd0a6f7e8ae7abb93dec06225958d02f037936421a2b0c75bfc7d99efd5e1c6e0e3c2d0a6d3404516f4d178349d1fa88d81a14adb65d027339cb237
 DIST tensorflow-patches-2.3.1-r1.tar.bz2 12300 BLAKE2B 
068c127d7e980baf63068c524c9411e4f19bb79ee369221cf474a964a15ad340b28bde09504a8d524167eea036caf9d2dc52d0ad7ae1e52a76d1892833b033a0
 SHA512 
510676e4f999c12331a61bfeeca45b2526292d8bca8b0b42c1d8d466bc52722075fbd4df26a5f67dbe1ca4ccd9059e783c113cf694b436ff48c8114c99234cd3
 DIST tensorflow-patches-2.4.0_rc3.tar.bz2 1843 BLAKE2B 
6d4188471502e4411a5a7a6e731142af38421961600c52e7d76d137f952a5b8327dc8d8b4a40b60d3fb46130fe3d40ae2adc3d60d9a882f9d9b07d424e45e194
 SHA512 
abf9fbd870a8fa59b9d4e1b8260c4fbb5badeeca3e2b77caa031036759302bccae4adf91b291bc7a12df3c679b887338a8cd98d41847eb8ddd0c2bf4b8ccf342
+DIST tensorflow-patches-2.4.0_rc4.tar.bz2 1843 BLAKE2B 
69d2bec532fbd65fcd44589ab554f3f9069112203a201c8ca2d19fedf1f4fa4211197b35a59cc487496e226f55a8e21e3865e04aee3df87fc13727558e5a3b74
 SHA512 
835055001c291bc7a32a0ec41e33ec9a8d17fada25af47d9d075c2991699ac52006f225b59ee9d828f71066e7fba3f5f1549388034b25ca0bedbebe0a3946355

diff --git a/sci-libs/tensorflow/tensorflow-2.4.0_rc4.ebuild 
b/sci-libs/tensorflow/tensorflow-2.4.0_rc4.ebuild
new file mode 100644
index 000..3ffae5ad6f7
--- /dev/null
+++ b/sci-libs/tensorflow/tensorflow-2.4.0_rc4.ebuild
@@ -0,0 +1,406 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_OPTIONAL=1
+PYTHON_COMPAT=( python3_{6,7,8} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+MY_PV=${PV/_rc/-rc}
+MY_P=${PN}-${MY_PV}
+
+inherit bazel check-reqs cuda distutils-r1 flag-o-matic prefix toolchain-funcs
+
+DESCRIPTION="Computation framework using data flow graphs for scalable machine 
learning"
+HOMEPAGE="https://www.tensorflow.org/;
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="cuda mpi +python xla"
+CPU_USE_FLAGS_X86="sse sse2 sse3 sse4_1 sse4_2 avx avx2 fma3 fma4"
+for i in $CPU_USE_FLAGS_X86; do
+   IUSE+=" cpu_flags_x86_$i"
+done
+
+# distfiles that bazel uses for the workspace, will be copied to basel-distdir
+bazel_external_uris="
+   https://github.com/petewarden/OouraFFT/archive/v1.0.tar.gz -> 
OouraFFT-v1.0.tar.gz
+   
https://gitlab.com/libeigen/eigen/-/archive/011e0db31d1bed8b7f73662be6d57d9f30fa457a/eigen-011e0db31d1bed8b7f73662be6d57d9f30fa457a.tar.gz
+   
https://github.com/abseil/abseil-cpp/archive/df3ea785d8c30a9503321a3d35ee7d35808f190d.tar.gz
 -> abseil-cpp-df3ea785d8c30a9503321a3d35ee7d35808f190d.tar.gz
+   
https://github.com/bazelbuild/bazel-skylib/releases/download/0.9.0/bazel_skylib-0.9.0.tar.gz
+   https://github.com/bazelbuild/rules_android/archive/v0.1.1.zip -> 
bazelbuild-rules_android-v0.1.1.zip
+   
https://github.com/bazelbuild/bazel-toolchains/archive/92dd8a7a518a2fb7ba992d47c8b38299fe0be825.tar.gz
 -> bazel-toolchains-92dd8a7a518a2fb7ba992d47c8b38299fe0be825.tar.gz
+   

[gentoo-commits] repo/gentoo:master commit in: app-portage/pram/

2020-12-06 Thread Sam James
commit: f30220738485d60188957231a6a6c7d34fde
Author: Sam James  gentoo  org>
AuthorDate: Mon Dec  7 03:57:05 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Dec  7 03:57:05 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f3022073

app-portage/pram: ~x64-macos keyworded for 9

Package-Manager: Portage-3.0.10.3-prefix, Repoman-3.0.2
Signed-off-by: Sam James  gentoo.org>

 app-portage/pram/pram-9.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-portage/pram/pram-9.ebuild b/app-portage/pram/pram-9.ebuild
index bf227cb8aae..bbeebeae04a 100644
--- a/app-portage/pram/pram-9.ebuild
+++ b/app-portage/pram/pram-9.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/mgorny/pram/archive/v${PV}.tar.gz 
-> ${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ppc64 x86"
+KEYWORDS="amd64 ~arm64 ppc64 x86 ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 



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

2020-12-06 Thread Sam James
commit: 8c61a2238d5f7e0e0b7e74bfbfd8bba583d6bea8
Author: John Helmert III  posteo  net>
AuthorDate: Sun Dec  6 16:47:17 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Dec  7 03:56:18 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8c61a223

media-libs/libass: security cleanup (<0.15.0)

Bug: https://bugs.gentoo.org/746413
Package-Manager: Portage-3.0.11, Repoman-3.0.2
Signed-off-by: John Helmert III  posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/18533
Signed-off-by: Sam James  gentoo.org>

 media-libs/libass/Manifest |  1 -
 media-libs/libass/libass-0.14.0.ebuild | 45 --
 media-libs/libass/metadata.xml |  3 ---
 3 files changed, 49 deletions(-)

diff --git a/media-libs/libass/Manifest b/media-libs/libass/Manifest
index 3128500c272..8d68b869e80 100644
--- a/media-libs/libass/Manifest
+++ b/media-libs/libass/Manifest
@@ -1,2 +1 @@
-DIST libass-0.14.0.tar.xz 356256 BLAKE2B 
cf38d472003d6590c69da9347310386559b1ce13425d47505daca881b504453802a60cd553bbe478044764c108586668886372b79a61ccba42cdf49b2ed9ca74
 SHA512 
0f5fe5d7e662ee1d649981f829e5ef7a53457754f74faaed5679252a5a6769c8f267b6119cda922ebc6a8e5b5b331569f13813ac74881b4e94da7b2e8143a9e6
 DIST libass-0.15.0.tar.xz 367848 BLAKE2B 
1ba444d9d718eb364cf0d3ee743404adda36384432dcdfb350db59c1769042b7bbedf1610ecc1b89c2a6c98921710d71ceeac9888371e0774c30f4701746096a
 SHA512 
067ed519e64da7e2e45436bb09e390f1a77d966aeb9420729f36c9725d89491655ead69eb61b43f3220b8ff8f9de3891911b62757466f843ab13ee7149d88459

diff --git a/media-libs/libass/libass-0.14.0.ebuild 
b/media-libs/libass/libass-0.14.0.ebuild
deleted file mode 100644
index bab9742205d..000
--- a/media-libs/libass/libass-0.14.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit multilib-minimal
-
-DESCRIPTION="Library for SSA/ASS subtitles rendering"
-HOMEPAGE="https://github.com/libass/libass;
-SRC_URI="https://github.com/libass/libass/releases/download/${PV}/${P}.tar.xz;
-
-LICENSE="ISC"
-SLOT="0/9" # subslot = libass soname version
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 
~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="+fontconfig +harfbuzz static-libs"
-
-RDEPEND="fontconfig? ( >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}] )
-   >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}]
-   >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
-   >=dev-libs/fribidi-0.19.5-r1[${MULTILIB_USEDEP}]
-   harfbuzz? ( >=media-libs/harfbuzz-0.9.12[truetype,${MULTILIB_USEDEP}] )"
-
-DEPEND="${RDEPEND}
-   virtual/pkgconfig"
-
-X86_CPU_OPTS="abi_x86_32 abi_x86_64"
-for i in ${X86_CPU_OPTS} ; do
-   DEPEND="${DEPEND}
-   ${i}? ( dev-lang/nasm )"
-done
-
-DOCS="Changelog"
-
-multilib_src_configure() {
-   ECONF_SOURCE="${S}" econf \
-   $(use_enable fontconfig) \
-   $(use_enable harfbuzz) \
-   $(use_enable static-libs static) \
-   --disable-require-system-font-provider
-}
-
-multilib_src_install_all() {
-   einstalldocs
-   find "${D}" -name '*.la' -type f -delete || die
-}

diff --git a/media-libs/libass/metadata.xml b/media-libs/libass/metadata.xml
index 535194aef96..790f049d7dd 100644
--- a/media-libs/libass/metadata.xml
+++ b/media-libs/libass/metadata.xml
@@ -4,9 +4,6 @@
   
 media-vi...@gentoo.org
   
-  
-Enables OpenType shaping via 
media-libs/harfbuzz.
-  
   
 libass/libass
   



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

2020-12-06 Thread Sam James
commit: 741a2d02636b6bfe73ea03efb1ac6fce541dfaac
Author: Sam James  gentoo  org>
AuthorDate: Mon Dec  7 03:53:58 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Dec  7 03:53:58 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=741a2d02

dev-util/ragel: ~x64-macos keyworded for 7.0.0.12

Package-Manager: Portage-3.0.10.3-prefix, Repoman-3.0.2
Signed-off-by: Sam James  gentoo.org>

 dev-util/ragel/ragel-7.0.0.10-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/ragel/ragel-7.0.0.10-r2.ebuild 
b/dev-util/ragel/ragel-7.0.0.10-r2.ebuild
index 5cd81dac09e..02fdab57ba4 100644
--- a/dev-util/ragel/ragel-7.0.0.10-r2.ebuild
+++ b/dev-util/ragel/ragel-7.0.0.10-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.colm.net/files/ragel/${P}.tar.gz;
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ia64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~ia64 x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="vim-syntax"
 
 DEPEND="~dev-util/colm-0.13.0.5"



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

2020-12-06 Thread Sam James
commit: 3b7ccda6719f79f371ad934d091b395b138a621f
Author: Sam James  gentoo  org>
AuthorDate: Mon Dec  7 03:54:33 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Dec  7 03:54:33 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3b7ccda6

dev-util/colm: ~x64-macos keyworded for 0.13.0.7

Package-Manager: Portage-3.0.10.3-prefix, Repoman-3.0.2
Signed-off-by: Sam James  gentoo.org>

 dev-util/colm/colm-0.13.0.7.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/colm/colm-0.13.0.7.ebuild 
b/dev-util/colm/colm-0.13.0.7.ebuild
index a7249366d3a..5ea9f227281 100644
--- a/dev-util/colm/colm-0.13.0.7.ebuild
+++ b/dev-util/colm/colm-0.13.0.7.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://www.colm.net/files/${PN}/${P}.tar.gz;
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 
~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 
~amd64-linux ~x86-linux ~x64-macos"
 
 BDEPEND="app-text/asciidoc"
 



[gentoo-commits] repo/gentoo:master commit in: dev-python/ndg-httpsclient/

2020-12-06 Thread Sam James
commit: 066062af7b3df88d74e8c881fbac9abf28c8115e
Author: Sam James  gentoo  org>
AuthorDate: Mon Dec  7 03:38:29 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Dec  7 03:38:52 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=066062af

dev-python/ndg-httpsclient: ~x64-macos keyworded for 0.5.1

Package-Manager: Portage-3.0.10.3-prefix, Repoman-3.0.2
Signed-off-by: Sam James  gentoo.org>

 dev-python/ndg-httpsclient/ndg-httpsclient-0.5.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-python/ndg-httpsclient/ndg-httpsclient-0.5.1.ebuild 
b/dev-python/ndg-httpsclient/ndg-httpsclient-0.5.1.ebuild
index 9a2da09643e..16064024037 100644
--- a/dev-python/ndg-httpsclient/ndg-httpsclient-0.5.1.ebuild
+++ b/dev-python/ndg-httpsclient/ndg-httpsclient-0.5.1.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${P/-/_}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86 
~x64-macos"
 
 RDEPEND="
dev-python/pyaes[${PYTHON_USEDEP}]



[gentoo-commits] repo/gentoo:master commit in: dev-lang/go/

2020-12-06 Thread William Hubbs
commit: ed122be08931392fd783a3331e554b9be90859ef
Author: William Hubbs  gentoo  org>
AuthorDate: Mon Dec  7 03:11:49 2020 +
Commit: William Hubbs  gentoo  org>
CommitDate: Mon Dec  7 03:12:08 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ed122be0

dev-lang/go: clean up live ebuild

Signed-off-by: William Hubbs  gentoo.org>

 dev-lang/go/go-.ebuild | 18 +-
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/dev-lang/go/go-.ebuild b/dev-lang/go/go-.ebuild
index 1157708bdb5..6bb792691ce 100644
--- a/dev-lang/go/go-.ebuild
+++ b/dev-lang/go/go-.ebuild
@@ -154,37 +154,37 @@ src_test()
 
 src_install()
 {
-   local bin_path f x
-
-   dodir /usr/lib/go
-
# There is a known issue which requires the source tree to be installed 
[1].
# Once this is fixed, we can consider using the doc use flag to control
# installing the doc and src directories.
+   # The use of cp is deliberate in order to retain permissions
# [1] https://golang.org/issue/2775
-   #
-   # deliberately use cp to retain permissions
+   dodir /usr/lib/go
cp -R api bin doc lib pkg misc src test "${ED}"/usr/lib/go
+   einstalldocs
+
# testdata directories are not needed on the installed system
rm -fr $(find "${ED}"/usr/lib/go -iname testdata -type d -print)
+
+   local bin_path
if go_cross_compile; then
bin_path="bin/$(go_tuple)"
else
bin_path=bin
fi
+   local f x
for x in ${bin_path}/*; do
f=${x##*/}
dosym ../lib/go/${bin_path}/${f} /usr/bin/${f}
done
-   einstalldocs
 
# install the @golang-rebuild set for Portage
insinto /usr/share/portage/config/sets
newins "${FILESDIR}"/go-sets.conf go.conf
 
+   # fix install_name for test object (binutils_test) on Darwin, it
+   # is never used in real circumstances
if [[ ${CHOST} == *-darwin* ]] ; then
-   # fix install_name for test object (binutils_test) on Darwin, it
-   # is never used in real circumstances
local 
libmac64="${EPREFIX}"/usr/lib/go/src/cmd/vendor/github.com/
  
libmac64+=google/pprof/internal/binutils/testdata/lib_mac_64
install_name_tool -id "${libmac64}" "${D}${libmac64}"



[gentoo-commits] proj/portage:master commit in: lib/portage/dbapi/, lib/portage/package/ebuild/

2020-12-06 Thread Zac Medico
commit: 87ca3d4b09324a2359ea10aa69c1f2875c531486
Author: Zac Medico  gentoo  org>
AuthorDate: Mon Dec  7 02:54:26 2020 +
Commit: Zac Medico  gentoo  org>
CommitDate: Mon Dec  7 02:54:52 2020 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=87ca3d4b

Remove unused EventLoop lazy imports

Signed-off-by: Zac Medico  gentoo.org>

 lib/portage/dbapi/vartree.py   | 1 -
 lib/portage/package/ebuild/doebuild.py | 1 -
 2 files changed, 2 deletions(-)

diff --git a/lib/portage/dbapi/vartree.py b/lib/portage/dbapi/vartree.py
index 1547d2f6d..f3d74cf82 100644
--- a/lib/portage/dbapi/vartree.py
+++ b/lib/portage/dbapi/vartree.py
@@ -41,7 +41,6 @@ portage.proxy.lazyimport.lazyimport(globals(),
'portage.util._dyn_libs.LinkageMapELF:LinkageMapELF@LinkageMap',
'portage.util._dyn_libs.NeededEntry:NeededEntry',
'portage.util._async.SchedulerInterface:SchedulerInterface',
-   'portage.util._eventloop.EventLoop:EventLoop',
'portage.util._eventloop.global_event_loop:global_event_loop',
'portage.versions:best,catpkgsplit,catsplit,cpv_getkey,vercmp,' + \
'_get_slot_re,_pkgsplit@pkgsplit,_pkg_str,_unknown_repo',

diff --git a/lib/portage/package/ebuild/doebuild.py 
b/lib/portage/package/ebuild/doebuild.py
index 3b1991b28..f6cee4518 100644
--- a/lib/portage/package/ebuild/doebuild.py
+++ b/lib/portage/package/ebuild/doebuild.py
@@ -39,7 +39,6 @@ portage.proxy.lazyimport.lazyimport(globals(),
'portage.util._dyn_libs.NeededEntry:NeededEntry',
'portage.util._dyn_libs.soname_deps:SonameDepsProcessor',
'portage.util._async.SchedulerInterface:SchedulerInterface',
-   'portage.util._eventloop.EventLoop:EventLoop',
'portage.util._eventloop.global_event_loop:global_event_loop',
'portage.util.ExtractKernelVersion:ExtractKernelVersion'
 )



[gentoo-commits] repo/gentoo:master commit in: dev-python/parameterized/

2020-12-06 Thread Matt Turner
commit: edb6091af6ca53463cf6a3e8a9596a433bd74c91
Author: Matt Turner  gentoo  org>
AuthorDate: Mon Dec  7 02:51:51 2020 +
Commit: Matt Turner  gentoo  org>
CommitDate: Mon Dec  7 02:51:51 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=edb6091a

dev-python/parameterized: Keyword 0.7.4 alpha, #758698

Signed-off-by: Matt Turner  gentoo.org>

 dev-python/parameterized/parameterized-0.7.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-python/parameterized/parameterized-0.7.4.ebuild 
b/dev-python/parameterized/parameterized-0.7.4.ebuild
index 58a7aa748ee..b7d6d18a9ca 100644
--- a/dev-python/parameterized/parameterized-0.7.4.ebuild
+++ b/dev-python/parameterized/parameterized-0.7.4.ebuild
@@ -13,6 +13,6 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 x86"
 
 distutils_enable_tests nose



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

2020-12-06 Thread Matt Turner
commit: a61c45f59644f90f7a2581599445309793e9f0a8
Author: Matt Turner  gentoo  org>
AuthorDate: Mon Dec  7 02:52:15 2020 +
Commit: Matt Turner  gentoo  org>
CommitDate: Mon Dec  7 02:52:15 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a61c45f5

profiles/alpha: Remove dev-util/gtk-doc[test] mask

Bug: https://bugs.gentoo.org/758698
Signed-off-by: Matt Turner  gentoo.org>

 profiles/arch/alpha/package.use.mask | 4 
 1 file changed, 4 deletions(-)

diff --git a/profiles/arch/alpha/package.use.mask 
b/profiles/arch/alpha/package.use.mask
index 2be512d47be..d94252dc6c5 100644
--- a/profiles/arch/alpha/package.use.mask
+++ b/profiles/arch/alpha/package.use.mask
@@ -1,10 +1,6 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-# Matt Turner  (2020-12-05)
-# dev-python/parameterized is not keyworded
-dev-util/gtk-doc test
-
 # Michał Górny  (2020-11-30)
 # Qt5 is not keyworded here.
 x11-misc/synergy gui



[gentoo-commits] proj/portage:master commit in: lib/portage/util/_eventloop/, lib/portage/util/futures/_asyncio/

2020-12-06 Thread Zac Medico
commit: cecd2f8a259cf2991f2324c9a14e26170ba0ddcf
Author: Zac Medico  gentoo  org>
AuthorDate: Sun Dec  6 09:25:17 2020 +
Commit: Zac Medico  gentoo  org>
CommitDate: Mon Dec  7 02:32:27 2020 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=cecd2f8a

Use default asyncio event loop implementation in API consumer threads

Make the _safe_loop function return an AsyncioEventLoop instance,
so that the default asyncio event loop implementation will be used
in API consumer threads. This is possible because the underlying
asyncio.get_event_loop() function returns a separate  event loop for
each thread. The AsyncioEventLoop _run_until_complete method will
now appropriately handle a ValueError from signal.set_wakeup_fd(-1)
if it is not called in the main thread.

For external API consumers calling from a non-main thread, an
asyncio loop must be registered for the current thread, or else an
error will be raised like this:

  RuntimeError: There is no current event loop in thread 'Thread-1'.

In order to avoid this RuntimeError, the external API consumer
is responsible for setting an event loop and managing its lifecycle.
For example, this code will set an event loop for the current thread:

  asyncio.set_event_loop(asyncio.new_event_loop())

In order to avoid a ResourceWarning, the caller should also close
the corresponding loop before the current thread terminates.

Bug: https://bugs.gentoo.org/758755
Signed-off-by: Zac Medico  gentoo.org>

 lib/portage/util/_eventloop/asyncio_event_loop.py |  6 +-
 lib/portage/util/futures/_asyncio/__init__.py | 26 +--
 2 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/lib/portage/util/_eventloop/asyncio_event_loop.py 
b/lib/portage/util/_eventloop/asyncio_event_loop.py
index 836f1c30a..4d7047ae8 100644
--- a/lib/portage/util/_eventloop/asyncio_event_loop.py
+++ b/lib/portage/util/_eventloop/asyncio_event_loop.py
@@ -121,4 +121,8 @@ class AsyncioEventLoop(_AbstractEventLoop):
try:
return self._loop.run_until_complete(future)
finally:
-   self._wakeup_fd = signal.set_wakeup_fd(-1)
+   try:
+   self._wakeup_fd = signal.set_wakeup_fd(-1)
+   except ValueError:
+   # This is intended to fail when not called in 
the main thread.
+   pass

diff --git a/lib/portage/util/futures/_asyncio/__init__.py 
b/lib/portage/util/futures/_asyncio/__init__.py
index a902ad895..6f3395a91 100644
--- a/lib/portage/util/futures/_asyncio/__init__.py
+++ b/lib/portage/util/futures/_asyncio/__init__.py
@@ -34,7 +34,6 @@ import portage
 portage.proxy.lazyimport.lazyimport(globals(),
'portage.util.futures.unix_events:_PortageEventLoopPolicy',
'portage.util.futures:compat_coroutine@_compat_coroutine',
-   'portage.util._eventloop.EventLoop:EventLoop@_EventLoop',
 )
 from portage.util._eventloop.asyncio_event_loop import AsyncioEventLoop as 
_AsyncioEventLoop
 from portage.util._eventloop.global_event_loop import (
@@ -246,14 +245,27 @@ def _wrap_loop(loop=None):
 def _safe_loop():
"""
Return an event loop that's safe to use within the current context.
-   For portage internal callers, this returns a globally shared event
-   loop instance. For external API consumers, this constructs a
-   temporary event loop instance that's safe to use in a non-main
-   thread (it does not override the global SIGCHLD handler).
+   For portage internal callers or external API consumers calling from
+   the main thread, this returns a globally shared event loop instance.
+
+   For external API consumers calling from a non-main thread, an
+   asyncio loop must be registered for the current thread, or else an
+   error will be raised like this:
+
+ RuntimeError: There is no current event loop in thread 'Thread-1'.
+
+   In order to avoid this RuntimeError, the external API consumer
+   is responsible for setting an event loop and managing its lifecycle.
+   For example, this code will set an event loop for the current thread:
+
+ asyncio.set_event_loop(asyncio.new_event_loop())
+
+   In order to avoid a ResourceWarning, the caller should also close the
+   corresponding loop before the current thread terminates.
 
@rtype: asyncio.AbstractEventLoop (or compatible)
@return: event loop instance
"""
-   if portage._internal_caller:
+   if portage._internal_caller or threading.current_thread() is 
threading.main_thread():
return _global_event_loop()
-   return _EventLoop(main=False)
+   return _AsyncioEventLoop()



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

2020-12-06 Thread Matt Turner
commit: aa01067ed1748a0a5b46424cae90fce06929ac65
Author: Matt Turner  gentoo  org>
AuthorDate: Mon Dec  7 02:40:18 2020 +
Commit: Matt Turner  gentoo  org>
CommitDate: Mon Dec  7 02:40:21 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aa01067e

profiles/alpha: Remove sys-block/fio mask

sys-block/fio has no ~alpha keywords.

Closes: https://bugs.gentoo.org/730480
Signed-off-by: Matt Turner  gentoo.org>

 profiles/arch/alpha/package.use.mask | 4 
 1 file changed, 4 deletions(-)

diff --git a/profiles/arch/alpha/package.use.mask 
b/profiles/arch/alpha/package.use.mask
index 7f5f82c43ca..2be512d47be 100644
--- a/profiles/arch/alpha/package.use.mask
+++ b/profiles/arch/alpha/package.use.mask
@@ -50,10 +50,6 @@ gnome-base/gvfs google
 # needs app-text/libgepub which depends on webkit-gtk
 xfce-extra/tumbler epub
 
-# Robin H. Johnson  (2020-07-02)
-# Mask io-uring & zbc pending keywording
-sys-block/fio -io-uring zbc
-
 # Michał Górny  (2020-06-14)
 # Requires dev-python/networkx.
 app-portage/nattka depgraph-order



[gentoo-commits] repo/gentoo:master commit in: dev-python/pytest-asyncio/

2020-12-06 Thread Matt Turner
commit: 926b8c5260649ff95a4d56b7e476fd057bc1aef7
Author: Matt Turner  gentoo  org>
AuthorDate: Mon Dec  7 02:37:24 2020 +
Commit: Matt Turner  gentoo  org>
CommitDate: Mon Dec  7 02:37:39 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=926b8c52

dev-python/pytest-asyncio: Keyword 0.14.0 alpha, #753988

Signed-off-by: Matt Turner  gentoo.org>

 dev-python/pytest-asyncio/pytest-asyncio-0.14.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-python/pytest-asyncio/pytest-asyncio-0.14.0.ebuild 
b/dev-python/pytest-asyncio/pytest-asyncio-0.14.0.ebuild
index edcb0634fba..3e38abcb5a6 100644
--- a/dev-python/pytest-asyncio/pytest-asyncio-0.14.0.ebuild
+++ b/dev-python/pytest-asyncio/pytest-asyncio-0.14.0.ebuild
@@ -14,7 +14,7 @@ 
SRC_URI="https://github.com/pytest-dev/pytest-asyncio/archive/v${PV}.tar.gz -> $
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x64-macos"
 
 RDEPEND="
>=dev-python/pytest-5.4.0"



[gentoo-commits] repo/gentoo:master commit in: dev-python/jeepney/

2020-12-06 Thread Matt Turner
commit: 687e08ddad628492e8aa31d467a13e8b43108ac1
Author: Matt Turner  gentoo  org>
AuthorDate: Mon Dec  7 02:37:25 2020 +
Commit: Matt Turner  gentoo  org>
CommitDate: Mon Dec  7 02:37:39 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=687e08dd

dev-python/jeepney: Keyword 0.6.0 alpha, #753988

Signed-off-by: Matt Turner  gentoo.org>

 dev-python/jeepney/jeepney-0.6.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-python/jeepney/jeepney-0.6.0.ebuild 
b/dev-python/jeepney/jeepney-0.6.0.ebuild
index 37af4f03c00..a9562c3433a 100644
--- a/dev-python/jeepney/jeepney-0.6.0.ebuild
+++ b/dev-python/jeepney/jeepney-0.6.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 
~x64-macos"
 IUSE="examples"
 
 BDEPEND="



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

2020-12-06 Thread Aaron Bauman
commit: b01b872d52e42b3d18b83c53b92d2da8b1cd057d
Author: Aaron Bauman  gentoo  org>
AuthorDate: Mon Dec  7 02:35:55 2020 +
Commit: Aaron Bauman  gentoo  org>
CommitDate: Mon Dec  7 02:36:45 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b01b872d

eclass/db-use: EAPI=7 is silently supported. Reflect that.

Signed-off-by: Aaron Bauman  gentoo.org>

 eclass/db-use.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/db-use.eclass b/eclass/db-use.eclass
index 3f58b7a381b..de257a9ae23 100644
--- a/eclass/db-use.eclass
+++ b/eclass/db-use.eclass
@@ -6,7 +6,7 @@
 # maintainer-nee...@gentoo.org
 # @AUTHOR:
 # Paul de Vrieze 
-# @SUPPORTED_EAPIS: 0 1 2 3 4 5 6
+# @SUPPORTED_EAPIS: 0 1 2 3 4 5 6 7
 # @BLURB: functions that aid the use of sys-libs/db
 # @DESCRIPTION:
 # functions that aid in the use of sys-libs/db



[gentoo-commits] proj/portage:master commit in: lib/portage/, lib/portage/util/_eventloop/

2020-12-06 Thread Zac Medico
commit: 58d8e4f6a917e262596108eb7bed1c2ef981e9de
Author: Zac Medico  gentoo  org>
AuthorDate: Sun Dec  6 08:44:20 2020 +
Commit: Zac Medico  gentoo  org>
CommitDate: Mon Dec  7 02:28:28 2020 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=58d8e4f6

Use default asyncio event loop implementation in child processes

Use the default asyncio event loop implementation in child
processes, instead of portage's internal EventLoop. After
fork, force instantiation of a new event loop policy as
a workaround for https://bugs.python.org/issue22087, which
is necessary for RetryTestCase to succeed.

Bug: https://bugs.gentoo.org/758740
Signed-off-by: Zac Medico  gentoo.org>

 lib/portage/__init__.py  | 4 
 lib/portage/util/_eventloop/global_event_loop.py | 7 ---
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/lib/portage/__init__.py b/lib/portage/__init__.py
index 4d4b590a8..621b1d99f 100644
--- a/lib/portage/__init__.py
+++ b/lib/portage/__init__.py
@@ -9,6 +9,7 @@ VERSION = "HEAD"
 # ===
 
 try:
+   import asyncio
import sys
import errno
if not hasattr(errno, 'ESTALE'):
@@ -373,6 +374,9 @@ class _ForkWatcher:
@staticmethod
def hook(_ForkWatcher):
_ForkWatcher.current_pid = _os.getpid()
+   # Force instantiation of a new event loop policy as a workaround
+   # for https://bugs.python.org/issue22087.
+   asyncio.set_event_loop_policy(None)
 
 _ForkWatcher.hook(_ForkWatcher)
 

diff --git a/lib/portage/util/_eventloop/global_event_loop.py 
b/lib/portage/util/_eventloop/global_event_loop.py
index 21a1d1970..413011178 100644
--- a/lib/portage/util/_eventloop/global_event_loop.py
+++ b/lib/portage/util/_eventloop/global_event_loop.py
@@ -2,11 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 import portage
-from .EventLoop import EventLoop
 from portage.util._eventloop.asyncio_event_loop import AsyncioEventLoop
 
-
-_MAIN_PID = portage.getpid()
 _instances = {}
 
 
@@ -22,10 +19,6 @@ def global_event_loop():
return instance
 
constructor = AsyncioEventLoop
-   # If the default constructor doesn't support multiprocessing,
-   # then multiprocessing constructor is used in subprocesses.
-   if not constructor.supports_multiprocessing and pid != _MAIN_PID:
-   constructor = EventLoop
 
# Use the _asyncio_wrapper attribute, so that unit tests can compare
# the reference to one retured from _wrap_loop(), since they should



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

2020-12-06 Thread Matt Turner
commit: 08adcb011ccab272561c23ad094d56841825ae23
Author: Matt Turner  gentoo  org>
AuthorDate: Mon Dec  7 02:24:50 2020 +
Commit: Matt Turner  gentoo  org>
CommitDate: Mon Dec  7 02:24:50 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=08adcb01

dev-libs/gumbo: Keyword 0.10.1 alpha, #748558

Signed-off-by: Matt Turner  gentoo.org>

 dev-libs/gumbo/gumbo-0.10.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-libs/gumbo/gumbo-0.10.1.ebuild 
b/dev-libs/gumbo/gumbo-0.10.1.ebuild
index d046877829c..74a04e0bd98 100644
--- a/dev-libs/gumbo/gumbo-0.10.1.ebuild
+++ b/dev-libs/gumbo/gumbo-0.10.1.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://github.com/google/gumbo-parser/archive/v${PV}.tar.gz -> ${P}.ta
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 x86 ~ppc-macos ~x64-macos 
~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 x86 ~ppc-macos 
~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 



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

2020-12-06 Thread Matt Turner
commit: 97a97d9a0717e34bd561f5bcd1dd9b92d5eecbdc
Author: Matt Turner  gentoo  org>
AuthorDate: Mon Dec  7 02:24:51 2020 +
Commit: Matt Turner  gentoo  org>
CommitDate: Mon Dec  7 02:24:51 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=97a97d9a

app-text/mupdf: Keyword 1.18.0-r2 alpha, #748558

Signed-off-by: Matt Turner  gentoo.org>

 app-text/mupdf/mupdf-1.18.0-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-text/mupdf/mupdf-1.18.0-r2.ebuild 
b/app-text/mupdf/mupdf-1.18.0-r2.ebuild
index dcce0f82d29..5cb9e2e2fa2 100644
--- a/app-text/mupdf/mupdf-1.18.0-r2.ebuild
+++ b/app-text/mupdf/mupdf-1.18.0-r2.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/${P}-source"
 
 LICENSE="AGPL-3"
 SLOT="0/${PV}"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 x86"
 IUSE="X +javascript libressl opengl ssl"
 REQUIRED_USE="opengl? ( javascript )"
 



[gentoo-commits] repo/gentoo:master commit in: dev-python/pytest/

2020-12-06 Thread Matt Turner
commit: 5b008c9afa92e6cd00c9de4e16d743aeab57b3ea
Author: Matt Turner  gentoo  org>
AuthorDate: Mon Dec  7 00:21:42 2020 +
Commit: Matt Turner  gentoo  org>
CommitDate: Mon Dec  7 01:59:07 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b008c9a

dev-python/pytest: Keyword 6.1.2 alpha, #752237

Signed-off-by: Matt Turner  gentoo.org>

 dev-python/pytest/pytest-6.1.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-python/pytest/pytest-6.1.2.ebuild 
b/dev-python/pytest/pytest-6.1.2.ebuild
index 83746d2c0f0..1ad1dc8983c 100644
--- a/dev-python/pytest/pytest-6.1.2.ebuild
+++ b/dev-python/pytest/pytest-6.1.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv sparc x86 
~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 



[gentoo-commits] repo/gentoo:master commit in: dev-lang/go/files/, dev-lang/go/

2020-12-06 Thread William Hubbs
commit: 3262576e57dc88108b7ce603a2e575c6fdf89e9b
Author: William Hubbs  gentoo  org>
AuthorDate: Mon Dec  7 01:41:03 2020 +
Commit: William Hubbs  gentoo  org>
CommitDate: Mon Dec  7 01:43:50 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3262576e

dev-lang/go: add way to have portage rebuild  software written in Go

This adds the @golang-rebuild set to portage to allow rebuilding all
known Go software in the tree.

This change only affects the live ebuild, but I will be adding it to
other versions.

Signed-off-by: William Hubbs  gentoo.org>

 dev-lang/go/files/go-sets.conf | 7 +++
 dev-lang/go/go-.ebuild | 6 --
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/dev-lang/go/files/go-sets.conf b/dev-lang/go/files/go-sets.conf
new file mode 100644
index 000..01ad4a8b3d4
--- /dev/null
+++ b/dev-lang/go/files/go-sets.conf
@@ -0,0 +1,7 @@
+# Installed packages that inherit from known Go related eclasses.
+# This is useful after a dev-lang/go version change to rebuild all
+# software written in Go.
+[golang-rebuild]
+class = portage.sets.dbapi.VariableSet
+variable = INHERITED
+includes = golang-base golang-build golang-vcs golang-vcs-snapshot go-module

diff --git a/dev-lang/go/go-.ebuild b/dev-lang/go/go-.ebuild
index c81e94e1235..1157708bdb5 100644
--- a/dev-lang/go/go-.ebuild
+++ b/dev-lang/go/go-.ebuild
@@ -178,6 +178,10 @@ src_install()
done
einstalldocs
 
+   # install the @golang-rebuild set for Portage
+   insinto /usr/share/portage/config/sets
+   newins "${FILESDIR}"/go-sets.conf go.conf
+
if [[ ${CHOST} == *-darwin* ]] ; then
# fix install_name for test object (binutils_test) on Darwin, it
# is never used in real circumstances
@@ -189,8 +193,6 @@ src_install()
 
 pkg_postinst() {
[[ -z ${REPLACING_VERSIONS} ]] && return
-   has_version "

[gentoo-commits] repo/gentoo:master commit in: x11-base/xorg-server/

2020-12-06 Thread Thomas Deutschmann
commit: afee25ad3701fe42dcb1a67be650d090a8b542ff
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Mon Dec  7 01:38:36 2020 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Mon Dec  7 01:41:28 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=afee25ad

x11-base/xorg-server: x86 stable (bug #757882)

Package-Manager: Portage-3.0.10, Repoman-3.0.2
Signed-off-by: Thomas Deutschmann  gentoo.org>

 x11-base/xorg-server/xorg-server-1.20.10.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-base/xorg-server/xorg-server-1.20.10.ebuild 
b/x11-base/xorg-server/xorg-server-1.20.10.ebuild
index 775640db49d..f4c2c6bbe59 100644
--- a/x11-base/xorg-server/xorg-server-1.20.10.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.20.10.ebuild
@@ -10,7 +10,7 @@ 
EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/xserver.git;
 DESCRIPTION="X.Org X servers"
 SLOT="0/${PV}"
 if [[ ${PV} != * ]]; then
-   KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 
~sparc ~x86 ~amd64-linux ~x86-linux"
+   KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 
~sparc x86 ~amd64-linux ~x86-linux"
 fi
 
 IUSE_SERVERS="dmx kdrive wayland xephyr xnest xorg xvfb"



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

2020-12-06 Thread Zac Medico
commit: f0bb5360fbc519550d46587af5217eae2ed514ac
Author: Zac Medico  gentoo  org>
AuthorDate: Mon Dec  7 01:33:33 2020 +
Commit: Zac Medico  gentoo  org>
CommitDate: Mon Dec  7 01:35:47 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f0bb5360

app-admin/vault: Remove vulnerable CVE-2020-25816

Bug: https://bugs.gentoo.org/747157
Package-Manager: Portage-3.0.11, Repoman-3.0.2
Signed-off-by: Zac Medico  gentoo.org>

 app-admin/vault/Manifest   |  2 -
 app-admin/vault/vault-1.4.5.ebuild | 77 --
 2 files changed, 79 deletions(-)

diff --git a/app-admin/vault/Manifest b/app-admin/vault/Manifest
index 4a1c60de227..8dd0b6330e7 100644
--- a/app-admin/vault/Manifest
+++ b/app-admin/vault/Manifest
@@ -1,5 +1,3 @@
-DIST vault-1.4.5-webui.tar.xz 1239532 BLAKE2B 
fe861cdf9ea833010f6b8b2ffa403fb8095456cc9038f19edefe44fbbdd418bf4c3ec129b1436296c78914d75964dbb6dcaf3077cad45a3cf905a54a42e7e82d
 SHA512 
d0fe0878b6f30a63e7156644c7a53bd8bf0008355e6bf9b79b8a4acd4a094ab43914e2b7ca63f48f3b31433dd36b1091ebbfb9afe8002e51c18dcf217292b521
-DIST vault-1.4.5.tar.gz 33272136 BLAKE2B 
3e0f3b11b975b1e563883d43f392dc998dc21ad057859c4aaad3dc67133e3a2dd9e3d1ab5b46f07d981738bdccaa5ced477ace6e057579815c13557cd74f30eb
 SHA512 
5b709ef857d6c64a1332b1c01b13f525491e21e958a7e1441fa817067a8016e8d78d7f71043c2b24d75141becea18063d97cfb5dd7a337130d6d8ef58a76d062
 DIST vault-1.4.7-webui.tar.xz 1236924 BLAKE2B 
83ab6f4494708f0738aed4f7226d5e634d01268da6b672c6ef1340559eccfdbb2a74baaa9a67cb3287290bd1ef332e325ba365280999f7db86e1694ec1731788
 SHA512 
634128a0a46c01d671c3c766eb4f84a58802f0cf0ade297f34e9d84eedb8d8dfbbbd4ad0eae6a28e33acb0b161f123a692b8b98a25918da8337cbce380c5f94b
 DIST vault-1.4.7.tar.gz 33265037 BLAKE2B 
11cd3d1bd2321a6240a31f32e0725b1bd3104a4cb050ecc78c9fc6bac1db1a79799e3a4b212468556a54e1f431e61f18115d2c86ddd0b229ae0f5ad06726
 SHA512 
a7af7780756df02a465a60989e3aba382116e0846cc48ab81d7b272133c31b7c47f60eed4ec5ad47ad0a80247baee7087a1554fcaf189a60a1edb807a268c3a4
 DIST vault-1.5.5-webui.tar.xz 1239480 BLAKE2B 
d1f9d98c2a6ece03f994c08c1e842343f713bdcde981c55ea75049f3cc51f4989a9187786190ff138a9c8ef264a7a9a26428f8a7d916b4b2c0554da85e48ae4d
 SHA512 
a9516605ec262ad44cb8ae61308a70a5cfa0458b8bb2e80d49c4e28711db5a7ad18ef2bcf0e9756b9da6534f1d47ed8bcfc6c7c734042aa8d9b0e9851059fa9d

diff --git a/app-admin/vault/vault-1.4.5.ebuild 
b/app-admin/vault/vault-1.4.5.ebuild
deleted file mode 100644
index 671178b2513..000
--- a/app-admin/vault/vault-1.4.5.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit fcaps go-module systemd
-
-DESCRIPTION="A tool for managing secrets"
-HOMEPAGE="https://vaultproject.io/;
-VAULT_WEBUI_ARCHIVE="${P}-webui.tar.xz"
-SRC_URI="https://github.com/hashicorp/vault/archive/v${PV}.tar.gz -> 
${P}.tar.gz
-   webui? (
-   https://dev.gentoo.org/~zmedico/dist/${VAULT_WEBUI_ARCHIVE}
-   )"
-
-LICENSE="MPL-2.0 Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="+webui"
-
-BDEPEND="dev-go/gox"
-COMMON_DEPEND="acct-group/vault
-   acct-user/vault"
-   DEPEND="${COMMON_DEPEND}"
-   RDEPEND="${COMMON_DEPEND}"
-
-FILECAPS=(
-   -m 755 'cap_ipc_lock=+ep' usr/bin/${PN}
-)
-
-RESTRICT+=" test"
-
-src_prepare() {
-   default
-   # Avoid the need to have a git checkout
-   sed -e 's:^\(GIT_COMMIT=\).*:\1:' \
-   -e 's:^\(GIT_DIRTY=\).*:\1:' \
-   -e s:\'\${GIT_COMMIT}\${GIT_DIRTY}\':: \
-   -i scripts/build.sh || die
-   sed -e "/hooks/d" \
-   -e 's|^\([[:space:]]*\)goimports .*)|\1true|' \
-   -i Makefile || die
-   if [[ -f "${WORKDIR}/http/bindata_assetfs.go" ]]; then
-   mv "${WORKDIR}/http/bindata_assetfs.go" "${S}/http" ||
-   die "mv failed"
-   fi
-}
-
-src_compile() {
-   mkdir "${T}"/bin || die
-   BUILD_TAGS="$(usex webui ui '')" \
-   GOFLAGS="-mod=vendor" \
-   GOPATH="${T}" \
-   XC_ARCH=$(go env GOARCH) \
-   XC_OS=$(go env GOOS) \
-   XC_OSARCH=$(go env GOOS)/$(go env GOARCH) \
-   emake
-}
-
-src_install() {
-   dobin bin/${PN}
-   dodoc CHANGELOG.md CONTRIBUTING.md README.md
-   insinto /etc/${PN}.d
-   doins "${FILESDIR}/"*.json.example
-   insinto /etc/logrotate.d
-   newins "${FILESDIR}/${PN}.logrotated" "${PN}"
-   newinitd "${FILESDIR}/${PN}.initd" "${PN}"
-   newconfd "${FILESDIR}/${PN}.confd" "${PN}"
-   systemd_dounit "${FILESDIR}/${PN}.service"
-   keepdir /var/log/${PN}
-   fowners ${PN}:${PN} /var/log/${PN}
-}
-
-pkg_postinst() {
-   fcaps_pkg_postinst
-   go-module_pkg_postinst
-}



[gentoo-commits] repo/gentoo:master commit in: media-plugins/kodi-pvr-hts/

2020-12-06 Thread Craig Andrews
commit: bb0abd3c381952f5e190481982297b164c8ef5f0
Author: Craig Andrews  gentoo  org>
AuthorDate: Mon Dec  7 01:18:33 2020 +
Commit: Craig Andrews  gentoo  org>
CommitDate: Mon Dec  7 01:29:13 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bb0abd3c

media-plugins/kodi-pvr-hts: Cleanup old versions

Package-Manager: Portage-3.0.11, Repoman-3.0.2
Signed-off-by: Craig Andrews  gentoo.org>

 media-plugins/kodi-pvr-hts/Manifest|  6 
 .../kodi-pvr-hts/kodi-pvr-hts-7.1.4.ebuild | 34 --
 .../kodi-pvr-hts/kodi-pvr-hts-7.2.0.ebuild | 34 --
 .../kodi-pvr-hts/kodi-pvr-hts-7.2.1.ebuild | 33 -
 .../kodi-pvr-hts/kodi-pvr-hts-7.2.2.ebuild | 33 -
 .../kodi-pvr-hts/kodi-pvr-hts-8.0.0.ebuild | 33 -
 .../kodi-pvr-hts/kodi-pvr-hts-8.1.0.ebuild | 33 -
 7 files changed, 206 deletions(-)

diff --git a/media-plugins/kodi-pvr-hts/Manifest 
b/media-plugins/kodi-pvr-hts/Manifest
index 46399393155..f010348a265 100644
--- a/media-plugins/kodi-pvr-hts/Manifest
+++ b/media-plugins/kodi-pvr-hts/Manifest
@@ -1,7 +1 @@
-DIST kodi-pvr-hts-7.1.4.tar.gz 167634 BLAKE2B 
34c19b9be6f8e66c22b93e74703d55ccf66970fb39b4c2ac52146aa9d94175280406339fbe6651a53be4b9216713dbeb25fc004f9959a1ce1db42e13b0aec2f7
 SHA512 
91f9420ad88ec806d2d16e618827583039b90e488014d0f998108c9d94906aa247755f5d53dc4b59badc9fdfad96c975b0d7c98ef0ffd7116171e8abd247c94b
-DIST kodi-pvr-hts-7.2.0.tar.gz 167998 BLAKE2B 
4da53589b58849259d66a03d2f719067cc1749ea181ad6037f03ca178879a34e209422039a1b2d0b3900ee2a2ef65d32a09cae0f177dc17dd8aa97e06dea4f2b
 SHA512 
736188c4464c9110e4916223cd0aa79195547d4ff568aea711aa42c1145d5aa981d1d5f62d4ed79b37575592bda9f2bbc532eff7b09e48785e644e8fdea668c0
-DIST kodi-pvr-hts-7.2.1.tar.gz 180461 BLAKE2B 
c0beed28549d80f71e5bb7197a396c5abf6c26e119caee5624e37c250d718425519d93317e26e1fa831f13d83903807e2fa3917831645ed83e465f8177cc77d3
 SHA512 
6f971a14e04c4ebb7b300286f7b10f64092eac91a63cbb1ea7ce0d47431231743080b73eb9939273e775f69c1659c2daa669ee53b22be3dafa4c732b095c43f8
-DIST kodi-pvr-hts-7.2.2.tar.gz 180484 BLAKE2B 
051fec04c54ef0e6d6bb756e118827b399881d34eb4657efad0a8f390d96d3b7117a7b48172674d6e5fa6179bf96716665f97d8bacd3f3097d7087eaa1cfa902
 SHA512 
1dd1a097f08e329afdcbcf749417da57001b0191b3a00851607851ba982a268d122dbb9bccf779a8d95f96227a1cf7dd557fcc7761fa32ed263510c2e7941f33
-DIST kodi-pvr-hts-8.0.0.tar.gz 180516 BLAKE2B 
3c76654515e3c40fb900c3765ecbb7648cead5d75cc6e43f440378f3041fa9acedc12bb996197384dd0a1a19be0e7771d67f8f5b496e3b4218dfa58b79af
 SHA512 
18f707bbaa5068aa2d2c2c71b4c8730e3edc1d9f24cdc99ebff0c665f47cab91c88111a444648cb733595e05d1275032cd824edcbb008e9c7609c2372eb03b9a
-DIST kodi-pvr-hts-8.1.0.tar.gz 180549 BLAKE2B 
01cce4af7e4859e6b9cbf21db80869dede60410f4b8a90e2ca7341cf36e3ffe97af356cb67ba4b604dbcd2bd8ee5374b91a4e5edf533414cef74abad2c4835e4
 SHA512 
dd3cdd183a1bfcb281ca72dac852e8ff8751747b5d2bc6a50234bf30954925e101235760052742ba7b82ba35177a80f0ea3833974912ac010ec666e718177676
 DIST kodi-pvr-hts-8.1.2.tar.gz 180630 BLAKE2B 
d65843b7ede1c2543c0c2d2c408c47a0004632154e3a35a119384e90f9104b523f90776c1387fee33acc97fdc1d04a691eb45b064ed25c45a73913b5c0a32e74
 SHA512 
92a510336a7ca7563149909c6d155d0ee7adf633653860d32cc29e1c88b88577d9ed8eea75bb507707645e254e116aa3ffc4f8a4acb95b1fb15157f7c8e3a2dc

diff --git a/media-plugins/kodi-pvr-hts/kodi-pvr-hts-7.1.4.ebuild 
b/media-plugins/kodi-pvr-hts/kodi-pvr-hts-7.1.4.ebuild
deleted file mode 100644
index 764206faf8d..000
--- a/media-plugins/kodi-pvr-hts/kodi-pvr-hts-7.1.4.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake kodi-addon
-
-DESCRIPTION="Tvheadend Live TV and Radio PVR client addon for Kodi"
-HOMEPAGE="https://github.com/kodi-pvr/pvr.hts;
-SRC_URI=""
-
-if [[ ${PV} ==  ]]; then
-   SRC_URI=""
-   EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.hts.git;
-   inherit git-r3
-else
-   CODENAME="Matrix"
-   KEYWORDS="~amd64 ~x86"
-   
SRC_URI="https://github.com/kodi-pvr/pvr.hts/archive/${PV}-${CODENAME}.tar.gz 
-> ${P}.tar.gz"
-   S="${WORKDIR}/pvr.hts-${PV}-${CODENAME}"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-   =dev-libs/libplatform-2*
-   =media-tv/kodi-19*
-   "
-
-RDEPEND="
-   ${DEPEND}
-   "

diff --git a/media-plugins/kodi-pvr-hts/kodi-pvr-hts-7.2.0.ebuild 
b/media-plugins/kodi-pvr-hts/kodi-pvr-hts-7.2.0.ebuild
deleted file mode 100644
index 764206faf8d..000
--- a/media-plugins/kodi-pvr-hts/kodi-pvr-hts-7.2.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake kodi-addon
-
-DESCRIPTION="Tvheadend Live TV and Radio PVR client addon for Kodi"

[gentoo-commits] repo/gentoo:master commit in: media-plugins/kodi-pvr-iptvsimple/

2020-12-06 Thread Craig Andrews
commit: 876a8aec35ec9ef3d6e6b3fbb50eadb7f15c7db7
Author: Craig Andrews  gentoo  org>
AuthorDate: Mon Dec  7 01:19:16 2020 +
Commit: Craig Andrews  gentoo  org>
CommitDate: Mon Dec  7 01:29:14 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=876a8aec

media-plugins/kodi-pvr-iptvsimple: 7.1.0 version bump

Package-Manager: Portage-3.0.11, Repoman-3.0.2
Signed-off-by: Craig Andrews  gentoo.org>

 media-plugins/kodi-pvr-iptvsimple/Manifest |  1 +
 .../kodi-pvr-iptvsimple-7.1.0.ebuild   | 43 ++
 2 files changed, 44 insertions(+)

diff --git a/media-plugins/kodi-pvr-iptvsimple/Manifest 
b/media-plugins/kodi-pvr-iptvsimple/Manifest
index b7f5c535d84..2966885e847 100644
--- a/media-plugins/kodi-pvr-iptvsimple/Manifest
+++ b/media-plugins/kodi-pvr-iptvsimple/Manifest
@@ -3,3 +3,4 @@ DIST kodi-pvr-iptvsimple-6.3.2.tar.gz 192436 BLAKE2B 
8d793ed6802a93457f1d1f2c1f0
 DIST kodi-pvr-iptvsimple-6.4.0.tar.gz 179020 BLAKE2B 
b4dbabc152cdea4c3768a6d74e1d67e2e1686ccc161fef40f25872e58ee07b66f732db1df48a1947103075b9828f11484a0961ede766806f0a27d2271fbc6a66
 SHA512 
b9a52244ef502c621276589030c391c5acae34999dd57a4a42fc4ce4d138b96dcd6f485eb08ef346a6d7e173175e5d7954feb8928fb8df097fb1ecbce051
 DIST kodi-pvr-iptvsimple-6.4.1.tar.gz 179019 BLAKE2B 
eaaa2230d697d2f85b26b3949ecb36b95fc02f57bee740b33f2ad99239b32067a1f89188320dbd874d4e15a2fd6a906f252e52ef619a09b40a2eb348fb30b805
 SHA512 
048898135ccd08ed2d584c52bfc94bb22865931036173c642606695ed68ffc55478a255e183e347ee9c704225a2af855871f4aaed85b614a42e7dcad040408dc
 DIST kodi-pvr-iptvsimple-7.0.0.tar.gz 179504 BLAKE2B 
11598b6313bcd0b0909df0191168e8e4d468c31be96290af881658656f92d5e97f031408fef6677e962f4203e6a02896977d49225f58f0fa5eb1d21bc28b5e22
 SHA512 
7c0d1f82f74c4c66e9276aa31444b76a816c6fa456ea53e25b897d7c24c352529dd158043391817502172d0c0c90ae6da22329ba334b6bbd38438e981036bce4
+DIST kodi-pvr-iptvsimple-7.1.0.tar.gz 180721 BLAKE2B 
0ec7ac0ffd1eb480e3a3a956b3fbd79e5bc3607713839a72dff45dc2d22e66d006d354ec12a5606360703f3e6bb29457e17034a5644ba06fc5ef032b5f0690c4
 SHA512 
b4b97d94c216a195b3741dc816ab9441493550c4d9fa9c9b28ba58dfb31a4d94e3fd429384ca46bf3150a607c8c52feac402a6f18f664bc18353a7c40e54f85e

diff --git a/media-plugins/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple-7.1.0.ebuild 
b/media-plugins/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple-7.1.0.ebuild
new file mode 100644
index 000..d29c62c10d9
--- /dev/null
+++ b/media-plugins/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple-7.1.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake kodi-addon
+
+DESCRIPTION="Kodi's IPTVSimple client addon"
+HOMEPAGE="https://github.com/kodi-pvr/pvr.iptvsimple;
+SRC_URI=""
+
+case ${PV} in
+)
+   SRC_URI=""
+   EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.iptvsimple.git;
+   inherit git-r3
+   ;;
+*)
+   CODENAME="Matrix"
+   KEYWORDS="~amd64 ~x86"
+   
SRC_URI="https://github.com/kodi-pvr/pvr.iptvsimple/archive/${PV}-${CODENAME}.tar.gz
 -> ${P}.tar.gz"
+   S="${WORKDIR}/pvr.iptvsimple-${PV}-${CODENAME}"
+   ;;
+esac
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+   dev-libs/pugixml
+   =media-tv/kodi-19*
+   sys-libs/zlib
+   "
+
+RDEPEND="
+   ${DEPEND}
+   "
+
+src_prepare() {
+   [ -d depends ] && rm -rf depends || die
+   cmake_src_prepare
+}



[gentoo-commits] repo/gentoo:master commit in: media-plugins/kodi-pvr-hts/

2020-12-06 Thread Craig Andrews
commit: 6449946c600e7e51aa9c8d226990c9b4af4576db
Author: Craig Andrews  gentoo  org>
AuthorDate: Mon Dec  7 01:17:50 2020 +
Commit: Craig Andrews  gentoo  org>
CommitDate: Mon Dec  7 01:29:13 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6449946c

media-plugins/kodi-pvr-hts: 8.1.2 version bump

Package-Manager: Portage-3.0.11, Repoman-3.0.2
Signed-off-by: Craig Andrews  gentoo.org>

 media-plugins/kodi-pvr-hts/Manifest|  1 +
 .../kodi-pvr-hts/kodi-pvr-hts-8.1.2.ebuild | 33 ++
 2 files changed, 34 insertions(+)

diff --git a/media-plugins/kodi-pvr-hts/Manifest 
b/media-plugins/kodi-pvr-hts/Manifest
index 4be1e290bc0..46399393155 100644
--- a/media-plugins/kodi-pvr-hts/Manifest
+++ b/media-plugins/kodi-pvr-hts/Manifest
@@ -4,3 +4,4 @@ DIST kodi-pvr-hts-7.2.1.tar.gz 180461 BLAKE2B 
c0beed28549d80f71e5bb7197a396c5abf
 DIST kodi-pvr-hts-7.2.2.tar.gz 180484 BLAKE2B 
051fec04c54ef0e6d6bb756e118827b399881d34eb4657efad0a8f390d96d3b7117a7b48172674d6e5fa6179bf96716665f97d8bacd3f3097d7087eaa1cfa902
 SHA512 
1dd1a097f08e329afdcbcf749417da57001b0191b3a00851607851ba982a268d122dbb9bccf779a8d95f96227a1cf7dd557fcc7761fa32ed263510c2e7941f33
 DIST kodi-pvr-hts-8.0.0.tar.gz 180516 BLAKE2B 
3c76654515e3c40fb900c3765ecbb7648cead5d75cc6e43f440378f3041fa9acedc12bb996197384dd0a1a19be0e7771d67f8f5b496e3b4218dfa58b79af
 SHA512 
18f707bbaa5068aa2d2c2c71b4c8730e3edc1d9f24cdc99ebff0c665f47cab91c88111a444648cb733595e05d1275032cd824edcbb008e9c7609c2372eb03b9a
 DIST kodi-pvr-hts-8.1.0.tar.gz 180549 BLAKE2B 
01cce4af7e4859e6b9cbf21db80869dede60410f4b8a90e2ca7341cf36e3ffe97af356cb67ba4b604dbcd2bd8ee5374b91a4e5edf533414cef74abad2c4835e4
 SHA512 
dd3cdd183a1bfcb281ca72dac852e8ff8751747b5d2bc6a50234bf30954925e101235760052742ba7b82ba35177a80f0ea3833974912ac010ec666e718177676
+DIST kodi-pvr-hts-8.1.2.tar.gz 180630 BLAKE2B 
d65843b7ede1c2543c0c2d2c408c47a0004632154e3a35a119384e90f9104b523f90776c1387fee33acc97fdc1d04a691eb45b064ed25c45a73913b5c0a32e74
 SHA512 
92a510336a7ca7563149909c6d155d0ee7adf633653860d32cc29e1c88b88577d9ed8eea75bb507707645e254e116aa3ffc4f8a4acb95b1fb15157f7c8e3a2dc

diff --git a/media-plugins/kodi-pvr-hts/kodi-pvr-hts-8.1.2.ebuild 
b/media-plugins/kodi-pvr-hts/kodi-pvr-hts-8.1.2.ebuild
new file mode 100644
index 000..c5e930e9931
--- /dev/null
+++ b/media-plugins/kodi-pvr-hts/kodi-pvr-hts-8.1.2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake kodi-addon
+
+DESCRIPTION="Tvheadend Live TV and Radio PVR client addon for Kodi"
+HOMEPAGE="https://github.com/kodi-pvr/pvr.hts;
+SRC_URI=""
+
+if [[ ${PV} ==  ]]; then
+   SRC_URI=""
+   EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.hts.git;
+   inherit git-r3
+else
+   CODENAME="Matrix"
+   KEYWORDS="~amd64 ~x86"
+   
SRC_URI="https://github.com/kodi-pvr/pvr.hts/archive/${PV}-${CODENAME}.tar.gz 
-> ${P}.tar.gz"
+   S="${WORKDIR}/pvr.hts-${PV}-${CODENAME}"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+   =media-tv/kodi-19*
+   "
+
+RDEPEND="
+   ${DEPEND}
+   "



[gentoo-commits] repo/gentoo:master commit in: media-plugins/kodi-pvr-iptvsimple/

2020-12-06 Thread Craig Andrews
commit: 0ba0ca2a8820349355d1e3c0d51c1556176f7b09
Author: Craig Andrews  gentoo  org>
AuthorDate: Mon Dec  7 01:19:43 2020 +
Commit: Craig Andrews  gentoo  org>
CommitDate: Mon Dec  7 01:29:14 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ba0ca2a

media-plugins/kodi-pvr-iptvsimple: Cleanup old versions

Package-Manager: Portage-3.0.11, Repoman-3.0.2
Signed-off-by: Craig Andrews  gentoo.org>

 media-plugins/kodi-pvr-iptvsimple/Manifest |  5 ---
 .../kodi-pvr-iptvsimple-6.3.1.ebuild   | 44 --
 .../kodi-pvr-iptvsimple-6.3.2.ebuild   | 43 -
 .../kodi-pvr-iptvsimple-6.4.0.ebuild   | 43 -
 .../kodi-pvr-iptvsimple-6.4.1.ebuild   | 43 -
 .../kodi-pvr-iptvsimple-7.0.0.ebuild   | 43 -
 6 files changed, 221 deletions(-)

diff --git a/media-plugins/kodi-pvr-iptvsimple/Manifest 
b/media-plugins/kodi-pvr-iptvsimple/Manifest
index 2966885e847..b2b351edd67 100644
--- a/media-plugins/kodi-pvr-iptvsimple/Manifest
+++ b/media-plugins/kodi-pvr-iptvsimple/Manifest
@@ -1,6 +1 @@
-DIST kodi-pvr-iptvsimple-6.3.1.tar.gz 178767 BLAKE2B 
9ce62b099bb1b5bd8038b0b638a7673c8498a128d9901c17263edb17ee6482ad83eb4bd8acd4144eaf8b694e72bc2eecc4cefd3675de82177f185aca18403dfe
 SHA512 
586f404c43e496ee7a12c84ed6f5ae9f373b1197be24b9d34df0c1c226961d0da5642b707f8f4bcf2ca9a5b38a3d5f6a8a17d31173af4e2c8ee6a0582707862d
-DIST kodi-pvr-iptvsimple-6.3.2.tar.gz 192436 BLAKE2B 
8d793ed6802a93457f1d1f2c1f08604c1f7e0387f29358ce3f97adf70ae5c05835dfd43bf59787970b8087ee948099d46b2d32ef5a76a04b9e91cfd048f745ea
 SHA512 
20a44e24403575493d3afeb76cf376dfcd31a9f6dbc2e64e43ccc4a007cef517af1287d5b6985d925d523b926642cb79586e296707dd6ada891edf29523bf61c
-DIST kodi-pvr-iptvsimple-6.4.0.tar.gz 179020 BLAKE2B 
b4dbabc152cdea4c3768a6d74e1d67e2e1686ccc161fef40f25872e58ee07b66f732db1df48a1947103075b9828f11484a0961ede766806f0a27d2271fbc6a66
 SHA512 
b9a52244ef502c621276589030c391c5acae34999dd57a4a42fc4ce4d138b96dcd6f485eb08ef346a6d7e173175e5d7954feb8928fb8df097fb1ecbce051
-DIST kodi-pvr-iptvsimple-6.4.1.tar.gz 179019 BLAKE2B 
eaaa2230d697d2f85b26b3949ecb36b95fc02f57bee740b33f2ad99239b32067a1f89188320dbd874d4e15a2fd6a906f252e52ef619a09b40a2eb348fb30b805
 SHA512 
048898135ccd08ed2d584c52bfc94bb22865931036173c642606695ed68ffc55478a255e183e347ee9c704225a2af855871f4aaed85b614a42e7dcad040408dc
-DIST kodi-pvr-iptvsimple-7.0.0.tar.gz 179504 BLAKE2B 
11598b6313bcd0b0909df0191168e8e4d468c31be96290af881658656f92d5e97f031408fef6677e962f4203e6a02896977d49225f58f0fa5eb1d21bc28b5e22
 SHA512 
7c0d1f82f74c4c66e9276aa31444b76a816c6fa456ea53e25b897d7c24c352529dd158043391817502172d0c0c90ae6da22329ba334b6bbd38438e981036bce4
 DIST kodi-pvr-iptvsimple-7.1.0.tar.gz 180721 BLAKE2B 
0ec7ac0ffd1eb480e3a3a956b3fbd79e5bc3607713839a72dff45dc2d22e66d006d354ec12a5606360703f3e6bb29457e17034a5644ba06fc5ef032b5f0690c4
 SHA512 
b4b97d94c216a195b3741dc816ab9441493550c4d9fa9c9b28ba58dfb31a4d94e3fd429384ca46bf3150a607c8c52feac402a6f18f664bc18353a7c40e54f85e

diff --git a/media-plugins/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple-6.3.1.ebuild 
b/media-plugins/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple-6.3.1.ebuild
deleted file mode 100644
index ca427448e66..000
--- a/media-plugins/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple-6.3.1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake kodi-addon
-
-DESCRIPTION="Kodi's IPTVSimple client addon"
-HOMEPAGE="https://github.com/kodi-pvr/pvr.iptvsimple;
-SRC_URI=""
-
-case ${PV} in
-)
-   SRC_URI=""
-   EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.iptvsimple.git;
-   inherit git-r3
-   ;;
-*)
-   CODENAME="Matrix"
-   KEYWORDS="~amd64 ~x86"
-   
SRC_URI="https://github.com/kodi-pvr/pvr.iptvsimple/archive/${PV}-${CODENAME}.tar.gz
 -> ${P}.tar.gz"
-   S="${WORKDIR}/pvr.iptvsimple-${PV}-${CODENAME}"
-   ;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-   =dev-libs/libplatform-2*
-   dev-libs/pugixml
-   =media-tv/kodi-19*
-   sys-libs/zlib
-   "
-
-RDEPEND="
-   ${DEPEND}
-   "
-
-src_prepare() {
-   [ -d depends ] && rm -rf depends || die
-   cmake_src_prepare
-}

diff --git a/media-plugins/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple-6.3.2.ebuild 
b/media-plugins/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple-6.3.2.ebuild
deleted file mode 100644
index d29c62c10d9..000
--- a/media-plugins/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple-6.3.2.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake kodi-addon
-
-DESCRIPTION="Kodi's IPTVSimple client addon"
-HOMEPAGE="https://github.com/kodi-pvr/pvr.iptvsimple;
-SRC_URI=""
-
-case ${PV} in
-)
-   SRC_URI=""

[gentoo-commits] repo/proj/guru:dev commit in: x11-misc/screenkey/

2020-12-06 Thread Maciej Barć
commit: 1d9d3429c00b78e0a4a61fa06810ae974fbc0b57
Author: Maciej Barć  protonmail  com>
AuthorDate: Sun Dec  6 21:09:35 2020 +
Commit: Maciej Barć  protonmail  com>
CommitDate: Sun Dec  6 21:10:07 2020 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=1d9d3429

x11-misc/screenkey: bump to 1.3

Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Maciej Barć  protonmail.com>

 x11-misc/screenkey/Manifest |  1 +
 x11-misc/screenkey/screenkey-1.3.ebuild | 43 +
 2 files changed, 44 insertions(+)

diff --git a/x11-misc/screenkey/Manifest b/x11-misc/screenkey/Manifest
index 692e5772..6658ae8e 100644
--- a/x11-misc/screenkey/Manifest
+++ b/x11-misc/screenkey/Manifest
@@ -1 +1,2 @@
 DIST screenkey-1.2.tar.gz 71803 BLAKE2B 
3f3ece34f9a3ba2907411d96022c329e63bbc55924f97cb13472b25740051bdaacb745601dde3ff8e162f807057bfc6d11ba1dd4a828c597c5f3ea6185d9b7d2
 SHA512 
0a9454409f3615849380765ecf884ef02049b9e9e8d6af6ae58d565f879eccb5821845341410232a1c252f9da294a9528557792e713f81915a2433cd14babf8b
+DIST screenkey-1.3.tar.gz 82732 BLAKE2B 
53cf700f7211783c360552667d5bc77dfa467137476c4ae57944fe7a1e3e9da9b4488cade9c2f091b2be51cb393e063509ae858f6cca1b34ceadd3e158586e05
 SHA512 
16aceeb1e1a0ed5add06ed2bfd1eca04b9909537bbb979f531a98270c33af3d5e667534e73546a85c3f58ef837795a35891f00f8cf41e5ea10c45b7992334e96

diff --git a/x11-misc/screenkey/screenkey-1.3.ebuild 
b/x11-misc/screenkey/screenkey-1.3.ebuild
new file mode 100644
index ..686f292a
--- /dev/null
+++ b/x11-misc/screenkey/screenkey-1.3.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+DISTUTILS_USE_SETUPTOOLS=bdepend
+
+inherit distutils-r1 xdg
+
+DESCRIPTION="A screencast tool to display your keys inspired by Screenflick"
+HOMEPAGE="https://www.thregr.org/~wavexx/software/screenkey/;
+
+if [[ "${PV}" == ** ]]; then
+   inherit git-r3
+   EGIT_REPO_URI="https://gitlab.com/screenkey/${PN}.git;
+else
+   
SRC_URI="https://gitlab.com/screenkey/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.gz
 -> ${P}.tar.gz"
+   KEYWORDS="~amd64"
+   S="${WORKDIR}"/"${PN}"-v"${PV}"
+fi
+
+RESTRICT="test"
+LICENSE="GPL-3"
+SLOT="0"
+
+BDEPEND="
+   dev-python/python-distutils-extra[${PYTHON_USEDEP}]
+"
+RDEPEND="
+   dev-python/pycairo[${PYTHON_USEDEP}]
+   dev-python/pygobject[${PYTHON_USEDEP}]
+   sys-devel/gettext
+"
+
+src_prepare() {
+   xdg_environment_reset
+
+   # Change the doc install path
+   sed -i "s/share\/doc\/screenkey/share\/doc\/${P}/g" setup.py || die
+
+   default
+}



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

2020-12-06 Thread Aaron Bauman
commit: 1e61463f2f9ebe1046e31169419d9bf43c5fe849
Author: Aaron Bauman  gentoo  org>
AuthorDate: Mon Dec  7 00:20:21 2020 +
Commit: Aaron Bauman  gentoo  org>
CommitDate: Mon Dec  7 01:09:01 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e61463f

eclass/dotnet: Fix EclassDocError

Signed-off-by: Aaron Bauman  gentoo.org>

 eclass/dotnet.eclass | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/eclass/dotnet.eclass b/eclass/dotnet.eclass
index 55e10645deb..f15b7f55fcc 100644
--- a/eclass/dotnet.eclass
+++ b/eclass/dotnet.eclass
@@ -1,8 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: dotnet.eclass
-# @MAINTAINER: dot...@gentoo.org
+# @MAINTAINER:
+# dot...@gentoo.org
 # @SUPPORTED_EAPIS: 1 2 3 4 5 6 7
 # @BLURB: common settings and functions for mono and dotnet related packages
 # @DESCRIPTION:



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

2020-12-06 Thread Aaron Bauman
commit: 8c1f63c638ff670a5784e5a7d63d35048f767c78
Author: Aaron Bauman  gentoo  org>
AuthorDate: Mon Dec  7 01:05:47 2020 +
Commit: Aaron Bauman  gentoo  org>
CommitDate: Mon Dec  7 01:09:01 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8c1f63c6

eclass/db-use: Fix EclassDocError

* Multiple tags and comments added
* Some functions could use better @USAGE
* CVS shows pauldv  gentoo.org as the original committer to the tree. As
  such, he is now listed as the author of the eclass [1]
* Assign to maintainer-needed as the eclass is still in use by several
  packages

[1]: 
https://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/eclass/db-use.eclass?view=log

Signed-off-by: Aaron Bauman  gentoo.org>

 eclass/db-use.eclass | 36 +++-
 1 file changed, 27 insertions(+), 9 deletions(-)

diff --git a/eclass/db-use.eclass b/eclass/db-use.eclass
index 83ae94799ca..3f58b7a381b 100644
--- a/eclass/db-use.eclass
+++ b/eclass/db-use.eclass
@@ -1,8 +1,15 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
-# This is a common location for functions that aid the use of sys-libs/db
-#
-# Bugs: maintainer-nee...@gentoo.org
+
+# @ECLASS: db-use.eclass
+# @MAINTAINER:
+# maintainer-nee...@gentoo.org
+# @AUTHOR:
+# Paul de Vrieze 
+# @SUPPORTED_EAPIS: 0 1 2 3 4 5 6
+# @BLURB: functions that aid the use of sys-libs/db
+# @DESCRIPTION:
+# functions that aid in the use of sys-libs/db
 
 # multilib is used for get_libname in all EAPI
 case "${EAPI:-0}" in
@@ -10,7 +17,10 @@ case "${EAPI:-0}" in
*) inherit multilib ;;
 esac
 
-#Convert a version to a db slot
+# @FUNCTION: db_ver_to_slot
+# @USAGE: 
+# @DESCRIPTION:
+# Convert a version to a db slot
 db_ver_to_slot() {
if [ $# -ne 1 ]; then
eerror "Function db_ver_to_slot needs one argument" >&2
@@ -28,7 +38,10 @@ db_ver_to_slot() {
echo -n "$1"
 }
 
-#Find the version that correspond to the given atom
+# @FUNCTION: db_findver
+# @USAGE: 
+# @DESCRIPTION:
+# Find the version that corresponds to the given atom
 db_findver() {
has "${EAPI:-0}" 0 1 2 && ! use prefix && EPREFIX=
if [ $# -ne 1 ]; then
@@ -52,6 +65,9 @@ db_findver() {
fi
 }
 
+# @FUNCTION: db_includedir
+# @USAGE: 
+# @DESCRIPTION:
 # Get the include dir for berkeley db.
 # This function has two modes. Without any arguments it will give the best
 # version available. With arguments that form the versions of db packages
@@ -71,7 +87,7 @@ db_includedir() {
return 1
fi
else
-   #arguments given
+   # arguments given
for x in $@
do
if VER=$(db_findver "=sys-libs/db-${x}*") &&
@@ -85,7 +101,9 @@ db_includedir() {
fi
 }
 
-
+# @FUNCTION: db_libname
+# @USAGE: 
+# @DESCRIPTION:
 # Get the library name for berkeley db. Something like "db-4.2" will be the
 # outcome. This function has two modes. Without any arguments it will give
 # the best version available. With arguments that form the versions of db
@@ -103,7 +121,7 @@ db_libname() {
return 1
fi
else
-   #arguments given
+   # arguments given
for x in $@
do
if VER=$(db_findver "=sys-libs/db-${x}*"); then



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

2020-12-06 Thread Aaron Bauman
commit: 324b233437e240bebf05df9e3743d0dd1132ddb6
Author: Aaron Bauman  gentoo  org>
AuthorDate: Mon Dec  7 00:17:45 2020 +
Commit: Aaron Bauman  gentoo  org>
CommitDate: Mon Dec  7 01:09:00 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=324b2334

eclass/alternatives: fix EclassDocError

* Add maintainer-needed as no Git history exists for this eclass

Signed-off-by: Aaron Bauman  gentoo.org>

 eclass/alternatives.eclass | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/eclass/alternatives.eclass b/eclass/alternatives.eclass
index fd99bd85acd..6ee984458fd 100644
--- a/eclass/alternatives.eclass
+++ b/eclass/alternatives.eclass
@@ -1,7 +1,9 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: alternatives.eclass
+# @MAINTAINER:
+# maintainer-nee...@gentoo.org
 # @AUTHOR:
 # Original author: Alastair Tse  (03 Oct 2003)
 # @BLURB: Creates symlink to the latest version of multiple slotted packages.



[gentoo-commits] proj/kde-sunset:master commit in: kde-apps/konq-plugins/files/, kde-apps/konq-plugins/

2020-12-06 Thread Andreas Sturmlechner
commit: 0043d3d1dd0b2d59b16972d8fb8f5ce0ead2bab3
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Dec  6 21:01:00 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Dec  6 23:48:47 2020 +
URL:https://gitweb.gentoo.org/proj/kde-sunset.git/commit/?id=0043d3d1

kde-apps/konq-plugins: Switch USE tidy to app-text/tidy-html5

Bug: https://bugs.gentoo.org/671450
Package-Manager: Portage-3.0.11, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 .../files/konq-plugins-4.14.3-tidyhtml5.patch  | 46 ++
 .../konq-plugins/konq-plugins-4.14.3-r1.ebuild | 32 +++
 2 files changed, 78 insertions(+)

diff --git a/kde-apps/konq-plugins/files/konq-plugins-4.14.3-tidyhtml5.patch 
b/kde-apps/konq-plugins/files/konq-plugins-4.14.3-tidyhtml5.patch
new file mode 100644
index ..d344e36e
--- /dev/null
+++ b/kde-apps/konq-plugins/files/konq-plugins-4.14.3-tidyhtml5.patch
@@ -0,0 +1,46 @@
+From 29955abce07526d01f3298da9d2f15bd9eb5e6f4 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner 
+Date: Sun, 18 Nov 2018 18:07:32 +0100
+Subject: [PATCH] Switch to tidy-html5 and use tidybuffio.h instead of buffio.h
+
+Summary: Header was renamed a few years ago.
+
+Test Plan: Builds and validates fine.
+
+Reviewers: #konqueror
+
+Differential Revision: https://phabricator.kde.org/D16982
+---
+ konq-plugins/validators/CMakeLists.txt | 2 +-
+ konq-plugins/validators/tidy_validator.cpp | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/konq-plugins/validators/CMakeLists.txt 
b/konq-plugins/validators/CMakeLists.txt
+index cf3b70694..7f6060e9c 100644
+--- a/konq-plugins/validators/CMakeLists.txt
 b/konq-plugins/validators/CMakeLists.txt
+@@ -4,7 +4,7 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} 
${CMAKE_CURRENT_SOURCE_DIR})
+ find_package(LibTidy)
+ find_package(KF5 REQUIRED KHtml WidgetsAddons IconThemes)
+ set_package_properties(LibTidy PROPERTIES DESCRIPTION "HTML Tidy"
+-   URL "http://tidy.sourceforge.net;
++   URL "http://www.html-tidy.org/;
+TYPE OPTIONAL
+PURPOSE "Gives the Konqueror validators plugin the 
ability to validate HTML"
+   )
+diff --git a/konq-plugins/validators/tidy_validator.cpp 
b/konq-plugins/validators/tidy_validator.cpp
+index 3247199f9..ac22429d0 100644
+--- a/konq-plugins/validators/tidy_validator.cpp
 b/konq-plugins/validators/tidy_validator.cpp
+@@ -25,7 +25,7 @@
+ 
+ #include 
+ 
+-#include 
++#include 
+ #include 
+ 
+ #include 
+-- 
+2.19.1
+

diff --git a/kde-apps/konq-plugins/konq-plugins-4.14.3-r1.ebuild 
b/kde-apps/konq-plugins/konq-plugins-4.14.3-r1.ebuild
new file mode 100644
index ..13128c39
--- /dev/null
+++ b/kde-apps/konq-plugins/konq-plugins-4.14.3-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KMNAME="kde-baseapps"
+inherit kde4-meta
+
+DESCRIPTION="Various plugins for konqueror"
+
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+IUSE="debug tidy"
+
+DEPEND="
+   $(add_kdeapps_dep libkonq)
+   tidy? ( app-text/tidy-html5 )
+"
+RDEPEND="${DEPEND}
+   !kde-misc/konq-plugins
+   $(add_kdeapps_dep kcmshell)
+   $(add_kdeapps_dep konqueror)
+"
+
+PATCHES=( "${FILESDIR}/${P}-tidyhtml5.patch" ) # bug 671450
+
+src_configure() {
+   local mycmakeargs=(
+   -DWITH_LibTidy=$(usex tidy)
+   )
+
+   kde4-meta_src_configure
+}



[gentoo-commits] proj/kde-sunset:master commit in: kde-apps/klinkstatus/

2020-12-06 Thread Andreas Sturmlechner
commit: 24ba7a1a3a3c4347fb893b3ffc6114a243e1c332
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Dec  6 21:27:05 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Dec  6 23:48:47 2020 +
URL:https://gitweb.gentoo.org/proj/kde-sunset.git/commit/?id=24ba7a1a

kde-apps/klinkstatus: Drop 4.14.3 (r0)

Package-Manager: Portage-3.0.11, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 kde-apps/klinkstatus/klinkstatus-4.14.3.ebuild | 37 --
 1 file changed, 37 deletions(-)

diff --git a/kde-apps/klinkstatus/klinkstatus-4.14.3.ebuild 
b/kde-apps/klinkstatus/klinkstatus-4.14.3.ebuild
deleted file mode 100644
index 00a6ca1a..
--- a/kde-apps/klinkstatus/klinkstatus-4.14.3.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-KDE_HANDBOOK="optional"
-KMNAME="kdewebdev"
-KDE_SCM="svn"
-inherit kde4-meta
-
-DESCRIPTION="KDE web development - link validity checker"
-HOMEPAGE="https://www.kde.org/applications/development/klinkstatus/;
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug tidy"
-
-DEPEND="
-   $(add_kdeapps_dep kdepimlibs)
-   tidy? ( app-text/htmltidy )
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-   local mycmakeargs=(
-   -DWITH_KdepimLibs=ON
-   $(cmake-utils_use_with tidy LibTidy)
-   )
-
-   kde4-meta_src_configure
-}
-
-pkg_postinst() {
-   kde4-meta_pkg_postinst
-
-   if ! has_version dev-lang/ruby ; then
-   elog "To use scripting in ${PN}, install dev-lang/ruby."
-   fi
-}



[gentoo-commits] proj/kde-sunset:master commit in: kde-apps/okular/

2020-12-06 Thread Andreas Sturmlechner
commit: 7d06cee78f954d317adb237222500e394aeb9b94
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Dec  6 13:03:25 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Dec  6 23:48:47 2020 +
URL:https://gitweb.gentoo.org/proj/kde-sunset.git/commit/?id=7d06cee7

kde-apps/okular: Switch to app-text/poppler:0-qt4, fix HOMEPAGE

drop unknown cmake arg

Improve compatibility with Gentoo ebuild repo.

Package-Manager: Portage-3.0.11, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 kde-apps/okular/okular-16.08.3.ebuild | 12 ++--
 kde-apps/okular/okular-4.14.3.ebuild  |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/kde-apps/okular/okular-16.08.3.ebuild 
b/kde-apps/okular/okular-16.08.3.ebuild
index 36650ee4..16076785 100644
--- a/kde-apps/okular/okular-16.08.3.ebuild
+++ b/kde-apps/okular/okular-16.08.3.ebuild
@@ -5,16 +5,17 @@ EAPI=6
 
 KDE_HANDBOOK="optional"
 #VIRTUALX_REQUIRED=test
-RESTRICT=test
-# test 2: parttest hangs
-
 inherit kde4-base
 
 DESCRIPTION="Universal document viewer based on KPDF"
-HOMEPAGE="https://okular.kde.org 
https://www.kde.org/applications/graphics/okular;
+HOMEPAGE="https://okular.kde.org https://apps.kde.org/en/okular;
+
 KEYWORDS="amd64 x86"
 IUSE="chm crypt debug djvu dpi ebook +jpeg mobi +postscript +pdf +tiff"
 
+RESTRICT+=" test"
+# test 2: parttest hangs
+
 DEPEND="
media-libs/freetype
media-libs/phonon:0-qt4
@@ -30,7 +31,7 @@ DEPEND="
virtual/jpeg:0
)
mobi? ( $(add_kdeapps_dep kdegraphics-mobipocket) )
-   pdf? ( >=app-text/poppler-0.20[qt4(-),-exceptions(-)] )
+   pdf? ( app-text/poppler:0-qt4 )
postscript? ( app-text/libspectre )
tiff? ( media-libs/tiff:0 )
 "
@@ -48,7 +49,6 @@ src_configure() {
-DWITH_Kexiv2=$(usex jpeg)
-DWITH_QMobipocket=$(usex mobi)
-DWITH_LibSpectre=$(usex postscript)
-   -DWITH_PopplerQt4=$(usex pdf)
-DWITH_Poppler=$(usex pdf)
-DWITH_TIFF=$(usex tiff)
)

diff --git a/kde-apps/okular/okular-4.14.3.ebuild 
b/kde-apps/okular/okular-4.14.3.ebuild
index 3a038768..280221e6 100644
--- a/kde-apps/okular/okular-4.14.3.ebuild
+++ b/kde-apps/okular/okular-4.14.3.ebuild
@@ -30,7 +30,7 @@ DEPEND="
virtual/jpeg:0
)
mobi? ( $(add_kdeapps_dep kdegraphics-mobipocket) )
-   pdf? ( >=app-text/poppler-0.20[qt4(-),-exceptions(-)] )
+   pdf? ( app-text/poppler:0-qt4 )
postscript? ( app-text/libspectre )
tiff? ( media-libs/tiff:0 )
 "



[gentoo-commits] proj/kde-sunset:master commit in: kde-apps/klinkstatus/, kde-apps/klinkstatus/files/

2020-12-06 Thread Andreas Sturmlechner
commit: abf39af492f6e5498908c04fda8fd2fdff0c9b3b
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Dec  6 21:26:04 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Dec  6 23:48:47 2020 +
URL:https://gitweb.gentoo.org/proj/kde-sunset.git/commit/?id=abf39af4

kde-apps/klinkstatus: Switch USE tidy to app-text/tidy-html5, EAPI-6

Package-Manager: Portage-3.0.11, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 .../files/klinkstatus-4.14.3-tidyhtml5.patch   | 11 +++
 kde-apps/klinkstatus/klinkstatus-4.14.3-r1.ebuild  | 38 ++
 2 files changed, 49 insertions(+)

diff --git a/kde-apps/klinkstatus/files/klinkstatus-4.14.3-tidyhtml5.patch 
b/kde-apps/klinkstatus/files/klinkstatus-4.14.3-tidyhtml5.patch
new file mode 100644
index ..85efd746
--- /dev/null
+++ b/kde-apps/klinkstatus/files/klinkstatus-4.14.3-tidyhtml5.patch
@@ -0,0 +1,11 @@
+--- a/klinkstatus/src/tidy/tidyx.h 2008-07-28 18:04:32.0 +0200
 b/klinkstatus/src/tidy/tidyx.h 2020-12-06 22:19:30.793217209 +0100
+@@ -49,7 +49,7 @@
+ */
+ 
+ #include 
+-#include 
++#include 
+ 
+ #include 
+ 

diff --git a/kde-apps/klinkstatus/klinkstatus-4.14.3-r1.ebuild 
b/kde-apps/klinkstatus/klinkstatus-4.14.3-r1.ebuild
new file mode 100644
index ..9732f2cd
--- /dev/null
+++ b/kde-apps/klinkstatus/klinkstatus-4.14.3-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="optional"
+KMNAME="kdewebdev"
+inherit kde4-meta
+
+DESCRIPTION="KDE web development - link validity checker"
+HOMEPAGE="https://apps.kde.org/en/klinkstatus;
+
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+IUSE="debug tidy"
+
+DEPEND="
+   $(add_kdeapps_dep kdepimlibs)
+   tidy? ( app-text/tidy-html5 )
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${P}-tidyhtml5.patch" )
+
+src_configure() {
+   local mycmakeargs=(
+   -DWITH_KdepimLibs=ON
+   -DWITH_LibTidy=$(usex tidy)
+   )
+
+   kde4-meta_src_configure
+}
+
+pkg_postinst() {
+   kde4-meta_pkg_postinst
+
+   has_version dev-lang/ruby ||
+   elog "To use scripting in ${PN}, install dev-lang/ruby."
+}



[gentoo-commits] proj/kde-sunset:master commit in: kde-frameworks/kdelibs/, kde-frameworks/kdelibs/files/

2020-12-06 Thread Andreas Sturmlechner
commit: d42b913b939d25ea762dcc6f0735ed1e30f55054
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Dec  6 20:35:00 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Dec  6 23:48:47 2020 +
URL:https://gitweb.gentoo.org/proj/kde-sunset.git/commit/?id=d42b913b

kde-frameworks/kdelibs: EAPI-7 bump, use cmake.eclass

- FindPopplerQt4.cmake: Find Gentoo-slotted poppler
- Switch docbundledir (HTML_INSTALL_DIR) to /usr/share/help
- Install api doc to /usr/share/doc/${PF}/html where it should be

Package-Manager: Portage-3.0.11, Repoman-3.0.2
RepoMan-Options: --force
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 .../files/kdelibs-4.14.38-CVE-2019-14744.patch |  11 +-
 .../kdelibs-4.14.38-gentoo-docbundledir.patch  |  72 ++
 ...ibs-4.14.38-gentoo-slotted-FindPopplerQt4.patch |  26 ++
 .../kdelibs-4.14.38-library-doc-policy-links.patch |  56 
 kde-frameworks/kdelibs/kdelibs-4.14.38-r1.ebuild   | 286 +
 5 files changed, 446 insertions(+), 5 deletions(-)

diff --git a/kde-frameworks/kdelibs/files/kdelibs-4.14.38-CVE-2019-14744.patch 
b/kde-frameworks/kdelibs/files/kdelibs-4.14.38-CVE-2019-14744.patch
index bc71dc0f..95c6d160 100644
--- a/kde-frameworks/kdelibs/files/kdelibs-4.14.38-CVE-2019-14744.patch
+++ b/kde-frameworks/kdelibs/files/kdelibs-4.14.38-CVE-2019-14744.patch
@@ -1,7 +1,8 @@
 From 2c3762feddf7e66cf6b64d9058f625a715694a00 Mon Sep 17 00:00:00 2001
 From: Kai Uwe Broulik 
 Date: Wed, 7 Aug 2019 09:47:46 +0200
-Subject: Security: remove support for $(...) in config keys with [$e] marker.
+Subject: [PATCH] Security: remove support for $(...) in config keys with [$e]
+ marker.
 
 It is very unclear at this point what a valid use case for this feature
 would possibly be. The old documentation only mentions $(hostname) as
@@ -23,7 +24,7 @@ Differential Revision: https://phabricator.kde.org/D22989
  3 files changed, 2 insertions(+), 48 deletions(-)
 
 diff --git a/kdecore/config/kconfig.cpp b/kdecore/config/kconfig.cpp
-index 7ea26a5..b30584b 100644
+index 7ea26a5480..b30584b302 100644
 --- a/kdecore/config/kconfig.cpp
 +++ b/kdecore/config/kconfig.cpp
 @@ -160,37 +160,7 @@ QString KConfigPrivate::expandString(const QString& value)
@@ -66,7 +67,7 @@ index 7ea26a5..b30584b 100644
  // the next character is not $
  QString aVarName;
 diff --git a/kdecore/doc/README.kiosk b/kdecore/doc/README.kiosk
-index b95002d..d902c61 100644
+index b95002d040..d902c61ea9 100644
 --- a/kdecore/doc/README.kiosk
 +++ b/kdecore/doc/README.kiosk
 @@ -640,18 +640,6 @@ The following syntax is also supported:
@@ -89,7 +90,7 @@ index b95002d..d902c61 100644
  ==
  
 diff --git a/kdecore/tests/kconfigtest.cpp b/kdecore/tests/kconfigtest.cpp
-index 78e6ad1..37ea3c2 100644
+index 78e6ad180e..37ea3c2825 100644
 --- a/kdecore/tests/kconfigtest.cpp
 +++ b/kdecore/tests/kconfigtest.cpp
 @@ -479,12 +479,8 @@ void KConfigTest::testPath()
@@ -107,5 +108,5 @@ index 78e6ad1..37ea3c2 100644
QCOMPARE(group.readEntry("noeol", QString()), QString("foo"));
  }
 -- 
-cgit v1.1
+2.29.2
 

diff --git 
a/kde-frameworks/kdelibs/files/kdelibs-4.14.38-gentoo-docbundledir.patch 
b/kde-frameworks/kdelibs/files/kdelibs-4.14.38-gentoo-docbundledir.patch
new file mode 100644
index ..00eb10d1
--- /dev/null
+++ b/kde-frameworks/kdelibs/files/kdelibs-4.14.38-gentoo-docbundledir.patch
@@ -0,0 +1,72 @@
+From c7159b51b4b78d4fd81f886be7b476d143f78869 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner 
+Date: Sun, 6 Dec 2020 21:16:00 +0100
+Subject: [PATCH] Switch HTML_INSTALL_DIR over to /usr/share/help
+
+Signed-off-by: Andreas Sturmlechner 
+---
+ cmake/modules/FindKDE4Internal.cmake | 6 +++---
+ cmake/modules/FindPyKDE4.cmake   | 2 +-
+ kdecore/kernel/kstandarddirs_win.cpp | 2 +-
+ 3 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/cmake/modules/FindKDE4Internal.cmake 
b/cmake/modules/FindKDE4Internal.cmake
+index c345eca36f..d436ec7756 100644
+--- a/cmake/modules/FindKDE4Internal.cmake
 b/cmake/modules/FindKDE4Internal.cmake
+@@ -164,7 +164,7 @@
+ #
+ #
+ # The following variable is provided, but seem to be unused:
+-#  LIBS_HTML_INSTALL_DIR/share/doc/HTMLCACHE STRING "Is this 
still used ?")
++#  LIBS_HTML_INSTALL_DIR/share/helpCACHE STRING "Is this 
still used ?")
+ #
+ # The following user adjustable options are provided:
+ #
+@@ -773,7 +773,7 @@ if (WIN32)
+set(IMPORTS_INSTALL_DIR   "${PLUGIN_INSTALL_DIR}/imports"   ) # "The 
subdirectory relative to the install prefix where imports will be installed
+set(CONFIG_INSTALL_DIR   "share/config") # The config file 
install dir
+set(DATA_INSTALL_DIR "share/apps"  ) # The parent 
directory where applications can install their data
+-   set(HTML_INSTALL_DIR "share/doc/HTML"  ) # The HTML 
install dir for documentation
++   set(HTML_INSTALL_DIR

[gentoo-commits] proj/kde-sunset:master commit in: app-office/calligra/, app-office/calligra/files/

2020-12-06 Thread Andreas Sturmlechner
commit: 9741b2d1823ff3e5ff72cdfa06713d91d22541d2
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Dec  6 15:31:34 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Dec  6 23:48:47 2020 +
URL:https://gitweb.gentoo.org/proj/kde-sunset.git/commit/?id=9741b2d1

app-office/calligra: Switch to app-text/poppler:0-qt4

Improve compatibility with Gentoo ebuild repo.

Package-Manager: Portage-3.0.11, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 app-office/calligra/calligra-2.9.11-r1.ebuild  | 31 ++--
 .../files/calligra-2.9.11-slotted-popplerqt4.patch | 92 ++
 2 files changed, 98 insertions(+), 25 deletions(-)

diff --git a/app-office/calligra/calligra-2.9.11-r1.ebuild 
b/app-office/calligra/calligra-2.9.11-r1.ebuild
index 06ff6908..ef0d5a3c 100644
--- a/app-office/calligra/calligra-2.9.11-r1.ebuild
+++ b/app-office/calligra/calligra-2.9.11-r1.ebuild
@@ -15,30 +15,12 @@ WEBKIT_REQUIRED="optional"
 inherit check-reqs kde4-base versionator
 
 DESCRIPTION="KDE Office Suite"
-HOMEPAGE="https://www.calligra.org/;
-
-case ${PV} in
-   2.[456789].[789]?)
-   # beta or rc releases
-   SRC_URI="mirror://kde/unstable/${P}/${P}.tar.xz" ;;
-   2.[456789].?|2.[456789].??)
-   # stable releases
-   SRC_URI="mirror://kde/stable/${P}/${P}.tar.xz" ;;
-   2.[456789].)
-   # stable branch live ebuild
-   SRC_URI="" ;;
-   )
-   # master branch live ebuild
-   SRC_URI="" ;;
-esac
+HOMEPAGE="https://calligra.org/;
+SRC_URI="mirror://kde/stable/${P}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="4"
-
-if [[ ${KDE_BUILD_TYPE} == release ]] ; then
-   KEYWORDS="amd64 x86"
-fi
-
+KEYWORDS="amd64 x86"
 IUSE="color-management +crypt +eigen +exif fftw +fontconfig freetds +glew +glib
 +gsf gsl import-filter +jpeg jpeg2k +lcms mysql openexr +pdf +pim
 postgres spacenav sybase test tiff +threads +truetype +xml"
@@ -100,7 +82,7 @@ RDEPEND="
virtual/glu
)
pdf? (
-   app-text/poppler:=
+   app-text/poppler:0-qt4=
media-gfx/pstoedit
)
pim? ( $(add_kdeapps_dep kdepimlibs) )
@@ -127,9 +109,7 @@ RDEPEND="
 DEPEND="${RDEPEND}
x11-misc/shared-mime-info
 "
-
-[[ ${PV} ==  ]] && LANGVERSION="2.9" || 
LANGVERSION="$(get_version_component_range 1-2)"
-PDEPEND=">=app-office/calligra-l10n-${LANGVERSION}"
+PDEPEND=">=app-office/calligra-l10n-$(get_version_component_range 1-2)"
 
 # bug 394273
 RESTRICT=test
@@ -138,6 +118,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-2.9.1-no-arch-detection.patch
"${FILESDIR}"/${P}-postgresql-9.6.patch
"${FILESDIR}"/${P}-libwps-0.4.patch
+   "${FILESDIR}"/${P}-slotted-popplerqt4.patch
 )
 
 pkg_pretend() {

diff --git a/app-office/calligra/files/calligra-2.9.11-slotted-popplerqt4.patch 
b/app-office/calligra/files/calligra-2.9.11-slotted-popplerqt4.patch
new file mode 100644
index ..c4886d8c
--- /dev/null
+++ b/app-office/calligra/files/calligra-2.9.11-slotted-popplerqt4.patch
@@ -0,0 +1,92 @@
+From 80b8805f3f4128a5684c4d47ccff40bfc3007292 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner 
+Date: Sun, 6 Dec 2020 17:02:45 +0100
+Subject: [PATCH] Implement "poppler0-qt4" slotting, but also fix poppler
+ include paths in general
+
+Signed-off-by: Andreas Sturmlechner 
+---
+ cmake/modules/FindPoppler.cmake | 8 
+ filters/karbon/pdf/PdfImport.cpp| 4 ++--
+ filters/karbon/pdf/SvgOutputDev.cpp | 8 
+ filters/karbon/pdf/SvgOutputDev.h   | 4 ++--
+ 4 files changed, 12 insertions(+), 12 deletions(-)
+
+diff --git a/cmake/modules/FindPoppler.cmake b/cmake/modules/FindPoppler.cmake
+index 294fad43121..ee200e6ea12 100644
+--- a/cmake/modules/FindPoppler.cmake
 b/cmake/modules/FindPoppler.cmake
+@@ -38,17 +38,17 @@ if(POPPLER_FOUND)
+   find_library(POPPLER_LIBRARY poppler-qt4
+HINTS ${_pc_poppler_LIBRARY_DIRS}
+   )
+-  find_library(POPPLER_CORE_LIBRARY poppler
++  find_library(POPPLER_CORE_LIBRARY poppler0-qt4
+HINTS ${_pc_poppler_LIBRARY_DIRS}
+   )
+ 
+-  find_path(POPPLER_INCLUDE_DIR poppler/qt4/poppler-qt4.h
++  find_path(POPPLER_INCLUDE_DIR poppler0-qt4/qt4/poppler-qt4.h
+ HINTS ${_pc_poppler_INCLUDE_DIRS}
+-PATH_SUFFIXES poppler/qt4
++PATH_SUFFIXES poppler0-qt4/qt4
+   )
+   find_path(POPPLER_INCLUDE_DIR_core qt4/poppler-qt4.h
+ HINTS ${_pc_poppler_INCLUDE_DIRS}
+-PATH_SUFFIXES poppler
++PATH_SUFFIXES poppler0-qt4
+   )
+ 
+   if(POPPLER_LIBRARY AND POPPLER_INCLUDE_DIR AND POPPLER_INCLUDE_DIR_core)
+diff --git a/filters/karbon/pdf/PdfImport.cpp 
b/filters/karbon/pdf/PdfImport.cpp
+index e55c06920c9..9c8a79fc042 100644
+--- a/filters/karbon/pdf/PdfImport.cpp
 b/filters/karbon/pdf/PdfImport.cpp
+@@ -34,8 +34,8 @@
+ #pragma GCC diagnostic ignored 

[gentoo-commits] proj/kde-sunset:master commit in: kde-misc/tellico/

2020-12-06 Thread Andreas Sturmlechner
commit: b467643166110387dbf90c96e8849737b74bad14
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Dec  6 22:40:00 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Dec  6 23:48:47 2020 +
URL:https://gitweb.gentoo.org/proj/kde-sunset.git/commit/?id=b4676431

kde-misc/tellico: Switch to app-text/poppler:0-qt4, EAPI-6 bump

Improve compatibility with Gentoo ebuild repo.

Package-Manager: Portage-3.0.11, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 kde-misc/tellico/tellico-2.3.11.ebuild | 20 ++--
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/kde-misc/tellico/tellico-2.3.11.ebuild 
b/kde-misc/tellico/tellico-2.3.11.ebuild
index 0283713b..48729ca2 100644
--- a/kde-misc/tellico/tellico-2.3.11.ebuild
+++ b/kde-misc/tellico/tellico-2.3.11.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
 KDE_MINIMAL="4.13.1"
 KDE_HANDBOOK="optional"
@@ -24,7 +24,7 @@ RDEPEND="
media-libs/qimageblitz
addressbook? ( $(add_kdeapps_dep kdepimlibs) )
cddb? ( $(add_kdeapps_dep libkcddb) )
-   pdf? ( app-text/poppler[qt4(-)] )
+   pdf? ( app-text/poppler:0-qt4 )
scanner? ( $(add_kdeapps_dep libksane) )
taglib? ( >=media-libs/taglib-1.5 )
v4l? ( >=media-libs/libv4l-0.8.3 )
@@ -43,14 +43,14 @@ DOCS=( AUTHORS ChangeLog README )
 src_configure() {
local mycmakeargs=(
-DWITH_Nepomuk=OFF
-   $(cmake-utils_use_with addressbook KdepimLibs)
-   $(cmake-utils_use_with cddb KdeMultimedia)
-   $(cmake-utils_use_with pdf PopplerQt4)
-   $(cmake-utils_use_with scanner KSane)
-   $(cmake-utils_use_with taglib)
-   $(cmake-utils_use_enable v4l WEBCAM)
-   $(cmake-utils_use_with xmp Exempi)
-   $(cmake-utils_use_with yaz)
+   -DWITH_KdepimLibs=$(usex addressbook)
+   -DWITH_KdeMultimedia=$(usex cddb)
+   -DWITH_PopplerQt4=$(usex pdf)
+   -DWITH_KSane=$(usex scanner)
+   -DWITH_Taglib=$(usex taglib)
+   -DENABLE_WEBCAM=$(usex v4l)
+   -DWITH_Exempi=$(usex xmp)
+   -DWITH_Yaz=$(usex yaz)
)
 
kde4-base_src_configure



[gentoo-commits] proj/kde-sunset:master commit in: kde-apps/konq-plugins/

2020-12-06 Thread Andreas Sturmlechner
commit: 86d89965c84461502f2d72275aedb11ff9f19754
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Dec  6 21:27:26 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Dec  6 23:48:47 2020 +
URL:https://gitweb.gentoo.org/proj/kde-sunset.git/commit/?id=86d89965

kde-apps/konq-plugins: Drop 4.14.3 (r0)

Package-Manager: Portage-3.0.11, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 kde-apps/konq-plugins/konq-plugins-4.14.3.ebuild | 31 
 1 file changed, 31 deletions(-)

diff --git a/kde-apps/konq-plugins/konq-plugins-4.14.3.ebuild 
b/kde-apps/konq-plugins/konq-plugins-4.14.3.ebuild
deleted file mode 100644
index 88643395..
--- a/kde-apps/konq-plugins/konq-plugins-4.14.3.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-KMNAME="kde-baseapps"
-inherit kde4-meta
-
-DESCRIPTION="Various plugins for konqueror"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug tidy"
-
-DEPEND="
-   $(add_kdeapps_dep libkonq)
-   tidy? ( app-text/htmltidy )
-"
-RDEPEND="${DEPEND}
-   !kde-misc/konq-plugins
-   $(add_kdeapps_dep kcmshell)
-   $(add_kdeapps_dep konqueror)
-"
-
-src_configure() {
-   local mycmakeargs=(
-   -DKdeWebKit=OFF
-   -DWebKitPart=OFF
-   $(cmake-utils_use_with tidy LibTidy)
-   )
-
-   kde4-meta_src_configure
-}



[gentoo-commits] proj/kde-sunset:master commit in: kde-frameworks/kfilemetadata/

2020-12-06 Thread Andreas Sturmlechner
commit: 43c48e44141fc3bb4603f321772535386393493d
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Dec  6 22:23:05 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Dec  6 23:48:47 2020 +
URL:https://gitweb.gentoo.org/proj/kde-sunset.git/commit/?id=43c48e44

kde-frameworks/kfilemetadata: Switch to app-text/poppler:0-qt4, EAPI-6

Improve compatibility with Gentoo ebuild repo.

Package-Manager: Portage-3.0.11, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 kde-frameworks/kfilemetadata/kfilemetadata-4.14.3.ebuild | 8 +---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/kde-frameworks/kfilemetadata/kfilemetadata-4.14.3.ebuild 
b/kde-frameworks/kfilemetadata/kfilemetadata-4.14.3.ebuild
index bd959ca8..6f976650 100644
--- a/kde-frameworks/kfilemetadata/kfilemetadata-4.14.3.ebuild
+++ b/kde-frameworks/kfilemetadata/kfilemetadata-4.14.3.ebuild
@@ -1,21 +1,23 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
+CMAKE_REMOVE_MODULES_LIST=( FindPopplerQt4 )
 inherit kde4-base
 
 DESCRIPTION="Library for extracting file metadata"
+
+SLOT="4"
 KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug epub exif ffmpeg mobi pdf taglib"
-SLOT="4"
 
 DEPEND="
epub? ( app-text/ebook-tools )
exif? ( media-gfx/exiv2:= )
ffmpeg? ( media-video/ffmpeg:0= )
mobi? ( $(add_kdeapps_dep kdegraphics-mobipocket) )
-   pdf? ( app-text/poppler[qt4(-)] )
+   pdf? ( app-text/poppler:0-qt4 )
taglib? ( media-libs/taglib )
 "
 RDEPEND="${DEPEND}"



[gentoo-commits] proj/kde-sunset:master commit in: kde-frameworks/kdelibs/

2020-12-06 Thread Andreas Sturmlechner
commit: 1ccd2a21acde49d2c2a82c3af6a54f62870f0c7f
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Dec  6 20:36:12 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Dec  6 23:48:47 2020 +
URL:https://gitweb.gentoo.org/proj/kde-sunset.git/commit/?id=1ccd2a21

kde-frameworks/kdelibs: Drop 4.14.38 (r0)

Package-Manager: Portage-3.0.11, Repoman-3.0.2
RepoMan-Options: --force
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 kde-frameworks/kdelibs/kdelibs-4.14.38.ebuild | 286 --
 1 file changed, 286 deletions(-)

diff --git a/kde-frameworks/kdelibs/kdelibs-4.14.38.ebuild 
b/kde-frameworks/kdelibs/kdelibs-4.14.38.ebuild
deleted file mode 100644
index 2d4c8ed8..
--- a/kde-frameworks/kdelibs/kdelibs-4.14.38.ebuild
+++ /dev/null
@@ -1,286 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-QT_MINIMAL="4.8.7"
-inherit cmake-utils flag-o-matic toolchain-funcs xdg-utils
-
-DESCRIPTION="Libraries needed for programs by KDE"
-HOMEPAGE="https://www.kde.org/;
-SRC_URI="mirror://kde/stable/applications/17.08.3/src/${P}.tar.xz"
-
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-LICENSE="LGPL-2.1"
-SLOT="4/4.14"
-IUSE="cpu_flags_x86_3dnow acl altivec +bzip2 debug doc fam +handbook kerberos
-libressl lzma cpu_flags_x86_mmx nls openexr opengl +plasma +policykit 
qt3support spell
-test cpu_flags_x86_sse cpu_flags_x86_sse2 ssl +udev +udisks +upower webkit 
zeroconf"
-
-REQUIRED_USE="
-   opengl? ( plasma )
-   udisks? ( udev )
-   upower? ( udev )
-"
-
-# needs the kate regression testsuite from svn
-RESTRICT="test"
-
-COMMONDEPEND="
-   app-text/docbook-xml-dtd:4.2
-   app-text/docbook-xsl-stylesheets
-   dev-lang/perl
-   >=dev-libs/libattica-0.4.2
-   dev-libs/libdbusmenu-qt[qt4(-)]
-   dev-libs/libpcre[unicode]
-   dev-libs/libxml2
-   dev-libs/libxslt
-   >=dev-qt/designer-${QT_MINIMAL}:4
-   >=dev-qt/qtcore-${QT_MINIMAL}:4[qt3support?,ssl]
-   >=dev-qt/qtdbus-${QT_MINIMAL}:4
-   >=dev-qt/qtdeclarative-${QT_MINIMAL}:4
-   >=dev-qt/qtgui-${QT_MINIMAL}:4[accessibility,dbus(+)]
-   >=dev-qt/qtscript-${QT_MINIMAL}:4
-   >=dev-qt/qtsvg-${QT_MINIMAL}:4
-   media-libs/fontconfig
-   media-libs/freetype:2
-   media-libs/giflib:=
-   media-libs/libpng:0=
-   media-libs/phonon:0-qt4
-   sys-libs/libutempter
-   sys-libs/zlib
-   virtual/jpeg:0
-   x11-libs/libICE
-   x11-libs/libSM
-   x11-libs/libX11
-   x11-libs/libXau
-   x11-libs/libXcursor
-   x11-libs/libXdmcp
-   x11-libs/libXext
-   x11-libs/libXfixes
-   x11-libs/libXft
-   x11-libs/libXpm
-   x11-libs/libXrender
-   x11-libs/libXScrnSaver
-   x11-libs/libXtst
-   x11-misc/shared-mime-info
-   acl? ( virtual/acl )
-   bzip2? ( app-arch/bzip2 )
-   fam? ( virtual/fam )
-   kerberos? ( virtual/krb5 )
-   openexr? (
-   media-libs/openexr:=
-   media-libs/ilmbase:=
-   )
-   opengl? ( >=dev-qt/qtopengl-${QT_MINIMAL}:4 )
-   plasma? (
-   app-crypt/qca:2-qt4
-   >=dev-qt/qtsql-${QT_MINIMAL}:4[qt3support?]
-   )
-   policykit? ( sys-auth/polkit-qt:0-qt4 )
-   spell? ( app-text/enchant:= )
-   ssl? (
-   libressl? ( dev-libs/libressl:0= )
-   !libressl? ( dev-libs/openssl:0= )
-   )
-   udev? ( virtual/udev )
-   webkit? ( >=dev-qt/qtwebkit-${QT_MINIMAL}:4 )
-   zeroconf? ( net-dns/avahi[mdnsresponder-compat] )
-"
-DEPEND="${COMMONDEPEND}
-   >=dev-qt/qttest-${QT_MINIMAL}:4
-   doc? ( app-doc/doxygen )
-   nls? ( virtual/libintl )
-   test? ( dev-util/cppunit )
-"
-RDEPEND="${COMMONDEPEND}
-   !dev-qt/qtphonon
-   >=app-crypt/gnupg-2.0.11
-   app-misc/ca-certificates
-   kde-frameworks/kdelibs-env:4
-   kde-frameworks/oxygen-icons
-   sys-apps/dbus[X]
-   x11-apps/iceauth
-   x11-apps/rgb
-   x11-misc/xdg-utils
-   plasma? ( !sci-libs/plasma )
-   udev? ( app-misc/media-player-info )
-   udisks? ( sys-fs/udisks:2 )
-   upower? ( >=sys-power/upower-0.9.23 )
-"
-PDEPEND="
-   dev-util/automoc
-   virtual/pkgconfig
-   x11-base/xorg-proto
-   >=x11-libs/libXtst-1.1.0
-   x11-misc/xdg-utils
-   handbook? ( kde-apps/khelpcenter:* )
-   policykit? ( kde-plasma/polkit-kde-agent:* )
-"
-
-DOCS=( AUTHORS README{,-WIN32.TXT} TODO )
-
-PATCHES=(
-   "${FILESDIR}/dist/01_gentoo_set_xdg_menu_prefix-1.patch"
-   "${FILESDIR}/dist/02_gentoo_append_xdg_config_dirs-1.patch"
-   "${FILESDIR}/${PN}-4.14.5-fatalwarnings.patch"
-   "${FILESDIR}/${PN}-4.14.5-mimetypes.patch"
-   "${FILESDIR}/${PN}-4.4.90-xslt.patch"
-   "${FILESDIR}/${PN}-4.6.3-no_suid_kdeinit.patch"
-   "${FILESDIR}/${PN}-4.8.1-norpath.patch"
-   

[gentoo-commits] proj/kde-sunset:master commit in: media-libs/phonon-vlc/

2020-12-06 Thread Andreas Sturmlechner
commit: aa1f7abc64dc9f781be1642eae220eec9f74fcd2
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Dec  6 02:13:36 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Dec  6 10:09:29 2020 +
URL:https://gitweb.gentoo.org/proj/kde-sunset.git/commit/?id=aa1f7abc

media-libs/phonon-vlc: Drop 0.9.1-r1

Package-Manager: Portage-3.0.11, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-libs/phonon-vlc/phonon-vlc-0.9.1-r1.ebuild | 70 
 1 file changed, 70 deletions(-)

diff --git a/media-libs/phonon-vlc/phonon-vlc-0.9.1-r1.ebuild 
b/media-libs/phonon-vlc/phonon-vlc-0.9.1-r1.ebuild
deleted file mode 100644
index f69828b2..
--- a/media-libs/phonon-vlc/phonon-vlc-0.9.1-r1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_PN="phonon-backend-vlc"
-MY_P="${MY_PN}-${PV}"
-inherit cmake-utils multibuild
-
-DESCRIPTION="Phonon VLC backend"
-HOMEPAGE="https://community.kde.org/Phonon;
-SRC_URI="mirror://kde/stable/phonon/${MY_PN}/${PV}/${MY_P}.tar.xz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="LGPL-2.1+ || ( LGPL-2.1 LGPL-3 )"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86"
-IUSE="debug qt4 +qt5"
-
-REQUIRED_USE="|| ( qt4 qt5 )"
-
-RDEPEND="
-   >=media-libs/phonon-4.9.0[qt4(-)=,qt5(+)=]
-   >=media-video/vlc-2.0.1:=[dbus,ogg,vorbis]
-   qt4? (
-   >=dev-qt/qtcore-4.8.7-r2:4
-   >=dev-qt/qtgui-4.8.7:4
-   )
-   qt5? (
-   dev-qt/qtcore:5
-   dev-qt/qtgui:5
-   dev-qt/qtwidgets:5
-   )
-"
-DEPEND="${RDEPEND}
-   virtual/pkgconfig
-"
-
-DOCS=( AUTHORS )
-
-pkg_setup() {
-   MULTIBUILD_VARIANTS=( $(usev qt4) $(usev qt5) )
-}
-
-src_configure() {
-   myconfigure() {
-   local mycmakeargs=()
-   if [[ ${MULTIBUILD_VARIANT} = qt4 ]]; then
-   mycmakeargs+=( -DPHONON_BUILD_PHONON4QT5=OFF )
-   fi
-   if [[ ${MULTIBUILD_VARIANT} = qt5 ]]; then
-   mycmakeargs+=( -DPHONON_BUILD_PHONON4QT5=ON )
-   fi
-   cmake-utils_src_configure
-   }
-
-   multibuild_foreach_variant myconfigure
-}
-
-src_compile() {
-   multibuild_foreach_variant cmake-utils_src_compile
-}
-
-src_test() {
-   multibuild_foreach_variant cmake-utils_src_test
-}
-
-src_install() {
-   multibuild_foreach_variant cmake-utils_src_install
-}



[gentoo-commits] proj/kde-sunset:master commit in: sys-auth/polkit-qt/

2020-12-06 Thread Andreas Sturmlechner
commit: 4d1bf5e598bbdbc1fcffdf7386c0b355b9a835b0
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Dec  6 02:24:32 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Dec  6 22:15:49 2020 +
URL:https://gitweb.gentoo.org/proj/kde-sunset.git/commit/?id=4d1bf5e5

sys-auth/polkit-qt: SLOT="0-qt4", EAPI-7, 0.112.0_p20190531 snapshot bump

Use cmake.eclass and kde.org.eclass

Package-Manager: Portage-3.0.11, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 .../polkit-qt/polkit-qt-0.112.0_p20190531.ebuild   | 40 ++
 1 file changed, 40 insertions(+)

diff --git a/sys-auth/polkit-qt/polkit-qt-0.112.0_p20190531.ebuild 
b/sys-auth/polkit-qt/polkit-qt-0.112.0_p20190531.ebuild
new file mode 100644
index ..cfdb268b
--- /dev/null
+++ b/sys-auth/polkit-qt/polkit-qt-0.112.0_p20190531.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+COMMIT=55776dc9c51d7153c66402b257f7a0992f9d4ae5
+KDE_ORG_NAME="polkit-qt-1"
+inherit cmake kde.org
+
+DESCRIPTION="Qt wrapper around polkit-1 client libraries"
+HOMEPAGE="https://api.kde.org/kdesupport-api/polkit-qt-1-apidocs/;
+SRC_URI="https://invent.kde.org/libraries/${KDE_ORG_NAME}/-/archive/${COMMIT}/${KDE_ORG_NAME}-${COMMIT}.tar.gz
 -> ${P}.tar.gz"
+S="${WORKDIR}/${KDE_ORG_NAME}-${COMMIT}"
+
+LICENSE="LGPL-2"
+SLOT="0-qt4"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86"
+IUSE="debug"
+
+RDEPEND="
+   dev-libs/glib:2
+   dev-qt/qtcore:4[glib]
+   dev-qt/qtdbus:4
+   dev-qt/qtgui:4[glib]
+   >=sys-auth/polkit-0.103
+"
+DEPEND="${RDEPEND}
+   !

[gentoo-commits] proj/kde-sunset:master commit in: app-text/poppler/, app-text/poppler/files/

2020-12-06 Thread Andreas Sturmlechner
commit: 57d3bfa1e8b607b335554031cd428f4673020437
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Dec  6 12:46:22 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Dec  6 22:32:02 2020 +
URL:https://gitweb.gentoo.org/proj/kde-sunset.git/commit/?id=57d3bfa1

app-text/poppler: Implement 0-qt4 slotting

Package-Manager: Portage-3.0.11, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 .../poppler/files/poppler-0.61.1-slotting.patch| 313 +
 app-text/poppler/poppler-0.61.1-r1.ebuild  |   4 +-
 2 files changed, 316 insertions(+), 1 deletion(-)

diff --git a/app-text/poppler/files/poppler-0.61.1-slotting.patch 
b/app-text/poppler/files/poppler-0.61.1-slotting.patch
new file mode 100644
index ..42aea27e
--- /dev/null
+++ b/app-text/poppler/files/poppler-0.61.1-slotting.patch
@@ -0,0 +1,313 @@
+From 2bf40380f3b9e6c35e5729f7b0d9190f2908e7fa Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner 
+Date: Sun, 6 Dec 2020 12:26:50 +0100
+Subject: [PATCH] Implement "0-qt4" slotting
+
+Signed-off-by: Andreas Sturmlechner 
+---
+ CMakeLists.txt| 74 +--
+ poppler-qt4.pc.cmake  |  2 +-
+ ...h.pc.cmake => poppler0-qt4-splash.pc.cmake |  0
+ poppler.pc.cmake => poppler0-qt4.pc.cmake |  4 +-
+ qt4/src/CMakeLists.txt|  6 +-
+ qt4/tests/CMakeLists.txt  |  4 +-
+ test/CMakeLists.txt   |  8 +-
+ 7 files changed, 49 insertions(+), 49 deletions(-)
+ rename poppler-splash.pc.cmake => poppler0-qt4-splash.pc.cmake (100%)
+ rename poppler.pc.cmake => poppler0-qt4.pc.cmake (72%)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index f181fdec..be4932bd 100644
+--- a/CMakeLists.txt
 b/CMakeLists.txt
+@@ -39,17 +39,17 @@ set (CMAKE_CXX_EXTENSIONS OFF)
+ 
+ # command line switches
+ option(ENABLE_XPDF_HEADERS "Install unsupported xpdf headers." OFF)
+-option(BUILD_GTK_TESTS "Whether compile the GTK+ test programs." ON)
++option(BUILD_GTK_TESTS "Whether compile the GTK+ test programs." OFF)
+ option(BUILD_QT4_TESTS "Whether compile the Qt4 test programs." ON)
+-option(BUILD_QT5_TESTS "Whether compile the Qt5 test programs." ON)
+-option(BUILD_CPP_TESTS "Whether compile the CPP test programs." ON)
++option(BUILD_QT5_TESTS "Whether compile the Qt5 test programs." OFF)
++option(BUILD_CPP_TESTS "Whether compile the CPP test programs." OFF)
+ option(ENABLE_SPLASH "Build the Splash graphics backend." ON)
+-option(ENABLE_UTILS "Compile poppler command line utils." ON)
+-option(ENABLE_CPP "Compile poppler cpp wrapper." ON)
+-option(ENABLE_GLIB "Compile poppler glib wrapper." ON)
++option(ENABLE_UTILS "Compile poppler command line utils." OFF)
++option(ENABLE_CPP "Compile poppler cpp wrapper." OFF)
++option(ENABLE_GLIB "Compile poppler glib wrapper." OFF)
+ option(ENABLE_GTK_DOC "Whether to generate glib API documentation." OFF)
+ option(ENABLE_QT4 "Compile poppler qt4 wrapper." ON)
+-option(ENABLE_QT5 "Compile poppler qt5 wrapper." ON)
++option(ENABLE_QT5 "Compile poppler qt5 wrapper." OFF)
+ set(ENABLE_LIBOPENJPEG "auto" CACHE STRING "Use libopenjpeg for JPX streams. 
Possible values: auto, openjpeg1, openjpeg2, unmaintained, none. 'auto' prefers 
openjpeg2 over openjpeg1 if both are available. 'unmaintained' gives you the 
internal unmaintained decoder. Use at your own risk. 'none' compiles no JPX 
decoder at all. Default: auto")
+ set(ENABLE_CMS "auto" CACHE STRING "Use color management system. Possible 
values: auto, lcms1, lcms2. 'auto' prefers lcms2 over lcms1 if both are 
available. Unset to disable color management system.")
+ set(ENABLE_DCTDECODER "libjpeg" CACHE STRING "Use libjpeg for DCT streams. 
Possible values: libjpeg, unmaintained, none. will use libjpeg if available or 
fail if not. 'unmaintained' gives you the internal unmaintained decoder. Use at 
your own risk. 'none' compiles no DCT decoder at all. Default: libjpeg")
+@@ -540,20 +540,20 @@ endif()
+ if(MSVC)
+ add_definitions(-D_CRT_SECURE_NO_WARNINGS)
+ set(CMAKE_CXX_FLAGS "/Zc:wchar_t- ${CMAKE_CXX_FLAGS}")
+-add_library(poppler STATIC ${poppler_SRCS})
++add_library(poppler0-qt4 STATIC ${poppler_SRCS})
+ else()
+-add_library(poppler ${poppler_SRCS})
++add_library(poppler0-qt4 ${poppler_SRCS})
+ endif()
+-set_target_properties(poppler PROPERTIES VERSION 72.0.0 SOVERSION 72)
++set_target_properties(poppler0-qt4 PROPERTIES VERSION 72.0.0 SOVERSION 72)
+ if(MINGW)
+-get_target_property(POPPLER_SOVERSION poppler SOVERSION)
+-set_target_properties(poppler PROPERTIES SUFFIX 
"-${POPPLER_SOVERSION}${CMAKE_SHARED_LIBRARY_SUFFIX}")
++get_target_property(POPPLER_SOVERSION poppler0-qt4 SOVERSION)
++set_target_properties(poppler0-qt4 PROPERTIES SUFFIX 
"-${POPPLER_SOVERSION}${CMAKE_SHARED_LIBRARY_SUFFIX}")
+ endif()
+-target_link_libraries(poppler LINK_PRIVATE ${poppler_LIBS})
++target_link_libraries(poppler0-qt4 

[gentoo-commits] proj/kde-sunset:master commit in: kde-plasma/polkit-kde-agent/

2020-12-06 Thread Andreas Sturmlechner
commit: 5fcbd655dade10ddee381186464a5db59a58f7f8
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Dec  6 10:04:44 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Dec  6 22:15:49 2020 +
URL:https://gitweb.gentoo.org/proj/kde-sunset.git/commit/?id=5fcbd655

kde-plasma/polkit-kde-agent: Update DESCRIPTION, HOMEPAGE

Package-Manager: Portage-3.0.11, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 kde-plasma/polkit-kde-agent/polkit-kde-agent-0.99.1-r1.ebuild | 11 +--
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/kde-plasma/polkit-kde-agent/polkit-kde-agent-0.99.1-r1.ebuild 
b/kde-plasma/polkit-kde-agent/polkit-kde-agent-0.99.1-r1.ebuild
index 4dc41b4b..faccd55a 100644
--- a/kde-plasma/polkit-kde-agent/polkit-kde-agent-0.99.1-r1.ebuild
+++ b/kde-plasma/polkit-kde-agent/polkit-kde-agent-0.99.1-r1.ebuild
@@ -1,17 +1,15 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
 MY_PN="${PN}-1"
-MY_P="${MY_PN}-${PV}"
-EGIT_REPONAME="${MY_PN}"
 inherit kde4-base
 
-DESCRIPTION="PolKit agent module for KDE"
-HOMEPAGE="https://www.kde.org;
+DESCRIPTION="PolKit agent module for KDE Plasma"
+HOMEPAGE="https://kde.org/;
 
SRC_URI="https://launchpad.net/ubuntu/+archive/primary/+files/${MY_PN/-agent/}_${PV}.orig.tar.xz;
-S=${WORKDIR}/${MY_P}
+S=${WORKDIR}/${MY_PN}-${PV}
 
 LICENSE="GPL-2"
 SLOT="4"
@@ -27,6 +25,7 @@ DEPEND="${COMMON_DEPEND}
 RDEPEND="${COMMON_DEPEND}
!sys-auth/polkit-kde
 "
+
 src_prepare() {
kde4-base_src_prepare
 



[gentoo-commits] proj/kde-sunset:master commit in: app-text/poppler/

2020-12-06 Thread Andreas Sturmlechner
commit: ae949c4b3585c76dcbe48fd0cb4a94e5543a3d2d
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Dec  6 22:11:39 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Dec  6 22:32:02 2020 +
URL:https://gitweb.gentoo.org/proj/kde-sunset.git/commit/?id=ae949c4b

app-text/poppler: Drop 0.61.1 (r0)

Package-Manager: Portage-3.0.11, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 app-text/poppler/metadata.xml  |   2 -
 app-text/poppler/poppler-0.61.1.ebuild | 145 -
 2 files changed, 147 deletions(-)

diff --git a/app-text/poppler/metadata.xml b/app-text/poppler/metadata.xml
index b17c201a..392250b8 100644
--- a/app-text/poppler/metadata.xml
+++ b/app-text/poppler/metadata.xml
@@ -3,8 +3,6 @@
 
 
 
-   Enable GObject introspection.
Enable signatures handling with 
dev-libs/nss
-   Install command-line PDF converters and various 
utilities.
 
 

diff --git a/app-text/poppler/poppler-0.61.1.ebuild 
b/app-text/poppler/poppler-0.61.1.ebuild
deleted file mode 100644
index c8a59a44..
--- a/app-text/poppler/poppler-0.61.1.ebuild
+++ /dev/null
@@ -1,145 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils flag-o-matic toolchain-funcs xdg-utils
-
-if [[ "${PV}" == "" ]] ; then
-   inherit git-r3
-   EGIT_REPO_URI="git://git.freedesktop.org/git/${PN}/${PN}"
-   SLOT="0/"
-else
-   SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz;
-   KEYWORDS="amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sparc x86 
~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris 
~sparc64-solaris ~x64-solaris ~x86-solaris"
-   SLOT="0/72"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so 
SOVERSION
-fi
-
-DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
-HOMEPAGE="https://poppler.freedesktop.org/;
-
-LICENSE="GPL-2"
-IUSE="cairo cjk curl cxx debug doc +introspection +jpeg +jpeg2k +lcms nss png 
qt4 qt5 tiff +utils"
-
-# No test data provided
-RESTRICT="test"
-
-COMMON_DEPEND="
-   >=media-libs/fontconfig-2.6.0
-   >=media-libs/freetype-2.3.9
-   sys-libs/zlib
-   cairo? (
-   dev-libs/glib:2
-   >=x11-libs/cairo-1.10.0
-   introspection? ( >=dev-libs/gobject-introspection-1.32.1:= )
-   )
-   curl? ( net-misc/curl )
-   jpeg? ( virtual/jpeg:0 )
-   jpeg2k? ( media-libs/openjpeg:2= )
-   lcms? ( media-libs/lcms:2 )
-   nss? ( >=dev-libs/nss-3.19:0 )
-   png? ( media-libs/libpng:0= )
-   qt4? (
-   dev-qt/qtcore:4
-   dev-qt/qtgui:4
-   )
-   qt5? (
-   dev-qt/qtcore:5
-   dev-qt/qtgui:5
-   dev-qt/qtxml:5
-   )
-   tiff? ( media-libs/tiff:0 )
-"
-DEPEND="${COMMON_DEPEND}
-   virtual/pkgconfig
-"
-RDEPEND="${COMMON_DEPEND}
-   cjk? ( >=app-text/poppler-data-0.4.7 )
-"
-
-DOCS=(AUTHORS NEWS README README-XPDF)
-
-PATCHES=(
-   "${FILESDIR}/${PN}-0.60.1-qt5-dependencies.patch"
-   "${FILESDIR}/${PN}-0.28.1-fix-multilib-configuration.patch"
-   "${FILESDIR}/${PN}-0.61.0-respect-cflags.patch"
-   "${FILESDIR}/${PN}-0.33.0-openjpeg2.patch"
-   "${FILESDIR}/${PN}-0.40-FindQt4.patch"
-   "${FILESDIR}/${PN}-0.57.0-disable-internal-jpx.patch"
-)
-
-src_prepare() {
-   cmake-utils_src_prepare
-
-   # Clang doesn't grok this flag, the configure nicely tests that, but
-   # cmake just uses it, so remove it if we use clang
-   if [[ ${CC} == clang ]] ; then
-   sed -i -e 's/-fno-check-new//' 
cmake/modules/PopplerMacros.cmake || die
-   fi
-
-   if ! grep -Fq 'cmake_policy(SET CMP0002 OLD)' CMakeLists.txt ; then
-   sed '/^cmake_minimum_required/acmake_policy(SET CMP0002 OLD)' \
-   -i CMakeLists.txt || die
-   else
-   einfo "policy(SET CMP0002 OLD) - workaround can be removed"
-   fi
-
-   # we need to up the C++ version, bug #622526, #643278
-   append-cxxflags -std=c++11
-}
-
-src_configure() {
-   xdg_environment_reset
-   local mycmakeargs=(
-   -DBUILD_GTK_TESTS=OFF
-   -DBUILD_QT4_TESTS=OFF
-   -DBUILD_QT5_TESTS=OFF
-   -DBUILD_CPP_TESTS=OFF
-   -DENABLE_SPLASH=ON
-   -DENABLE_ZLIB=ON
-   -DENABLE_ZLIB_UNCOMPRESS=OFF
-   -DENABLE_XPDF_HEADERS=ON
-   -DENABLE_LIBCURL="$(usex curl)"
-   -DENABLE_CPP="$(usex cxx)"
-   -DENABLE_UTILS="$(usex utils)"
-   -DSPLASH_CMYK=OFF
-   -DUSE_FIXEDPOINT=OFF
-   -DUSE_FLOAT=OFF
-   -DWITH_Cairo="$(usex cairo)"
-   -DWITH_GObjectIntrospection="$(usex introspection)"
-   -DWITH_JPEG="$(usex jpeg)"
-   -DWITH_NSS3="$(usex 

[gentoo-commits] proj/kde-sunset:master commit in: kde-plasma/kwin/

2020-12-06 Thread Andreas Sturmlechner
commit: cbaaf02736cb909a0fa52e5b314c4b7964d412ab
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Dec  6 10:27:39 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Dec  6 22:15:49 2020 +
URL:https://gitweb.gentoo.org/proj/kde-sunset.git/commit/?id=cbaaf027

kde-plasma/kwin: EAPI-6 bump, drop IUSE="opengl,wayland", gles->gles2-only

- wayland is irrelevant in KDE SC4 times
- drop REQUIRED_USE completely
- drop unused cmake args

Package-Manager: Portage-3.0.11, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 kde-plasma/kwin/kwin-4.11.22.ebuild | 34 +-
 kde-plasma/kwin/metadata.xml|  3 ---
 2 files changed, 13 insertions(+), 24 deletions(-)

diff --git a/kde-plasma/kwin/kwin-4.11.22.ebuild 
b/kde-plasma/kwin/kwin-4.11.22.ebuild
index 3358c7b2..a481b672 100644
--- a/kde-plasma/kwin/kwin-4.11.22.ebuild
+++ b/kde-plasma/kwin/kwin-4.11.22.ebuild
@@ -1,22 +1,22 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
 KMNAME="kde-workspace"
 DECLARATIVE_REQUIRED="always"
 OPENGL_REQUIRED="always"
-
 #VIRTUALX_REQUIRED=test
-RESTRICT=test
-# test 8: kwin-TestVirtualDesktops hangs even with virtualx
-
 inherit flag-o-matic kde4-meta
 
 DESCRIPTION="KDE window manager"
 HOMEPAGE+=" https://userbase.kde.org/KWin;
+
 KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug gles opengl wayland"
+IUSE="debug gles2-only"
+
+RESTRICT+=" test"
+# test 8: kwin-TestVirtualDesktops hangs even with virtualx
 
 COMMONDEPEND="
kde-frameworks/kactivities:4
@@ -38,9 +38,8 @@ COMMONDEPEND="
>=x11-libs/libXrandr-1.2.1
x11-libs/libXrender
x11-libs/libXxf86vm
-   opengl? ( >=media-libs/mesa-7.10 )
-   gles? ( >=media-libs/mesa-7.12[egl(+),gles2] )
-   wayland? ( >=media-libs/mesa-9.0[egl(+),wayland] )
+   !gles2-only? ( >=media-libs/mesa-7.10 )
+   gles2-only? ( >=media-libs/mesa-7.12[egl(+),gles2] )
 "
 DEPEND="${COMMONDEPEND}
x11-libs/xcb-util-renderutil
@@ -56,23 +55,16 @@ KMEXTRACTONLY="
libs/oxygen/
 "
 
-PATCHES=(
-   "${FILESDIR}/${P}-gcc6.patch"
-)
-
-# you need one of these
-REQUIRED_USE="!opengl? ( gles ) !gles? ( opengl ) wayland? ( gles )"
+PATCHES=( "${FILESDIR}/${P}-gcc6.patch" )
 
 src_configure() {
# FIXME Remove when activity API moved away from libkworkspace
append-cppflags "-I${EPREFIX}/usr/include/kworkspace"
 
local mycmakeargs=(
-   $(cmake-utils_use_with gles OpenGLES)
-   $(cmake-utils_use gles KWIN_BUILD_WITH_OPENGLES)
-   $(cmake-utils_use_with opengl OpenGL)
-   $(cmake-utils_use_with wayland Wayland)
-   -DWITH_X11_Xcomposite=ON
+   -DWITH_Wayland=OFF
+   -DWITH_OpenGLES=$(usex gles2-only)
+   -DWITH_OpenGL=$(usex !gles2-only)
)
 
kde4-meta_src_configure

diff --git a/kde-plasma/kwin/metadata.xml b/kde-plasma/kwin/metadata.xml
index 5640fb6e..7a38bb90 100644
--- a/kde-plasma/kwin/metadata.xml
+++ b/kde-plasma/kwin/metadata.xml
@@ -2,7 +2,4 @@
 http://www.gentoo.org/dtd/metadata.dtd;>
 

-   
-   Enable support for GLES
-   
 



[gentoo-commits] proj/kde-sunset:master commit in: sys-auth/polkit-qt/

2020-12-06 Thread Andreas Sturmlechner
commit: 21d3c59a70e8b12b2a845fe8cc81385974b34196
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Dec  6 02:29:16 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Dec  6 22:15:49 2020 +
URL:https://gitweb.gentoo.org/proj/kde-sunset.git/commit/?id=21d3c59a

sys-auth/polkit-qt: Drop 0.112.0_p20160416-r1

Package-Manager: Portage-3.0.11, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 .../polkit-qt-0.112.0_p20160416-r1.ebuild  | 73 --
 1 file changed, 73 deletions(-)

diff --git a/sys-auth/polkit-qt/polkit-qt-0.112.0_p20160416-r1.ebuild 
b/sys-auth/polkit-qt/polkit-qt-0.112.0_p20160416-r1.ebuild
deleted file mode 100644
index e037e684..
--- a/sys-auth/polkit-qt/polkit-qt-0.112.0_p20160416-r1.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_P="${P/qt/qt-1}"
-
-inherit cmake-utils multibuild
-
-DESCRIPTION="PolicyKit Qt API wrapper library"
-HOMEPAGE="https://www.kde.org/;
-SRC_URI="https://dev.gentoo.org/~kensington/distfiles/${MY_P}.tar.xz;
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86"
-IUSE="debug examples qt4"
-
-RDEPEND="
-   dev-libs/glib:2
-   dev-qt/qtcore:5
-   dev-qt/qtdbus:5
-   dev-qt/qtgui:5
-   dev-qt/qtwidgets:5
-   >=sys-auth/polkit-0.103
-   examples? ( dev-qt/qtxml:5 )
-   qt4? (
-   dev-qt/qtcore:4[glib]
-   dev-qt/qtdbus:4
-   dev-qt/qtgui:4[glib]
-   )
-"
-DEPEND="${RDEPEND}"
-
-DOCS=( AUTHORS README README.porting TODO )
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-   MULTIBUILD_VARIANTS=( $(usev qt4) qt5 )
-}
-
-src_configure() {
-   myconfigure() {
-   local mycmakeargs=(
-   -DSYSCONF_INSTALL_DIR="${EPREFIX}"/etc
-   -DBUILD_EXAMPLES=$(usex examples)
-   )
-
-   if [[ ${MULTIBUILD_VARIANT} = qt4 ]] ; then
-   mycmakeargs+=( -DUSE_QT4=ON )
-   fi
-   if [[ ${MULTIBUILD_VARIANT} = qt5 ]] ; then
-   mycmakeargs+=( -DUSE_QT5=ON )
-   fi
-
-   cmake-utils_src_configure
-   }
-
-   multibuild_foreach_variant myconfigure
-}
-
-src_compile() {
-   multibuild_foreach_variant cmake-utils_src_compile
-}
-
-src_test() {
-   multibuild_foreach_variant cmake-utils_src_test
-}
-
-src_install() {
-   multibuild_foreach_variant cmake-utils_src_install
-}



[gentoo-commits] proj/kde-sunset:master commit in: media-libs/phonon/files/, media-libs/phonon/

2020-12-06 Thread Andreas Sturmlechner
commit: c419a6d6b447279c2a538107bf9c1a7203225d9c
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Dec  6 02:14:06 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Dec  6 10:09:29 2020 +
URL:https://gitweb.gentoo.org/proj/kde-sunset.git/commit/?id=c419a6d6

media-libs/phonon: Drop 4.9.1-r1

Package-Manager: Portage-3.0.11, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 .../phonon/files/phonon-4.7.0-plugin-install.patch |  13 ---
 media-libs/phonon/phonon-4.9.1-r1.ebuild   | 126 -
 2 files changed, 139 deletions(-)

diff --git a/media-libs/phonon/files/phonon-4.7.0-plugin-install.patch 
b/media-libs/phonon/files/phonon-4.7.0-plugin-install.patch
deleted file mode 100644
index 5f478cac..
--- a/media-libs/phonon/files/phonon-4.7.0-plugin-install.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/cmake/FindPhononInternal.cmake b/cmake/FindPhononInternal.cmake
-index 3245e9b..3427c62 100644
 a/cmake/FindPhononInternal.cmake
-+++ b/cmake/FindPhononInternal.cmake
-@@ -178,7 +178,7 @@ if (PHONON_BUILD_PHONON4QT5)
- endif (PHONON_BUILD_PHONON4QT5)
- set(BIN_INSTALL_DIR "bin" ) # CACHE PATH "The install 
dir for executables (default ${EXEC_INSTALL_PREFIX}/bin)")
- set(LIB_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}" ) #  CACHE PATH 
"The subdirectory relative to the install prefix where libraries will be 
installed"
--set(PLUGIN_INSTALL_DIR  "${LIB_INSTALL_DIR}/kde4"   
CACHE PATH "The subdirectory relative to the install prefix where plugins will 
be installed (default is ${LIB_INSTALL_DIR}/kde4)")
-+set(PLUGIN_INSTALL_DIR  "${LIB_INSTALL_DIR}/qt4"   
CACHE PATH "The subdirectory relative to the install prefix where plugins will 
be installed (default is ${LIB_INSTALL_DIR}/qt4)")
- if (PHONON_BUILD_PHONON4QT5)
- set(PLUGIN_INSTALL_DIR  "${LIB_INSTALL_DIR}/qt5"  
 CACHE PATH "The subdirectory relative to the install prefix where plugins will 
be installed (default is ${LIB_INSTALL_DIR}/qt5)" FORCE)
- endif(PHONON_BUILD_PHONON4QT5)

diff --git a/media-libs/phonon/phonon-4.9.1-r1.ebuild 
b/media-libs/phonon/phonon-4.9.1-r1.ebuild
deleted file mode 100644
index 08cd6522..
--- a/media-libs/phonon/phonon-4.9.1-r1.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 cmake-multilib qmake-utils
-
-DESCRIPTION="KDE multimedia API"
-HOMEPAGE="https://community.kde.org/Phonon;
-SRC_URI="mirror://kde/stable/phonon/${PV}/${P}.tar.xz"
-
-LICENSE="|| ( LGPL-2.1 LGPL-3 )"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~x86-macos"
-IUSE="debug designer gstreamer pulseaudio qt4 +qt5 +vlc"
-
-REQUIRED_USE="|| ( qt4 qt5 )"
-
-RDEPEND="
-   !!dev-qt/qtphonon:4
-   pulseaudio? (
-   dev-libs/glib:2[${MULTILIB_USEDEP}]
-   >=media-sound/pulseaudio-0.9.21[glib,${MULTILIB_USEDEP}]
-   )
-   qt4? (
-   >=dev-qt/qtcore-4.8.7-r2:4[${MULTILIB_USEDEP}]
-   >=dev-qt/qtdbus-4.8.7:4[${MULTILIB_USEDEP}]
-   >=dev-qt/qtgui-4.8.7:4[${MULTILIB_USEDEP}]
-   designer? ( >=dev-qt/designer-4.8.7:4[${MULTILIB_USEDEP}] )
-   )
-   qt5? (
-   dev-qt/qtcore:5
-   dev-qt/qtdbus:5
-   dev-qt/qtgui:5
-   dev-qt/qtwidgets:5
-   designer? ( dev-qt/designer:5 )
-   )
-"
-DEPEND="${RDEPEND}
-   virtual/pkgconfig
-   qt5? ( kde-frameworks/extra-cmake-modules:5 )
-"
-PDEPEND="
-   gstreamer? ( >=media-libs/phonon-gstreamer-4.9.0[qt4(-)?,qt5(+)?] )
-   vlc? ( >=media-libs/phonon-vlc-0.9.0[qt4(-)?,qt5(+)?] )
-"
-
-PATCHES=( "${FILESDIR}/${PN}-4.7.0-plugin-install.patch" )
-
-pkg_setup() {
-   MULTIBUILD_VARIANTS=( $(usev qt4) $(usev qt5) )
-}
-
-multilib_src_configure() {
-   local mycmakeargs=(
-   -DPHONON_BUILD_DESIGNER_PLUGIN=$(usex designer)
-   -DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT=TRUE
-   -DWITH_GLIB2=$(usex pulseaudio)
-   -DWITH_PulseAudio=$(usex pulseaudio)
-   
-DQT_QMAKE_EXECUTABLE="$(${QT_MULTIBUILD_VARIANT}_get_bindir)"/qmake
-   )
-
-   if [[ ${QT_MULTIBUILD_VARIANT} = qt4 ]]; then
-   mycmakeargs+=(
-   -DPHONON_BUILD_PHONON4QT5=OFF
-   -DWITH_QZeitgeist=OFF
-   )
-   fi
-   if [[ ${QT_MULTIBUILD_VARIANT} = qt5 ]]; then
-   mycmakeargs+=(
-   -DPHONON_BUILD_PHONON4QT5=ON
-   -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Declarative=ON
-   )
-   fi
-
-   cmake-utils_src_configure
-}
-
-src_configure() {
-   myconfigure() {
-   local QT_MULTIBUILD_VARIANT=${MULTIBUILD_VARIANT}
- 

  1   2   3   4   >