parent
a633a2c720
commit
8f11272fe1
Binary file not shown.
Binary file not shown.
@ -1,48 +0,0 @@
|
|||||||
# Copyright 1999-2018 Gentoo Foundation
|
|
||||||
# Distributed under the terms of the GNU General Public License v2
|
|
||||||
|
|
||||||
EAPI=6
|
|
||||||
|
|
||||||
PYTHON_COMPAT=( python2_7 python3_5 )
|
|
||||||
|
|
||||||
inherit distutils-r1
|
|
||||||
|
|
||||||
DESCRIPTION="ARA Records Ansible"
|
|
||||||
HOMEPAGE="https://github.com/openstack/ara"
|
|
||||||
SRC_URI="https://github.com/openstack/ara/archive/${PV}.tar.gz -> ${P}.tar.gz"
|
|
||||||
|
|
||||||
LICENSE="GPL-3"
|
|
||||||
SLOT="0"
|
|
||||||
KEYWORDS="~amd64 ~x86"
|
|
||||||
|
|
||||||
RDEPEND="
|
|
||||||
dev-python/jinja[${PYTHON_USEDEP}]
|
|
||||||
dev-python/flask[${PYTHON_USEDEP}]
|
|
||||||
dev-python/flask-sqlalchemy[${PYTHON_USEDEP}]
|
|
||||||
dev-python/flask-script[${PYTHON_USEDEP}]
|
|
||||||
dev-python/frozen-flask[${PYTHON_USEDEP}]
|
|
||||||
dev-python/decorator[${PYTHON_USEDEP}]
|
|
||||||
dev-python/cliff[${PYTHON_USEDEP}]
|
|
||||||
dev-python/subunit[${PYTHON_USEDEP}]
|
|
||||||
dev-python/pygments[${PYTHON_USEDEP}]
|
|
||||||
dev-python/debtcollector[${PYTHON_USEDEP}]
|
|
||||||
dev-python/junit-xml[${PYTHON_USEDEP}]
|
|
||||||
dev-python/pyfakefs[${PYTHON_USEDEP}]
|
|
||||||
>=dev-python/pbr-3.1.1[${PYTHON_USEDEP}]
|
|
||||||
dev-python/oslo-serialization[${PYTHON_USEDEP}]
|
|
||||||
dev-python/oslo-utils[${PYTHON_USEDEP}]"
|
|
||||||
|
|
||||||
DEPEND="
|
|
||||||
dev-python/setuptools[${PYTHON_USEDEP}]
|
|
||||||
dev-python/six[${PYTHON_USEDEP}]"
|
|
||||||
|
|
||||||
python_compile() {
|
|
||||||
export PBR_VERSION="${PV}"
|
|
||||||
distutils-r1_python_compile
|
|
||||||
}
|
|
||||||
|
|
||||||
python_install_all() {
|
|
||||||
distutils-r1_python_install_all
|
|
||||||
einstalldocs
|
|
||||||
dodoc -r doc
|
|
||||||
}
|
|
@ -1,5 +1,4 @@
|
|||||||
DIST prelude-manager-3.0.0.tar.gz 1286459 BLAKE2B 0909b0d7501909de51cd580b6ce22a66b1900a3b5b7376d3aeb4136bf41128ab766a025d69d33c414a9623dabb0de144e2f21190c3c3cccb9c067db359aab1bd SHA512 4c16a353495179265375686ce9592c8cd044b4255060b78286466bd25f9b38634233c95af058e1c0b81e1b574ec9ada5b2db92d6d1f5594dfcddce572fd0fd67
|
DIST prelude-manager-3.0.0.tar.gz 1286459 BLAKE2B 0909b0d7501909de51cd580b6ce22a66b1900a3b5b7376d3aeb4136bf41128ab766a025d69d33c414a9623dabb0de144e2f21190c3c3cccb9c067db359aab1bd SHA512 4c16a353495179265375686ce9592c8cd044b4255060b78286466bd25f9b38634233c95af058e1c0b81e1b574ec9ada5b2db92d6d1f5594dfcddce572fd0fd67
|
||||||
DIST prelude-manager-3.1.0.tar.gz 1301799 BLAKE2B 938937d2752ad47630b36c3a546f2493a964fde01e3df694e4a9fbddfa1efc3ddc9d864f8c1169e8ae8f3b414c4cd1983bbbd015f192ee065e2531489a23ba8b SHA512 75df43f9db81d2b6bd87c649eda7bb30ee10510576473bea83cb5cce44f576e9d69d775b5d76dcea8841eee61730a97cdae51e6c8b3a426d2442c5183d0e0d10
|
|
||||||
DIST prelude-manager-4.0.0.tar.gz 1353116 BLAKE2B 20aaa28797a67fd310807735bb08f0c21c3bd95950598a86c45144ee2474785aef0c7d569732c817509ae8ae52ffce5f43f3c071931f2960578681f91a8c9504 SHA512 793ed37c71eb4884cbbb49b11c7388ee291a35252255458ceadb4ce10d1392e8bad423f95e31bff4550a9cf1d04139e43729352554fd847048b6c8d14f813a8a
|
DIST prelude-manager-4.0.0.tar.gz 1353116 BLAKE2B 20aaa28797a67fd310807735bb08f0c21c3bd95950598a86c45144ee2474785aef0c7d569732c817509ae8ae52ffce5f43f3c071931f2960578681f91a8c9504 SHA512 793ed37c71eb4884cbbb49b11c7388ee291a35252255458ceadb4ce10d1392e8bad423f95e31bff4550a9cf1d04139e43729352554fd847048b6c8d14f813a8a
|
||||||
DIST prelude-manager-4.1.1.tar.gz 1415847 BLAKE2B 7cea7209a680a38cf597a9678f3ac9a31b00187e4597e1aeed91bbe57a55981279e8399ee8c90a044e40873e595ca648736fa79090420d9bcd72b82588f7bb5e SHA512 4e9d09b56eb7ec55144caa06a04e458bf0462d8c0064a34aac5aa0fb96a30fbefe5a4956185b606ec58fc410e4cbcac8721e521b3396303b3bff88808042a966
|
DIST prelude-manager-4.1.1.tar.gz 1415847 BLAKE2B 7cea7209a680a38cf597a9678f3ac9a31b00187e4597e1aeed91bbe57a55981279e8399ee8c90a044e40873e595ca648736fa79090420d9bcd72b82588f7bb5e SHA512 4e9d09b56eb7ec55144caa06a04e458bf0462d8c0064a34aac5aa0fb96a30fbefe5a4956185b606ec58fc410e4cbcac8721e521b3396303b3bff88808042a966
|
||||||
DIST prelude-manager-5.1.0.tar.gz 1510054 BLAKE2B 88ef666a76c58af1a8164c033b7e9c1ea869a18a66cb489d8c7fdbf1fa331006e7844aea4386ea3185902afd108af5eb1b46ee17686032de460d8c5b336fd658 SHA512 1f0e993f9bf684ec65a741db3cdaf537dc47bc2f77652a37c194db422dd5da2aa33b78d3ee454c78b28b44c022eacc7246ee99187b0b8779c12f3a67320d89a3
|
DIST prelude-manager-5.1.0.tar.gz 1510054 BLAKE2B 88ef666a76c58af1a8164c033b7e9c1ea869a18a66cb489d8c7fdbf1fa331006e7844aea4386ea3185902afd108af5eb1b46ee17686032de460d8c5b336fd658 SHA512 1f0e993f9bf684ec65a741db3cdaf537dc47bc2f77652a37c194db422dd5da2aa33b78d3ee454c78b28b44c022eacc7246ee99187b0b8779c12f3a67320d89a3
|
||||||
|
@ -1,58 +0,0 @@
|
|||||||
# Copyright 1999-2016 Gentoo Foundation
|
|
||||||
# Distributed under the terms of the GNU General Public License v2
|
|
||||||
|
|
||||||
EAPI=6
|
|
||||||
|
|
||||||
inherit autotools systemd
|
|
||||||
|
|
||||||
DESCRIPTION="Bus communication for all Prelude modules"
|
|
||||||
HOMEPAGE="https://www.prelude-siem.org"
|
|
||||||
SRC_URI="https://www.prelude-siem.org/pkg/src/${PV}/${P}.tar.gz"
|
|
||||||
|
|
||||||
LICENSE="GPL-2+"
|
|
||||||
SLOT="0"
|
|
||||||
KEYWORDS="~amd64 ~x86"
|
|
||||||
IUSE="tcpwrapper xml geoip dbx"
|
|
||||||
|
|
||||||
RDEPEND="net-libs/gnutls:=
|
|
||||||
~dev-libs/libprelude-${PV}
|
|
||||||
dbx? ( ~dev-libs/libpreludedb-${PV} )
|
|
||||||
tcpwrapper? ( sys-apps/tcp-wrappers )
|
|
||||||
xml? ( dev-libs/libxml2 )
|
|
||||||
geoip? ( dev-libs/libmaxminddb )"
|
|
||||||
|
|
||||||
DEPEND="${RDEPEND}
|
|
||||||
virtual/pkgconfig"
|
|
||||||
|
|
||||||
PATCHES=(
|
|
||||||
"${FILESDIR}/${P}-run.patch"
|
|
||||||
)
|
|
||||||
|
|
||||||
src_prepare() {
|
|
||||||
default
|
|
||||||
|
|
||||||
eautoreconf
|
|
||||||
}
|
|
||||||
|
|
||||||
src_configure() {
|
|
||||||
econf \
|
|
||||||
--localstatedir="${EPREFIX}/var" \
|
|
||||||
$(use_with dbx libpreludedb-prefix) \
|
|
||||||
$(use_with tcpwrapper libwrap) \
|
|
||||||
$(use_with xml xml-prefix) \
|
|
||||||
$(use_enable geoip libmaxminddb)
|
|
||||||
}
|
|
||||||
|
|
||||||
src_install() {
|
|
||||||
default
|
|
||||||
|
|
||||||
rm -rv "${ED%/}/run" || die "rm failed"
|
|
||||||
keepdir /var/spool/prelude-manager{,/failover,/scheduler}
|
|
||||||
|
|
||||||
find "${D}" -name '*.la' -delete || die
|
|
||||||
|
|
||||||
systemd_dounit "${FILESDIR}/${PN}.service"
|
|
||||||
systemd_newtmpfilesd "${FILESDIR}/${PN}.run" "${PN}.conf"
|
|
||||||
|
|
||||||
newinitd "${FILESDIR}/${PN}.initd" "${PN}"
|
|
||||||
}
|
|
Binary file not shown.
@ -1,2 +1 @@
|
|||||||
DIST bootchart2-0.14.7.tar.gz 1175145 BLAKE2B dfe56572eb2f85b68e0ad871c939ef16c48b0ee11ca881f03914d6773b86050091b232d80706f0df1d094c2e069c252609a0266d1cfa5159a6a0916321ea1dcf SHA512 82074a6ca6725a1b9ffe2a5d7f7bc6fd7918ab837573c23f75e7ebf209f30284ac7e59d2e84768ed313e4cee80da8e67dde167881d907fe71eff376ae9d16541
|
|
||||||
DIST bootchart2-0.14.8.tar.gz 1175527 BLAKE2B 623ca2269420eda79b09d955ab9d4a37af004e9e97ad0e0c6014e53b4b0c63239661cb5359345306504980b060ccd11488970cb0aa3d832bfb55392724e715dd SHA512 58303db91d22ccc44c0dc765e7a6672fb277840555fd87ce64b8987cba85250cfe3db17f3ec7e0e1e726ad59166a5d3d01a7a262c07b5690c595877b46c66bd0
|
DIST bootchart2-0.14.8.tar.gz 1175527 BLAKE2B 623ca2269420eda79b09d955ab9d4a37af004e9e97ad0e0c6014e53b4b0c63239661cb5359345306504980b060ccd11488970cb0aa3d832bfb55392724e715dd SHA512 58303db91d22ccc44c0dc765e7a6672fb277840555fd87ce64b8987cba85250cfe3db17f3ec7e0e1e726ad59166a5d3d01a7a262c07b5690c595877b46c66bd0
|
||||||
|
@ -1,79 +0,0 @@
|
|||||||
# Copyright 1999-2019 Gentoo Authors
|
|
||||||
# Distributed under the terms of the GNU General Public License v2
|
|
||||||
|
|
||||||
EAPI=5
|
|
||||||
|
|
||||||
PYTHON_COMPAT=( python2_7 python3_5 )
|
|
||||||
|
|
||||||
inherit linux-info python-r1 systemd toolchain-funcs
|
|
||||||
|
|
||||||
DESCRIPTION="Performance analysis and visualization of the system boot process"
|
|
||||||
HOMEPAGE="https://github.com/mmeeks/bootchart/"
|
|
||||||
SRC_URI="https://github.com/mmeeks/bootchart/archive/${PV}.tar.gz -> ${P}.tar.gz"
|
|
||||||
|
|
||||||
SLOT="0"
|
|
||||||
LICENSE="GPL-2"
|
|
||||||
KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
|
|
||||||
IUSE="svg test X"
|
|
||||||
RESTRICT="!test? ( test )"
|
|
||||||
|
|
||||||
REQUIRED_USE="
|
|
||||||
X? ( ${PYTHON_REQUIRED_USE} )
|
|
||||||
test? ( X )"
|
|
||||||
|
|
||||||
RDEPEND="
|
|
||||||
!app-benchmarks/bootchart
|
|
||||||
X? (
|
|
||||||
dev-python/pycairo[svg(+)?,${PYTHON_USEDEP}]
|
|
||||||
dev-python/pygtk[$(python_gen_usedep 'python2*')]
|
|
||||||
${PYTHON_DEPS}
|
|
||||||
)
|
|
||||||
sys-apps/lsb-release"
|
|
||||||
DEPEND="${PYTHON_DEPS}"
|
|
||||||
|
|
||||||
S="${WORKDIR}"/${PN%2}-${PV}
|
|
||||||
|
|
||||||
CONFIG_CHECK="~PROC_EVENTS ~TASKSTATS ~TASK_DELAY_ACCT ~TMPFS"
|
|
||||||
|
|
||||||
src_prepare() {
|
|
||||||
epatch "${FILESDIR}"/${P}-sysmacros.patch #579922
|
|
||||||
tc-export CC
|
|
||||||
sed \
|
|
||||||
-e "/^install/s:py-install-compile::g" \
|
|
||||||
-e "/^SYSTEMD_UNIT_DIR/s:=.*:= $(systemd_get_unitdir):g" \
|
|
||||||
-i Makefile || die
|
|
||||||
sed \
|
|
||||||
-e '/^EXIT_PROC/s:^.*$:EXIT_PROC="agetty mgetty mingetty:g' \
|
|
||||||
-i bootchartd.conf bootchartd.in || die
|
|
||||||
}
|
|
||||||
|
|
||||||
src_test() {
|
|
||||||
python_foreach_impl emake test
|
|
||||||
}
|
|
||||||
|
|
||||||
src_install() {
|
|
||||||
export DOCDIR=/usr/share/doc/${PF}
|
|
||||||
default
|
|
||||||
|
|
||||||
# Note: LIBDIR is hardcoded as /lib in collector/common.h, so we shouldn't
|
|
||||||
# just change it. Since no libraries are installed, /lib is fine.
|
|
||||||
keepdir /lib/bootchart/tmpfs
|
|
||||||
|
|
||||||
installation() {
|
|
||||||
python_domodule pybootchartgui
|
|
||||||
|
|
||||||
python_newscript pybootchartgui.py pybootchartgui
|
|
||||||
}
|
|
||||||
use X && python_foreach_impl installation
|
|
||||||
|
|
||||||
newinitd "${FILESDIR}"/${PN}.init ${PN}
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
pkg_postinst() {
|
|
||||||
elog "If you are using an initrd during boot"
|
|
||||||
echo
|
|
||||||
elog "please add the init script to your default runlevel"
|
|
||||||
elog "rc-update add bootchart2 default"
|
|
||||||
echo
|
|
||||||
}
|
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -1,2 +1 @@
|
|||||||
DIST chkcrontab-1.6.tar.gz 24701 BLAKE2B a4a47e0e41a17a535662b22deb57dd49b461694f4842a59a1a9debe8523f4216f4834c64d01c62e24e13ee4d45e526f361650b402968a164b2802e0a13d63a63 SHA512 249061ecf7c8dc2d2275dcda3048fd00fc2ca85d39dabb2de61a3ab415243bbd1a61222be8c0ddfa66eb36577bb2efb27ba4a0c2a013559dee126c95cc73bd1b
|
|
||||||
DIST chkcrontab-1.7.tar.gz 25088 BLAKE2B 5e3cffcbcd064cfe8e9898dc74c215b14bdd69a4c110a91b73777cb024dd6dfe8d10ce862e82752baad65a8daf88dc45bee06f8e736393e0f973ee2f79f7bd96 SHA512 5236b1996a8d4f5d3861bf3d8a1bafafa271237965721ea4ff61e6712ee4546b9d0484483a0dac25f9d920904f899f2930b46df16d656083b422d95a1d6de0c0
|
DIST chkcrontab-1.7.tar.gz 25088 BLAKE2B 5e3cffcbcd064cfe8e9898dc74c215b14bdd69a4c110a91b73777cb024dd6dfe8d10ce862e82752baad65a8daf88dc45bee06f8e736393e0f973ee2f79f7bd96 SHA512 5236b1996a8d4f5d3861bf3d8a1bafafa271237965721ea4ff61e6712ee4546b9d0484483a0dac25f9d920904f899f2930b46df16d656083b422d95a1d6de0c0
|
||||||
|
@ -1,27 +0,0 @@
|
|||||||
# Copyright 1999-2019 Gentoo Authors
|
|
||||||
# Distributed under the terms of the GNU General Public License v2
|
|
||||||
|
|
||||||
EAPI=6
|
|
||||||
|
|
||||||
PYTHON_COMPAT=( python{2_7,3_5} )
|
|
||||||
|
|
||||||
inherit distutils-r1
|
|
||||||
|
|
||||||
DESCRIPTION="A tool to detect crontab errors"
|
|
||||||
HOMEPAGE="https://github.com/lyda/chkcrontab"
|
|
||||||
SRC_URI="https://github.com/lyda/chkcrontab/archive/v${PV}.tar.gz -> ${P}.tar.gz"
|
|
||||||
|
|
||||||
LICENSE="Apache-2.0"
|
|
||||||
SLOT="0"
|
|
||||||
KEYWORDS="amd64 x86"
|
|
||||||
IUSE="test"
|
|
||||||
RESTRICT="!test? ( test )"
|
|
||||||
|
|
||||||
python_test() {
|
|
||||||
esetup.py test
|
|
||||||
}
|
|
||||||
|
|
||||||
python_install_all() {
|
|
||||||
doman doc/${PN}.1
|
|
||||||
distutils-r1_python_install_all
|
|
||||||
}
|
|
@ -1,27 +0,0 @@
|
|||||||
# cache functions
|
|
||||||
regexp=\b(loading|updating|creating) cache\b
|
|
||||||
colours=yellow bold
|
|
||||||
.........
|
|
||||||
# checking
|
|
||||||
regexp=\bchecking\s*(for|if|whether|command|how|that)?(\s*to)?\b
|
|
||||||
colours=yellow
|
|
||||||
.........
|
|
||||||
# result is complex
|
|
||||||
regexp=\.\.\. .*$
|
|
||||||
colours=cyan
|
|
||||||
.........
|
|
||||||
# check succeeded
|
|
||||||
regexp=\.\.\.( \(cached\))? yes$
|
|
||||||
colours=blue bold
|
|
||||||
.........
|
|
||||||
# check did not succeed
|
|
||||||
regexp=\.\.\.( \(cached\))? no$
|
|
||||||
colours=magenta
|
|
||||||
.........
|
|
||||||
# ... should be normal
|
|
||||||
regexp=\.\.\.
|
|
||||||
colours=default
|
|
||||||
.........
|
|
||||||
# creating stuff
|
|
||||||
regexp=\bcreating\b
|
|
||||||
colours=green
|
|
@ -1,16 +0,0 @@
|
|||||||
conf.netstat | 2 +-
|
|
||||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/conf.netstat b/conf.netstat
|
|
||||||
index 2dd96e3..ec2779b 100644
|
|
||||||
--- a/conf.netstat
|
|
||||||
+++ b/conf.netstat
|
|
||||||
@@ -19,7 +19,7 @@ regexp=^IPX.*[\dABCDEF]+:[\dABCDEF]+
|
|
||||||
colours=green
|
|
||||||
=======
|
|
||||||
# protocols
|
|
||||||
-regexp=(^tcp|^udp|^unix|^IPX|STREAM|DGRAM)
|
|
||||||
+regexp=(^tcp6|^tcp|^udp6|^udp|^unix|^IPX|STREAM|DGRAM)
|
|
||||||
colours=bold blue
|
|
||||||
=======
|
|
||||||
# status
|
|
@ -1,53 +0,0 @@
|
|||||||
--- grc-1.4.orig/conf.gcc
|
|
||||||
+++ grc-1.4/conf.gcc
|
|
||||||
@@ -1,7 +1,7 @@
|
|
||||||
#
|
|
||||||
-regexp=\bgcc\b
|
|
||||||
-colours=yellow
|
|
||||||
-count=more
|
|
||||||
+regexp=\b(g?cc|[gc]\+\+|g?as|ld)\b
|
|
||||||
+colours=white bold
|
|
||||||
+count=once
|
|
||||||
.........
|
|
||||||
#
|
|
||||||
regexp=^[^:\s]*?:\d+:
|
|
||||||
@@ -15,6 +15,10 @@
|
|
||||||
regexp=\`[A-Za-z0-9_():&*]+( const)?\'
|
|
||||||
colours=magenta
|
|
||||||
.........
|
|
||||||
+# compilation method modifiers
|
|
||||||
+regexp=\s\-(O\d?|f\S+|pthread|g\S*|c|W\S,\S+)\b
|
|
||||||
+colours=yellow
|
|
||||||
+.........
|
|
||||||
# -O
|
|
||||||
regexp=\-O\d
|
|
||||||
colours=green
|
|
||||||
@@ -27,7 +31,7 @@
|
|
||||||
# stderr to grcat
|
|
||||||
#
|
|
||||||
# warning
|
|
||||||
-regexp=warning:.*
|
|
||||||
+regexp=[Ww]arning[:\b]
|
|
||||||
colours=white
|
|
||||||
.........
|
|
||||||
regexp=warning:
|
|
||||||
@@ -35,7 +39,7 @@
|
|
||||||
count=once
|
|
||||||
.........
|
|
||||||
# error
|
|
||||||
-regexp=error:.*
|
|
||||||
+regexp=[Ee]rror[:\b]
|
|
||||||
colours=bold white
|
|
||||||
.........
|
|
||||||
regexp=error:
|
|
||||||
--- grc-1.4.orig/grc.conf
|
|
||||||
+++ grc-1.4/grc.conf
|
|
||||||
@@ -19,7 +19,7 @@
|
|
||||||
conf.traceroute
|
|
||||||
|
|
||||||
# gcc command
|
|
||||||
-(^|[/\w\.]+/)g?cc\s
|
|
||||||
+(^|[/\w\.]+/)(g?cc|[gc]\+\+)\s
|
|
||||||
conf.gcc
|
|
||||||
|
|
||||||
# make command
|
|
@ -1,26 +0,0 @@
|
|||||||
From 1d4f9e1ca5a27426da4dcbd3caee1e38b5d272aa Mon Sep 17 00:00:00 2001
|
|
||||||
From: Justin Lecher <jlec@gentoo.org>
|
|
||||||
Date: Tue, 27 Dec 2016 13:17:27 +0000
|
|
||||||
Subject: [PATCH] Use bash internal functionalities for grc detection
|
|
||||||
|
|
||||||
which is an external tool, where as type is a bash internal funciton
|
|
||||||
and always available
|
|
||||||
|
|
||||||
Signed-off-by: Justin Lecher <jlec@gentoo.org>
|
|
||||||
---
|
|
||||||
grc.bashrc | 5 ++---
|
|
||||||
1 file changed, 2 insertions(+), 3 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/grc.bashrc b/grc.bashrc
|
|
||||||
index e9eba08..54e570d 100644
|
|
||||||
--- a/grc.bashrc
|
|
||||||
+++ b/grc.bashrc
|
|
||||||
@@ -1,6 +1,5 @@
|
|
||||||
-GRC=`which grc`
|
|
||||||
-if [ "$TERM" != dumb ] && [ -n "$GRC" ]
|
|
||||||
-then
|
|
||||||
+GRC="$(type -p grc)"
|
|
||||||
+if [ "$TERM" != dumb ] && [ -n "$GRC" ]; then
|
|
||||||
alias colourify="$GRC -es --colour=auto"
|
|
||||||
alias configure='colourify ./configure'
|
|
||||||
alias diff='colourify diff'
|
|
@ -1,46 +0,0 @@
|
|||||||
From 6d7ab5f6486c6d30a685605aa5b0ecfda0434e86 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Justin Lecher <jlec@gentoo.org>
|
|
||||||
Date: Tue, 27 Dec 2016 17:32:48 +0000
|
|
||||||
Subject: [PATCH] More advanced regex for configure colouring
|
|
||||||
|
|
||||||
Signed-off-by: Justin Lecher <jlec@gentoo.org>
|
|
||||||
---
|
|
||||||
conf.configure | 21 +++++++++++++++++----
|
|
||||||
1 file changed, 17 insertions(+), 4 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/conf.configure b/conf.configure
|
|
||||||
index ac88ec7..e7b5d89 100644
|
|
||||||
--- a/conf.configure
|
|
||||||
+++ b/conf.configure
|
|
||||||
@@ -1,14 +1,27 @@
|
|
||||||
-regexp=^checking
|
|
||||||
+# cache functions
|
|
||||||
+regexp=\b(loading|updating|creating) cache\b
|
|
||||||
+colours=yellow bold
|
|
||||||
+.........
|
|
||||||
+# checking
|
|
||||||
+regexp=\bchecking\s*(for|if|whether|command|how|that)?(\s*to)?\b
|
|
||||||
colours=bold blue
|
|
||||||
.........
|
|
||||||
+# result is complex
|
|
||||||
regexp=\.\.\. .*$
|
|
||||||
colours=bold yellow
|
|
||||||
.........
|
|
||||||
-regexp=\.\.\. yes$
|
|
||||||
+# check succeeded
|
|
||||||
+regexp=\.\.\.( \(cached\))? yes$
|
|
||||||
colours=bold cyan
|
|
||||||
.........
|
|
||||||
-regexp=\.\.\. no$
|
|
||||||
+# check did not succeed
|
|
||||||
+regexp=\.\.\.( \(cached\))? no$
|
|
||||||
colours=bold red
|
|
||||||
.........
|
|
||||||
-regexp=\.\.\.[ ]
|
|
||||||
+# ... should be normal
|
|
||||||
+regexp=\.\.\.
|
|
||||||
colours=default
|
|
||||||
+.........
|
|
||||||
+# creating stuff
|
|
||||||
+regexp=\bcreating\b
|
|
||||||
+colours=green
|
|
@ -1,22 +0,0 @@
|
|||||||
From 2e422109af7094d2787660f7841e7c2ab10bbcc8 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Pavel Vishnyakov <djhumster@gmail.com>
|
|
||||||
Date: Thu, 17 Dec 2015 18:00:37 +0300
|
|
||||||
Subject: [PATCH] Update conf.traceroute
|
|
||||||
|
|
||||||
More correct way to match domains with any length.
|
|
||||||
Can be checked her https://regex101.com/r/dI3jQ3/1
|
|
||||||
---
|
|
||||||
conf.traceroute | 2 +-
|
|
||||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/conf.traceroute b/conf.traceroute
|
|
||||||
index b6501a2..983a7cd 100644
|
|
||||||
--- a/conf.traceroute
|
|
||||||
+++ b/conf.traceroute
|
|
||||||
@@ -1,5 +1,5 @@
|
|
||||||
# hostname
|
|
||||||
-regexp=\s\w+[\w\-\.]+\w+
|
|
||||||
+regexp=\w+[\w\-\.]+\.[a-z]+
|
|
||||||
colours=bold yellow
|
|
||||||
count=once
|
|
||||||
-
|
|
@ -1,41 +0,0 @@
|
|||||||
grc | 2 ++
|
|
||||||
grcat | 8 +++-----
|
|
||||||
2 files changed, 5 insertions(+), 5 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/grc b/grc
|
|
||||||
index 56a53b4..19afe7c 100755
|
|
||||||
--- a/grc
|
|
||||||
+++ b/grc
|
|
||||||
@@ -1,5 +1,7 @@
|
|
||||||
#! /usr/bin/python
|
|
||||||
|
|
||||||
+from __future__ import print_function
|
|
||||||
+
|
|
||||||
import os, re, string, sys, getopt, signal
|
|
||||||
|
|
||||||
def version():
|
|
||||||
diff --git a/grcat b/grcat
|
|
||||||
index a4e6dd9..16586e2 100755
|
|
||||||
--- a/grcat
|
|
||||||
+++ b/grcat
|
|
||||||
@@ -1,5 +1,7 @@
|
|
||||||
#! /usr/bin/python
|
|
||||||
|
|
||||||
+from __future__ import print_function
|
|
||||||
+
|
|
||||||
import sys, os, string, re, signal, errno
|
|
||||||
|
|
||||||
#some default definitions
|
|
||||||
@@ -140,11 +142,7 @@ while not is_last:
|
|
||||||
# do not try to understand the optimized form below :-)
|
|
||||||
if 'colours' in ll:
|
|
||||||
colstrings = list(
|
|
||||||
- map(
|
|
||||||
- lambda colgroup:
|
|
||||||
- ''.join(map(lambda x: get_colour(x), split(colgroup))),
|
|
||||||
- split(ll['colours'], ',')
|
|
||||||
- )
|
|
||||||
+ [''.join([get_colour(x) for x in split(colgroup)]) for colgroup in split(ll['colours'], ',')]
|
|
||||||
)
|
|
||||||
ll['colours'] = colstrings
|
|
||||||
|
|
@ -1,41 +0,0 @@
|
|||||||
# Copyright 1999-2015 Gentoo Foundation
|
|
||||||
# Distributed under the terms of the GNU General Public License v2
|
|
||||||
|
|
||||||
EAPI=5
|
|
||||||
|
|
||||||
PYTHON_COMPAT=( python2_7 pypy )
|
|
||||||
|
|
||||||
inherit eutils python-r1
|
|
||||||
|
|
||||||
DESCRIPTION="Generic Colouriser beautifies your logfiles or output of commands"
|
|
||||||
HOMEPAGE="http://kassiopeia.juls.savba.sk/~garabik/software/grc.html"
|
|
||||||
SRC_URI="http://kassiopeia.juls.savba.sk/~garabik/software/${PN}/${P/-/_}.tar.gz"
|
|
||||||
|
|
||||||
LICENSE="GPL-2"
|
|
||||||
SLOT="0"
|
|
||||||
KEYWORDS="amd64 ppc x86"
|
|
||||||
IUSE=""
|
|
||||||
|
|
||||||
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
|
|
||||||
|
|
||||||
RDEPEND="${PYTHON_DEPS}"
|
|
||||||
DEPEND="${RDEPEND}"
|
|
||||||
|
|
||||||
src_prepare() {
|
|
||||||
epatch \
|
|
||||||
"${FILESDIR}"/${PN}-1.4-support-more-files.patch \
|
|
||||||
"${FILESDIR}"/${PN}-1.4-ipv6.patch
|
|
||||||
}
|
|
||||||
|
|
||||||
src_install() {
|
|
||||||
python_foreach_impl python_doscript grc grcat
|
|
||||||
|
|
||||||
insinto /usr/share/grc
|
|
||||||
doins conf.* "${FILESDIR}"/conf.*
|
|
||||||
|
|
||||||
insinto /etc
|
|
||||||
doins grc.conf
|
|
||||||
|
|
||||||
dodoc README INSTALL TODO debian/changelog CREDITS
|
|
||||||
doman grc.1 grcat.1
|
|
||||||
}
|
|
@ -1,53 +0,0 @@
|
|||||||
# Copyright 1999-2019 Gentoo Authors
|
|
||||||
# Distributed under the terms of the GNU General Public License v2
|
|
||||||
|
|
||||||
EAPI=6
|
|
||||||
|
|
||||||
PYTHON_COMPAT=( python{2_7,3_5} pypy )
|
|
||||||
|
|
||||||
inherit eutils python-r1
|
|
||||||
|
|
||||||
DESCRIPTION="Generic Colouriser beautifies your logfiles or output of commands"
|
|
||||||
HOMEPAGE="http://kassiopeia.juls.savba.sk/~garabik/software/grc.html"
|
|
||||||
SRC_URI="https://github.com/garabik/grc/archive/v${PV}.tar.gz -> ${P}.tar.gz"
|
|
||||||
|
|
||||||
LICENSE="GPL-2"
|
|
||||||
SLOT="0"
|
|
||||||
KEYWORDS="~amd64 ~ppc ~x86"
|
|
||||||
IUSE=""
|
|
||||||
|
|
||||||
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
|
|
||||||
|
|
||||||
RDEPEND="${PYTHON_DEPS}"
|
|
||||||
DEPEND="${RDEPEND}"
|
|
||||||
|
|
||||||
PATCHES=(
|
|
||||||
# https://github.com/garabik/grc/pull/44
|
|
||||||
"${FILESDIR}"/${PN}-1.4-support-more-files.patch
|
|
||||||
# https://github.com/garabik/grc/pull/43
|
|
||||||
"${FILESDIR}"/${PN}-1.4-ipv6.patch
|
|
||||||
# https://github.com/garabik/grc/pull/9
|
|
||||||
"${FILESDIR}"/${P}-domain-match.patch
|
|
||||||
# https://github.com/garabik/grc/pull/45
|
|
||||||
"${FILESDIR}"/${P}-python3.patch
|
|
||||||
# https://github.com/garabik/grc/pull/46
|
|
||||||
"${FILESDIR}"/${P}-bash.patch
|
|
||||||
# https://github.com/garabik/grc/pull/47
|
|
||||||
"${FILESDIR}"/${P}-configure.patch
|
|
||||||
)
|
|
||||||
|
|
||||||
src_install() {
|
|
||||||
python_foreach_impl python_doscript grc grcat
|
|
||||||
|
|
||||||
insinto /usr/share/grc
|
|
||||||
doins \
|
|
||||||
mrsmith/conf.* \
|
|
||||||
conf.* \
|
|
||||||
grc.bashrc
|
|
||||||
|
|
||||||
insinto /etc
|
|
||||||
doins grc.conf
|
|
||||||
|
|
||||||
dodoc README INSTALL TODO debian/changelog CREDITS Regexp.txt
|
|
||||||
doman *.1
|
|
||||||
}
|
|
@ -1,2 +1 @@
|
|||||||
DIST icdiff-1.7.3.tar.gz 20215 BLAKE2B 9946506e91d3d49144f2a997fcd364831b8ecc07a22cb79549a3751d53d682970ad555160959cbd58fdd4984023fe598df10926a6d4c7b72eb4c1eaa36236c41 SHA512 ae8ca394c3fdf820d4795282672bc44eb01f88f9614d6240f035c31f99130b188185a0e241c3c17974d76f604b85ef48aa8296835b5dfb46463a88cb1f68d305
|
|
||||||
DIST icdiff-1.9.1.tar.gz 24387 BLAKE2B 482b128f03ac8af7e98db9b32ba7d9cf8bcd1a395eb50653a98ac186da26fea7933ee13f01840bb6c105e0f573a519a3e20ad83fbd8e513bfdd6c8c6d14b90c5 SHA512 f73108f6f3a4a2fc40e041bbe7b5934acd76684bb54a3fa544e9f146fd3c528528928378496f53ad92d649547ccc491a77296b6fa57e4534abb13d61c0df8d58
|
DIST icdiff-1.9.1.tar.gz 24387 BLAKE2B 482b128f03ac8af7e98db9b32ba7d9cf8bcd1a395eb50653a98ac186da26fea7933ee13f01840bb6c105e0f573a519a3e20ad83fbd8e513bfdd6c8c6d14b90c5 SHA512 f73108f6f3a4a2fc40e041bbe7b5934acd76684bb54a3fa544e9f146fd3c528528928378496f53ad92d649547ccc491a77296b6fa57e4534abb13d61c0df8d58
|
||||||
|
@ -1,16 +0,0 @@
|
|||||||
diff --git a/test.sh b/test.sh
|
|
||||||
index 264c696..1bb7290 100755
|
|
||||||
--- a/test.sh
|
|
||||||
+++ b/test.sh
|
|
||||||
@@ -97,11 +97,6 @@ check_gold gold-67-wf.txt tests/input-{6,7}.txt --cols=80 --whole-file
|
|
||||||
check_gold gold-67-ln.txt tests/input-{6,7}.txt --cols=80 --line-numbers
|
|
||||||
check_gold gold-67-u3.txt tests/input-{6,7}.txt --cols=80 -U 3
|
|
||||||
|
|
||||||
-if [ $(./icdiff --version | awk '{print $NF}') != $(head -n 1 ChangeLog) ]; then
|
|
||||||
- echo "Version mismatch between ChangeLog and icdiff source."
|
|
||||||
- fail
|
|
||||||
-fi
|
|
||||||
-
|
|
||||||
if ! $REGOLD; then
|
|
||||||
echo PASS
|
|
||||||
fi
|
|
@ -1,27 +0,0 @@
|
|||||||
# Copyright 1999-2019 Gentoo Authors
|
|
||||||
# Distributed under the terms of the GNU General Public License v2
|
|
||||||
|
|
||||||
EAPI=6
|
|
||||||
PYTHON_COMPAT=(python2_7 python3_5)
|
|
||||||
|
|
||||||
inherit distutils-r1
|
|
||||||
|
|
||||||
DESCRIPTION="Colourized diff that supports side-by-side diffing"
|
|
||||||
HOMEPAGE="https://www.jefftk.com/icdiff"
|
|
||||||
SRC_URI="https://github.com/jeffkaufman/${PN}/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
|
|
||||||
|
|
||||||
LICENSE="PSF-2"
|
|
||||||
SLOT="0"
|
|
||||||
KEYWORDS="~amd64"
|
|
||||||
|
|
||||||
PATCHES=(
|
|
||||||
"${FILESDIR}/${PN}-1.7.3-dont-check-changelog.patch"
|
|
||||||
)
|
|
||||||
|
|
||||||
DOCS=(README.md ChangeLog)
|
|
||||||
|
|
||||||
S="${WORKDIR}/${PN}-release-${PV}"
|
|
||||||
|
|
||||||
python_test() {
|
|
||||||
./test.sh "${EPYTHON%.*}" || die "Tests failed"
|
|
||||||
}
|
|
@ -0,0 +1 @@
|
|||||||
|
DIST transfolio-1.0.1.zip 158362 BLAKE2B 291e80e3576c3d92f00905c49d891c9ff926229cc2d843520b9b69f44660ec16ea274b4b68f4d8f3e353d140a6f8549697f3d2456310a5cd3a0e736ff6e0b61a SHA512 5d8c348cabcc3765c192a200ec011344960704085e815d249db23ac3669760c15ec343b16ecdce3469f49f76872f6f93563d50a96cf305f75ed19235d3a5d665
|
@ -0,0 +1,13 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
||||||
|
<pkgmetadata>
|
||||||
|
<maintainer type="person">
|
||||||
|
<email>conikost@gentoo.org</email>
|
||||||
|
<name>Conrad Kostecki</name>
|
||||||
|
</maintainer>
|
||||||
|
<longdescription>
|
||||||
|
TransFolio is a command line tool for Linux and Windows which,
|
||||||
|
as did Atari's DOS program FT.COM.
|
||||||
|
It enables data transfer between the PC and the Atari Portfolio.
|
||||||
|
</longdescription>
|
||||||
|
</pkgmetadata>
|
@ -0,0 +1,31 @@
|
|||||||
|
# Copyright 2019 Gentoo Authors
|
||||||
|
# Distributed under the terms of the GNU General Public License v2
|
||||||
|
|
||||||
|
EAPI=7
|
||||||
|
|
||||||
|
inherit toolchain-funcs
|
||||||
|
|
||||||
|
DESCRIPTION="Enables data transfer between the PC and the Atari Portfolio"
|
||||||
|
HOMEPAGE="http://leute.server.de/peichl/"
|
||||||
|
SRC_URI="http://leute.server.de/peichl/transfolio.zip -> ${P}.zip"
|
||||||
|
|
||||||
|
LICENSE="GPL-2+"
|
||||||
|
SLOT="0"
|
||||||
|
KEYWORDS="~amd64 ~x86"
|
||||||
|
|
||||||
|
BDEPEND="app-arch/unzip"
|
||||||
|
|
||||||
|
src_prepare() {
|
||||||
|
default
|
||||||
|
|
||||||
|
# Respect users CC, CFLAGS and disable striping
|
||||||
|
sed -e 's/cc/${CC}/' -e 's/-O2/${CFLAGS}/' -e '/strip/d' -i Makefile || die
|
||||||
|
|
||||||
|
tc-export CC
|
||||||
|
}
|
||||||
|
|
||||||
|
src_install() {
|
||||||
|
dobin transfolio
|
||||||
|
|
||||||
|
einstalldocs
|
||||||
|
}
|
Binary file not shown.
Binary file not shown.
@ -0,0 +1,153 @@
|
|||||||
|
Source/Upstream: Yes fixed in svn
|
||||||
|
Reason: Fix build with poppler 0.83.0
|
||||||
|
|
||||||
|
From b51c2bab4d57d685f96d427d6816bdd4ecfb4674 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Jean Ghali <jghali@libertysurf.fr>
|
||||||
|
Date: Wed, 4 Dec 2019 05:51:19 +0000
|
||||||
|
Subject: [PATCH] #15985: Fix failure to build against poppler 0.83.0
|
||||||
|
|
||||||
|
git-svn-id: svn://scribus.net/trunk/Scribus@23395 11d20701-8431-0410-a711-e3c959e3b870
|
||||||
|
---
|
||||||
|
scribus/plugins/import/pdf/importpdf.cpp | 22 ++++++++++++++++++++
|
||||||
|
scribus/plugins/import/pdf/importpdfconfig.h | 6 ++++++
|
||||||
|
scribus/plugins/import/pdf/slaoutput.cpp | 4 ++--
|
||||||
|
scribus/plugins/import/pdf/slaoutput.h | 2 +-
|
||||||
|
4 files changed, 31 insertions(+), 3 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/scribus/plugins/import/pdf/importpdf.cpp b/scribus/plugins/import/pdf/importpdf.cpp
|
||||||
|
index 2ab38ac758..427cd66ef2 100644
|
||||||
|
--- a/scribus/plugins/import/pdf/importpdf.cpp
|
||||||
|
+++ b/scribus/plugins/import/pdf/importpdf.cpp
|
||||||
|
@@ -74,7 +74,11 @@ PdfPlug::PdfPlug(ScribusDoc* doc, int flags)
|
||||||
|
QImage PdfPlug::readThumbnail(const QString& fName)
|
||||||
|
{
|
||||||
|
QString pdfFile = QDir::toNativeSeparators(fName);
|
||||||
|
+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 83, 0)
|
||||||
|
+ globalParams.reset(new GlobalParams());
|
||||||
|
+#else
|
||||||
|
globalParams = new GlobalParams();
|
||||||
|
+#endif
|
||||||
|
if (globalParams)
|
||||||
|
{
|
||||||
|
#if defined(Q_OS_WIN32) && POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 62, 0)
|
||||||
|
@@ -89,7 +93,9 @@ QImage PdfPlug::readThumbnail(const QString& fName)
|
||||||
|
if (pdfDoc->getErrorCode() == errEncrypted)
|
||||||
|
{
|
||||||
|
delete pdfDoc;
|
||||||
|
+#if POPPLER_ENCODED_VERSION < POPPLER_VERSION_ENCODE(0, 83, 0)
|
||||||
|
delete globalParams;
|
||||||
|
+#endif
|
||||||
|
return QImage();
|
||||||
|
}
|
||||||
|
if (pdfDoc->isOk())
|
||||||
|
@@ -133,11 +139,15 @@ QImage PdfPlug::readThumbnail(const QString& fName)
|
||||||
|
image.setText("YSize", QString("%1").arg(h));
|
||||||
|
delete dev;
|
||||||
|
delete pdfDoc;
|
||||||
|
+#if POPPLER_ENCODED_VERSION < POPPLER_VERSION_ENCODE(0, 83, 0)
|
||||||
|
delete globalParams;
|
||||||
|
+#endif
|
||||||
|
return image;
|
||||||
|
}
|
||||||
|
delete pdfDoc;
|
||||||
|
+#if POPPLER_ENCODED_VERSION < POPPLER_VERSION_ENCODE(0, 83, 0)
|
||||||
|
delete globalParams;
|
||||||
|
+#endif
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return QImage();
|
||||||
|
@@ -343,7 +353,11 @@ bool PdfPlug::convert(const QString& fn)
|
||||||
|
qApp->processEvents();
|
||||||
|
}
|
||||||
|
|
||||||
|
+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 83, 0)
|
||||||
|
+ globalParams.reset(new GlobalParams());
|
||||||
|
+#else
|
||||||
|
globalParams = new GlobalParams();
|
||||||
|
+#endif
|
||||||
|
GooString *userPW = nullptr;
|
||||||
|
if (globalParams)
|
||||||
|
{
|
||||||
|
@@ -385,7 +399,9 @@ bool PdfPlug::convert(const QString& fn)
|
||||||
|
if (progressDialog)
|
||||||
|
progressDialog->close();
|
||||||
|
delete pdfDoc;
|
||||||
|
+#if POPPLER_ENCODED_VERSION < POPPLER_VERSION_ENCODE(0, 83, 0)
|
||||||
|
delete globalParams;
|
||||||
|
+#endif
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
if (progressDialog)
|
||||||
|
@@ -430,7 +446,9 @@ bool PdfPlug::convert(const QString& fn)
|
||||||
|
progressDialog->close();
|
||||||
|
delete optImp;
|
||||||
|
delete pdfDoc;
|
||||||
|
+#if POPPLER_ENCODED_VERSION < POPPLER_VERSION_ENCODE(0, 83, 0)
|
||||||
|
delete globalParams;
|
||||||
|
+#endif
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
pageString = optImp->getPagesString();
|
||||||
|
@@ -843,8 +861,12 @@ bool PdfPlug::convert(const QString& fn)
|
||||||
|
}
|
||||||
|
delete pdfDoc;
|
||||||
|
}
|
||||||
|
+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 83, 0)
|
||||||
|
+ globalParams.release();
|
||||||
|
+#else
|
||||||
|
delete globalParams;
|
||||||
|
globalParams = nullptr;
|
||||||
|
+#endif
|
||||||
|
|
||||||
|
// qDebug() << "converting finished";
|
||||||
|
// qDebug() << "Imported" << Elements.count() << "Elements";
|
||||||
|
diff --git a/scribus/plugins/import/pdf/importpdfconfig.h b/scribus/plugins/import/pdf/importpdfconfig.h
|
||||||
|
index 9913ee382c..5a7e0d2162 100644
|
||||||
|
--- a/scribus/plugins/import/pdf/importpdfconfig.h
|
||||||
|
+++ b/scribus/plugins/import/pdf/importpdfconfig.h
|
||||||
|
@@ -58,4 +58,10 @@ for which a new license (GPL+exception) is in place.
|
||||||
|
#define POPPLER_CONST_082
|
||||||
|
#endif
|
||||||
|
|
||||||
|
+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 83, 0)
|
||||||
|
+#define POPPLER_CONST_083 const
|
||||||
|
+#else
|
||||||
|
+#define POPPLER_CONST_083
|
||||||
|
+#endif
|
||||||
|
+
|
||||||
|
#endif
|
||||||
|
diff --git a/scribus/plugins/import/pdf/slaoutput.cpp b/scribus/plugins/import/pdf/slaoutput.cpp
|
||||||
|
index 5e4d32a551..ffcfa8450b 100644
|
||||||
|
--- a/scribus/plugins/import/pdf/slaoutput.cpp
|
||||||
|
+++ b/scribus/plugins/import/pdf/slaoutput.cpp
|
||||||
|
@@ -3678,7 +3678,7 @@ QString SlaOutputDev::getAnnotationColor(const AnnotColor *color)
|
||||||
|
return fNam;
|
||||||
|
}
|
||||||
|
|
||||||
|
-QString SlaOutputDev::convertPath(GfxPath *path)
|
||||||
|
+QString SlaOutputDev::convertPath(POPPLER_CONST_083 GfxPath *path)
|
||||||
|
{
|
||||||
|
if (! path)
|
||||||
|
return QString();
|
||||||
|
@@ -3688,7 +3688,7 @@ QString SlaOutputDev::convertPath(GfxPath *path)
|
||||||
|
|
||||||
|
for (int i = 0; i < path->getNumSubpaths(); ++i)
|
||||||
|
{
|
||||||
|
- GfxSubpath * subpath = path->getSubpath(i);
|
||||||
|
+ POPPLER_CONST_083 GfxSubpath * subpath = path->getSubpath(i);
|
||||||
|
if (subpath->getNumPoints() > 0)
|
||||||
|
{
|
||||||
|
output += QString("M %1 %2").arg(subpath->getX(0)).arg(subpath->getY(0));
|
||||||
|
diff --git a/scribus/plugins/import/pdf/slaoutput.h b/scribus/plugins/import/pdf/slaoutput.h
|
||||||
|
index 60fb900618..d928fada81 100644
|
||||||
|
--- a/scribus/plugins/import/pdf/slaoutput.h
|
||||||
|
+++ b/scribus/plugins/import/pdf/slaoutput.h
|
||||||
|
@@ -282,7 +282,7 @@ class SlaOutputDev : public OutputDev
|
||||||
|
void getPenState(GfxState *state);
|
||||||
|
QString getColor(GfxColorSpace *color_space, POPPLER_CONST_070 GfxColor *color, int *shade);
|
||||||
|
QString getAnnotationColor(const AnnotColor *color);
|
||||||
|
- QString convertPath(GfxPath *path);
|
||||||
|
+ QString convertPath(POPPLER_CONST_083 GfxPath *path);
|
||||||
|
int getBlendMode(GfxState *state);
|
||||||
|
void applyMask(PageItem *ite);
|
||||||
|
void pushGroup(const QString& maskName = "", GBool forSoftMask = gFalse, GBool alpha = gFalse, bool inverted = false);
|
Binary file not shown.
@ -1,2 +1 @@
|
|||||||
DIST elogviewer-2.7.tar.gz 19936 BLAKE2B 530c3324666089af93712a17f01cc9b6284b2639b4e768a41461da35d615ee1a75870a4138587d85d4eff4925945dee45dbc1af848b7fc500165c8e96d3c7d01 SHA512 81cf20e8e5509d83634d601f0920bd369e1974c843b600b54faa433dc9927a0df6c9820d2b1f35b241bcd86ea891945f16ec2b0d1b65d08c085a3b245c8b038d
|
|
||||||
DIST elogviewer-2.9.tar.gz 24157 BLAKE2B ff527c0198e86f7be15fce3f25f0e9677b6911cef72cfdc1f582c62f534fc15adac8c2cf612475f174561dd46b489dcaf819c8ccd1b5893adeb7a6c085ce11c2 SHA512 e5781eeaf663fafa680b0620c4a6aec63afffd05c1cb4cb5362e9eca3a35c85550ee295a6b753155b0392d69442068cf155c3ead872c457e5a3cdbcd59b1ab2e
|
DIST elogviewer-2.9.tar.gz 24157 BLAKE2B ff527c0198e86f7be15fce3f25f0e9677b6911cef72cfdc1f582c62f534fc15adac8c2cf612475f174561dd46b489dcaf819c8ccd1b5893adeb7a6c085ce11c2 SHA512 e5781eeaf663fafa680b0620c4a6aec63afffd05c1cb4cb5362e9eca3a35c85550ee295a6b753155b0392d69442068cf155c3ead872c457e5a3cdbcd59b1ab2e
|
||||||
|
@ -1,61 +0,0 @@
|
|||||||
# Copyright 1999-2019 Gentoo Authors
|
|
||||||
# Distributed under the terms of the GNU General Public License v2
|
|
||||||
|
|
||||||
EAPI=6
|
|
||||||
|
|
||||||
PYTHON_COMPAT=( python{2_7,3_5} )
|
|
||||||
|
|
||||||
DISABLE_AUTOFORMATTING=true
|
|
||||||
|
|
||||||
inherit python-single-r1 eutils readme.gentoo-r1
|
|
||||||
|
|
||||||
DESCRIPTION="Elog viewer for Gentoo"
|
|
||||||
HOMEPAGE="https://sourceforge.net/projects/elogviewer"
|
|
||||||
SRC_URI="https://github.com/Synss/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
|
|
||||||
|
|
||||||
LICENSE="GPL-2"
|
|
||||||
SLOT="0"
|
|
||||||
KEYWORDS="amd64 ~ppc x86"
|
|
||||||
IUSE=""
|
|
||||||
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
|
|
||||||
|
|
||||||
RDEPEND="${PYTHON_DEPS}
|
|
||||||
dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
|
|
||||||
>=sys-apps/portage-2.1[${PYTHON_USEDEP}]
|
|
||||||
$(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' python2_7)
|
|
||||||
"
|
|
||||||
DEPEND="${RDEPEND}
|
|
||||||
dev-python/setuptools[${PYTHON_USEDEP}]"
|
|
||||||
|
|
||||||
DOC_CONTENTS="In order to use this software, you need to activate
|
|
||||||
Portage's elog features. Required is
|
|
||||||
PORTAGE_ELOG_SYSTEM=\"save\"
|
|
||||||
and at least one of
|
|
||||||
PORTAGE_ELOG_CLASSES=\"warn error info log qa\"
|
|
||||||
More information on the elog system can be found in
|
|
||||||
/usr/share/portage/config/make.conf.example
|
|
||||||
|
|
||||||
To operate properly this software needs the directory
|
|
||||||
${PORT_LOGDIR:-/var/log/portage}/elog created, belonging to group portage.
|
|
||||||
To start the software as a user, add yourself to the portage group."
|
|
||||||
|
|
||||||
src_compile() {
|
|
||||||
rm -f Makefile
|
|
||||||
}
|
|
||||||
|
|
||||||
src_install() {
|
|
||||||
python_newscript elogviewer.py elogviewer
|
|
||||||
|
|
||||||
make_desktop_entry ${PN} ${PN} ${PN} System
|
|
||||||
|
|
||||||
doman elogviewer.1
|
|
||||||
readme.gentoo_create_doc
|
|
||||||
}
|
|
||||||
|
|
||||||
pkg_postinst() {
|
|
||||||
readme.gentoo_print_elog
|
|
||||||
|
|
||||||
ewarn "The elogviewer's configuration file is now saved in:"
|
|
||||||
ewarn "~/.config/elogviewer/ (was ~/.config/Mathias\ Laurin/)."
|
|
||||||
ewarn "Please migrate any user specific settings to the new config file."
|
|
||||||
}
|
|
@ -1,4 +1 @@
|
|||||||
DIST layman-2.0.0.tar.gz 81184 BLAKE2B a1d8481f6dba7392c2c857c887284371c53f0bf64b4f013091b415fdb95c27d5695beaf004585fbc83731abcbdc08f4ecd6591dbfdc5a1caa418f3ab47aa37dc SHA512 30756464d71ab1e047036550b6500d7e57999d808ebe3efba1d1ae6c037f8ca777ba704a4981d75a90285133635027a7bc13f1890f34823de33ae991ed99e2da
|
|
||||||
DIST layman-2.2.0.tar.gz 116210 BLAKE2B 253fc35885e9e0bb804512db50962749a53cd25950102e3e79df48f87e683b6ad24857fcbd7d398a11a152c455a683e22a92dfa2ceaa7b80b6db764d54355514 SHA512 34cac041d7b64274debdbc42cab079fd3bb3aee511ea9e80db726df0f828207d79a5262788483ced5cbf49924e3aa4f19fe21439c98dceea973d8f83473c2e41
|
|
||||||
DIST layman-2.4.1.tar.gz 130388 BLAKE2B 0a03e7f67d3c33528bee0c53a1216862d20dbdb1a48a18331b5d936bb48568072ac4c208807baf667b346bbbc1edb6acc385cc379de1d54d96adb62484c5f085 SHA512 bdb713d4c7d3773129b45a385068278958040759bb564e48cfda4dda9da5224ccaa7833fce3d06151ed1fecddbb6f1a059db6e71534d0e887dff12640af6c806
|
|
||||||
DIST layman-2.4.2.tar.gz 137893 BLAKE2B ad925b974e280c0c933cb7c7d5131946fbb40d15410a671be3d93fa895e2d92a4f3218bce99abc8f2c1e007e72bd51662a18665579bf2ded7f349eb9ed5c652c SHA512 9d32269f51f896c554e6cbf8a674c50009bce48dd83dfe773b08b75bafd567eb75c26c227ab3a60bc83c1ed511862a3979b8d851befe8ad16fd0847eb91337cf
|
DIST layman-2.4.2.tar.gz 137893 BLAKE2B ad925b974e280c0c933cb7c7d5131946fbb40d15410a671be3d93fa895e2d92a4f3218bce99abc8f2c1e007e72bd51662a18665579bf2ded7f349eb9ed5c652c SHA512 9d32269f51f896c554e6cbf8a674c50009bce48dd83dfe773b08b75bafd567eb75c26c227ab3a60bc83c1ed511862a3979b8d851befe8ad16fd0847eb91337cf
|
||||||
|
@ -1,20 +0,0 @@
|
|||||||
diff --git a/layman/db.py b/layman/db.py
|
|
||||||
index e2d740c..55a846a 100644
|
|
||||||
--- a/layman/db.py
|
|
||||||
+++ b/layman/db.py
|
|
||||||
@@ -93,6 +93,7 @@ class DB(DbBase):
|
|
||||||
>>> from layman.config import OptionConfig
|
|
||||||
>>> myoptions = {'installed' :
|
|
||||||
... here + '/tests/testfiles/global-overlays.xml',
|
|
||||||
+ ... 'local_list': here + '/tests/testfiles/overlays.xml',
|
|
||||||
... 'make_conf' : write2,
|
|
||||||
... 'nocheck' : 'yes',
|
|
||||||
... 'storage' : tmpdir}
|
|
||||||
@@ -173,6 +174,7 @@ class DB(DbBase):
|
|
||||||
>>> from layman.config import OptionConfig
|
|
||||||
>>> myoptions = {'installed' :
|
|
||||||
... here + '/tests/testfiles/global-overlays.xml',
|
|
||||||
+ ... 'local_list': here + '/tests/testfiles/overlays.xml',
|
|
||||||
... 'make_conf' : write2,
|
|
||||||
... 'nocheck' : 'yes',
|
|
||||||
... 'storage' : tmpdir}
|
|
@ -1,58 +0,0 @@
|
|||||||
From 580097d4bc0cd3f07b4ce1b8da33e63f03ef0305 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Brian Dolbec <dolsen@gentoo.org>
|
|
||||||
Date: Mon, 6 Jan 2014 22:01:12 -0800
|
|
||||||
Subject: [PATCH] Update svn's check_upgrade() for newer svn versions.
|
|
||||||
|
|
||||||
Thanks you, Arfrever, for your assistance.
|
|
||||||
---
|
|
||||||
layman/overlays/svn.py | 32 ++++++++++++--------------------
|
|
||||||
1 file changed, 12 insertions(+), 20 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/layman/overlays/svn.py b/layman/overlays/svn.py
|
|
||||||
index 4804925..374a516 100644
|
|
||||||
--- a/layman/overlays/svn.py
|
|
||||||
+++ b/layman/overlays/svn.py
|
|
||||||
@@ -131,27 +131,19 @@ class SvnOverlay(OverlaySource):
|
|
||||||
return
|
|
||||||
|
|
||||||
def check_upgrade(self, target):
|
|
||||||
- '''Code to check the installed svn version and
|
|
||||||
- run "svn upgrade" if needed.'''
|
|
||||||
+ '''Code to run "svn upgrade" it only takes longer
|
|
||||||
+ than checking if it does need an upgrade if it is
|
|
||||||
+ actually needed.
|
|
||||||
+ '''
|
|
||||||
file_to_run = _resolve_command(self.command(), self.output.error)[1]
|
|
||||||
- args = file_to_run + ' -q --version'
|
|
||||||
+ args = " ".join([file_to_run, " upgrade", target])
|
|
||||||
- pipe = Popen(args, shell=True, stdout=PIPE)
|
|
||||||
+ pipe = Popen(args, shell=True, stdout=PIPE, stderr=PIPE)
|
|
||||||
if pipe:
|
|
||||||
- self.output.debug("SVN: check_upgrade()... have a valid pipe", 4)
|
|
||||||
- version = pipe.stdout.readline().strip('\n')
|
|
||||||
- self.output.debug("SVN: check_upgrade()... svn version found: %s"
|
|
||||||
- % version, 4)
|
|
||||||
+ self.output.debug("SVN: check_upgrade()... have a valid pipe, "
|
|
||||||
+ "running upgrade", 4)
|
|
||||||
+ upgrade_output = pipe.stdout.readline().strip('\n')
|
|
||||||
+ if upgrade_output:
|
|
||||||
+ self.output.debug(" output: %s" % upgrade_output, 4)
|
|
||||||
+ self.output.debug("SVN: check_upgrade()... svn upgrade done", 4)
|
|
||||||
pipe.terminate()
|
|
||||||
- if version >= '1.7.0':
|
|
||||||
- self.output.debug("SVN: check_upgrade()... svn upgrade maybe",
|
|
||||||
- 4)
|
|
||||||
- _path = path([target,'.svn/wc.db'])
|
|
||||||
- if not os.path.exists(_path):
|
|
||||||
- self.output.info("An svn upgrade needs to be run...",
|
|
||||||
- 2)
|
|
||||||
- args = ["upgrade"]
|
|
||||||
- return self.run_command(self.command(), args,
|
|
||||||
- cwd=target, cmd="svn upgrade")
|
|
||||||
- return
|
|
||||||
- else:
|
|
||||||
- return
|
|
||||||
+ return
|
|
||||||
--
|
|
||||||
1.8.3.2
|
|
||||||
|
|
@ -1,28 +0,0 @@
|
|||||||
From: Devan Franchini <twitch153@gentoo.org>
|
|
||||||
Date: Sun, 7 Dec 2014 23:12:36 -0500
|
|
||||||
Subject: [PATCH] Adds kwargs-debug and modifies kwargs-info level to 5
|
|
||||||
|
|
||||||
--- a/layman/overlays/archive.py
|
|
||||||
+++ b/layman/overlays/archive.py
|
|
||||||
@@ -50,7 +50,8 @@ class ArchiveOverlay(OverlaySource):
|
|
||||||
connector_output = {
|
|
||||||
'info': self.output.debug,
|
|
||||||
'error': self.output.error,
|
|
||||||
- 'kwargs-info': {'level': 2},
|
|
||||||
+ 'kwargs-info': {'level': 5},
|
|
||||||
+ 'kwargs-debug': {'level': 2},
|
|
||||||
'kwargs-error': {'level': None},
|
|
||||||
}
|
|
||||||
|
|
||||||
--- a/layman/remotedb.py
|
|
||||||
+++ b/layman/remotedb.py
|
|
||||||
@@ -120,6 +120,6 @@ class RemoteDB(DbBase):
|
|
||||||
'info': self.output.info,
|
|
||||||
'debug': self.output.debug,
|
|
||||||
'error': self.output.error,
|
|
||||||
- 'kwargs-info': {'level': 2},
|
|
||||||
+ 'kwargs-info': {'level': 5},
|
|
||||||
'kwargs-debug': {'level': 2},
|
|
||||||
'kwargs-error':{'level': None},
|
|
||||||
}
|
|
||||||
|
|
@ -1,38 +0,0 @@
|
|||||||
From 81f1545f1371931d560492e8b323096d4befc775 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Brian Dolbec <dolsen@gentoo.org>
|
|
||||||
Date: Fri, 17 Oct 2014 19:40:38 -0700
|
|
||||||
Subject: [PATCH] remotedb.py: Change for upstream ssl-fetch change
|
|
||||||
|
|
||||||
---
|
|
||||||
layman/remotedb.py | 6 ++++--
|
|
||||||
1 file changed, 4 insertions(+), 2 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/layman/remotedb.py b/layman/remotedb.py
|
|
||||||
index f0f7ea9..b866bd7 100644
|
|
||||||
--- a/layman/remotedb.py
|
|
||||||
+++ b/layman/remotedb.py
|
|
||||||
@@ -57,7 +57,7 @@ class RemoteDB(DbBase):
|
|
||||||
self.detached_urls = []
|
|
||||||
self.signed_urls = []
|
|
||||||
self.proxies = config.proxies
|
|
||||||
-
|
|
||||||
+
|
|
||||||
self.urls = [i.strip()
|
|
||||||
for i in config['overlays'].split('\n') if len(i)]
|
|
||||||
|
|
||||||
@@ -116,9 +116,11 @@ class RemoteDB(DbBase):
|
|
||||||
need_gpg = [False, True, True]
|
|
||||||
# setup the ssl-fetch output map
|
|
||||||
connector_output = {
|
|
||||||
- 'info': self.output.debug,
|
|
||||||
+ 'info': self.output.info,
|
|
||||||
+ 'debug': self.output.debug,
|
|
||||||
'error': self.output.error,
|
|
||||||
'kwargs-info': {'level': 2},
|
|
||||||
+ 'kwargs-debug': {'level': 2},
|
|
||||||
'kwargs-error':{'level': None},
|
|
||||||
}
|
|
||||||
fetcher = Connector(connector_output, self.proxies, USERAGENT)
|
|
||||||
--
|
|
||||||
2.0.5
|
|
||||||
|
|
@ -1,208 +0,0 @@
|
|||||||
From: Devan Franchini <twitch153@gentoo.org>
|
|
||||||
Date: Fri, 18 Oct 2014 15:21:24 -0400
|
|
||||||
Subject: [PATCH] Removes doctest remnants
|
|
||||||
|
|
||||||
--- a/layman/api.py 2014-10-18 14:27:13.233842116 -0400
|
|
||||||
+++ b/layman/api.py 2014-10-18 14:29:51.184849673 -0400
|
|
||||||
@@ -714,15 +714,3 @@
|
|
||||||
write = os.fdopen(fd_w, 'w')
|
|
||||||
read = os.fdopen(fd_r, 'r')
|
|
||||||
return (read, write, fd_r, fd_w)
|
|
||||||
-
|
|
||||||
-
|
|
||||||
-if __name__ == '__main__':
|
|
||||||
- import doctest, sys
|
|
||||||
-
|
|
||||||
- # Ignore warnings here. We are just testing
|
|
||||||
- from warnings import filterwarnings, resetwarnings
|
|
||||||
- filterwarnings('ignore')
|
|
||||||
-
|
|
||||||
- doctest.testmod(sys.modules[__name__])
|
|
||||||
-
|
|
||||||
- resetwarnings()
|
|
||||||
--- a/layman/argsparser.py 2014-10-18 14:27:13.233842116 -0400
|
|
||||||
+++ b/layman/argsparser.py 2014-10-18 14:30:35.256851781 -0400
|
|
||||||
@@ -404,14 +404,3 @@
|
|
||||||
self.output.debug('ARGSPARSER: Returning keys', 9)
|
|
||||||
|
|
||||||
return keys
|
|
||||||
-
|
|
||||||
-
|
|
||||||
-#===============================================================================
|
|
||||||
-#
|
|
||||||
-# Testing
|
|
||||||
-#
|
|
||||||
-#-------------------------------------------------------------------------------
|
|
||||||
-
|
|
||||||
-if __name__ == '__main__':
|
|
||||||
- import doctest
|
|
||||||
- doctest.testmod(sys.modules[__name__])
|
|
||||||
--- a/layman/cli.py 2014-10-18 14:27:13.233842116 -0400
|
|
||||||
+++ b/layman/cli.py 2014-10-18 14:32:11.456856384 -0400
|
|
||||||
@@ -397,15 +397,3 @@
|
|
||||||
# blank newline -- no " *"
|
|
||||||
self.output.notice('')
|
|
||||||
return info != {}
|
|
||||||
-
|
|
||||||
-
|
|
||||||
-if __name__ == '__main__':
|
|
||||||
- import doctest
|
|
||||||
-
|
|
||||||
- # Ignore warnings here. We are just testing
|
|
||||||
- from warnings import filterwarnings, resetwarnings
|
|
||||||
- filterwarnings('ignore')
|
|
||||||
-
|
|
||||||
- doctest.testmod(sys.modules[__name__])
|
|
||||||
-
|
|
||||||
- resetwarnings()
|
|
||||||
--- a/layman/config.py 2014-10-18 14:27:13.233842116 -0400
|
|
||||||
+++ b/layman/config.py 2014-10-18 14:31:02.528853086 -0400
|
|
||||||
@@ -348,13 +348,3 @@
|
|
||||||
if new_defaults is not None:
|
|
||||||
self._defaults.update(new_defaults)
|
|
||||||
return
|
|
||||||
-
|
|
||||||
-#===============================================================================
|
|
||||||
-#
|
|
||||||
-# Testing
|
|
||||||
-#
|
|
||||||
-#-------------------------------------------------------------------------------
|
|
||||||
-
|
|
||||||
-if __name__ == '__main__':
|
|
||||||
- import doctest
|
|
||||||
- doctest.testmod(sys.modules[__name__])
|
|
||||||
--- a/layman/db.py 2014-10-18 14:27:13.234842116 -0400
|
|
||||||
+++ b/layman/db.py 2014-10-18 14:32:32.160857374 -0400
|
|
||||||
@@ -315,21 +315,3 @@
|
|
||||||
raise Exception('Syncing overlay "' + overlay_name +
|
|
||||||
'" returned status ' + str(result) + '!' +
|
|
||||||
'\ndb.sync()')
|
|
||||||
-
|
|
||||||
-
|
|
||||||
-#===============================================================================
|
|
||||||
-#
|
|
||||||
-# Testing
|
|
||||||
-#
|
|
||||||
-#-------------------------------------------------------------------------------
|
|
||||||
-
|
|
||||||
-if __name__ == '__main__':
|
|
||||||
- import doctest, sys
|
|
||||||
-
|
|
||||||
- # Ignore warnings here. We are just testing
|
|
||||||
- from warnings import filterwarnings, resetwarnings
|
|
||||||
- filterwarnings('ignore')
|
|
||||||
-
|
|
||||||
- doctest.testmod(sys.modules[__name__])
|
|
||||||
-
|
|
||||||
- resetwarnings()
|
|
||||||
--- a/layman/dbbase.py 2014-10-18 14:27:13.234842116 -0400
|
|
||||||
+++ b/layman/dbbase.py 2014-10-18 14:31:14.648853666 -0400
|
|
||||||
@@ -252,21 +252,3 @@
|
|
||||||
"""returns a list of the overlay names
|
|
||||||
"""
|
|
||||||
return sorted(self.overlays)
|
|
||||||
-
|
|
||||||
-
|
|
||||||
-#===============================================================================
|
|
||||||
-#
|
|
||||||
-# Testing
|
|
||||||
-#
|
|
||||||
-#-------------------------------------------------------------------------------
|
|
||||||
-
|
|
||||||
-if __name__ == '__main__':
|
|
||||||
- import doctest
|
|
||||||
-
|
|
||||||
- # Ignore warnings here. We are just testing
|
|
||||||
- from warnings import filterwarnings, resetwarnings
|
|
||||||
- filterwarnings('ignore')
|
|
||||||
-
|
|
||||||
- doctest.testmod(sys.modules[__name__])
|
|
||||||
-
|
|
||||||
- resetwarnings()
|
|
||||||
--- a/layman/overlays/archive.py 2014-10-18 14:27:13.253842116 -0400
|
|
||||||
+++ b/layman/overlays/archive.py 2014-10-18 14:31:54.640855579 -0400
|
|
||||||
@@ -188,15 +188,3 @@
|
|
||||||
'''
|
|
||||||
|
|
||||||
return self.is_supported()
|
|
||||||
-
|
|
||||||
-
|
|
||||||
-if __name__ == '__main__':
|
|
||||||
- import doctest
|
|
||||||
-
|
|
||||||
- # Ignore warnings here. We are just testing.
|
|
||||||
- from warnings import filterwarnings, resetwarnings
|
|
||||||
- filterwarnings('ignore')
|
|
||||||
-
|
|
||||||
- doctest.testmod(sys.modules[__name__])
|
|
||||||
-
|
|
||||||
- resetwarnings()
|
|
||||||
--- a/layman/overlays/modules/tar/tar.py 2014-10-18 14:27:13.245842116 -0400
|
|
||||||
+++ b/layman/overlays/modules/tar/tar.py 2014-10-18 15:10:13.303965557 -0400
|
|
||||||
@@ -94,14 +94,3 @@
|
|
||||||
return require_supported(
|
|
||||||
[(self.command(), 'tar', 'app-arch/tar'), ],
|
|
||||||
self.output.warn)
|
|
||||||
-
|
|
||||||
-if __name__ == '__main__':
|
|
||||||
- import doctest
|
|
||||||
-
|
|
||||||
- # Ignore warnings here. We are just testing
|
|
||||||
- from warnings import filterwarnings, resetwarnings
|
|
||||||
- filterwarnings('ignore')
|
|
||||||
-
|
|
||||||
- doctest.testmod(sys.modules[__name__])
|
|
||||||
-
|
|
||||||
- resetwarnings()
|
|
||||||
--- a/layman/overlays/overlay.py 2014-10-18 14:27:13.253842116 -0400
|
|
||||||
+++ b/layman/overlays/overlay.py 2014-10-18 14:31:38.624854813 -0400
|
|
||||||
@@ -546,14 +546,3 @@
|
|
||||||
def source_types(self):
|
|
||||||
for i in self.sources:
|
|
||||||
yield i.type
|
|
||||||
-
|
|
||||||
-
|
|
||||||
-#==============================================================================
|
|
||||||
-#
|
|
||||||
-# Testing
|
|
||||||
-#
|
|
||||||
-#------------------------------------------------------------------------------
|
|
||||||
-
|
|
||||||
-if __name__ == '__main__':
|
|
||||||
- import doctest
|
|
||||||
- doctest.testmod(sys.modules[__name__])
|
|
||||||
--- a/layman/remotedb.py 2014-10-18 14:27:13.253842116 -0400
|
|
||||||
+++ b/layman/remotedb.py 2014-10-18 14:29:31.064848710 -0400
|
|
||||||
@@ -384,14 +384,3 @@
|
|
||||||
self.signed_urls = [i.strip()
|
|
||||||
for i in self.config['gpg_signed_lists'].split('\n') if len(i)]
|
|
||||||
'''
|
|
||||||
-
|
|
||||||
-if __name__ == '__main__':
|
|
||||||
- import doctest
|
|
||||||
-
|
|
||||||
- # Ignore warnings here. We are just testing
|
|
||||||
- from warnings import filterwarnings, resetwarnings
|
|
||||||
- filterwarnings('ignore')
|
|
||||||
-
|
|
||||||
- doctest.testmod(sys.modules[__name__])
|
|
||||||
-
|
|
||||||
- resetwarnings()
|
|
||||||
--- a/layman/utils.py 2014-10-18 14:27:13.254842117 -0400
|
|
||||||
+++ b/layman/utils.py 2014-10-18 14:30:24.088851247 -0400
|
|
||||||
@@ -347,14 +347,3 @@
|
|
||||||
for key in kwargs:
|
|
||||||
result[key] = kwargs[key]
|
|
||||||
return result
|
|
||||||
-
|
|
||||||
-
|
|
||||||
-#===============================================================================
|
|
||||||
-#
|
|
||||||
-# Testing
|
|
||||||
-#
|
|
||||||
-#-------------------------------------------------------------------------------
|
|
||||||
-
|
|
||||||
-if __name__ == '__main__':
|
|
||||||
- import doctest
|
|
||||||
- doctest.testmod(sys.modules[__name__])
|
|
||||||
|
|
@ -1,42 +0,0 @@
|
|||||||
From 90fe6724d0a8d1ebfe6443dee118432e20432b8b Mon Sep 17 00:00:00 2001
|
|
||||||
From: Brian Dolbec <dolsen@gentoo.org>
|
|
||||||
Date: Tue, 10 May 2016 15:12:02 -0700
|
|
||||||
Subject: [PATCH] layman/module.py: Fix commit 63808ef00f94 mis-applied
|
|
||||||
'sourcefile' attribute changes
|
|
||||||
|
|
||||||
It was not looking for the 'sourcefile' attribute first, then falling back to the kidname for
|
|
||||||
backward compatibility.
|
|
||||||
It was incorrectly looking for an ImportError, instead of a 'sourcefile' KeyError.
|
|
||||||
The filepath of the affected file for the error message had an extra leading '_'.
|
|
||||||
Add the module name to the warning message.
|
|
||||||
---
|
|
||||||
layman/module.py | 11 ++++++-----
|
|
||||||
1 file changed, 6 insertions(+), 5 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/layman/module.py b/layman/module.py
|
|
||||||
index 08bcbc2..092418f 100644
|
|
||||||
--- a/layman/module.py
|
|
||||||
+++ b/layman/module.py
|
|
||||||
@@ -49,13 +49,14 @@ class Module(object):
|
|
||||||
kid = self.module_spec['provides'][submodule]
|
|
||||||
kidname = kid['name']
|
|
||||||
try:
|
|
||||||
+ kid['module_name'] = '.'.join([mod_name, kid['sourcefile']])
|
|
||||||
+ except KeyError:
|
|
||||||
kid['module_name'] = '.'.join([mod_name, kidname])
|
|
||||||
- except ImportError:
|
|
||||||
- kid['module_name'] = '.'.join([mod_name, self.name])
|
|
||||||
- f = self.__module.__file__
|
|
||||||
- msg = 'Module.__initialize(); module spec is old, missing '\
|
|
||||||
+ f = self._module.__file__
|
|
||||||
+ msg = 'Module.__initialize(); %(module)s module spec is old, missing '\
|
|
||||||
'attribute: \'sourcefile\'.\nBackward compatibility '\
|
|
||||||
- 'may be removed in the future.\nFile: %(f)s' % {'f': f}
|
|
||||||
+ 'may be removed in the future.\nFile: %(f)s' % {
|
|
||||||
+ 'module': self.name, 'f': f}
|
|
||||||
self.output.warn(msg)
|
|
||||||
kid['is_imported'] = False
|
|
||||||
self.kids[kidname] = kid
|
|
||||||
--
|
|
||||||
2.8.3
|
|
||||||
|
|
@ -1,69 +0,0 @@
|
|||||||
# Copyright 1999-2019 Gentoo Authors
|
|
||||||
# Distributed under the terms of the GNU General Public License v2
|
|
||||||
|
|
||||||
EAPI="5"
|
|
||||||
|
|
||||||
PYTHON_COMPAT=( python2_7 )
|
|
||||||
PYTHON_REQ_USE="xml(+)"
|
|
||||||
|
|
||||||
inherit eutils distutils-r1 prefix
|
|
||||||
|
|
||||||
DESCRIPTION="Tool to manage Gentoo overlays"
|
|
||||||
HOMEPAGE="http://layman.sourceforge.net/"
|
|
||||||
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
|
|
||||||
|
|
||||||
LICENSE="GPL-2"
|
|
||||||
SLOT="0"
|
|
||||||
KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
|
|
||||||
IUSE="bazaar cvs darcs +git mercurial subversion test"
|
|
||||||
RESTRICT="!test? ( test )"
|
|
||||||
|
|
||||||
DEPEND="test? ( dev-vcs/subversion )"
|
|
||||||
|
|
||||||
RDEPEND="
|
|
||||||
bazaar? ( dev-vcs/bzr )
|
|
||||||
cvs? ( dev-vcs/cvs )
|
|
||||||
darcs? ( dev-vcs/darcs )
|
|
||||||
git? ( dev-vcs/git )
|
|
||||||
mercurial? ( dev-vcs/mercurial )
|
|
||||||
subversion? (
|
|
||||||
|| (
|
|
||||||
>=dev-vcs/subversion-1.5.4[http]
|
|
||||||
>=dev-vcs/subversion-1.5.4[webdav-neon]
|
|
||||||
>=dev-vcs/subversion-1.5.4[webdav-serf]
|
|
||||||
)
|
|
||||||
)
|
|
||||||
"
|
|
||||||
|
|
||||||
python_prepare_all() {
|
|
||||||
local PATCHES=( "${FILESDIR}"/layman-2.0.0.doctest.patch )
|
|
||||||
distutils-r1_python_prepare_all
|
|
||||||
eprefixify etc/layman.cfg layman/config.py
|
|
||||||
}
|
|
||||||
|
|
||||||
python_test() {
|
|
||||||
for suite in layman/tests/{dtest,external}.py ; do
|
|
||||||
PYTHONPATH="." "${PYTHON}" ${suite} \
|
|
||||||
|| die "test suite '${suite}' failed"
|
|
||||||
done
|
|
||||||
}
|
|
||||||
|
|
||||||
python_install_all() {
|
|
||||||
distutils-r1_python_install_all
|
|
||||||
|
|
||||||
insinto /etc/layman
|
|
||||||
doins etc/layman.cfg
|
|
||||||
|
|
||||||
doman doc/layman.8
|
|
||||||
dohtml doc/layman.8.html
|
|
||||||
|
|
||||||
keepdir /var/lib/layman
|
|
||||||
keepdir /etc/layman/overlays
|
|
||||||
}
|
|
||||||
|
|
||||||
pkg_postinst() {
|
|
||||||
# now run layman's update utility
|
|
||||||
einfo "Running layman-updater..."
|
|
||||||
"${EROOT}"/usr/bin/layman-updater
|
|
||||||
einfo
|
|
||||||
}
|
|
@ -1,70 +0,0 @@
|
|||||||
# Copyright 1999-2019 Gentoo Authors
|
|
||||||
# Distributed under the terms of the GNU General Public License v2
|
|
||||||
|
|
||||||
EAPI="5"
|
|
||||||
|
|
||||||
PYTHON_COMPAT=( python2_7 pypy )
|
|
||||||
PYTHON_REQ_USE="xml(+)"
|
|
||||||
|
|
||||||
inherit eutils distutils-r1 prefix
|
|
||||||
|
|
||||||
DESCRIPTION="Tool to manage Gentoo overlays"
|
|
||||||
HOMEPAGE="http://layman.sourceforge.net/"
|
|
||||||
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
|
|
||||||
|
|
||||||
LICENSE="GPL-2"
|
|
||||||
SLOT="0"
|
|
||||||
KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
|
|
||||||
IUSE="bazaar cvs darcs +git mercurial subversion test"
|
|
||||||
RESTRICT="!test? ( test )"
|
|
||||||
|
|
||||||
DEPEND="test? ( dev-vcs/subversion )"
|
|
||||||
|
|
||||||
RDEPEND="
|
|
||||||
bazaar? ( dev-vcs/bzr )
|
|
||||||
cvs? ( dev-vcs/cvs )
|
|
||||||
darcs? ( dev-vcs/darcs )
|
|
||||||
git? ( dev-vcs/git )
|
|
||||||
mercurial? ( dev-vcs/mercurial )
|
|
||||||
subversion? (
|
|
||||||
|| (
|
|
||||||
>=dev-vcs/subversion-1.5.4[http]
|
|
||||||
>=dev-vcs/subversion-1.5.4[webdav-neon]
|
|
||||||
>=dev-vcs/subversion-1.5.4[webdav-serf]
|
|
||||||
)
|
|
||||||
)
|
|
||||||
sys-apps/portage[${PYTHON_USEDEP}]
|
|
||||||
"
|
|
||||||
|
|
||||||
python_prepare_all() {
|
|
||||||
local PATCHES=( "${FILESDIR}"/layman-2.0.0.*.patch )
|
|
||||||
distutils-r1_python_prepare_all
|
|
||||||
eprefixify etc/layman.cfg layman/config.py
|
|
||||||
}
|
|
||||||
|
|
||||||
python_test() {
|
|
||||||
for suite in layman/tests/{dtest,external}.py ; do
|
|
||||||
PYTHONPATH="." "${PYTHON}" ${suite} \
|
|
||||||
|| die "test suite '${suite}' failed"
|
|
||||||
done
|
|
||||||
}
|
|
||||||
|
|
||||||
python_install_all() {
|
|
||||||
distutils-r1_python_install_all
|
|
||||||
|
|
||||||
insinto /etc/layman
|
|
||||||
doins etc/layman.cfg
|
|
||||||
|
|
||||||
doman doc/layman.8
|
|
||||||
dohtml doc/layman.8.html
|
|
||||||
|
|
||||||
keepdir /var/lib/layman
|
|
||||||
keepdir /etc/layman/overlays
|
|
||||||
}
|
|
||||||
|
|
||||||
pkg_postinst() {
|
|
||||||
# now run layman's update utility
|
|
||||||
einfo "Running layman-updater..."
|
|
||||||
"${EROOT}"/usr/bin/layman-updater
|
|
||||||
einfo
|
|
||||||
}
|
|
@ -1,89 +0,0 @@
|
|||||||
# Copyright 1999-2019 Gentoo Authors
|
|
||||||
# Distributed under the terms of the GNU General Public License v2
|
|
||||||
|
|
||||||
EAPI="5"
|
|
||||||
|
|
||||||
PYTHON_COMPAT=( python2_7 pypy )
|
|
||||||
PYTHON_REQ_USE="xml(+)"
|
|
||||||
|
|
||||||
inherit eutils distutils-r1 linux-info prefix
|
|
||||||
|
|
||||||
DESCRIPTION="Tool to manage Gentoo overlays"
|
|
||||||
HOMEPAGE="http://layman.sourceforge.net"
|
|
||||||
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
|
|
||||||
|
|
||||||
LICENSE="GPL-2"
|
|
||||||
SLOT="0"
|
|
||||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
|
|
||||||
IUSE="bazaar cvs darcs +git g-sorcery mercurial squashfs subversion test"
|
|
||||||
RESTRICT="!test? ( test )"
|
|
||||||
|
|
||||||
DEPEND="test? ( dev-vcs/subversion )"
|
|
||||||
|
|
||||||
RDEPEND="
|
|
||||||
bazaar? ( dev-vcs/bzr )
|
|
||||||
cvs? ( dev-vcs/cvs )
|
|
||||||
darcs? ( dev-vcs/darcs )
|
|
||||||
git? ( dev-vcs/git )
|
|
||||||
mercurial? ( dev-vcs/mercurial )
|
|
||||||
g-sorcery? ( app-portage/g-sorcery )
|
|
||||||
subversion? (
|
|
||||||
|| (
|
|
||||||
>=dev-vcs/subversion-1.5.4[http]
|
|
||||||
>=dev-vcs/subversion-1.5.4[webdav-neon]
|
|
||||||
>=dev-vcs/subversion-1.5.4[webdav-serf]
|
|
||||||
)
|
|
||||||
)
|
|
||||||
sys-apps/portage[${PYTHON_USEDEP}]
|
|
||||||
>=dev-python/ssl-fetch-0.2[${PYTHON_USEDEP}]
|
|
||||||
"
|
|
||||||
|
|
||||||
layman_check_kernel_config() {
|
|
||||||
local CONFIG_CHECK
|
|
||||||
use squashfs && CONFIG_CHECK+=" ~BLK_DEV_LOOP ~SQUASHFS"
|
|
||||||
[[ -n ${CONFIG_CHECK} ]] && check_extra_config
|
|
||||||
}
|
|
||||||
|
|
||||||
pkg_pretend() {
|
|
||||||
layman_check_kernel_config
|
|
||||||
}
|
|
||||||
|
|
||||||
pkg_setup() {
|
|
||||||
layman_check_kernel_config
|
|
||||||
}
|
|
||||||
|
|
||||||
python_prepare_all() {
|
|
||||||
distutils-r1_python_prepare_all
|
|
||||||
epatch "${FILESDIR}"/${P}-removes-doctest-remnants.patch
|
|
||||||
epatch "${FILESDIR}"/${P}-change-for-upstream-ssl-fetch.patch
|
|
||||||
epatch "${FILESDIR}"/${P}-adds-kwargs-debug.patch
|
|
||||||
rm "${S}"/"${PN}"/tests/dtest.py
|
|
||||||
eprefixify etc/layman.cfg layman/config.py
|
|
||||||
}
|
|
||||||
|
|
||||||
python_test() {
|
|
||||||
for suite in layman/tests/external.py ; do
|
|
||||||
PYTHONPATH="." "${PYTHON}" ${suite} \
|
|
||||||
|| die "test suite '${suite}' failed"
|
|
||||||
done
|
|
||||||
}
|
|
||||||
|
|
||||||
python_install_all() {
|
|
||||||
distutils-r1_python_install_all
|
|
||||||
|
|
||||||
insinto /etc/layman
|
|
||||||
doins etc/layman.cfg
|
|
||||||
|
|
||||||
doman doc/layman.8
|
|
||||||
dohtml doc/layman.8.html
|
|
||||||
|
|
||||||
keepdir /var/lib/layman
|
|
||||||
keepdir /etc/layman/overlays
|
|
||||||
}
|
|
||||||
|
|
||||||
pkg_postinst() {
|
|
||||||
# now run layman's update utility
|
|
||||||
einfo "Running layman-updater..."
|
|
||||||
"${EROOT}"/usr/bin/layman-updater
|
|
||||||
einfo
|
|
||||||
}
|
|
@ -1,93 +0,0 @@
|
|||||||
# Copyright 1999-2019 Gentoo Authors
|
|
||||||
# Distributed under the terms of the GNU General Public License v2
|
|
||||||
|
|
||||||
EAPI="5"
|
|
||||||
|
|
||||||
PYTHON_COMPAT=( python{2_7,3_5} pypy )
|
|
||||||
PYTHON_REQ_USE="xml(+),sqlite?"
|
|
||||||
|
|
||||||
inherit eutils distutils-r1 linux-info prefix
|
|
||||||
|
|
||||||
DESCRIPTION="Tool to manage Gentoo overlays"
|
|
||||||
HOMEPAGE="https://wiki.gentoo.org/wiki/Layman"
|
|
||||||
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
|
|
||||||
|
|
||||||
LICENSE="GPL-2"
|
|
||||||
SLOT="0"
|
|
||||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~x86"
|
|
||||||
IUSE="bazaar cvs darcs +git gpg g-sorcery mercurial sqlite squashfs subversion sync-plugin-portage test"
|
|
||||||
RESTRICT="!test? ( test )"
|
|
||||||
|
|
||||||
DEPEND="test? ( dev-vcs/subversion )
|
|
||||||
"
|
|
||||||
|
|
||||||
RDEPEND="
|
|
||||||
bazaar? ( dev-vcs/bzr )
|
|
||||||
cvs? ( dev-vcs/cvs )
|
|
||||||
darcs? ( dev-vcs/darcs )
|
|
||||||
git? ( dev-vcs/git )
|
|
||||||
mercurial? ( dev-vcs/mercurial )
|
|
||||||
g-sorcery? ( app-portage/g-sorcery )
|
|
||||||
subversion? (
|
|
||||||
|| (
|
|
||||||
>=dev-vcs/subversion-1.5.4[http]
|
|
||||||
>=dev-vcs/subversion-1.5.4[webdav-neon]
|
|
||||||
>=dev-vcs/subversion-1.5.4[webdav-serf]
|
|
||||||
)
|
|
||||||
)
|
|
||||||
gpg? ( >=dev-python/pyGPG-0.2 )
|
|
||||||
sync-plugin-portage? ( >=sys-apps/portage-2.2.16[${PYTHON_USEDEP}] )
|
|
||||||
!sync-plugin-portage? ( sys-apps/portage[${PYTHON_USEDEP}] )
|
|
||||||
>=dev-python/ssl-fetch-0.4[${PYTHON_USEDEP}]
|
|
||||||
"
|
|
||||||
|
|
||||||
PATCHES=(
|
|
||||||
"${FILESDIR}/layman-2.4.1-sourcefileattributechanges.patch"
|
|
||||||
)
|
|
||||||
|
|
||||||
layman_check_kernel_config() {
|
|
||||||
local CONFIG_CHECK
|
|
||||||
use squashfs && CONFIG_CHECK+=" ~BLK_DEV_LOOP ~SQUASHFS"
|
|
||||||
[[ -n ${CONFIG_CHECK} ]] && check_extra_config
|
|
||||||
}
|
|
||||||
|
|
||||||
pkg_pretend() {
|
|
||||||
layman_check_kernel_config
|
|
||||||
}
|
|
||||||
|
|
||||||
pkg_setup() {
|
|
||||||
layman_check_kernel_config
|
|
||||||
}
|
|
||||||
|
|
||||||
python_prepare_all() {
|
|
||||||
python_setup
|
|
||||||
esetup.py setup_plugins
|
|
||||||
distutils-r1_python_prepare_all
|
|
||||||
eprefixify etc/layman.cfg layman/config.py
|
|
||||||
}
|
|
||||||
|
|
||||||
python_test() {
|
|
||||||
suite=layman/tests/external.py
|
|
||||||
PYTHONPATH="." "${PYTHON}" ${suite} || die "test suite '${suite}' failed"
|
|
||||||
unset suite
|
|
||||||
}
|
|
||||||
|
|
||||||
python_install_all() {
|
|
||||||
distutils-r1_python_install_all
|
|
||||||
|
|
||||||
insinto /etc/layman
|
|
||||||
doins etc/layman.cfg
|
|
||||||
|
|
||||||
doman doc/layman.8
|
|
||||||
dohtml doc/layman.8.html
|
|
||||||
|
|
||||||
keepdir /var/lib/layman
|
|
||||||
keepdir /etc/layman/overlays
|
|
||||||
}
|
|
||||||
|
|
||||||
pkg_postinst() {
|
|
||||||
# now run layman's update utility
|
|
||||||
einfo "Running layman-updater..."
|
|
||||||
"${EROOT}"/usr/bin/layman-updater
|
|
||||||
einfo
|
|
||||||
}
|
|
@ -1,96 +0,0 @@
|
|||||||
qdepends: restore regex matching capabilities for reverse dependencies
|
|
||||||
|
|
||||||
The use of atom matching unintendedly removed the ability to use
|
|
||||||
regexes, which broke app-admin/gentoo-perl-helpers. This patch removes
|
|
||||||
the atom matching, and reverts to using regex matching always to restore
|
|
||||||
behaviour.
|
|
||||||
|
|
||||||
Bug: https://bugs.gentoo.org/683430
|
|
||||||
|
|
||||||
--- a/qdepends.c
|
|
||||||
+++ b/qdepends.c
|
|
||||||
@@ -483,11 +483,9 @@
|
|
||||||
int ret;
|
|
||||||
regex_t preg;
|
|
||||||
regmatch_t match;
|
|
||||||
- depend_atom *aq;
|
|
||||||
depend_atom *as;
|
|
||||||
depend_atom *ac;
|
|
||||||
char firstmatch = 0;
|
|
||||||
- char *sslot;
|
|
||||||
|
|
||||||
if (!q_vdb_pkg_eat(pkg_ctx, state->depend_file, &depend, &depend_len))
|
|
||||||
return 0;
|
|
||||||
@@ -526,34 +524,17 @@
|
|
||||||
return 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
- aq = atom_explode(state->query);
|
|
||||||
- if (!aq) {
|
|
||||||
- /* "fall" back to old behaviour of just performing an extended
|
|
||||||
- * regular expression match */
|
|
||||||
- if (wregcomp(&preg, state->query, REG_EXTENDED) != 0) {
|
|
||||||
- dep_burn_tree(dep_tree);
|
|
||||||
- return 1;
|
|
||||||
- }
|
|
||||||
+ /* fallback for old behaviour of just performing an extended
|
|
||||||
+ * regular expression match */
|
|
||||||
+ if (wregcomp(&preg, state->query, REG_EXTENDED) != 0) {
|
|
||||||
+ dep_burn_tree(dep_tree);
|
|
||||||
+ return 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
match.rm_eo = 0;
|
|
||||||
firstmatch = 1;
|
|
||||||
do { /* find all matches */
|
|
||||||
- if (!aq) {
|
|
||||||
- ret = regexec(&preg, ptr + match.rm_eo, 1, &match, 0);
|
|
||||||
- } else {
|
|
||||||
- char *loc;
|
|
||||||
- ret = -1;
|
|
||||||
- snprintf(qbuf, sizeof(qbuf), "%s%s%s",
|
|
||||||
- aq->CATEGORY ? aq->CATEGORY : "",
|
|
||||||
- aq->CATEGORY ? "/" : "",
|
|
||||||
- aq->PN);
|
|
||||||
- if ((loc = strstr(ptr + match.rm_eo, qbuf)) != NULL) {
|
|
||||||
- ret = 0;
|
|
||||||
- match.rm_so = loc - ptr;
|
|
||||||
- match.rm_eo = match.rm_so + strlen(qbuf);
|
|
||||||
- }
|
|
||||||
- }
|
|
||||||
+ ret = regexec(&preg, ptr + match.rm_eo, 1, &match, 0);
|
|
||||||
if (ret != 0)
|
|
||||||
break;
|
|
||||||
|
|
||||||
@@ -571,18 +552,6 @@
|
|
||||||
ptr + match.rm_so);
|
|
||||||
ac = atom_explode(qbuf);
|
|
||||||
|
|
||||||
- /* drop SLOT when not present in aq so we can match atoms
|
|
||||||
- * regardless */
|
|
||||||
- sslot = ac->SLOT;
|
|
||||||
- if (aq->SLOT == NULL && ac->SLOT != NULL)
|
|
||||||
- ac->SLOT = NULL;
|
|
||||||
- ret = atom_compare(ac, aq);
|
|
||||||
- ac->SLOT = sslot;
|
|
||||||
- if (ret != EQUAL) {
|
|
||||||
- atom_implode(ac);
|
|
||||||
- break;
|
|
||||||
- }
|
|
||||||
-
|
|
||||||
if (firstmatch == 1) {
|
|
||||||
firstmatch = 0;
|
|
||||||
printf("%s%s/%s%s%s%c", BOLD, catname, BLUE,
|
|
||||||
@@ -615,11 +584,7 @@
|
|
||||||
if (verbose && firstmatch == 0)
|
|
||||||
printf("\n");
|
|
||||||
|
|
||||||
- if (!aq) {
|
|
||||||
- regfree(&preg);
|
|
||||||
- } else {
|
|
||||||
- atom_implode(aq);
|
|
||||||
- }
|
|
||||||
+ regfree(&preg);
|
|
||||||
atom_implode(as);
|
|
||||||
dep_burn_tree(dep_tree);
|
|
||||||
|
|
@ -1,8 +0,0 @@
|
|||||||
#!/bin/sh
|
|
||||||
# Copyright 2006-2009 Gentoo Foundation
|
|
||||||
# Distributed under the terms of the GNU General Public License v2
|
|
||||||
|
|
||||||
for f in /etc/portage/postsync.d/* ; do
|
|
||||||
[ -x "${f}" ] && "${f}"
|
|
||||||
done
|
|
||||||
:
|
|
@ -1,3 +0,0 @@
|
|||||||
#!/bin/sh
|
|
||||||
[ -x /usr/bin/q ] && /usr/bin/q -r ${PORTAGE_QUIET:+-q}
|
|
||||||
:
|
|
Binary file not shown.
@ -1,2 +1 @@
|
|||||||
DIST doconce-1.3.tar.bz2 112034753 BLAKE2B 4ac826b09ca2dce93d8725868f6fa00a07b61835336a56b72f4d846cb81282cc6982ca25c7fc27d9e66aed5a22d3ef30badbc137748f7c6c3a2e078554b6715e SHA512 b59568e801f4cc5b7f01f3c3d344702ec80c65b5a065e2ece3b3ed8cb5f669739c9adf3caf96cd0b43c646ccae0f11325d5ca64ee1a325ac404ec6e5feb6148d
|
|
||||||
DIST doconce-1.4.4.tar.bz2 112713371 BLAKE2B 65acba4d02095d616c5ca6a070bb4a80ae57b4f201d9810f7b88e212e1ea86bd211440213194c4d61a2eefd19dfa9de9f81376d3e535f032747a8102bfdc2160 SHA512 9b5caae789a395bcdbb4daeea57182f2ea21a2c3c4da0abae2c097351fece601da6901de8d89ab60a187c1bc0ba5f913bbee14a847c1f85020dc16e0cdffdf31
|
DIST doconce-1.4.4.tar.bz2 112713371 BLAKE2B 65acba4d02095d616c5ca6a070bb4a80ae57b4f201d9810f7b88e212e1ea86bd211440213194c4d61a2eefd19dfa9de9f81376d3e535f032747a8102bfdc2160 SHA512 9b5caae789a395bcdbb4daeea57182f2ea21a2c3c4da0abae2c097351fece601da6901de8d89ab60a187c1bc0ba5f913bbee14a847c1f85020dc16e0cdffdf31
|
||||||
|
@ -1,16 +0,0 @@
|
|||||||
# Copyright 1999-2019 Gentoo Authors
|
|
||||||
# Distributed under the terms of the GNU General Public License v2
|
|
||||||
|
|
||||||
EAPI=5
|
|
||||||
PYTHON_COMPAT=( python2_7 python3_5 )
|
|
||||||
inherit distutils-r1
|
|
||||||
|
|
||||||
DESCRIPTION="A markdown-like langauge to generate docs in html, LaTeX, and many other formats"
|
|
||||||
HOMEPAGE="https://github.com/hplgit/doconce/ https://pypi.org/project/doconce/"
|
|
||||||
SRC_URI="https://dev.gentoo.org/~grozin/${P}.tar.bz2"
|
|
||||||
LICENSE="BSD"
|
|
||||||
SLOT="0"
|
|
||||||
IUSE=""
|
|
||||||
KEYWORDS="~amd64 ~x86"
|
|
||||||
DEPEND="dev-python/future"
|
|
||||||
RDEPEND="${DEPEND}"
|
|
@ -1,2 +1,3 @@
|
|||||||
DIST poppler-0.82.0.tar.xz 1553336 BLAKE2B a83d476ce1174cb7789f857a52a8a9ed29dfe8863d082ef662508ad9957667349aa62b038fa1a52e9e7ae3ddf4701eb5fbd58545b041b6aebd69cb8b91376d8d SHA512 1631be30e398dd18a4e8c2cc893cf0d9469a98d93f02f2ffe3bc14857518b76674a10cafe89ee92b9886c3c6b03d50e214a6838c102f673a62789c9832cfa4a2
|
DIST poppler-0.82.0.tar.xz 1553336 BLAKE2B a83d476ce1174cb7789f857a52a8a9ed29dfe8863d082ef662508ad9957667349aa62b038fa1a52e9e7ae3ddf4701eb5fbd58545b041b6aebd69cb8b91376d8d SHA512 1631be30e398dd18a4e8c2cc893cf0d9469a98d93f02f2ffe3bc14857518b76674a10cafe89ee92b9886c3c6b03d50e214a6838c102f673a62789c9832cfa4a2
|
||||||
DIST poppler-0.83.0.tar.xz 1555456 BLAKE2B 4ab24a85e879d0ddbf24cf7bab5b1da7c15fc026e88b4076dc2b8cd34d69a5bcc0113df20fabda6915afea880480613ba34be6e23b5b0d79a3c6197c92af7853 SHA512 bfde1e3cc4d9c626949aab770d84fccbe47bdde2331d3b9f5b98c24319eb573a5db62acbfa5a524b21ed0f195f8b163fee64677c2bd616d31d0bb219d1e66713
|
DIST poppler-0.83.0.tar.xz 1555456 BLAKE2B 4ab24a85e879d0ddbf24cf7bab5b1da7c15fc026e88b4076dc2b8cd34d69a5bcc0113df20fabda6915afea880480613ba34be6e23b5b0d79a3c6197c92af7853 SHA512 bfde1e3cc4d9c626949aab770d84fccbe47bdde2331d3b9f5b98c24319eb573a5db62acbfa5a524b21ed0f195f8b163fee64677c2bd616d31d0bb219d1e66713
|
||||||
|
DIST poppler-0.84.0.tar.xz 1561236 BLAKE2B eb85b2d0aac2d736ffa74a11df4fbdf28841ded8fec3d32aa92d22f0d1c51aae9d3deacc8cbdd7dbf95906cf46b01f1bca7aa8af99c7fe209e4169478a778e72 SHA512 e00aca76b4909621b79ec68374529396ddba756af5d60d86750095dfebbabe5b576aa7c873c3fcfabaff28c89e3e37e826d4a0fac356d76ef966500514a772e7
|
||||||
|
@ -0,0 +1,122 @@
|
|||||||
|
# Copyright 2005-2019 Gentoo Authors
|
||||||
|
# Distributed under the terms of the GNU General Public License v2
|
||||||
|
|
||||||
|
EAPI=7
|
||||||
|
|
||||||
|
inherit cmake toolchain-funcs xdg-utils
|
||||||
|
|
||||||
|
if [[ ${PV} == *9999* ]] ; then
|
||||||
|
inherit git-r3
|
||||||
|
EGIT_REPO_URI="https://anongit.freedesktop.org/git/poppler/poppler.git"
|
||||||
|
SLOT="0/9999"
|
||||||
|
else
|
||||||
|
SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz"
|
||||||
|
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
|
||||||
|
SLOT="0/94" # 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 qt5 tiff +utils"
|
||||||
|
|
||||||
|
# No test data provided
|
||||||
|
RESTRICT="test"
|
||||||
|
|
||||||
|
BDEPEND="
|
||||||
|
dev-util/glib-utils
|
||||||
|
virtual/pkgconfig
|
||||||
|
"
|
||||||
|
DEPEND="
|
||||||
|
media-libs/fontconfig
|
||||||
|
media-libs/freetype
|
||||||
|
sys-libs/zlib
|
||||||
|
cairo? (
|
||||||
|
dev-libs/glib:2
|
||||||
|
x11-libs/cairo
|
||||||
|
introspection? ( dev-libs/gobject-introspection:= )
|
||||||
|
)
|
||||||
|
curl? ( net-misc/curl )
|
||||||
|
jpeg? ( virtual/jpeg:0 )
|
||||||
|
jpeg2k? ( >=media-libs/openjpeg-2.3.0-r1:2= )
|
||||||
|
lcms? ( media-libs/lcms:2 )
|
||||||
|
nss? ( >=dev-libs/nss-3.19:0 )
|
||||||
|
png? ( media-libs/libpng:0= )
|
||||||
|
qt5? (
|
||||||
|
dev-qt/qtcore:5
|
||||||
|
dev-qt/qtgui:5
|
||||||
|
dev-qt/qtxml:5
|
||||||
|
)
|
||||||
|
tiff? ( media-libs/tiff:0 )
|
||||||
|
"
|
||||||
|
RDEPEND="${DEPEND}
|
||||||
|
cjk? ( app-text/poppler-data )
|
||||||
|
"
|
||||||
|
|
||||||
|
DOCS=( AUTHORS NEWS README.md README-XPDF )
|
||||||
|
|
||||||
|
PATCHES=(
|
||||||
|
"${FILESDIR}/${PN}-0.60.1-qt5-dependencies.patch"
|
||||||
|
"${FILESDIR}/${PN}-0.28.1-fix-multilib-configuration.patch"
|
||||||
|
"${FILESDIR}/${PN}-0.82.0-respect-cflags.patch"
|
||||||
|
"${FILESDIR}/${PN}-0.61.0-respect-cflags.patch"
|
||||||
|
"${FILESDIR}/${PN}-0.57.0-disable-internal-jpx.patch"
|
||||||
|
)
|
||||||
|
|
||||||
|
src_prepare() {
|
||||||
|
cmake_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 -e 's/-fno-check-new//' -i cmake/modules/PopplerMacros.cmake || die
|
||||||
|
fi
|
||||||
|
|
||||||
|
if ! grep -Fq 'cmake_policy(SET CMP0002 OLD)' CMakeLists.txt ; then
|
||||||
|
sed -e '/^cmake_minimum_required/acmake_policy(SET CMP0002 OLD)' \
|
||||||
|
-i CMakeLists.txt || die
|
||||||
|
else
|
||||||
|
einfo "policy(SET CMP0002 OLD) - workaround can be removed"
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
src_configure() {
|
||||||
|
xdg_environment_reset
|
||||||
|
local mycmakeargs=(
|
||||||
|
-DBUILD_GTK_TESTS=OFF
|
||||||
|
-DBUILD_QT5_TESTS=OFF
|
||||||
|
-DBUILD_CPP_TESTS=OFF
|
||||||
|
-DENABLE_SPLASH=ON
|
||||||
|
-DENABLE_ZLIB=ON
|
||||||
|
-DENABLE_ZLIB_UNCOMPRESS=OFF
|
||||||
|
-DENABLE_UNSTABLE_API_ABI_HEADERS=ON
|
||||||
|
-DUSE_FLOAT=OFF
|
||||||
|
-DWITH_Cairo=$(usex cairo)
|
||||||
|
-DENABLE_LIBCURL=$(usex curl)
|
||||||
|
-DENABLE_CPP=$(usex cxx)
|
||||||
|
-DWITH_JPEG=$(usex jpeg)
|
||||||
|
-DENABLE_DCTDECODER=$(usex jpeg libjpeg none)
|
||||||
|
-DENABLE_LIBOPENJPEG=$(usex jpeg2k openjpeg2 none)
|
||||||
|
-DENABLE_CMS=$(usex lcms lcms2 none)
|
||||||
|
-DWITH_NSS3=$(usex nss)
|
||||||
|
-DWITH_PNG=$(usex png)
|
||||||
|
$(cmake_use_find_package qt5 Qt5Core)
|
||||||
|
-DWITH_TIFF=$(usex tiff)
|
||||||
|
-DENABLE_UTILS=$(usex utils)
|
||||||
|
)
|
||||||
|
use cairo && mycmakeargs+=( -DWITH_GObjectIntrospection=$(usex introspection) )
|
||||||
|
|
||||||
|
cmake_src_configure
|
||||||
|
}
|
||||||
|
|
||||||
|
src_install() {
|
||||||
|
cmake_src_install
|
||||||
|
|
||||||
|
# live version doesn't provide html documentation
|
||||||
|
if use cairo && use doc && [[ ${PV} != *9999* ]]; then
|
||||||
|
# For now install gtk-doc there
|
||||||
|
insinto /usr/share/gtk-doc/html/poppler
|
||||||
|
doins -r "${S}"/glib/reference/html/*
|
||||||
|
fi
|
||||||
|
}
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -1,29 +0,0 @@
|
|||||||
Fix build failure against ghc-7.4
|
|
||||||
|
|
||||||
[ 4 of 84] Compiling Graphics.Rendering.OpenGL.GL.GLboolean ( Graphics/Rendering/OpenGL/GL/GLboolean.hs, dist/build/Graphics/Rendering/OpenGL/GL/GLboolean.o )
|
|
||||||
|
|
||||||
Graphics/Rendering/OpenGL/GL/GLboolean.hs:27:23:
|
|
||||||
Could not deduce (Eq a) arising from a use of `/='
|
|
||||||
from the context (Num a)
|
|
||||||
bound by the type signature for
|
|
||||||
unmarshalGLboolean :: Num a => a -> Bool
|
|
||||||
at Graphics/Rendering/OpenGL/GL/GLboolean.hs:27:1-27
|
|
||||||
Possible fix:
|
|
||||||
add (Eq a) to the context of
|
|
||||||
the type signature for unmarshalGLboolean :: Num a => a -> Bool
|
|
||||||
In the expression: (/= 0)
|
|
||||||
In an equation for `unmarshalGLboolean':
|
|
||||||
unmarshalGLboolean = (/= 0)
|
|
||||||
|
|
||||||
Reported-by: Christian Lask
|
|
||||||
diff --git a/Graphics/Rendering/OpenGL/GL/GLboolean.hs b/Graphics/Rendering/OpenGL/GL/GLboolean.hs
|
|
||||||
index cab7356..cc4faa8 100644
|
|
||||||
--- a/Graphics/Rendering/OpenGL/GL/GLboolean.hs
|
|
||||||
+++ b/Graphics/Rendering/OpenGL/GL/GLboolean.hs
|
|
||||||
@@ -23,5 +23,5 @@ marshalGLboolean :: Num a => Bool -> a
|
|
||||||
marshalGLboolean False = 0
|
|
||||||
marshalGLboolean True = 1
|
|
||||||
|
|
||||||
-unmarshalGLboolean :: Num a => a -> Bool
|
|
||||||
+unmarshalGLboolean :: (Eq a, Num a) => a -> Bool
|
|
||||||
unmarshalGLboolean = (/= 0)
|
|
Binary file not shown.
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in new issue