Sync with portage [Thu Aug 3 09:51:09 MSK 2017].

mhiretskiy 941
root 7 years ago
parent ca9f992cb7
commit e69b4de489

@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
<maintainer type="person">
<email>prometheanfire@gentoo.org</email>
<name>Matthew Thode</name>
</maintainer>
<upstream>
<remote-id type="github">letsencrypt/letsencrypt</remote-id>
</upstream>

@ -1,7 +1,10 @@
<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
<maintainer type="person">
<email>prometheanfire@gentoo.org</email>
<name>Matthew Thode</name>
</maintainer>
<upstream>
<remote-id type="github">certbot/certbot</remote-id>
</upstream>

@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
<maintainer type="person">
<email>prometheanfire@gentoo.org</email>
<name>Matthew Thode</name>
</maintainer>
<upstream>
<remote-id type="github">certbot/certbot</remote-id>
</upstream>

@ -0,0 +1,101 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
inherit versionator toolchain-funcs
MY_PV=$(replace_version_separator 2 '_')
DESCRIPTION="A vi/ex clone"
HOMEPAGE="http://elvis.the-little-red-haired-girl.org"
SRC_URI="ftp://ftp.cs.pdx.edu/pub/elvis/${PN}-${MY_PV}.tar.gz"
LICENSE="Artistic"
SLOT="0"
KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~ppc-macos ~x86-macos ~m68k-mint ~sparc-solaris"
IUSE="X"
RDEPEND="
sys-libs/ncurses:0=
app-eselect/eselect-vi
X? (
>=x11-proto/xproto-7.0.4
>=x11-libs/libX11-1.0.0
>=x11-libs/libXt-1.0.0
>=x11-libs/libXpm-3.5.4.2
>=x11-libs/libXft-2.1.8.2
)"
DEPEND="
${RDEPEND}
virtual/pkgconfig"
S="${WORKDIR}/${PN}-${MY_PV}"
PATCHES=(
"${FILESDIR}"/ft2.3-symbol-collision-fix.patch
"${FILESDIR}"/${P}-glibc-2.10.patch
"${FILESDIR}"/${P}-interix.patch
)
src_configure() {
./configure \
--libs="$($(tc-getPKG_CONFIG) --libs ncurses)" \
--prefix="${EPREFIX}"/usr \
--bindir="${EPREFIX}"/usr/bin \
--datadir="${EPREFIX}"/usr/share/elvis \
--docdir="${EPREFIX}"/usr/share/doc/${PF} \
$(use_with X x) \
|| die
# Some Makefile fixups (must happen after configure)
# Use our CFLAGS
sed -i -e "s:gcc -O2:$(tc-getCC) ${CFLAGS}:" Makefile || die "sed 1 failed"
# We'll install the man-pages ourselves
sed -i -e '/^ sh instman.sh/d' Makefile || die "sed 2 failed"
# Don't try to write to /etc
sed -i -e 's,/etc/elvis,${ED}/etc/elvis,g' Makefile || die "sed 3 failed"
# Use LDFLAGS
sed -i -e "s#\$(CC) \$(CFLAGS)#\$(CC) \$(CFLAGS) ${LDFLAGS}#" Makefile || \
die "sed 4 failed"
}
src_install() {
dodir /usr/bin
dodir /usr/share/man/man1
dodir /usr/share/elvis
dodir /usr/share/doc/${PF}
dodir /etc
emake install \
PREFIX="${ED}"/usr \
BINDIR="${ED}"/usr/bin \
DATADIR="${ED}"/usr/share/elvis \
DOCDIR="${ED}"/usr/share/doc/${PF}
# Install the man-pages
mv doc/elvis.man doc/elvis.1 || die
mv doc/elvtags.man doc/elvtags.1 || die
mv doc/ref.man doc/ref.1 || die
doman doc/*.1
# Fixup some READMEs
sed -i -e "s,${ED},,g" "${ED}"/etc/elvis/README \
|| die 'sed /etc/elvis/README failed'
sed -i -e "s,${ED},,g" "${ED}"/usr/share/elvis/README \
|| die 'sed /usr/share/elvis/README failed'
}
pkg_postinst() {
einfo "Setting /usr/bin/vi symlink"
eselect vi set "${PN}"
}
pkg_postrm() {
einfo "Updating /usr/bin/vi symlink"
eselect vi update
}

@ -1,7 +1,3 @@
DIST diskimage-builder-1.28.0.tar.gz 267409 SHA256 2d8999a8484d27e8604d125aabcbdad648f8b601776225cfc611faf1a3b9a0e6 SHA512 ae13e29563f90a4aaa4f2bee889bca4fd662da41fcffb957ca8a4380907e5d89fbc25ecb93aeda2cb5597776b51417388e8a5e39741250d68a8f7f67239ebc7f WHIRLPOOL 7cfcefcf37fd0d5fae4fb8d3284ad3b60e53e4a2853c85625a1925c34bd4cdbee999932089f7dae81adcf699226ba1550f729a2b1b8aab4b6e54c10c7148fea1
DIST diskimage-builder-2.3.3.tar.gz 294768 SHA256 227943d8702a66c9ed08d59362324bc79951ad7c11d9efdb67c32b2fbd517af2 SHA512 d3e97ef520270d056877bef467d9fb4bb8bd64ebff149ca7e8a5b11e5f19043a93932968d61b7efe7e54767dc88e04536ceb8b664e9c40ab388eac52303e2a74 WHIRLPOOL c780d3de0bcc43e35b5b12bbd188eece079467eec5ea7a426450d30f14135cdd4fe82985804514c1382424aae41534af37c163e55de98031d3327d89743a3a2b
DIST diskimage-builder-2.4.0.tar.gz 308467 SHA256 ae9bc8b0dde17d422785d0099152997a15a4c051c484f3efff17594d8bb8d34c SHA512 2936d88f13dcebe67133400c20fa355349c33eb1d89045c38ffa4c2942152d9ca4b7fadefa622bf1c0055f8903a68d958f3b3db21fb3472da7b6ec7fd5c01267 WHIRLPOOL 6cd869d5a8fd31e3aa154d76eaa2543644c254eb90b12df80ce649c331759fbc5e4c8912a7753099a32c15c6dc98db256080d02d16e1d1d82377b293a7af49f0
DIST diskimage-builder-2.4.1.tar.gz 304969 SHA256 9a01eabc73bde93da3fde598249cc273c6cc744e8e6b850a0f7dd7e69c076543 SHA512 32ef8b7cae08c90691256be4b8b65c986de00306d935919c7d9ecba21722534da8bb00ab887b810bfff35e60c1e943641de576a7c4b29a6ff3d15315b55fb307 WHIRLPOOL a4e9a30452e2e0785e371968d463a95a04d5e9a7316decc2a00e27038b3606ca03515535b76e721eb12b8072567c91f9a6372d780fb60ab983d81071f88974e4
DIST diskimage-builder-2.5.0.tar.gz 312486 SHA256 5c665dbd6b8e3f24be26e65159a560b34e2250111adb4c7569db453d4bbbdf6c SHA512 b254b5ca9d56ace54fcdd90ec35065bb67312a203529b94d24ff6629a159e6918bae291b2bc2f8218b38caa8fe65369ebaf8c286994b060c4f62342e6a192bea WHIRLPOOL 31f3f4867dcd7543c7e6006717dc13de0d0d00f23a96126ce1cfac20bd24b17803422099a5737dd7b4aea1ddf53c9b9b6d3ad702fb0ace72bcb4ddb03d33acd1
DIST diskimage-builder-2.6.1.tar.gz 312190 SHA256 4f5a9405c3b6599afe2ed037ef3dc72727a539a8b902dd23f1905dd772ab2ad1 SHA512 d79ec6b0cc7962b8dbd4a3f8d5193907f89c39e15a73fd5cd9cf5203792df2de7ced6b0acbe53e9d1cb7e100751f36c1bc77db2be1f25ab9472ca759f54bdc4b WHIRLPOOL 234308ec76126f8b1002e47a72eec3590b39997acfd6e9ea8c0ebdddfee01ab6a9dd249a5e245d58475f067ef0635d783ee9cc82344c9061d69dce38fa4ae888
DIST diskimage-builder-2.7.2.tar.gz 315463 SHA256 0a914611aca8d03266a744af3807d1452aa49475dfec2abd7d17e312284617d0 SHA512 e5ea2fa692ce8c9234e8ff1e1fccd94452ec4887838cfe823464cbeb448c5fc8645310e455d38269db5ba0dd3efc5c7934511bf07549a66d49bf75a2acb285bc WHIRLPOOL f6c57498d011b5bcb8bc4906ccf886001db01ff0cf1e6eecebe99604968346c315a1673fadecff612d0c3d4f09bfe594a2108bf0011d0f1651eeeff6e5d8587c
DIST diskimage-builder-2.8.0.tar.gz 315628 SHA256 ac93598cff826074c4a83049be0c3745b13891dc21e5e9d85fc354d99583c0e8 SHA512 9827f063ed7e4e66fb55a721f3ea81a2e6186b87000b9008a40469934b64b9380699f709956e7396c8b9f03275d195645f9e9b74d6eae4812b1b2149a884cca2 WHIRLPOOL 68a4fbc3d83ce0355d411e8f8aeb84946fba7e2a3fc47bcb211405862be3b69d3233061c4f8b41d478b23762273148acd34e2bf64596e9696a1b3cb6a81e1290

@ -1,33 +0,0 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
PYTHON_COMPAT=( python2_7 )
inherit distutils-r1
DESCRIPTION="Golden Disk Image builder."
HOMEPAGE="http://docs.openstack.org/developer/diskimage-builder/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
IUSE=""
CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
DEPEND="${CDEPEND}
dev-python/setuptools[${PYTHON_USEDEP}]"
RDEPEND="${CDEPEND}
>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
!~dev-python/Babel-2.4.0[${PYTHON_USEDEP}]
>=dev-python/pyyaml-3.10.0[${PYTHON_USEDEP}]
>=dev-python/flake8-2.5.4[${PYTHON_USEDEP}]
<dev-python/flake8-2.6.0[${PYTHON_USEDEP}]
>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
app-emulation/qemu
sys-block/parted
sys-fs/multipath-tools
!dev-python/dib-utils[${PYTHON_USEDEP}]"

@ -1,33 +0,0 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
PYTHON_COMPAT=( python2_7 )
inherit distutils-r1
DESCRIPTION="Golden Disk Image builder."
HOMEPAGE="http://docs.openstack.org/developer/diskimage-builder/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
IUSE=""
CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
DEPEND="${CDEPEND}
dev-python/setuptools[${PYTHON_USEDEP}]"
RDEPEND="${CDEPEND}
>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
!~dev-python/Babel-2.4.0[${PYTHON_USEDEP}]
>=dev-python/pyyaml-3.10.0[${PYTHON_USEDEP}]
>=dev-python/flake8-2.5.4[${PYTHON_USEDEP}]
<dev-python/flake8-2.6.0[${PYTHON_USEDEP}]
>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
app-emulation/qemu
sys-block/parted
sys-fs/multipath-tools
!dev-python/dib-utils[${PYTHON_USEDEP}]"

@ -1,33 +0,0 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
PYTHON_COMPAT=( python2_7 )
inherit distutils-r1
DESCRIPTION="Golden Disk Image builder."
HOMEPAGE="http://docs.openstack.org/developer/diskimage-builder/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
IUSE=""
CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
DEPEND="${CDEPEND}
dev-python/setuptools[${PYTHON_USEDEP}]"
RDEPEND="${CDEPEND}
>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
!~dev-python/Babel-2.4.0[${PYTHON_USEDEP}]
>=dev-python/pyyaml-3.10.0[${PYTHON_USEDEP}]
>=dev-python/flake8-2.5.4[${PYTHON_USEDEP}]
<dev-python/flake8-2.6.0[${PYTHON_USEDEP}]
>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
app-emulation/qemu
sys-block/parted
sys-fs/multipath-tools
!dev-python/dib-utils[${PYTHON_USEDEP}]"

@ -1,34 +0,0 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
PYTHON_COMPAT=( python2_7 )
inherit distutils-r1
DESCRIPTION="Golden Disk Image builder."
HOMEPAGE="http://docs.openstack.org/developer/diskimage-builder/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
IUSE=""
CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
DEPEND="${CDEPEND}
dev-python/setuptools[${PYTHON_USEDEP}]"
RDEPEND="${CDEPEND}
>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
!~dev-python/Babel-2.4.0[${PYTHON_USEDEP}]
>=dev-python/networkx-1.10[${PYTHON_USEDEP}]
>=dev-python/pyyaml-3.10.0[${PYTHON_USEDEP}]
>=dev-python/flake8-2.5.4[${PYTHON_USEDEP}]
<dev-python/flake8-2.6.0[${PYTHON_USEDEP}]
>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
app-emulation/qemu
sys-block/parted
sys-fs/multipath-tools
!dev-python/dib-utils[${PYTHON_USEDEP}]"

@ -1,11 +0,0 @@
--- project/linux/Makefile.orig 2012-01-02 12:08:20.400871287 +0100
+++ project/linux/Makefile 2012-01-02 12:08:48.966488826 +0100
@@ -50,7 +50,7 @@
LIBDIR = -L/usr/local/lib -L/usr/lib
# What libraries do we need?
-LIBS = -lxerces-c -lxalan-c -lpcre -lpopt -lgcrypt -lblkid
+LIBS = -lxerces-c -lxalan-c -lpcre -lpopt -lgcrypt -lblkid -lsepol -lselinux
# Determine what package management system is being used
#PACKAGE_RPM = $(shell /usr/bin/env rpm --version 2>/dev/null)

@ -1,11 +0,0 @@
--- src/linux/ProbeFactory.cpp 2010-12-10 13:37:00.019140703 +0100
+++ src/linux/ProbeFactory.cpp 2010-08-27 21:23:41.000000000 +0200
@@ -61,8 +61,6 @@
probe = XmlFileContentProbe::Instance();
} else if(objectName.compare("textfilecontent54_object") == 0) {
probe = TextFileContent54Probe::Instance();
- } else if(objectName.compare("ldap_object") == 0) {
- probe = LDAPProbe::Instance();
// here are the objects defined in the unix schema
} else if(objectName.compare("file_object") == 0) {

@ -1,94 +0,0 @@
--- ./src/linux/ProbeFactory.cpp.old 2011-08-18 14:45:11.314556346 +0200
+++ ./src/linux/ProbeFactory.cpp 2011-08-18 14:45:23.151011753 +0200
@@ -101,10 +101,6 @@
#endif
} else if (objectName.compare("partition_object") == 0) {
probe = PartitionProbe::Instance();
- } else if (objectName.compare("selinuxsecuritycontext_object") == 0) {
- probe = SelinuxSecurityContextProbe::Instance();
- } else if (objectName.compare("selinuxboolean_object") == 0) {
- probe = SelinuxBooleanProbe::Instance();
} else if (objectName.compare("iflisteners_object") == 0) {
probe = IfListenersProbe::Instance();
} else {
--- src/linux/ProbeFactory.h.old 2011-08-18 14:47:23.226501075 +0200
+++ src/linux/ProbeFactory.h 2011-08-18 14:47:34.183998019 +0200
@@ -71,8 +71,6 @@
#include "InetdProbe.h"
#include "PartitionProbe.h"
-#include "SelinuxSecurityContextProbe.h"
-#include "SelinuxBooleanProbe.h"
#include "IfListenersProbe.h"
class AbsProbe;
--- src/probes/unix/Process58Probe.cpp.old 2012-05-22 10:09:52.980828398 +0200
+++ src/probes/unix/Process58Probe.cpp 2012-05-22 10:11:06.266468168 +0200
@@ -29,10 +29,10 @@
//****************************************************************************************//
#ifdef LINUX
-# include <selinux/selinux.h>
-# include <selinux/context.h>
+/*# include <selinux/selinux.h>
+# include <selinux/context.h>*/
# include <sys/capability.h>
-# include <SecurityContextGuard.h>
+/*# include <SecurityContextGuard.h>*/
#endif
#include <fstream>
@@ -328,7 +328,7 @@
pid_t sessionId;
uid_t loginuid;
uint64_t effCap, *effCapp=&effCap;
- string selinuxDomainLabel;
+/* string selinuxDomainLabel;*/
Process58Probe::ProcStatus statStatus, statusStatus, ttyStatus, loginuidStatus;
@@ -423,10 +423,10 @@
}
// this one doesn't require reading anything in /proc
- if (!RetrieveSelinuxDomainLabel(pid, &selinuxDomainLabel, &errMsg)) {
+/* if (!RetrieveSelinuxDomainLabel(pid, &selinuxDomainLabel, &errMsg)) {
item->AppendMessage(new OvalMessage(errMsg, OvalEnum::LEVEL_ERROR));
item->SetStatus(OvalEnum::STATUS_ERROR);
- }
+ }*/
// The Linux start time is represented as the number of jiffies (1/100 sec)
// that the application was started after the last system reboot. To get an
@@ -491,10 +491,10 @@
// aren't any.
item->AppendElement(new ItemEntity("posix_capability", "", OvalEnum::DATATYPE_STRING, false, OvalEnum::STATUS_ERROR));
- if (selinuxDomainLabel.empty())
+/* if (selinuxDomainLabel.empty())*/
item->AppendElement(new ItemEntity("selinux_domain_label", "", OvalEnum::DATATYPE_STRING, false, OvalEnum::STATUS_ERROR));
- else
- item->AppendElement(new ItemEntity("selinux_domain_label", selinuxDomainLabel));
+/* else
+ item->AppendElement(new ItemEntity("selinux_domain_label", selinuxDomainLabel));*/
if (statStatus == PROC_OK)
item->AppendElement(new ItemEntity("session_id", Common::ToString(sessionId), OvalEnum::DATATYPE_INTEGER));
@@ -709,7 +709,7 @@
capMap[capEnum]));
}
}
-
+/*
bool Process58Probe::RetrieveSelinuxDomainLabel(pid_t pid, string *label, string *err) {
security_context_t sctx;
int ec = getpidcon(pid, &sctx);
@@ -732,7 +732,7 @@
*label = tmp;
return true;
}
-
+*/
#elif defined SUNOS
void Process58Probe::GetPSInfo(string command, string pidStr, ItemVector* items) {

@ -1,20 +0,0 @@
--- src/CountFunction.cpp.old 2012-01-02 11:37:27.113604532 +0100
+++ src/CountFunction.cpp 2012-01-02 11:37:39.624998573 +0100
@@ -29,6 +29,7 @@
//****************************************************************************************//
#include <cstddef>
+#include <memory>
#include "CountFunction.h"
#include "ComponentFactory.h"
--- src/UniqueFunction.cpp.orig 2012-01-02 11:39:58.564269070 +0100
+++ src/UniqueFunction.cpp 2012-01-02 11:40:12.057615550 +0100
@@ -29,6 +29,7 @@
//****************************************************************************************//
#include <set>
+#include <memory>
#include "Common.h"
#include "ComponentFactory.h"
#include "UniqueFunction.h"

@ -1,11 +0,0 @@
--- src/Main.h.old 2010-10-22 14:59:13.000000000 +0200
+++ src/Main.h 2010-10-22 14:59:38.000000000 +0200
@@ -38,7 +38,7 @@
#endif
#ifdef LINUX
-# define STRNICMP strnicmp
+# define STRNICMP strncasecmp
#elif defined SUNOS
# define STRNICMP strncasecmp
#elif defined DARWIN

@ -1,306 +0,0 @@
--- src/XmlProcessor.cpp.old 2011-08-18 14:51:20.311616357 +0200
+++ src/XmlProcessor.cpp 2011-08-18 14:51:47.214381144 +0200
@@ -35,7 +35,6 @@
// for dom Writer
#include <xercesc/dom/DOMImplementation.hpp>
#include <xercesc/dom/DOMImplementationLS.hpp>
-#include <xercesc/dom/DOMWriter.hpp>
#include <xercesc/framework/StdOutFormatTarget.hpp>
#include <xercesc/framework/LocalFileFormatTarget.hpp>
#include <xercesc/util/XMLUni.hpp>
@@ -53,8 +52,17 @@
//****************************************************************************************//
// DataDirResolver Class //
//****************************************************************************************//
-
+#if XERCES_VERSION_MAJOR < 3
DOMInputSource* DataDirResolver::resolveEntity (const XMLCh *const /*publicId*/, const XMLCh *const systemId, const XMLCh *const /*baseURI*/) {
+#else
+InputSource* DataDirResolver::resolveEntity(const XMLCh* publicId, const XMLCh* systemId)
+{
+ return NULL;
+ //return DataDirResolver::resolveEntity (publicId, systemId, NULL);
+}
+
+DOMLSInput* DataDirResolver::resolveEntity (const XMLCh *const publicId, const XMLCh *const systemId, const XMLCh *const baseURI) {
+#endif
string path = "";
size_t last;
string schemapath = Common::GetSchemaPath();
@@ -104,13 +112,19 @@
try {
XMLPlatformUtils::Initialize();
+#if XERCES_VERSION_MAJOR < 3
+#define SetParameter(parser,n,v) parser->setFeature(n,v)
+#else
+#define SetParameter(parser,n,v) parser->getDomConfig()->setParameter(n,v)
+#endif
parser = makeParser();
parserWithCallerAdoption = makeParser();
// add one extra feature on this parser to prevent it from
// taking ownership of its documents.
- parserWithCallerAdoption->setFeature(XMLUni::fgXercesUserAdoptsDOMDocument, true);
+ SetParameter(parserWithCallerAdoption, XMLUni::fgXercesUserAdoptsDOMDocument, true);
+#undef SetParameter
} catch (const XMLException& toCatch) {
string errMsg = "Error: An error occured durring initialization of the xml utilities:\n";
errMsg.append(XmlCommon::ToString(toCatch.getMessage()));
@@ -137,32 +151,55 @@
}
+#if XERCES_VERSION_MAJOR < 3
DOMBuilder *XmlProcessor::makeParser() {
+#else
+DOMLSParser *XmlProcessor::makeParser() {
+#endif
// Instantiate the DOM parser.
static const XMLCh gLS[] = { chLatin_L, chLatin_S, chNull };
DOMImplementation *impl = DOMImplementationRegistry::getDOMImplementation(gLS);
+#if XERCES_VERSION_MAJOR < 3
DOMBuilder *parser = ((DOMImplementationLS*)impl)->createDOMBuilder(DOMImplementationLS::MODE_SYNCHRONOUS, 0);
+#else
+ DOMLSParser *parser = ((DOMImplementationLS*)impl)->createLSParser(DOMImplementationLS::MODE_SYNCHRONOUS, 0);
+#endif
///////////////////////////////////////////////////////
// Set features on the builder
///////////////////////////////////////////////////////
- parser->setFeature(XMLUni::fgDOMComments, false); // Discard Comment nodes in the document.
- parser->setFeature(XMLUni::fgDOMDatatypeNormalization, true); // Let the validation process do its datatype normalization that is defined in the used schema language.
- parser->setFeature(XMLUni::fgDOMNamespaces, true); // Perform Namespace processing
- parser->setFeature(XMLUni::fgDOMValidation, true); // Report all validation errors.
- parser->setFeature(XMLUni::fgXercesSchema, true); // Enable the parser's schema support.
- parser->setFeature(XMLUni::fgXercesSchemaFullChecking, true); // Enable full schema constraint checking, including checking which may be time-consuming or memory intensive. Currently, particle unique attribution constraint checking and particle derivation restriction checking are controlled by this option.
- parser->setFeature(XMLUni::fgXercesValidationErrorAsFatal, true); // The parser will treat validation error as fatal and will exit
- parser->setFeature(XMLUni::fgXercesDOMHasPSVIInfo, true); // Enable storing of PSVI information in element and attribute nodes.
+#if XERCES_VERSION_MAJOR < 3
+#define SetParameter(parser,n,v) parser->setFeature(n,v)
+#else
+#define SetParameter(parser,n,v) parser->getDomConfig()->setParameter(n,v)
+#endif
+
+ SetParameter(parser, XMLUni::fgDOMComments, false); // Discard Comment nodes in the document.
+ SetParameter(parser, XMLUni::fgDOMDatatypeNormalization, true); // Let the validation process do its datatype normalization that is defined in the used schema language.
+ SetParameter(parser, XMLUni::fgDOMNamespaces, true); // Perform Namespace processing
+#if XERCES_VERSION_MAJOR < 3
+ SetParameter(parser, XMLUni::fgDOMValidation, true); // Report all validation errors.
+#else
+ SetParameter(parser, XMLUni::fgDOMValidate, true); // Report all validation errors.
+#endif
+ SetParameter(parser, XMLUni::fgXercesSchema, true); // Enable the parser's schema support.
+ SetParameter(parser, XMLUni::fgXercesSchemaFullChecking, true); // Enable full schema constraint checking, including checking which may be time-consuming or memory intensive. Currently, particle unique attribution constraint checking and particle derivation restriction checking are controlled by this option.
+ SetParameter(parser, XMLUni::fgXercesValidationErrorAsFatal, true); // The parser will treat validation error as fatal and will exit
+ SetParameter(parser, XMLUni::fgXercesDOMHasPSVIInfo, true); // Enable storing of PSVI information in element and attribute nodes.
+#undef SetParameter
///////////////////////////////////////////////////////
//****************************************************************************************//
// The following code was added to handle air-gap operation //
//****************************************************************************************//
/* Look for XML schemas in local directory instead of Internet */
+#if XERCES_VERSION_MAJOR < 3
parser->setEntityResolver (&resolver);
+#else
+ parser->getDomConfig()->setParameter(XMLUni::fgXercesEntityResolver, &resolver);
+#endif
//****************************************************************************************//
// End of air-gap code //
//****************************************************************************************//
@@ -170,7 +207,11 @@
///////////////////////////////////////////////////////
// Add an Error Handler
///////////////////////////////////////////////////////
+#if XERCES_VERSION_MAJOR < 3
parser->setErrorHandler(&errHandler);
+#else
+ parser->getDomConfig()->setParameter(XMLUni::fgDOMErrorHandler, &errHandler);
+#endif
return parser;
}
@@ -250,24 +291,26 @@
XMLCh tempStr[100];
XMLString::transcode("LS", tempStr, 99);
DOMImplementation *impl = DOMImplementationRegistry::getDOMImplementation(tempStr);
+#if XERCES_VERSION_MAJOR < 3
DOMWriter *theSerializer = ((DOMImplementationLS*)impl)->createDOMWriter();
+#else
+ DOMLSSerializer *theSerializer = ((DOMImplementationLS*)impl)->createLSSerializer();
+#endif
+
+#if XERCES_VERSION_MAJOR < 3
+#define SetParameter(serializer,n,v) if (serializer->canSetFeature(n,v)) serializer->setFeature(n,v)
+#else
+#define SetParameter(serializer,n,v) if (serializer->getDomConfig()->canSetParameter(n,v)) serializer->getDomConfig()->setParameter(n,v)
+#endif
// set feature if the serializer supports the feature/mode
- if (theSerializer->canSetFeature(XMLUni::fgDOMWRTSplitCdataSections, true))
- theSerializer->setFeature(XMLUni::fgDOMWRTSplitCdataSections, true);
-
- if (theSerializer->canSetFeature(XMLUni::fgDOMWRTDiscardDefaultContent, true))
- theSerializer->setFeature(XMLUni::fgDOMWRTDiscardDefaultContent, true);
-
- if (theSerializer->canSetFeature(XMLUni::fgDOMWRTFormatPrettyPrint, true))
- theSerializer->setFeature(XMLUni::fgDOMWRTFormatPrettyPrint, true);
-
- if (theSerializer->canSetFeature(XMLUni::fgDOMWRTBOM, false))
- theSerializer->setFeature(XMLUni::fgDOMWRTBOM, false);
-
- //if (theSerializer->canSetFeature(XMLUni::fgDOMWRTDiscardDefaultContent, true))
- // theSerializer->setFeature(XMLUni::fgDOMWRTBOM, true);
+ SetParameter(theSerializer, XMLUni::fgDOMWRTSplitCdataSections, true);
+ SetParameter(theSerializer, XMLUni::fgDOMWRTDiscardDefaultContent, true);
+ SetParameter(theSerializer, XMLUni::fgDOMWRTFormatPrettyPrint, true);
+ SetParameter(theSerializer, XMLUni::fgDOMWRTBOM, false);
+ //SetParameter(theSerializer, XMLUni::fgDOMWRTBOM, true);
+#undef SetParameter
//
// Plug in a format target to receive the resultant
// XML stream from the serializer.
@@ -284,7 +327,13 @@
//
// do the serialization through DOMWriter::writeNode();
//
+#if XERCES_VERSION_MAJOR < 3
theSerializer->writeNode(myFormTarget, *doc);
+#else
+ DOMLSOutput *output = ((DOMImplementationLS*)impl)->createLSOutput();
+ output->setByteStream(myFormTarget);
+ theSerializer->write(doc, output);
+#endif
theSerializer->release();
delete myFormTarget;
--- src/XmlProcessor.h.old 2011-08-18 14:35:41.608703233 +0200
+++ src/XmlProcessor.h 2011-08-18 14:39:21.835597094 +0200
@@ -38,14 +38,17 @@
#include <string>
// required xerces includes
-#include <xercesc/dom/DOMBuilder.hpp>
#include <xercesc/dom/DOMDocument.hpp>
#include <xercesc/dom/DOMErrorHandler.hpp>
#include <xercesc/dom/DOMError.hpp>
// for entity resolver
-#include <xercesc/dom/DOMEntityResolver.hpp>
-#include <xercesc/dom/DOMInputSource.hpp>
+
+#include <xercesc/dom/DOMImplementationRegistry.hpp>
+#include <xercesc/dom/DOMLSParser.hpp>
+#include <xercesc/sax/EntityResolver.hpp>
+#include <xercesc/sax/InputSource.hpp>
+#include <xercesc/sax2/SAX2XMLReader.hpp>
#include "Exception.h"
@@ -53,12 +56,14 @@
This class extends the default DOMEntityResolver and implments the resolve entity method
to support
*/
-class DataDirResolver : public xercesc::DOMEntityResolver {
+class DataDirResolver : public xercesc::EntityResolver {
public:
/**
*
*/
- xercesc::DOMInputSource *resolveEntity (const XMLCh *const publicId, const XMLCh *const systemId, const XMLCh *const baseURI);
+// xercesc::DOMInputSource *resolveEntity (const XMLCh *const publicId, const XMLCh *const systemId, const XMLCh *const baseURI);
+ xercesc::InputSource *resolveEntity (const XMLCh *const publicId, const XMLCh *const systemId);
+ xercesc::DOMLSInput *resolveEntity (const XMLCh *const publicId, const XMLCh *const systemId, const XMLCh *const baseURI);
};
/**
@@ -135,7 +140,7 @@
/**
* Has the common code for creating an XML parser.
*/
- xercesc::DOMBuilder *makeParser();
+ xercesc::DOMLSParser *makeParser();
static XmlProcessor* instance;
@@ -144,7 +149,7 @@
* owns the documents it builds. Users must manually destroy
* those documents.
*/
- xercesc::DOMBuilder *parserWithCallerAdoption;
+ xercesc::DOMLSParser *parserWithCallerAdoption;
/**
* This parser doesn't have user-adoption switched on, so it
@@ -156,7 +161,7 @@
* appear to ever be switched off. So to make sure this isn't
* leaking memory, I have created separate parsers.
*/
- xercesc::DOMBuilder *parser;
+ xercesc::DOMLSParser *parser;
/** The entity resolver for both parsers. */
DataDirResolver resolver;
--- src/probes/independent/XmlFileContentProbe.cpp.old 2010-10-22 14:49:22.000000000 +0200
+++ src/probes/independent/XmlFileContentProbe.cpp 2010-10-22 14:51:39.000000000 +0200
@@ -419,12 +419,24 @@
return new DummyEntityResolver::DoNothingBinInputStream();
}
+#if XERCES_VERSION_MAJOR < 3
unsigned int DummyEntityResolver::DoNothingBinInputStream::curPos() const
+#else
+const XMLCh* DummyEntityResolver::DoNothingBinInputStream::getContentType() const
+{
+ return NULL;
+}
+XMLFilePos DummyEntityResolver::DoNothingBinInputStream::curPos() const
+#endif
{
return 0;
}
+#if XERCES_VERSION_MAJOR < 3
unsigned int DummyEntityResolver::DoNothingBinInputStream::readBytes(XMLByte *const /*toFill*/, const unsigned int /*maxToRead*/)
+#else
+XMLSize_t DummyEntityResolver::DoNothingBinInputStream::readBytes(XMLByte *const toFill, XMLSize_t maxToRead)
+#endif
{
return 0;
}
--- src/probes/independent/XmlFileContentProbe.h.old 2010-10-22 14:55:47.000000000 +0200
+++ src/probes/independent/XmlFileContentProbe.h 2010-10-22 14:57:00.000000000 +0200
@@ -134,8 +134,14 @@
class DoNothingBinInputStream : public BinInputStream
{
public:
+#if XERCES_VERSION_MAJOR < 3
virtual unsigned int curPos() const;
virtual unsigned int readBytes(XMLByte *const toFill, const unsigned int maxToRead);
+#else
+ virtual XMLFilePos curPos() const;
+ virtual const XMLCh* getContentType() const;
+ virtual XMLSize_t readBytes(XMLByte *const toFill, XMLSize_t maxToRead);
+#endif
};
};
--- src/XmlCommon.cpp.old
+++ src/XmlCommon.cpp
@@ -546,7 +546,11 @@ void XmlCommon::AddSchemaLocation(XERCES_CPP_NAMESPACE_QUALIFIER DOMDocument *do
string XmlCommon::GetNamespace(DOMElement *element) {
string xmlns = "";
+#if XERCES_VERSION_MAJOR < 3
xmlns = XmlCommon::ToString(element->getTypeInfo()->getNamespace());
+#else
+ xmlns = XmlCommon::ToString(element->getSchemaTypeInfo()->getTypeNamespace());
+#endif
if (xmlns.compare("") == 0) {
xmlns = "";
}

@ -1,32 +0,0 @@
--- src/linux/ProbeFactory.cpp 2010-12-10 13:37:00.019140703 +0100
+++ src/linux/ProbeFactory.cpp 2010-08-27 21:23:41.000000000 +0200
@@ -61,8 +61,6 @@
probe = XmlFileContentProbe::Instance();
} else if(objectName.compare("textfilecontent54_object") == 0) {
probe = TextFileContent54Probe::Instance();
- } else if(objectName.compare("ldap_object") == 0) {
- probe = LDAPProbe::Instance();
// here are the objects defined in the unix schema
} else if(objectName.compare("file_object") == 0) {
--- src/linux/ProbeFactory.h 2010-12-10 13:36:50.315386197 +0100
+++ src/linux/ProbeFactory.h 2010-08-27 21:23:41.000000000 +0200
@@ -68,7 +68,6 @@
#include "RunLevelProbe.h"
#include "XinetdProbe.h"
#include "InetdProbe.h"
-#include "LDAPProbe.h"
--- project/linux/Makefile 2010-12-10 13:49:06.655143160 +0100
+++ project/linux/Makefile 2010-12-10 13:47:37.247382096 +0100
@@ -49,7 +49,7 @@
LIBDIR = -L/usr/local/lib -L/usr/lib
# What libraries do we need?
-LIBS = -lxerces-c -lxalan-c -lpcre -lpopt -lgcrypt -lldap
+LIBS = -lxerces-c -lxalan-c -lpcre -lpopt -lgcrypt
# Determine what package management system is being used
PACKAGE_RPM = $(shell /usr/bin/env rpm --version 2>/dev/null)

@ -1,11 +0,0 @@
--- src/Main.h.old 2010-10-22 14:59:13.000000000 +0200
+++ src/Main.h 2010-10-22 14:59:38.000000000 +0200
@@ -38,7 +38,7 @@
#endif
#ifdef LINUX
-# define STRNICMP strnicmp
+# define STRNICMP strncasecmp
#elif defined SUNOS
# define STRNICMP strncasecmp
#elif defined DARWIN

@ -1,270 +0,0 @@
--- src/XmlProcessor.cpp.old 2010-10-25 15:13:58.000000000 +0200
+++ src/XmlProcessor.cpp 2010-10-26 09:14:46.000000000 +0200
@@ -34,8 +34,17 @@
//****************************************************************************************//
// DataDirResolver Class //
//****************************************************************************************//
-
+#if XERCES_VERSION_MAJOR < 3
DOMInputSource* DataDirResolver::resolveEntity (const XMLCh *const /*publicId*/, const XMLCh *const systemId, const XMLCh *const /*baseURI*/) {
+#else
+InputSource* DataDirResolver::resolveEntity(const XMLCh* publicId, const XMLCh* systemId)
+{
+ return NULL;
+ //return DataDirResolver::resolveEntity (publicId, systemId, NULL);
+}
+
+DOMLSInput* DataDirResolver::resolveEntity (const XMLCh *const publicId, const XMLCh *const systemId, const XMLCh *const baseURI) {
+#endif
string path = "";
size_t last;
string schemapath = Common::GetSchemaPath();
@@ -111,21 +120,35 @@
// Instantiate the DOM parser.
static const XMLCh gLS[] = { chLatin_L, chLatin_S, chNull };
DOMImplementation *impl = DOMImplementationRegistry::getDOMImplementation(gLS);
+#if XERCES_VERSION_MAJOR < 3
parser = ((DOMImplementationLS*)impl)->createDOMBuilder(DOMImplementationLS::MODE_SYNCHRONOUS, 0);
+#else
+ parser = ((DOMImplementationLS*)impl)->createLSParser(DOMImplementationLS::MODE_SYNCHRONOUS, 0);
+#endif
///////////////////////////////////////////////////////
// Set fetuares on the builder
///////////////////////////////////////////////////////
+#if XERCES_VERSION_MAJOR < 3
+#define SetParameter(parser,n,v) parser->setFeature(n,v)
+#else
+#define SetParameter(parser,n,v) parser->getDomConfig()->setParameter(n,v)
+#endif
+ SetParameter(parser, XMLUni::fgDOMComments, false); // Discard Comment nodes in the document.
+ SetParameter(parser, XMLUni::fgDOMDatatypeNormalization, true); // Let the validation process do its datatype normalization that is defined in the used schema language.
+ SetParameter(parser, XMLUni::fgDOMNamespaces, true); // Perform Namespace processing
+#if XERCES_VERSION_MAJOR < 3
+ SetParameter(parser, XMLUni::fgDOMValidation, true); // Report all validation errors.
+#else
+ SetParameter(parser, XMLUni::fgDOMValidate, true); // Report all validation errors.
+#endif
+ SetParameter(parser, XMLUni::fgXercesSchema, true); // Enable the parser's schema support.
+ SetParameter(parser, XMLUni::fgXercesSchemaFullChecking, true); // Enable full schema constraint checking, including checking which may be time-consuming or memory intensive. Currently, particle unique attribution constraint checking and particle derivation restriction checking are controlled by this option.
+ SetParameter(parser, XMLUni::fgXercesValidationErrorAsFatal, true); // The parser will treat validation error as fatal and will exit
+ SetParameter(parser, XMLUni::fgXercesDOMHasPSVIInfo, true); // Enable storing of PSVI information in element and attribute nodes.
- parser->setFeature(XMLUni::fgDOMComments, false); // Discard Comment nodes in the document.
- parser->setFeature(XMLUni::fgDOMDatatypeNormalization, true); // Let the validation process do its datatype normalization that is defined in the used schema language.
- parser->setFeature(XMLUni::fgDOMNamespaces, true); // Perform Namespace processing
- parser->setFeature(XMLUni::fgDOMValidation, true); // Report all validation errors.
- parser->setFeature(XMLUni::fgXercesSchema, true); // Enable the parser's schema support.
- parser->setFeature(XMLUni::fgXercesSchemaFullChecking, true); // Enable full schema constraint checking, including checking which may be time-consuming or memory intensive. Currently, particle unique attribution constraint checking and particle derivation restriction checking are controlled by this option.
- parser->setFeature(XMLUni::fgXercesValidationErrorAsFatal, true); // The parser will treat validation error as fatal and will exit
- parser->setFeature(XMLUni::fgXercesDOMHasPSVIInfo, true); // Enable storing of PSVI information in element and attribute nodes.
+#undef SetParameter
///////////////////////////////////////////////////////
//****************************************************************************************//
@@ -133,7 +156,11 @@
//****************************************************************************************//
/* Look for XML schemas in local directory instead of Internet */
DataDirResolver resolver;
+#if XERCES_VERSION_MAJOR < 3
parser->setEntityResolver (&resolver);
+#else
+ parser->getDomConfig()->setParameter(XMLUni::fgXercesEntityResolver, &resolver);
+#endif
//****************************************************************************************//
// End of air-gap code //
//****************************************************************************************//
@@ -144,7 +171,11 @@
// Create a new DOMErrorHandler
// and set it to the builder
XmlProcessorErrorHandler *errHandler = new XmlProcessorErrorHandler();
+#if XERCES_VERSION_MAJOR < 3
parser->setErrorHandler(errHandler);
+#else
+ parser->getDomConfig()->setParameter(XMLUni::fgDOMErrorHandler, errHandler);
+#endif
try {
// reset document pool
@@ -215,24 +246,26 @@
XMLCh tempStr[100];
XMLString::transcode("LS", tempStr, 99);
DOMImplementation *impl = DOMImplementationRegistry::getDOMImplementation(tempStr);
+#if XERCES_VERSION_MAJOR < 3
DOMWriter *theSerializer = ((DOMImplementationLS*)impl)->createDOMWriter();
+#else
+ DOMLSSerializer *theSerializer = ((DOMImplementationLS*)impl)->createLSSerializer();
+#endif
+
+#if XERCES_VERSION_MAJOR < 3
+#define SetParameter(serializer,n,v) if (serializer->canSetFeature(n,v)) serializer->setFeature(n,v)
+#else
+#define SetParameter(serializer,n,v) if (serializer->getDomConfig()->canSetParameter(n,v)) serializer->getDomConfig()->setParameter(n,v)
+#endif
// set feature if the serializer supports the feature/mode
- if (theSerializer->canSetFeature(XMLUni::fgDOMWRTSplitCdataSections, true))
- theSerializer->setFeature(XMLUni::fgDOMWRTSplitCdataSections, true);
-
- if (theSerializer->canSetFeature(XMLUni::fgDOMWRTDiscardDefaultContent, true))
- theSerializer->setFeature(XMLUni::fgDOMWRTDiscardDefaultContent, true);
-
- if (theSerializer->canSetFeature(XMLUni::fgDOMWRTFormatPrettyPrint, true))
- theSerializer->setFeature(XMLUni::fgDOMWRTFormatPrettyPrint, true);
-
- if (theSerializer->canSetFeature(XMLUni::fgDOMWRTBOM, false))
- theSerializer->setFeature(XMLUni::fgDOMWRTBOM, false);
-
- //if (theSerializer->canSetFeature(XMLUni::fgDOMWRTDiscardDefaultContent, true))
- // theSerializer->setFeature(XMLUni::fgDOMWRTBOM, true);
+ SetParameter(theSerializer, XMLUni::fgDOMWRTSplitCdataSections, true);
+ SetParameter(theSerializer, XMLUni::fgDOMWRTDiscardDefaultContent, true);
+ SetParameter(theSerializer, XMLUni::fgDOMWRTFormatPrettyPrint, true);
+ SetParameter(theSerializer, XMLUni::fgDOMWRTBOM, false);
+ //SetParameter(theSerializer, XMLUni::fgDOMWRTBOM, true);
+#undef SetParameter
//
// Plug in a format target to receive the resultant
// XML stream from the serializer.
@@ -249,7 +282,13 @@
//
// do the serialization through DOMWriter::writeNode();
//
+#if XERCES_VERSION_MAJOR < 3
theSerializer->writeNode(myFormTarget, *doc);
+#else
+ DOMLSOutput *output = ((DOMImplementationLS*)impl)->createLSOutput();
+ output->setByteStream(myFormTarget);
+ theSerializer->write(doc, output);
+#endif
delete theSerializer;
delete myFormTarget;
--- src/XmlProcessor.h.old 2010-10-22 12:06:05.000000000 +0200
+++ src/XmlProcessor.h 2010-10-22 12:06:20.000000000 +0200
@@ -40,7 +40,7 @@
// required xerces includes
#include <xercesc/dom/DOMImplementationRegistry.hpp>
-#include <xercesc/dom/DOMBuilder.hpp>
+//#include <xercesc/dom/DOMBuilder.hpp>
#include <xercesc/dom/DOMException.hpp>
#include <xercesc/dom/DOMErrorHandler.hpp>
#include <xercesc/dom/DOMError.hpp>
--- src/XmlProcessor.h.old 2010-10-22 14:40:45.000000000 +0200
+++ src/XmlProcessor.h 2010-10-22 14:42:00.000000000 +0200
@@ -50,18 +50,23 @@
// for dom Writer
#include <xercesc/dom/DOMImplementation.hpp>
#include <xercesc/dom/DOMImplementationLS.hpp>
-#include <xercesc/dom/DOMWriter.hpp>
+//#include <xercesc/dom/DOMWriter.hpp>
#include <xercesc/framework/StdOutFormatTarget.hpp>
#include <xercesc/framework/LocalFileFormatTarget.hpp>
#include <xercesc/parsers/XercesDOMParser.hpp>
#include <xercesc/util/XMLUni.hpp>
// for entity resolver
-#include <xercesc/dom/DOMEntityResolver.hpp>
-#include <xercesc/dom/DOMInputSource.hpp>
+//#include <xercesc/dom/DOMEntityResolver.hpp>
+//#include <xercesc/dom/DOMInputSource.hpp>
#include <xercesc/framework/LocalFileInputSource.hpp>
#include <xercesc/framework/Wrapper4InputSource.hpp>
+#include <xercesc/dom/DOMImplementationRegistry.hpp>
+#include <xercesc/sax/EntityResolver.hpp>
+#include <xercesc/sax/InputSource.hpp>
+#include <xercesc/sax2/SAX2XMLReader.hpp>
+
XERCES_CPP_NAMESPACE_USE
--- src/XmlProcessor.h.old 2010-10-22 14:43:06.000000000 +0200
+++ src/XmlProcessor.h 2010-10-22 14:44:16.000000000 +0200
@@ -75,12 +75,14 @@
This class extends the default DOMEntityResolver and implments the resolve entity method
to support
*/
-class DataDirResolver : public DOMEntityResolver {
+class DataDirResolver : public EntityResolver {
public:
/**
*
*/
- DOMInputSource *resolveEntity (const XMLCh *const publicId, const XMLCh *const systemId, const XMLCh *const baseURI);
+// DOMInputSource *resolveEntity (const XMLCh *const publicId, const XMLCh *const systemId, const XMLCh *const baseURI);
+ InputSource *resolveEntity (const XMLCh *const publicId, const XMLCh *const systemId);
+ DOMLSInput *resolveEntity (const XMLCh *const publicId, const XMLCh *const systemId, const XMLCh *const baseURI);
};
/**
@@ -120,7 +122,7 @@
static XmlProcessor* instance;
- DOMBuilder *parser;
+ DOMLSParser *parser;
};
/**
--- src/probes/independent/XmlFileContentProbe.cpp.old 2010-10-22 14:49:22.000000000 +0200
+++ src/probes/independent/XmlFileContentProbe.cpp 2010-10-22 14:51:39.000000000 +0200
@@ -419,12 +419,24 @@
return new DummyEntityResolver::DoNothingBinInputStream();
}
+#if XERCES_VERSION_MAJOR < 3
unsigned int DummyEntityResolver::DoNothingBinInputStream::curPos() const
+#else
+const XMLCh* DummyEntityResolver::DoNothingBinInputStream::getContentType() const
+{
+ return NULL;
+}
+XMLFilePos DummyEntityResolver::DoNothingBinInputStream::curPos() const
+#endif
{
return 0;
}
+#if XERCES_VERSION_MAJOR < 3
unsigned int DummyEntityResolver::DoNothingBinInputStream::readBytes(XMLByte *const /*toFill*/, const unsigned int /*maxToRead*/)
+#else
+XMLSize_t DummyEntityResolver::DoNothingBinInputStream::readBytes(XMLByte *const toFill, XMLSize_t maxToRead)
+#endif
{
return 0;
}
--- src/probes/independent/XmlFileContentProbe.h.old 2010-10-22 14:55:47.000000000 +0200
+++ src/probes/independent/XmlFileContentProbe.h 2010-10-22 14:57:00.000000000 +0200
@@ -134,8 +134,14 @@
class DoNothingBinInputStream : public BinInputStream
{
public:
+#if XERCES_VERSION_MAJOR < 3
virtual unsigned int curPos() const;
virtual unsigned int readBytes(XMLByte *const toFill, const unsigned int maxToRead);
+#else
+ virtual XMLFilePos curPos() const;
+ virtual const XMLCh* getContentType() const;
+ virtual XMLSize_t readBytes(XMLByte *const toFill, XMLSize_t maxToRead);
+#endif
};
};
--- src/XmlCommon.cpp.old
+++ src/XmlCommon.cpp
@@ -546,7 +546,11 @@ void XmlCommon::AddSchemaLocation(XERCES_CPP_NAMESPACE_QUALIFIER DOMDocument *do
string XmlCommon::GetNamespace(DOMElement *element) {
string xmlns = "";
+#if XERCES_VERSION_MAJOR < 3
xmlns = XmlCommon::ToString(element->getTypeInfo()->getNamespace());
+#else
+ xmlns = XmlCommon::ToString(element->getSchemaTypeInfo()->getTypeNamespace());
+#endif
if (xmlns.compare("") == 0) {
xmlns = "";
}

@ -1,58 +0,0 @@
--- src/probes/linux/rpmdb.h.old 2010-10-22 15:16:49.000000000 +0200
+++ src/probes/linux/rpmdb.h 2010-10-22 15:22:09.000000000 +0200
@@ -8,8 +8,8 @@
*/
#include <assert.h>
-#include "rpmlib.h"
-#include "rpmsw.h"
+/*#include <rpmlib.h>
+#include <rpmsw.h>*/
#include "db.h"
/*@-exportlocal@*/
@@ -508,7 +508,7 @@
* @param opx per-rpmdb accumulator index (aka rpmtsOpX)
* @return per-rpmdb accumulator pointer
*/
-void * dbiStatsAccumulator(dbiIndex dbi, int opx)
+rpmop_s * dbiStatsAccumulator(dbiIndex dbi, int opx)
/*@*/;
#if !defined(SWIG)
@@ -576,7 +576,7 @@
/*@globals fileSystem, internalState @*/
/*@modifies dbi, *dbcursor, fileSystem, internalState @*/
{
- void * sw = dbiStatsAccumulator(dbi, 16); /* RPMTS_OP_DBDEL */
+ rpmop_s *sw = dbiStatsAccumulator(dbi, 16); /* RPMTS_OP_DBDEL */
int rc;
assert(key->data != NULL && key->size > 0);
(void) rpmswEnter(sw, 0);
@@ -600,7 +600,7 @@
/*@globals fileSystem, internalState @*/
/*@modifies dbi, *dbcursor, *key, *data, fileSystem, internalState @*/
{
- void * sw = dbiStatsAccumulator(dbi, 14); /* RPMTS_OP_DBGET */
+ rpmop_s * sw = dbiStatsAccumulator(dbi, 14); /* RPMTS_OP_DBGET */
int rc;
assert((flags == DB_NEXT) || (key->data != NULL && key->size > 0));
(void) rpmswEnter(sw, 0);
@@ -625,7 +625,7 @@
/*@globals fileSystem, internalState @*/
/*@modifies dbi, *dbcursor, *key, *pkey, *data, fileSystem, internalState @*/
{
- void * sw = dbiStatsAccumulator(dbi, 14); /* RPMTS_OP_DBGET */
+ rpmop_s * sw = dbiStatsAccumulator(dbi, 14); /* RPMTS_OP_DBGET */
int rc;
assert((flags == DB_NEXT) || (key->data != NULL && key->size > 0));
(void) rpmswEnter(sw, 0);
@@ -649,7 +649,7 @@
/*@globals fileSystem, internalState @*/
/*@modifies dbi, *dbcursor, *key, fileSystem, internalState @*/
{
- void * sw = dbiStatsAccumulator(dbi, 15); /* RPMTS_OP_DBPUT */
+ rpmop_s * sw = dbiStatsAccumulator(dbi, 15); /* RPMTS_OP_DBPUT */
int rc;
assert(key->data != NULL && key->size > 0 && data->data != NULL && data->size > 0);
(void) rpmswEnter(sw, 0);

@ -1,11 +0,0 @@
--- src/probes/linux/RPMInfoProbe.h.old 2010-10-22 15:12:50.000000000 +0200
+++ src/probes/linux/RPMInfoProbe.h 2010-10-22 15:13:02.000000000 +0200
@@ -36,7 +36,7 @@
#include <rpm/rpmlib.h>
#include <rpm/rpmio.h>
#include <rpm/rpmts.h>
-#include <rpm/rpmdb.h>
+#include "rpmdb.h"
#include <rpm/header.h>
#include <rpm/rpmcli.h> // added for rpm query function
#include <rpm/rpmds.h> // added for rpm query function

@ -10,9 +10,6 @@
<email>proxy-maint@gentoo.org</email>
<name>Proxy Maintainers</name>
</maintainer>
<use>
<flag name="rpm">Enable the RPM probes</flag>
</use>
<upstream>
<remote-id type="sourceforge">ovaldi</remote-id>
</upstream>

@ -1,4 +1,4 @@
# Copyright 1999-2014 Gentoo Foundation
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.bz2"
LICENSE="BSD"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="acl ldap rpm selinux"
IUSE="acl ldap selinux"
CDEPEND="dev-libs/libgcrypt:0
dev-libs/libpcre
@ -21,8 +21,7 @@ CDEPEND="dev-libs/libgcrypt:0
sys-apps/util-linux
sys-libs/libcap
acl? ( sys-apps/acl )
ldap? ( net-nds/openldap )
rpm? ( app-arch/rpm )"
ldap? ( net-nds/openldap )"
DEPEND="${CDEPEND}
sys-apps/sed"
RDEPEND="${CDEPEND}
@ -54,16 +53,9 @@ src_prepare() {
sed -i 's, -lacl , ,' project/linux/Makefile || die
fi
# rpm probes support is build dependant only on the presence of the rpm binary
if use rpm ; then
#Same problems as bug 274679, so i do a local copy of the header and patch it
cp /usr/include/rpm/rpmdb.h src/probes/linux/ || die
epatch "${FILESDIR}"/use_local_rpmdb.patch
epatch "${FILESDIR}"/rpmdb.patch
else
einfo "Disabling rpm probes"
sed -i 's/^PACKAGE_RPM/#PACKAGE_RPM/' project/linux/Makefile || die
fi
einfo "Disabling rpm probes"
sed -i 's/^PACKAGE_RPM/#PACKAGE_RPM/' project/linux/Makefile || die
# same thing for dpkg, but package dpkg is not sufficient, needs app-arch/apt-pkg that is not on tree
einfo "Disabling dpkg probes"
sed -i 's/^PACKAGE_DPKG/#PACKAGE_DPKG/' project/linux/Makefile || die

@ -7,7 +7,7 @@
</maintainer>
<longdescription lang="en">
The M17N engine for IBus. It allows input of many languages using the input
table maps from <pkg>dev-db/m17n-lib</pkg>.
table maps from <pkg>dev-db/m17n-db</pkg>.
</longdescription>
<use>
<flag name="gtk2">

@ -1,18 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>yaleks@gmail.com</email>
<name>Aleksandr Yakimov</name>
</maintainer>
<maintainer type="person">
<email>rich0@gentoo.org</email>
<name>Richard Freeman</name>
</maintainer>
<maintainer type="project">
<email>proxy-maint@gentoo.org</email>
<name>Proxy Maintainers</name>
</maintainer>
<!-- maintainer-needed -->
<longdescription lang="en">
Cuneiform is an multi-language OCR system.
</longdescription>

@ -1,4 +1,4 @@
# Copyright 1999-2016 Gentoo Foundation
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@ -9,6 +9,7 @@ DESCRIPTION="vim plugin: unite all sources"
HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=3396"
LICENSE="MIT"
KEYWORDS="amd64 x86"
IUSE=""
VIM_PLUGIN_HELPFILES="${PN}.txt"
RDEPEND="!app-vim/neocomplcache"

@ -1,4 +1,3 @@
DIST mysql-extras-20161130-2354Z.tar.bz2 303863 SHA256 b18ce4ccfd023106a802bcb2e17a5bc3a1ec4d99e7bf7f45d047cf18ebb9ad1b SHA512 6c24c581fd471c4ce0ff20ed68bdb32150e310a2f8f000c8bb9892ab98302127f3427165b17967da3f5663e1da5a7f1d26f84021d4cb8292cbb5e0c241505113 WHIRLPOOL de6d896474faedf1d3696e346877cb03fb9908338d66f2b901aa83a24983ec3e0ea5f7f54dfd190bdf7a55f72bb580e21ab826850018ae25629b572cbabf532d
DIST percona-server-5.6.35-80.0.tar.gz 55839147 SHA256 259b5aa2c6218958c8cc55170b9381955ea60445127bf46e02aa09903af7f26b SHA512 78b0b9cd69f26dc3ac13e4c6165590736d723b0f07d18a8ac1056281522de22b67d9fd931b035962bc278c97775fe7f98c46791328ece286268c7d31a484b69d WHIRLPOOL a6a6f78f41b1f8b5c26d0899efa6b043256749f4082ae9bffafe9210c3a326f33fe512a4c6578984892797e4f2c94de88ceca4c8c983cde7096cf01e88dec9b7
DIST percona-server-5.6.35-81.0.tar.gz 56065684 SHA256 c71c3f80662982ade22a0a538c5fd595b1761472c98efc2509124ecc4004d1e7 SHA512 7020946e91d57f6377064a7c3e820b9c9d5149d22f80c9bb509d4b06631862a4378167d7bec40d7ca9ff01bcb498bdb9656cad8a64f2eab985ebc722fd1985aa WHIRLPOOL 51239409fc5742f81b4baa6e3150ac5f2fa6d6f55d55b34e426737968bacc44999427e9ab65a390459ba270b740462b4c1c409d95a3d13781a2aefe716037cdf
DIST percona-server-5.6.36-82.0.tar.gz 56116691 SHA256 4304ac45de79053128fb78f13527f483ec9cf1c9592498deeacbbe541216fc9d SHA512 c5046f212a893de2ce80afbeed3648915842d862383faf3a354a47515920016ed98b91d4bd42b77ea422b28aa9a5cb691942b031099fc893833127080e5a38b0 WHIRLPOOL 2cfa29d9cd864f5ff828553a3659ff2818589201f983be45a984474a27c625e6868a77f4a751ba0a575a79793ddcf34337f7efa95cb09e0c290c9b9cdaa9b173
DIST percona-server-5.6.36-82.1.tar.gz 56190395 SHA256 bebab31321e17682bc23f0f1e95211f002ba2a24c21d9a7ce9821cbe2a1ba4ba SHA512 b604772a65cdd94d832c69a2b7984e065bef1ce3b9305c1d35c0f37513b962067f9fcb47f43172a318e55648222b7c7bd6e86fb003314ef75da3696bd2a63a21 WHIRLPOOL 88307c416f066df5a55821d2b6fa4bde98acb4e23defc661cf01a52d635f6e25e132f37a27e5748d302ade80470803aab0afca2585221870b7208edfff6aa7b0

@ -1,219 +0,0 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
MY_EXTRAS_VER="20161130-2354Z"
SUBSLOT="18"
PYTHON_COMPAT=( python2_7 )
inherit linux-info python-any-r1 mysql-multilib-r1
IUSE="numa pam tokudb tokudb-backup-plugin"
# REMEMBER: also update eclass/mysql*.eclass before committing!
KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-linux"
HOMEPAGE="http://www.percona.com/software/percona-server"
DESCRIPTION="An enhanced, drop-in replacement for MySQL from the Percona team"
# When MY_EXTRAS is bumped, the index should be revised to exclude these.
EPATCH_EXCLUDE=''
COMMON_DEPEND="numa? ( sys-process/numactl:= )
server? ( pam? ( virtual/pam:0= ) )
tokudb? ( app-arch/snappy )
tokudb-backup-plugin? ( dev-util/valgrind )
"
DEPEND="${COMMON_DEPEND}
|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )
test? ( $(python_gen_any_dep 'dev-python/mysql-python[${PYTHON_USEDEP}]') )"
RDEPEND="${COMMON_DEPEND}"
REQUIRED_USE="tokudb-backup-plugin? ( tokudb ) tokudb? ( jemalloc !tcmalloc )"
MY_PATCH_DIR="${WORKDIR}/mysql-extras-${MY_EXTRAS_VER}"
PATCHES=(
"${MY_PATCH_DIR}"/01050_all_mysql_config_cleanup-5.6.patch
"${MY_PATCH_DIR}"/02040_all_embedded-library-shared-5.5.10.patch
"${MY_PATCH_DIR}"/20001_all_fix-minimal-build-cmake-mysql-5.6.20.patch
"${MY_PATCH_DIR}"/20006_all_cmake_elib-percona-5.6.34.patch
"${MY_PATCH_DIR}"/20007_all_cmake-debug-werror-5.6.22.patch
"${MY_PATCH_DIR}"/20008_all_mysql-tzinfo-symlink.patch
"${MY_PATCH_DIR}"/20009_all_mysql_myodbc_symbol_fix-5.6.patch
"${MY_PATCH_DIR}"/20018_all_percona-server-5.6.25-without-clientlibs-tools.patch
)
# Please do not add a naive src_unpack to this ebuild
# If you want to add a single patch, copy the ebuild to an overlay
# and create your own mysql-extras tarball, looking at 000_index.txt
pkg_pretend() {
mysql-multilib-r1_pkg_pretend
if use numa; then
local CONFIG_CHECK="~NUMA"
local WARNING_NUMA="This package expects NUMA support in kernel which this system does not have at the moment;"
WARNING_NUMA+=" Either expect runtime errors, enable NUMA support in kernel or rebuild the package without NUMA support"
check_extra_config
fi
}
python_check_deps() {
has_version "dev-python/mysql-python[${PYTHON_USEDEP}]"
}
src_prepare() {
mysql-multilib-r1_src_prepare
if use libressl ; then
sed -i 's/OPENSSL_MAJOR_VERSION STREQUAL "1"/OPENSSL_MAJOR_VERSION STREQUAL "2"/' \
"${S}/cmake/ssl.cmake" || die
fi
}
src_configure() {
local MYSQL_CMAKE_NATIVE_DEFINES=( -DWITH_NUMA=$(usex numa)
-DWITH_PAM=$(usex pam)
$(mysql-cmake_use_plugin tokudb TOKUDB)
)
if use tokudb ; then
# TokuDB Backup plugin requires valgrind unconditionally
MYSQL_CMAKE_NATIVE_DEFINES+=(
$(usex tokudb-backup-plugin '' -DTOKUDB_BACKUP_DISABLED=1)
)
fi
mysql-multilib-r1_src_configure
}
# Official test instructions:
# USE='extraengine perl openssl static-libs' \
# FEATURES='test userpriv -usersandbox' \
# ebuild percona-server-X.X.XX.ebuild \
# digest clean package
multilib_src_test() {
if ! multilib_is_native_abi ; then
einfo "Server tests not available on non-native abi".
return 0;
fi
if ! use server ; then
einfo "Skipping server tests due to minimal build."
return 0
fi
local TESTDIR="${CMAKE_BUILD_DIR}/mysql-test"
local retstatus_unit
local retstatus_tests
# Bug #213475 - MySQL _will_ object strenously if your machine is named
# localhost. Also causes weird failures.
[[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
if [[ $UID -eq 0 ]]; then
die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
fi
einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
# Run CTest (test-units)
cmake-utils_src_test
retstatus_unit=$?
[[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
# Ensure that parallel runs don't die
export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
# Enable parallel testing, auto will try to detect number of cores
# You may set this by hand.
# The default maximum is 8 unless MTR_MAX_PARALLEL is increased
export MTR_PARALLEL="${MTR_PARALLEL:-auto}"
# create directories because mysqladmin might right out of order
mkdir -p "${T}"/var-tests{,/log}
# These are failing in Percona 5.6 for now and are believed to be
# false positives:
#
# main.information_schema, binlog.binlog_statement_insert_delayed,
# main.mysqld--help-notwin, binlog.binlog_mysqlbinlog_filter
# perfschema.binlog_edge_mix, perfschema.binlog_edge_stmt
# funcs_1.is_columns_mysql funcs_1.is_tables_mysql funcs_1.is_triggers
# engines/funcs.db_alter_character_set engines/funcs.db_alter_character_set_collate
# engines/funcs.db_alter_collate_ascii engines/funcs.db_alter_collate_utf8
# engines/funcs.db_create_character_set engines/funcs.db_create_character_set_collate
# fails due to USE=-latin1 / utf8 default
#
# main.mysql_client_test:
# segfaults at random under Portage only, suspect resource limits.
#
# main.percona_bug1289599
# Looks to be a syntax error in the test file itself
#
# main.variables main.myisam main.merge_recover
# fails due to ulimit not able to open enough files (needs 5000)
#
# main.mysqlhotcopy_archive main.mysqlhotcopy_myisam
# Called with bad parameters should be reported upstream
#
local t
for t in main.mysql_client_test \
binlog.binlog_statement_insert_delayed main.information_schema \
main.mysqld--help-notwin binlog.binlog_mysqlbinlog_filter \
perfschema.binlog_edge_mix perfschema.binlog_edge_stmt \
funcs_1.is_columns_mysql funcs_1.is_tables_mysql funcs_1.is_triggers \
main.variables main.myisam main.merge_recover \
engines/funcs.db_alter_character_set engines/funcs.db_alter_character_set_collate \
engines/funcs.db_alter_collate_ascii engines/funcs.db_alter_collate_utf8 \
engines/funcs.db_create_character_set engines/funcs.db_create_character_set_collate \
main.percona_bug1289599 main.mysqlhotcopy_archive main.mysqlhotcopy_myisam ; do
mysql-multilib-r1_disable_test "$t" "False positives in Gentoo"
done
if use numa && use kernel_linux ; then
# bug 584880
if ! linux_config_exists || ! linux_chkconfig_present NUMA ; then
for t in sys_vars.innodb_buffer_pool_populate_basic ; do
mysql-multilib-r1_disable_test "$t" "Test $t requires system with NUMA support"
done
fi
fi
if ! use extraengine ; then
# bug 401673, 530766
for t in federated.federated_plugin ; do
mysql-multilib-r1_disable_test "$t" "Test $t requires USE=extraengine (Need federated engine)"
done
fi
# Run mysql tests
pushd "${TESTDIR}" || die
# Set file limits higher so tests run
ulimit -n 3000
python_setup
# run mysql-test tests
perl mysql-test-run.pl --force --vardir="${T}/var-tests" \
--testcase-timeout=30 --reorder
retstatus_tests=$?
[[ $retstatus_tests -eq 0 ]] || eerror "tests failed"
popd || die
# Cleanup is important for these testcases.
pkill -9 -f "${S}/ndb" 2>/dev/null
pkill -9 -f "${S}/sql" 2>/dev/null
failures=""
[[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
[[ $retstatus_tests -eq 0 ]] || failures="${failures} tests"
if [[ -n "$failures" ]]; then
has usersandbox $FEATURES && eerror "Some tests may have failed due to FEATURES=usersandbox"
die "Test failures: $failures"
fi
einfo "Tests successfully completed"
}

@ -11,3 +11,4 @@ DIST swipl-7.5.5.tar.gz 16670102 SHA256 285f8531908d7e6964e115c844e930a8c4797029
DIST swipl-7.5.6.tar.gz 16672920 SHA256 47c31d4d3140e96706295555b01916dd7bde6c4151c80515a48e7aabfc747288 SHA512 5809878d3381ca8646e8526382e9edad0c378e1e7b6d57e1f88df7500a6a78ddf2d80f5e6e0bff2efa77781e3e1e77d6097205bd1433572f6e9cfe7d04a217c1 WHIRLPOOL 05527e99580ce3b536bfda47ee6ae4709765b2edc8a13c4de86994effbb6eb39ca8c58d84618fc07a609a7025767f5df121e0ae8749114e3ae9adfa5fe83fa39
DIST swipl-7.5.7.tar.gz 16683795 SHA256 648d15a534a3503ef281cc7c2ead7ee913866c3d7cb1d1344508ee24b96b4512 SHA512 2e5247358d6db04c9a3535d9be0b8cfef19908fc0274a879a3b7ca02cfd8663689aab2ed3faa4faafd5e9e3ce29e31c07337f83cd39679a64be3409576ffe962 WHIRLPOOL a41b0130af1ab02494ba201786229d53535efa1499bce1b119b3abd10cf9c0ce8b38ddd96b8d39ae231193b73e6a98d8b9f2c23562ebf0309458fdd9c347a72f
DIST swipl-7.5.8.tar.gz 16689471 SHA256 a02c42506fb5d071c51ddf139fc2ca1d66e9067e24cde5179824381a27c66ccd SHA512 5e494ac0e0389e43c57daf266f1dd0d04c0c7201f3030640b7876fe2f2fb01d6b22a3688213adb45919efd6c05e4c9f67ed9a626ae57bd2ca889c27a3cec3a38 WHIRLPOOL 57ea21a2300f1ad56b6cad5097214c4bc5eb8cafa1c32c29047bd71874b955d30e25b4d2bcd51ddcae2ce3e27bef643b3ee249089dd7d15f9f56afddc9d43f98
DIST swipl-7.5.9.tar.gz 16699493 SHA256 10064a729b8f8647d9d3544880dd0669b24025448da5e0cab77b2942e69dc7de SHA512 0ed3bf2a7bdd510fa23afe4c435e59934eb5149086377b776a1483de915227f13a646c15db1e8c427f734b2f548916bc3867245c34cb0b234e19af0e92a24a6a WHIRLPOOL b1512fbca346a9e18d90a5c8079fe5a80804b7f94ba22f64770ae56bf673ce0e2c7153d3d21d128e220d03ff614119e95e11aea2a926a65d81475fab99b8032d

@ -0,0 +1,144 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
inherit eutils flag-o-matic java-pkg-opt-2 multilib
PATCHSET_VER="0"
DESCRIPTION="free, small, and standard compliant Prolog compiler"
HOMEPAGE="http://www.swi-prolog.org/"
SRC_URI="http://www.swi-prolog.org/download/devel/src/swipl-${PV}.tar.gz"
LICENSE="BSD-2"
SLOT="0"
KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
IUSE="archive berkdb debug doc +gmp hardened java +libedit libressl minimal odbc readline ssl static-libs test uuid zlib X"
RDEPEND="sys-libs/ncurses:=
archive? ( app-arch/libarchive )
berkdb? ( >=sys-libs/db-4:= )
zlib? ( sys-libs/zlib )
odbc? ( dev-db/unixODBC )
readline? ( sys-libs/readline:= )
libedit? ( dev-libs/libedit )
gmp? ( dev-libs/gmp:0 )
ssl? (
!libressl? ( dev-libs/openssl:0 )
libressl? ( dev-libs/libressl )
)
java? ( >=virtual/jdk-1.5:= )
uuid? ( dev-libs/ossp-uuid )
X? (
virtual/jpeg:0
x11-libs/libX11
x11-libs/libXft
x11-libs/libXpm
x11-libs/libXt
x11-libs/libICE
x11-libs/libSM )"
DEPEND="${RDEPEND}
X? ( x11-proto/xproto )
java? ( test? ( =dev-java/junit-3.8* ) )"
S="${WORKDIR}/swipl-${PV}"
src_prepare() {
EPATCH_FORCE=yes
EPATCH_SUFFIX=patch
if [[ -d "${WORKDIR}"/${PV} ]] ; then
epatch "${WORKDIR}"/${PV}
fi
if ! use uuid; then
mv packages/clib/uuid.pl packages/clib/uuid.pl.unused || die
fi
# OSX/Intel ld doesn't like an archive without table of contents
sed -i -e 's/-cru/-scru/' packages/nlp/libstemmer_c/Makefile.pl || die
}
src_configure() {
append-flags -fno-strict-aliasing
use ppc && append-flags -mno-altivec
use hardened && append-flags -fno-unit-at-a-time
use debug && append-flags -DO_DEBUG
# ARCH is used in the configure script to figure out host and target
# specific stuff
export ARCH=${CHOST}
export CC_FOR_BUILD=$(tc-getBUILD_CC)
cd "${S}"/src || die
econf \
--libdir="${EPREFIX}"/usr/$(get_libdir) \
$(use_enable gmp) \
$(use_enable static-libs static) \
--enable-shared \
--enable-custom-flags COFLAGS="${CFLAGS}"
if ! use minimal ; then
local jpltestconf
if use java && use test ; then
jpltestconf="--with-junit=$(java-config --classpath junit)"
fi
cd "${S}/packages" || die
econf \
--libdir="${EPREFIX}"/usr/$(get_libdir) \
$(use_with archive) \
$(use_with berkdb bdb ) \
$(use_with java jpl) \
${jpltestconf} \
$(use_with libedit) \
$(use_with odbc) \
$(use_with readline) \
$(use_with ssl) \
$(use_with X xpce) \
$(use_with zlib) \
COFLAGS='"${CFLAGS}"'
fi
}
src_compile() {
cd "${S}"/src || die
emake
if ! use minimal ; then
cd "${S}/packages" || die
emake
./report-failed || die "Cannot report failed packages"
fi
}
src_test() {
cd "${S}/src" || die
emake check
if ! use minimal ; then
unset DISPLAY
cd "${S}/packages" || die
emake \
USE_PUBLIC_NETWORK_TESTS=false \
USE_ODBC_TESTS=false \
check
./report-failed || die
fi
}
src_install() {
emake -C src DESTDIR="${D}" install
if ! use minimal ; then
emake -C packages DESTDIR="${D}" install
if use doc ; then
emake -C packages DESTDIR="${D}" html-install
fi
./packages/report-failed || die "Cannot report failed packages"
fi
dodoc ReleaseNotes/relnotes-5.10 INSTALL README.md VERSION
}

@ -1 +1,2 @@
DIST amdgpu-pro-17.10-429170.tar.xz 121382128 SHA256 cb1ea7f9756f197a976138d2c00f239ae4ee43b839fbb1ea57f8770957d4afd6 SHA512 2d9d0a97478564e259dc8494083df8dc13e3bc664384978aff369070b1105703653d8dc4dca38e94dc8bdf3ddfb5c6f4de39cec5a9b263423de8fb91fd0117c6 WHIRLPOOL 1e07579d2c9d5d8a796973658cbb6627418b133a630ca5e977f93da0d27b900da2078d2ea8b35a13071b0b05e3d5e7f47e17d61042dcca60709f6599c18380a2
DIST amdgpu-pro-17.30-458935.tar.xz 393634984 SHA256 3652a5c9476a650a3e3cd89bcd7ac119ed7d16a570501eeeea6a902cbc6f9488 SHA512 3f517ce13e102edb820f8f9538e0894c794d767816f99774fbfec342adb6912712664f069db2542412baabb24ee198204f38757407c29aff238ed1772dc3caab WHIRLPOOL 29a5b06657767255ace0529467ca56a904a021254f7dab854b1fd3ac843108ac346d3c4e97e10ef53844152de116581bff7c3aa8f4f066a08becb88e59918da3

@ -0,0 +1,77 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
inherit unpacker versionator
SUPER_PN='amdgpu-pro'
MY_PV=$(replace_version_separator 2 '-')
DESCRIPTION="Proprietary OpenCL implementation for AMD GPUs"
HOMEPAGE="https://support.amd.com/en-us/kb-articles/Pages/AMDGPU-PRO-Driver-for-Linux-Release-Notes.aspx"
SRC_URI="${SUPER_PN}-${MY_PV}.tar.xz"
LICENSE="AMD-GPU-PRO-EULA"
SLOT="0"
KEYWORDS="~amd64"
RESTRICT="mirror fetch strip"
DEPEND="dev-util/patchelf"
RDEPEND="dev-libs/ocl-icd"
QA_PREBUILT="/opt/${SUPER_PN}/lib*/*"
S="${WORKDIR}/${SUPER_PN}-${MY_PV}"
pkg_nofetch() {
local pkgver=$(get_version_component_range 1-2)
einfo "Please download the AMDGPU-Pro Driver ${pkgver} for Ubuntu from"
einfo " ${HOMEPAGE}"
einfo "The archive should then be placed into ${DISTDIR}."
}
src_unpack() {
default
local libdrm_ver="2.4.70"
local patchlevel=$(get_version_component_range 3)
cd "${S}" || die
unpack_deb opencl-${SUPER_PN}-icd_${MY_PV}_amd64.deb
unpack_deb libdrm-${SUPER_PN}-amdgpu1_${libdrm_ver}-${patchlevel}_amd64.deb
}
src_prepare() {
default
cd "${S}/opt/${SUPER_PN}/lib/x86_64-linux-gnu" || die
patchelf --set-rpath '$ORIGIN' libamdocl64.so || die "Failed to fix library rpath"
}
src_install() {
into "/opt/${SUPER_PN}"
dolib opt/${SUPER_PN}/lib/x86_64-linux-gnu/*
insinto /etc/OpenCL/vendors/
echo "/opt/${SUPER_PN}/$(get_libdir)/libamdocl64.so" > "${SUPER_PN}.icd" || die "Failed to generate ICD file"
doins "${SUPER_PN}.icd"
}
pkg_postinst() {
if [[ -z "${REPLACING_VERSIONS}" ]]; then
ewarn "Please note that using proprietary OpenCL libraries together with the"
ewarn "Open Source amdgpu stack is not officially supported by AMD. Do not ask them"
ewarn "for support in case of problems with this package."
ewarn ""
ewarn "Furthermore, if you have the whole AMDGPU-Pro stack installed this package"
ewarn "will almost certainly conflict with it. This might change once AMDGPU-Pro"
ewarn "has become officially supported by Gentoo."
fi
elog "AMD OpenCL driver relies on dev-libs/ocl-icd to work. To enable it, please run"
elog ""
elog " eselect opencl set ocl-icd"
elog ""
}

@ -1,3 +1,4 @@
DIST expat-2.2.0.tar.bz2 414352 SHA256 d9e50ff2d19b3538bd2127902a89987474e1a4db8e43a66a4d1a712ab9a504ff SHA512 2be1a6eea87b439374bfacb1fbb8e814fd8a085d5dfd3ca3be69d1af29b5dc93d36cbdec5f6843ca6d5910843c7ffbc498adc2a561b9dcece488edf3c6f8c7c8 WHIRLPOOL b1914e2c23170dabab6fce4fb0eb2511dc8dcde8db986a7cdf6b236d262fb756fb0955cb4c1fc7475a1ad3d9c005b632e42850dcf3af66f4cc87fe4ecfc3cb47
DIST expat-2.2.1.tar.bz2 405441 SHA256 1868cadae4c82a018e361e2b2091de103cd820aaacb0d6cfa49bd2cd83978885 SHA512 74089b55872df16f214a4baba0143e6353736dfa34063391293bb2760aa3e5118d9ccb3592e07c74c9d52a2a5b91496e15153f28214c4c01242d95b3019b67ea WHIRLPOOL f571ee00d43813c20d81d02d5d25f3fd4fdec3ec5a6aa331a965b4373ca681053e4e66d22fed4523f9a207333b80eb5e63c78d2e36e0c2b5a64ad1c38b0fe38a
DIST expat-2.2.2.tar.bz2 405561 SHA256 4376911fcf81a23ebd821bbabc26fd933f3ac74833f74924342c29aad2c86046 SHA512 05383244f345b1c6a7290f3bb58bfab4da9546bfe880de644e784bcc48bd4317f2beb3fdb6120a5f396e06bb269f7e80713db211346d2d17bc7de3353d556575 WHIRLPOOL d4d42ebf6ca1544a5496461bf1abec030ca6f71c72bf24bc2d32b78a4d976b5334f49d8244cf041e09cb64354d90885adab4d96d3811041d6ef6d0a7289284af
DIST expat-2.2.3.tar.bz2 435593 SHA256 b31890fb02f85c002a67491923f89bda5028a880fd6c374f707193ad81aace5f SHA512 d42ca209da7f50eb4ac108ea0ef85dc6626d63fe48144a4e6f2d8b44b1f9276f711cbac85f6813c4725a3c4933b7054b74dde2c43a0f2febaed4afa0a6f5ac88 WHIRLPOOL b9a8f62cf44db68adfa64dd3c8d89ddb2867cb0b354a43fb15453d5fc2d137671dc215e3e4cc1555a39ec2248307f89916dcaa81e3e78941d2fe3ea7039b7a0c

@ -0,0 +1,78 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
inherit eutils libtool multilib toolchain-funcs multilib-minimal
DESCRIPTION="Stream-oriented XML parser library"
HOMEPAGE="https://libexpat.github.io/"
SRC_URI="mirror://sourceforge/expat/${P}.tar.bz2"
LICENSE="MIT"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE="elibc_FreeBSD examples static-libs unicode"
RDEPEND="abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r6
!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )"
DOCS=( AUTHORS Changes README.md )
multilib_src_configure() {
local myconf="$(use_enable static-libs static)"
mkdir -p "${BUILD_DIR}"{u,w} || die
ECONF_SOURCE="${S}" econf ${myconf}
if use unicode; then
pushd "${BUILD_DIR}"w >/dev/null
CPPFLAGS="${CPPFLAGS} -DXML_UNICODE" ECONF_SOURCE="${S}" econf ${myconf}
popd >/dev/null
fi
}
multilib_src_compile() {
emake
if use unicode; then
pushd "${BUILD_DIR}"w >/dev/null
emake buildlib LIBRARY=libexpatw.la
popd >/dev/null
fi
}
multilib_src_install() {
emake install DESTDIR="${D}"
if use unicode; then
pushd "${BUILD_DIR}"w >/dev/null
emake installlib DESTDIR="${D}" LIBRARY=libexpatw.la
popd >/dev/null
pushd "${ED}"/usr/$(get_libdir)/pkgconfig >/dev/null
cp expat.pc expatw.pc
sed -i -e '/^Libs/s:-lexpat:&w:' expatw.pc || die
popd >/dev/null
fi
if multilib_is_native_abi ; then
# libgeom in /lib and ifconfig in /sbin require libexpat on FreeBSD since
# we stripped the libbsdxml copy starting from freebsd-lib-8.2-r1
use elibc_FreeBSD && gen_usr_ldscript -a expat
fi
}
multilib_src_install_all() {
einstalldocs
# Note: Use of HTML_DOCS would add unwanted "doc" subfolder
docinto html
dodoc doc/*.{css,html,png}
if use examples; then
insinto /usr/share/doc/${PF}/examples
doins examples/*.c
fi
prune_libtool_files
}

@ -1,2 +1 @@
DIST DB-1.8.2.tgz 131693 SHA256 51a4ad2bd3a5ec3590591013620bc81a89bc871d299599d4152681f5d2b1f125 SHA512 0af79e037964962d6e517d28aa6908de011ea8e1effd35c3f5250462e4a58e4253671f830171bb59f11a491957c44d2732f667cca9351a3bebb7595dc92f3055 WHIRLPOOL 0c2f51ba24b20f3a11020556a0fbff5155fce95961a33ae1e7367407909af9177965a2c9f7b6ec0cc90572f907cbeb312fe4bd8e83875facbdb1ca7afcf5d316
DIST DB-1.9.2.tgz 133795 SHA256 09a32b3eb7242accd61a8d8270596ab7486d2d63d2612ad51def696f7f2bd1b1 SHA512 126bbbb847a24c20731f1e5f4a549e9d7e0651a760f10c49cfc7550f80dd8b05f3560bc80110bcaab9e79dcbb714c6113948f14a727f7f4087a23178b3db0afa WHIRLPOOL 594d8a425b250a5501f1ffcff2e7cb19ddb88d70eaeff0749b0ad564dd2e9b7a90a94a0b4757e99a72631449965cfa8d7fc6d2c5beea78201822b1e05b1cdf41

@ -1,13 +0,0 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
inherit php-pear-r1
KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
DESCRIPTION="Database abstraction layer for PHP"
LICENSE="PHP-3"
SLOT="0"
IUSE=""

@ -0,0 +1,26 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
inherit php-pear-r2
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
DESCRIPTION="Database abstraction layer for PHP"
LICENSE="PHP-3"
SLOT="0"
IUSE="test"
DEPEND="test? ( dev-php/PEAR-PEAR )"
DOCS=( doc/TESTERS doc/IDEAS doc/MAINTAINERS doc/STATUS )
src_test() {
# Requires the "pear" executable from dev-php/PEAR-PEAR, and also
# a working version of the cli SAPI eselected.
pear run-tests tests || die
# The command succeeds regardless of whether or not the test suite
# passed, but this file is only written when there was a failure.
[[ -f run-tests.log ]] && die "test suite failed"
}

@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
KEYWORDS="~alpha amd64 ~arm ~arm64 ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
KEYWORDS="~alpha amd64 arm ~arm64 ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
IUSE=""
DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"

@ -1,2 +1 @@
DIST oslo.context-2.12.1.tar.gz 25879 SHA256 e257c5962928c564ad323a436703733662b39e45d4892d5aff3f290e89e95b94 SHA512 075f402786dfe0e153c0fe21f2a2a8a2099cc2451a6f891fef00e0fd460f9f39220d390c9ae7ba0515a3ad79a94a1b2288c65029aea8f5e7481f8fe181d877b4 WHIRLPOOL 9df270cd41bc2067dcbbba4312fd60682a4f2a5f461d61c80d4b5d5e19a4b1c691c08e8bd34d581e89e4998760f950cc7e8964d04a23c6188cf906892623c55b
DIST oslo.context-2.12.2.tar.gz 26860 SHA256 36decf5f8bd72a986d58c2e603c2e0d96d31da4283f2fbc145c6804113b86f64 SHA512 752d2e9744fbf94d23d6cc3205f3b4974d440bf71ab885de2feea3e706ed93b771b50df264c754cc8f6882f8526de0318cb3d1fc07a28a872f4b02e59118af98 WHIRLPOOL e54612a8fda6ee4a07ad603f54356f6bf5aa8bedcd11f9faaf88ff7f98ef79b0407dc50d9295b8131375fbc4916b5915096ce97a142a2c8c06eb9345749483e6

@ -1,47 +0,0 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
PYTHON_COMPAT=( python{2_7,3_{4,5}} )
inherit distutils-r1
DESCRIPTION="Helpers to maintain useful information about a request context"
HOMEPAGE="https://pypi.python.org/pypi/oslo.context"
SRC_URI="mirror://pypi/${PN:0:1}/oslo.context/oslo.context-${PV}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="amd64 ~arm64 x86"
IUSE="test"
CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
${CDEPEND}
test? (
>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
>=dev-python/coverage-4.0[${PYTHON_USEDEP}]
>=dev-python/oslo-sphinx-4.7.0[${PYTHON_USEDEP}]
>=dev-python/sphinx-1.2.1[${PYTHON_USEDEP}]
<dev-python/sphinx-1.4[${PYTHON_USEDEP}]
>=dev-python/reno-1.8.0[${PYTHON_USEDEP}]
)"
RDEPEND="
${CDEPEND}
>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
>=dev-python/positional-1.1.1[${PYTHON_USEDEP}]
"
S="${WORKDIR}/oslo.context-${PV}"
python_prepare_all() {
sed -i '/^hacking/d' test-requirements.txt || die
distutils-r1_python_prepare_all
}
# This time half the doc files are missing; Do you want them?
python_test() {
nosetests tests/ || die "test failed under ${EPYTHON}"
}

@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/oslo.context/oslo.context-${PV}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="~amd64 ~arm64 ~x86"
KEYWORDS="amd64 ~arm64 x86"
IUSE="test"
CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"

@ -1,2 +1 @@
DIST oslo.db-4.17.0.tar.gz 158388 SHA256 e25bfea8393bdbecba84cf82910378c34d646e930e9bedd5e8bf7b20a73f3ba7 SHA512 3b3c3af14080aae46d9d18958470b4004e9ed9d392475558f38973fc2acd2d4be0a49840f6914d3b54f54bf2cf44fe9f9302b8f7459a3fade28a5b0ba923546d WHIRLPOOL f14335f062166eca7fa407f7aab2d0a54b015060a74c93e39549b1de68b505c1a74f117ab1a0640eea275c977a6137fdd44b97d63eea233b290e9c5ef7d5eb31
DIST oslo.db-4.17.1.tar.gz 159919 SHA256 a38250c599b6d3e04f008251098eab1b7951e29d8e5ba1ff16fb3f1c55bceac9 SHA512 8bbe89feb56784b964778655cc9e12e57d20079ef520f68ca115168273ec86705b27c5551cd7707c6d64b8d87b742c6d7f80d9cce39141751cf77fb51cc9b1de WHIRLPOOL eebdcbe4974a915237bb237a0c484ac6433dedd54aa991ca140e0e802b26ff4a070619d04f2a97501ed59be0dbc3195dfc588f31716f43505e70141ed8b3a7c2

@ -1,56 +0,0 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
PYTHON_COMPAT=( python2_7 python3_4 python3_5)
inherit distutils-r1
DESCRIPTION="OpenStack Common DB Code"
HOMEPAGE="https://launchpad.net/oslo"
SRC_URI="mirror://pypi/${PN:0:1}/oslo.db/oslo.db-${PV}.tar.gz"
S="${WORKDIR}/oslo.db-${PV}"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="amd64 ~arm64 x86"
IUSE="+sqlite mysql postgres"
REQUIRED_USE="|| ( mysql postgres sqlite )"
DEPEND="
dev-python/setuptools[${PYTHON_USEDEP}]
>=dev-python/pbr-1.8.0[${PYTHON_USEDEP}]
"
RDEPEND="
>=dev-python/pbr-1.8.0[${PYTHON_USEDEP}]
>=dev-python/alembic-0.8.4[${PYTHON_USEDEP}]
>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
>=dev-python/oslo-config-3.14.0[${PYTHON_USEDEP}]
>=dev-python/oslo-config-3.18.0[${PYTHON_USEDEP}]
>=dev-python/oslo-context-2.9.0[${PYTHON_USEDEP}]
>=dev-python/oslo-utils-3.18.0[${PYTHON_USEDEP}]
sqlite? (
|| (
>=dev-python/sqlalchemy-1.0.10[sqlite,${PYTHON_USEDEP}]
<dev-python/sqlalchemy-1.1.0[sqlite,${PYTHON_USEDEP}]
)
)
mysql? (
dev-python/mysql-python
|| (
>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
<dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
)
)
postgres? (
dev-python/psycopg:2
|| (
>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
<dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
)
)
>=dev-python/sqlalchemy-migrate-0.9.6[${PYTHON_USEDEP}]
>=dev-python/stevedore-1.17.1[${PYTHON_USEDEP}]
>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
"

@ -13,7 +13,7 @@ S="${WORKDIR}/oslo.db-${PV}"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="~amd64 ~arm64 ~x86"
KEYWORDS="amd64 ~arm64 x86"
IUSE="+sqlite mysql postgres"
REQUIRED_USE="|| ( mysql postgres sqlite )"

@ -1,2 +1 @@
DIST oslo.middleware-3.23.1.tar.gz 52469 SHA256 fab9a0779ff196020875c7e47e6c36b9d6c9468063645b857e687114e70a8019 SHA512 155f88184216ef18a265b996973b616a3b7a9e52618d95235a396e099bcfb5f51a5dded8e1f039df4d648a0b779c8a6daab9d6b8ff091981c17524a8521ac72a WHIRLPOOL 683d78da63af0d68b6301aa718562cd29f8dc09511df53fb0394311bbda7727edadd975401f81e8ee5c6f35a4e9e8d636bd140b786fec4e7f9c3b0f0015f02e8
DIST oslo.middleware-3.23.2.tar.gz 51645 SHA256 53363b5d92ac23378cfd872720f9dada29afb267c8b303d8910c3f5b6cb208a9 SHA512 0fbf97b3fd5ae69c72f42755cdfdba7dc70570763299cbdbf836b5ad0a70c692cb1249397ed6e6f9d843223f656e5814adcc80e19d283984851216ea7395de83 WHIRLPOOL ecb736218e0c571a2aa6e1f8d2ca5a088496bd06fbb54ff60f2e392fb0fd153b46dc46448136ae34b86276730d1edbcf24453cbc462aa23659e440116de730c6

@ -1,60 +0,0 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
inherit distutils-r1
DESCRIPTION="Components injected into wsgi pipelines to intercept request/response flows."
HOMEPAGE="https://pypi.python.org/pypi/oslo.middleware"
SRC_URI="mirror://pypi/${PN:0:1}/oslo.middleware/oslo.middleware-${PV}.tar.gz"
S="${WORKDIR}/oslo.middleware-${PV}"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="amd64 ~arm64 x86"
IUSE="test"
CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
${CDEPEND}
test? (
>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
>=dev-python/oslo-sphinx-4.7.0[${PYTHON_USEDEP}]
>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
>=dev-python/sphinx-1.2.1[${PYTHON_USEDEP}]
<dev-python/sphinx-1.4[${PYTHON_USEDEP}]
>=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
>=dev-python/coverage-4.0[${PYTHON_USEDEP}]
>=dev-python/reno-1.8.0[${PYTHON_USEDEP}]
)"
RDEPEND="
${CDEPEND}
>=dev-python/jinja-2.8[${PYTHON_USEDEP}]
!~dev-python/jinja-2.9.0[${PYTHON_USEDEP}]
!~dev-python/jinja-2.9.1[${PYTHON_USEDEP}]
!~dev-python/jinja-2.9.2[${PYTHON_USEDEP}]
!~dev-python/jinja-2.9.3[${PYTHON_USEDEP}]
!~dev-python/jinja-2.9.4[${PYTHON_USEDEP}]
>=dev-python/oslo-config-3.14.0[${PYTHON_USEDEP}]
!~dev-python/oslo-config-3.18.0[${PYTHON_USEDEP}]
>=dev-python/oslo-context-2.9.0[${PYTHON_USEDEP}]
>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
>=dev-python/oslo-utils-3.18.0[${PYTHON_USEDEP}]
>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
>=dev-python/stevedore-1.17.1[${PYTHON_USEDEP}]
>=dev-python/webob-1.6.0[${PYTHON_USEDEP}]
>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
>=dev-python/statsd-3.2.1[${PYTHON_USEDEP}]
"
python_prepare_all() {
sed -i '/^hacking/d' test-requirements.txt || die
distutils-r1_python_prepare_all
}
python_test() {
nosetests tests/ || die "test failed under ${EPYTHON}"
}

@ -13,7 +13,7 @@ S="${WORKDIR}/oslo.middleware-${PV}"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="~amd64 ~arm64 ~x86"
KEYWORDS="amd64 ~arm64 x86"
IUSE="test"
CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"

@ -1,2 +1 @@
DIST oslo-utils-3.22.0.tar.gz 84490 SHA256 aa72be266fee787541c02baa9ac341ec4b1b01b0d5a097db459aee05b27b12fb SHA512 09b53b5a322133ace2d68bba871746b88f709b50385b93bea0c4398ceb6a848a3019f2fc68f0bb645963a95432b9e616e733720ebb57aff61108d8e22bc11e70 WHIRLPOOL b464196269e165db0aaa9807a5e284f5905f5aaf95e6fd66cf3580838eb07611dacc3f69f2d21c7516c75694d6d246cb6c719756fca61b136388875a2e921236
DIST oslo-utils-3.22.1.tar.gz 84249 SHA256 9825db6337ce10e7c383d2598f87865605d35af15fa9ece7212838ba7d33730e SHA512 afb21f8267f815e192a667fec247ae2e0d8163d7872805d36c4399928b475e34790136810607e8706ea37e32eb31da2fdc2b9defb2e06f7ba0a7235b2de1abc9 WHIRLPOOL 501cb7c18b2997635b5a2ffd91fd472f84168730e2cc76cb13f4937e657448e535d614e9eea64595bce31211af4e1ce0590cb8e313dd31785fe7700c4776585a

@ -1,95 +0,0 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
inherit distutils-r1 vcs-snapshot
MY_PN=${PN/-/.}
DESCRIPTION="Oslo Utility library"
HOMEPAGE="https://launchpad.net/oslo"
SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="amd64 ~arm64 x86"
IUSE="doc test"
CDEPEND=">=dev-python/pbr-1.6[${PYTHON_USEDEP}]"
DEPEND="
dev-python/setuptools[${PYTHON_USEDEP}]
${CDEPEND}
test? (
>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
>=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
>=dev-python/coverage-4.0.0[${PYTHON_USEDEP}]
>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
>=dev-python/oslo-config-3.14.0[${PYTHON_USEDEP}]
!~dev-python/oslo-config-3.18.0[${PYTHON_USEDEP}]
>=dev-python/bandit-1.1.0[${PYTHON_USEDEP}]
>=dev-python/reno-1.8.0[${PYTHON_USEDEP}]
)
doc? (
>=dev-python/oslo-sphinx-4.7.0[${PYTHON_USEDEP}]
>=dev-python/sphinx-1.2.1[${PYTHON_USEDEP}]
<dev-python/sphinx-1.4[${PYTHON_USEDEP}]
>=dev-python/reno-1.8.0[${PYTHON_USEDEP}]
)
"
RDEPEND="
${CDEPEND}
>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
virtual/python-funcsigs[${PYTHON_USEDEP}]
>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
>=dev-python/monotonic-0.6[${PYTHON_USEDEP}]
>=dev-python/pytz-2013.6[${PYTHON_USEDEP}]
>=dev-python/netaddr-0.7.13[${PYTHON_USEDEP}]
!~dev-python/netaddr-0.7.16[${PYTHON_USEDEP}]
>=dev-python/netifaces-0.10.4[${PYTHON_USEDEP}]
>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
>=dev-python/pyparsing-2.0.7[${PYTHON_USEDEP}]
"
python_prepare_all() {
sed -i '/^hacking/d' test-requirements.txt || die
distutils-r1_python_prepare_all
}
python_compile_all() {
use doc && esetup.py build_sphinx
}
# Note: Tests fail due to requiring installation
#
# Installation appears to fail due to the use of namespace packages but root
# cause was never truly established.
#
# Tests fail with:
# ImportError: No module named 'oslo.utils
#RESTRICT="test"
python_test() {
distutils_install_for_testing
cd "${TEST_DIR}"/lib || die
rm -rf .testrepository || die "couldn't remove '.testrepository' under ${EPTYHON}"
testr init || die "testr init failed under ${EPYTHON}"
testr run || die "testr run failed under ${EPYTHON}"
}
python_install_all() {
use doc && local HTML_DOCS=( doc/build/html/. )
distutils-r1_python_install_all
}

@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.g
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="~amd64 ~arm64 ~x86"
KEYWORDS="amd64 ~arm64 x86"
IUSE="doc test"
CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"

@ -1,2 +1 @@
DIST oslo.vmware-2.17.0.tar.gz 205078 SHA256 f283a3c5b9ff79602519c758efebcb41d490eedf1d6f76e9d4e30e61fbd1d36d SHA512 03750c0bf498b45fe812e10e97c2efcbb04ea3c020f0dde26361c25ad4fc2ad10637930653ed4e667571ade02553e82adc79f9b74d3b766b5db923256d2cdcbb WHIRLPOOL 974ab36d2e4088b72cdd80376541c59f9d6ce18b3926051f6d7dfec2e8cf2291b36d14ad25bcb2290c547496dfb0a3c3bf6d67d1bf970a7d320f69bd1cc6ab8a
DIST oslo.vmware-2.17.1.tar.gz 205998 SHA256 43a306816440dd1571cbdd8625f975aa58389121ba96f90e7bb2fcefa177ad7e SHA512 da8516733ffd10821691e56ca036942dc9f1043452999b42f115e87c83ccb79058bcaea604b7ca990f53f4dd4ad7302989b417ca179898523fade5b136fbca85 WHIRLPOOL 7597acf5337b20aba8b35a04d4bb88243602be72a1b07bd2384178d180628774d3fd4e2e7a6d816a94aac24e370baa13a844fb76f7396336deba251d221e7070

@ -1,63 +0,0 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
inherit distutils-r1
DESCRIPTION="Oslo VMware library for OpenStack projects"
HOMEPAGE="https://pypi.python.org/pypi/oslo.vmware"
SRC_URI="mirror://pypi/${PN:0:1}/oslo.vmware/oslo.vmware-${PV}.tar.gz"
S="${WORKDIR}/oslo.vmware-${PV}"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="amd64 ~arm64 x86"
IUSE="test"
CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
${CDEPEND}
test? (
>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
>=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
>=dev-python/coverage-4.0[${PYTHON_USEDEP}]
>=dev-python/oslo-sphinx-4.7.0[${PYTHON_USEDEP}]
>=dev-python/sphinx-1.2.1[${PYTHON_USEDEP}]
<dev-python/sphinx-1.4[${PYTHON_USEDEP}]
>=dev-python/reno-1.8.0[${PYTHON_USEDEP}]
>=dev-python/bandit-1.1.0[${PYTHON_USEDEP}]
dev-python/nose[${PYTHON_USEDEP}]
)"
RDEPEND="
${CDEPEND}
>=dev-python/stevedore-1.17.1[${PYTHON_USEDEP}]
>=dev-python/netaddr-0.7.12[${PYTHON_USEDEP}]
!~dev-python/netaddr-0.7.16[${PYTHON_USEDEP}]
>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
>=dev-python/oslo-utils-3.18.0[${PYTHON_USEDEP}]
>=dev-python/pyyaml-3.10.0[${PYTHON_USEDEP}]
>=dev-python/lxml-2.3[${PYTHON_USEDEP}]
!~dev-python/lxml-3.7.0[${PYTHON_USEDEP}]
>=dev-python/suds-0.6[${PYTHON_USEDEP}]
>=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}]
>=dev-python/requests-2.10.0[${PYTHON_USEDEP}]
!~dev-python/requests-2.12.2[${PYTHON_USEDEP}]
>=dev-python/urllib3-1.15.1[${PYTHON_USEDEP}]
>=dev-python/oslo-concurrency-3.8.0[${PYTHON_USEDEP}]
"
python_prepare() {
sed -i '/^suds-jurko/d' requirements.txt || die
sed -i '/^hacking/d' test-requirements.txt || die
}
python_test() {
nosetests tests/ || die "test failed under ${EPYTHON}"
}

@ -13,7 +13,7 @@ S="${WORKDIR}/oslo.vmware-${PV}"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="~amd64 ~arm64 ~x86"
KEYWORDS="amd64 ~arm64 x86"
IUSE="test"
CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"

@ -56,9 +56,7 @@ python_prepare_all() {
sed -e s':test_command_hooks:_&:' \
-e s':test_global_setup_hooks:_&:' \
-i pbr/tests/test_hooks.py || die
sed \
-e "s:test_wsgi_script_install:_&:" \
-i pbr/tests/test_wsgi.py || die
rm pbr/tests/test_wsgi.py || die "couldn't remove wsgi network tests"
einfo "rogue tests disabled"
sed -i '/^hacking/d' test-requirements.txt || die

@ -13,13 +13,12 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD-2"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
IUSE="doc test"
RDEPEND="
dev-python/namespace-sphinxcontrib[${PYTHON_USEDEP}]
dev-python/requests[${PYTHON_USEDEP}]
dev-python/sphinx[${PYTHON_USEDEP}]"
>=dev-python/requests-0.13[${PYTHON_USEDEP}]
>=dev-python/sphinx-1.1[${PYTHON_USEDEP}]"
DEPEND="${RDEPEND}
dev-python/setuptools[${PYTHON_USEDEP}]
test? (
@ -35,7 +34,7 @@ python_prepare_all() {
# and virtualx.eclass.
rm tests/test_stylesheet.py || die
# Avoid redundant objects.inv from downloading, sed more lightweight
# Avoid redundant objects.inv from downloading, sed more lightwieght
if use doc; then
sed -e "s:^intersphinx_mapping:#intersphinx_mapping:" \
-e "s:^ 'sphinx':#:" \
@ -55,8 +54,3 @@ python_compile_all() {
python_test() {
py.test || die
}
python_install_all() {
distutils-r1_python_install_all
find "${ED}" -name '*.pth' -delete || die
}

@ -0,0 +1,62 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
inherit distutils-r1
DESCRIPTION="Extension to sphinx to create links to issue trackers"
HOMEPAGE="http://sphinxcontrib-issuetracker.readthedocs.org/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD-2"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
IUSE="doc test"
RDEPEND="
dev-python/namespace-sphinxcontrib[${PYTHON_USEDEP}]
dev-python/requests[${PYTHON_USEDEP}]
dev-python/sphinx[${PYTHON_USEDEP}]"
DEPEND="${RDEPEND}
dev-python/setuptools[${PYTHON_USEDEP}]
test? (
dev-python/mock[${PYTHON_USEDEP}]
dev-python/pytest[${PYTHON_USEDEP}]
)"
python_prepare_all() {
# test requires network access (bug #425694)
rm tests/test_builtin_trackers.py || die
# Tests from tests/test_stylesheet.py require dev-python/PyQt4[X,webkit]
# and virtualx.eclass.
rm tests/test_stylesheet.py || die
# Avoid redundant objects.inv from downloading, sed more lightweight
if use doc; then
sed -e "s:^intersphinx_mapping:#intersphinx_mapping:" \
-e "s:^ 'sphinx':#:" \
-i doc/conf.py || die
fi
distutils-r1_python_prepare_all
}
python_compile_all() {
if use doc; then
emake -C doc html
HTML_DOCS=( doc/_build/html/. )
fi
}
python_test() {
py.test || die
}
python_install_all() {
distutils-r1_python_install_all
find "${ED}" -name '*.pth' -delete || die
}

@ -1,2 +1 @@
DIST stevedore-1.20.0.tar.gz 505716 SHA256 83884f80ed0917346e658bfe51cdb2474512ec6521c18480b41f58b54c4a1f83 SHA512 c4519004eb61ab6ca48cf3b9e543d6c9d726d6f9e1208b6d6e44eb1e770cd7c5c1f378464e50a5510f99f3d91f1d2cf93e9cf3e1812aeab3bfa71a04dcb695d2 WHIRLPOOL 8b169c02d8e92dde53288fdc11b6dd02ce0bae81bf583e675cd9e959537cc54c19b9183468ec83d6206a6d3bf47f33d8597202acd2bae56dde81e8bd37255a5c
DIST stevedore-1.20.1.tar.gz 505908 SHA256 046200a915780b58bf1c84436e86701b741d664893aefa84d8aceadd15ed4734 SHA512 7518fb4cac2ea15867a616373521169fd114152ae7e657deb26dbcf874f2442336824ded480973b4334e9b56c349abd165aab7779defc219f57d7ba7f670048c WHIRLPOOL e67a89733def07e8425750d9bc742388de83f8cb13d95dd0001fba4136449e74c465b847a7218df423633d311f0af0003eda8087eb0a4e071ab4d2e78949fca7

@ -1,62 +0,0 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
inherit distutils-r1
DESCRIPTION="Manage dynamic plugins for Python applications"
HOMEPAGE="https://github.com/openstack/stevedore https://pypi.python.org/pypi/stevedore"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="amd64 ~arm64 x86"
IUSE="doc test"
CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
DEPEND="
dev-python/setuptools[${PYTHON_USEDEP}]
${CDEPEND}
test? (
>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
dev-python/nose[${PYTHON_USEDEP}]
>=dev-python/coverage-4.0[${PYTHON_USEDEP}]
>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
>=dev-python/oslo-sphinx-4.7.0[${PYTHON_USEDEP}]
>=dev-python/reno-1.8.0[${PYTHON_USEDEP}]
)
doc? (
>=dev-python/pillow-2.4.0[${PYTHON_USEDEP}]
>=dev-python/sphinx-1.2.1[${PYTHON_USEDEP}]
<dev-python/sphinx-1.4[${PYTHON_USEDEP}]
>=dev-python/oslo-sphinx-4.7.0[${PYTHON_USEDEP}]
>=dev-python/reno-1.8.0[${PYTHON_USEDEP}]
)
"
RDEPEND="
${CDEPEND}
>=dev-python/six-1.9.0[${PYTHON_USEDEP}]"
python_prepare_all() {
# Delete spurious data in requirements.txt
sed -e '/^pbr/d' -i requirements.txt || die
distutils-r1_python_prepare_all
}
python_compile_all() {
use doc && esetup.py build_sphinx
}
python_test() {
nosetests --verbosity=3 stevedore || die
}
python_install_all() {
use doc && local HTML_DOCS=( doc/build/html/. )
distutils-r1_python_install_all
}

@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="~amd64 ~arm64 ~x86"
KEYWORDS="amd64 ~arm64 x86"
IUSE="doc test"
CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"

@ -1,9 +1,9 @@
# Copyright 1999-2016 Gentoo Foundation
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
USE_RUBY="ruby20 ruby21 ruby22"
USE_RUBY="ruby21 ruby22 ruby23 ruby24"
RUBY_FAKEGEM_RECIPE_TEST="rspec"

@ -1,2 +1,3 @@
DIST haml-4.0.7.gem 121856 SHA256 3754d0f7c21cf261a30b207a94524211293b921492fab58c89d1ede7e7933f57 SHA512 5736ded231bb10a0c0932453294604075e24a9020c2658e703c13ebf7a8d148327188157f982a3aea5db6d6938beb372c0167dfbc4ff06325517b2c8bd71a568 WHIRLPOOL 62f1f152dbf8eea15ef3935d8e85b062f5a3f079a3cc4e4ad47056acfe7427b443611f092f591ff957f348d1727ce43b23d9f88083a4678b30d759a2ecd6e659
DIST haml-5.0.1.tar.gz 123154 SHA256 c6580d96245f85d26c2d953cabb14c3035941e82b897684d528a10491fa5cb42 SHA512 deb5dc4746a0bc4b5103880c2364b6354eaa7968b6fa3df5a0a216a5c26c524e985c4a1e39df1de90b303d490b8d9ed9daa65eb00c0cbbbf772cd6b577c773be WHIRLPOOL 8174e1b5b027604157297f6c9f1bcd03bbfe20357a55799bfaa55e179025c53daab64d024eb8ab765592980199c758f4a8e901df975695c1326e1699b1d85b0b
DIST haml-5.0.2.tar.gz 124000 SHA256 76e1024120d00454e11d6061a630ce785bf7092ba9063bbe1926ae51fceeb619 SHA512 c266a48424db4c9949d29bdb72f2c96ef5878a78ae98867b9259b0e2e2f581cb9fecf4c51091e6bce3ba4d86c60b44e8c7e95759a8aec8c95d59b9707903032e WHIRLPOOL ffaf5249f3241573c4752d31031b290a5190da14701b5f194660c342bffd546b38f279707a9befcfbb72f8ec70fe994966bcfce5c4f576ff1a1fd97615ea3d2c

@ -0,0 +1,57 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
USE_RUBY="ruby21 ruby22 ruby23"
RUBY_FAKEGEM_TASK_TEST="test"
RUBY_FAKEGEM_TASK_DOC="-Ilib doc"
RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md FAQ.md README.md REFERENCE.md"
RUBY_FAKEGEM_DOCDIR="doc"
RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
inherit ruby-fakegem
DESCRIPTION="A ruby web page templating engine"
HOMEPAGE="http://haml.info/"
SRC_URI="https://github.com/haml/haml/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="MIT"
SLOT="5"
KEYWORDS="~amd64 ~arm ~ppc64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="doc test"
RDEPEND="${RDEPEND} !!<dev-ruby/haml-3.1.8-r2"
ruby_add_rdepend ">=dev-ruby/temple-0.8.0 dev-ruby/tilt:*"
ruby_add_bdepend "
test? (
dev-ruby/minitest:5
dev-ruby/nokogiri
dev-ruby/railties:4.2
dev-ruby/activemodel:4.2
dev-ruby/actionpack:4.2
)
doc? (
dev-ruby/yard
>=dev-ruby/maruku-0.7.2-r1
)"
all_ruby_prepare() {
sed -i -e 's/git ls-files -z/find . -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
sed -i -e '/bundler/ s:^:#:' \
-e 's/gem "minitest"/gem "minitest", "~>5.0"/'\
-e '1igem "actionpack", "~>4.2"'\
-e '1igem "activesupport", "~>4.2"; gem "activemodel", "~>4.2"'\
-e '1igem "railties", "~>4.2"'\
test/test_helper.rb || die
# Remove test that fails when RedCloth is available
sed -i -e "/should raise error when a Tilt filters dependencies are unavailable for extension/,/^ end/ s/^/#/"\
test/filters_test.rb || die
}

@ -1,2 +1,3 @@
DIST jira-ruby-1.2.0.gem 53760 SHA256 427127d81f6cbe94ba8c0b9c25e7caedcdee6226719ddd9a9ab4b9c64d2dda4a SHA512 83f469a818fcfe84fb4d7dd744400f937b114930e3108ac3a2d4aa99f4d0780961d929b781cc0f9bb614c09cc7651a7e9addb2d5a38caa086f239abc5aed92f8 WHIRLPOOL 130da1340fb7b28bd0046f6b370498aa8dcde13c89dab4693e2c18f34ccbb469101a255aa3a4e15fed783dbf2c691709747eb1f3d2f710124c16c477cbf975e6
DIST jira-ruby-1.3.0.gem 57344 SHA256 b25f24188e42b0e87b6a8d5b6abfab999e94ae82de5fde32a1e9661c648e093a SHA512 dcfbce86e21b57a2c50d11655d4e94c7341c32f32c935f7d2f841d4706e61011c96b2bc57a8d7f2c0c6a1288b21ac7fcef9d21d16a8b6a8d6f82e6e8ef77b7ac WHIRLPOOL 936630df6c1f7bd63d7349a305fd64b34794c08c38cbdebb7e5d9aefde76904ad2696201b14f67b460ddc17f0802499662452b2f9517e411ac2526e8da0f83d8
DIST jira-ruby-1.4.0.gem 57856 SHA256 bf6ead596530def3945b30b5d9729074cd034a6481233c2fc34845fd7f267e5b SHA512 11a8560b5ae31e9da508e1ba1bd5cf1916d65535d05c0f888e126e712070835f89cacb5d90c6118b8abd4363b62b0f5c070cde40b2c034d98f4eab4b584d2104 WHIRLPOOL 7f81e4ac41b41381ece295523657a8d13e20a6c766a93e6e00e8e8c8630318bac671cde96c85e741570fce0a10a6d7e4c10b2d37a766e347c40afa8360c7c41f

@ -0,0 +1,43 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
USE_RUBY="ruby22 ruby23"
RUBY_FAKEGEM_RECIPE_TEST="rspec3"
RUBY_FAKEGEM_RECIPE_DOC="rdoc"
inherit ruby-fakegem
DESCRIPTION="API for JIRA"
HOMEPAGE="https://github.com/sumoheavy/jira-ruby https://rubygems.org/gems/jira-ruby"
LICENSE="MIT"
SLOT="0"
KEYWORDS="~amd64"
IUSE=""
ruby_add_rdepend "dev-ruby/activesupport:*
dev-ruby/multipart-post
>=dev-ruby/oauth-0.5.0
<dev-ruby/oauth-1"
ruby_add_bdepend "test? (
dev-ruby/railties
>=dev-ruby/webmock-1.18.0:0
dev-ruby/rake )"
DEPEND="${DEPEND} test? ( dev-libs/openssl:0 )"
all_ruby_prepare() {
sed -i -e "/bundler/d" \
-e '1igem "webmock", "~>1.0"' \
spec/spec_helper.rb || die
sed -i -e '/git ls-files/d' ${PN}.gemspec || die
}
each_ruby_test() {
${RUBY} -S rake jira:generate_public_cert || die
RSPEC_VERSION=3 ruby-ng_rspec || die
}

@ -3,7 +3,7 @@
EAPI=5
USE_RUBY="ruby21 ruby22 ruby23"
USE_RUBY="ruby21 ruby22 ruby23 ruby24"
RUBY_FAKEGEM_RECIPE_TEST="rspec"

@ -1,7 +1,7 @@
# Copyright 1999-2012 Gentoo Foundation
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI="3"
EAPI=6
DESCRIPTION="fast and light Scheme implementation"
HOMEPAGE="http://www.stklos.net"
@ -11,7 +11,7 @@ LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="threads"
DEPEND="dev-libs/gmp dev-libs/libpcre virtual/libffi dev-libs/boehm-gc[threads?]"
DEPEND="dev-libs/gmp:= dev-libs/libpcre virtual/libffi dev-libs/boehm-gc[threads?]"
RDEPEND="${DEPEND}"
#parallel build failure reported upstream
@ -19,7 +19,8 @@ MAKEOPTS=-j1
src_prepare() {
# kill bundled libs
rm -rf "${S}"/{ffi,gc,gmp,pcre}
rm -rf "${S}"/{ffi,gc,gmp,pcre} || die
default
}
src_configure() {
@ -29,7 +30,6 @@ src_configure() {
}
src_install() {
emake DESTDIR="${D}" install || die "Install failed"
dodoc AUTHORS ChangeLog NEWS PACKAGES-USED PORTING-NOTES README SUPPORTED-SRFIS \
|| die "dodocs failed"
emake DESTDIR="${D}" install
dodoc AUTHORS ChangeLog NEWS PACKAGES-USED PORTING-NOTES README SUPPORTED-SRFIS
}

@ -0,0 +1,75 @@
From 7f0be6a33b8260f7789c6aeed58be8d1c844229a Mon Sep 17 00:00:00 2001
From: Leslie Zhai <lesliezhai@llvm.org.cn>
Date: Tue, 1 Aug 2017 14:13:05 +0800
Subject: Fix K3b::Device::from2Byte out-of-bounds issue.
A great bug report by Mark!
BUG: 382941
---
libk3bdevice/k3bdeviceglobals.cpp | 24 ++++++++++++------------
tests/k3bdeviceglobalstest.cpp | 4 +++-
2 files changed, 15 insertions(+), 13 deletions(-)
diff --git a/libk3bdevice/k3bdeviceglobals.cpp b/libk3bdevice/k3bdeviceglobals.cpp
index 090ed29..c016f59 100644
--- a/libk3bdevice/k3bdeviceglobals.cpp
+++ b/libk3bdevice/k3bdeviceglobals.cpp
@@ -212,27 +212,27 @@ void K3b::Device::debugBitfield( unsigned char* data, long len )
}
-quint16 K3b::Device::from2Byte( const unsigned char* d )
+quint16 K3b::Device::from2Byte(const unsigned char* d)
{
- if (d == NULL) {
- qWarning() << "Invalid nullptr!";
+ if (d == NULL || strlen((const char *) d) < 2) {
+ qWarning() << "Invalid Byte!";
return 0;
}
- return ( (d[0] << 8 & 0xFF00) |
- (d[1] & 0xFF) );
+ return ((d[0] << 8 & 0xFF00) |
+ (d[1] & 0xFF));
}
-quint32 K3b::Device::from4Byte( const unsigned char* d )
+quint32 K3b::Device::from4Byte(const unsigned char* d)
{
- if (d == NULL) {
- qWarning() << "Invalid nullptr!";
+ if (d == NULL || strlen((const char *) d) < 4) {
+ qWarning() << "Invalid Byte!";
return 0;
}
- return ( (d[0] << 24 & 0xFF000000) |
- (d[1] << 16 & 0xFF0000) |
- (d[2] << 8 & 0xFF00) |
- (d[3] & 0xFF) );
+ return ((d[0] << 24 & 0xFF000000) |
+ (d[1] << 16 & 0xFF0000) |
+ (d[2] << 8 & 0xFF00) |
+ (d[3] & 0xFF));
}
diff --git a/tests/k3bdeviceglobalstest.cpp b/tests/k3bdeviceglobalstest.cpp
index 307b772..635ee39 100644
--- a/tests/k3bdeviceglobalstest.cpp
+++ b/tests/k3bdeviceglobalstest.cpp
@@ -23,8 +23,10 @@ DeviceGlobalsTest::DeviceGlobalsTest()
void DeviceGlobalsTest::testFrom2Byte()
{
- const unsigned char* d = NULL;
+ unsigned char* d = NULL;
QCOMPARE(K3b::Device::from2Byte(d), (quint16)0);
+ unsigned char buf[1] = { '\0' };
+ QCOMPARE(K3b::Device::from2Byte(buf), (quint16)0);
}
void DeviceGlobalsTest::testFrom4Byte()
--
cgit v0.11.2

@ -9,6 +9,7 @@ inherit kde5
DESCRIPTION="Full-featured burning and ripping application based on KDE Frameworks"
HOMEPAGE="http://www.k3b.org/"
LICENSE="GPL-2 FDL-1.2"
KEYWORDS="~amd64 ~x86"
IUSE="dvd emovix encode ffmpeg flac libav mad mp3 musepack sndfile sox taglib vcd vorbis webkit"
@ -21,7 +22,7 @@ DEPEND="
$(add_frameworks_dep kconfig)
$(add_frameworks_dep kconfigwidgets)
$(add_frameworks_dep kcoreaddons)
$(add_frameworks_dep kfilemetadata)
$(add_frameworks_dep kfilemetadata 'taglib?')
$(add_frameworks_dep ki18n)
$(add_frameworks_dep kiconthemes)
$(add_frameworks_dep kio)
@ -69,8 +70,9 @@ RDEPEND="${DEPEND}
"
REQUIRED_USE="
mp3? ( encode )
sox? ( encode )
flac? ( taglib )
mp3? ( encode taglib )
sox? ( encode taglib )
"
DOCS+=( ChangeLog {FAQ,PERMISSIONS,README}.txt )

@ -0,0 +1,120 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
KDE_HANDBOOK="forceoptional"
KDE_TEST="true"
inherit kde5
DESCRIPTION="Full-featured burning and ripping application based on KDE Frameworks"
HOMEPAGE="http://www.k3b.org/"
LICENSE="GPL-2 FDL-1.2"
KEYWORDS="~amd64 ~x86"
IUSE="dvd emovix encode ffmpeg flac libav mad mp3 musepack sndfile sox taglib vcd vorbis webkit"
DEPEND="
$(add_frameworks_dep karchive)
$(add_frameworks_dep kbookmarks)
$(add_frameworks_dep kcmutils)
$(add_frameworks_dep kcompletion)
$(add_frameworks_dep kconfig)
$(add_frameworks_dep kconfigwidgets)
$(add_frameworks_dep kcoreaddons)
$(add_frameworks_dep kfilemetadata 'taglib?')
$(add_frameworks_dep ki18n)
$(add_frameworks_dep kiconthemes)
$(add_frameworks_dep kio)
$(add_frameworks_dep kjobwidgets)
$(add_frameworks_dep knewstuff)
$(add_frameworks_dep knotifications)
$(add_frameworks_dep knotifyconfig)
$(add_frameworks_dep kservice)
$(add_frameworks_dep kwidgetsaddons)
$(add_frameworks_dep kxmlgui)
$(add_frameworks_dep solid)
$(add_kdeapps_dep libkcddb)
$(add_qt_dep qtdbus)
$(add_qt_dep qtgui)
$(add_qt_dep qtnetwork)
$(add_qt_dep qtwidgets)
$(add_qt_dep qtxml)
media-libs/libsamplerate
dvd? ( media-libs/libdvdread )
ffmpeg? (
libav? ( media-video/libav:= )
!libav? ( media-video/ffmpeg:0= )
)
flac? ( >=media-libs/flac-1.2[cxx] )
mp3? ( media-sound/lame )
mad? ( media-libs/libmad )
musepack? ( >=media-sound/musepack-tools-444 )
sndfile? ( media-libs/libsndfile )
taglib? ( >=media-libs/taglib-1.5 )
vorbis? ( media-libs/libvorbis )
webkit? ( $(add_qt_dep qtwebkit) )
"
RDEPEND="${DEPEND}
app-cdr/cdrdao
dev-libs/libburn
media-sound/cdparanoia
virtual/cdrtools
dvd? (
>=app-cdr/dvd+rw-tools-7
encode? ( media-video/transcode[dvd] )
)
emovix? ( media-video/emovix )
sox? ( media-sound/sox )
vcd? ( media-video/vcdimager )
"
REQUIRED_USE="
flac? ( taglib )
mp3? ( encode taglib )
sox? ( encode taglib )
"
DOCS+=( ChangeLog {FAQ,PERMISSIONS,README}.txt )
PATCHES=( "${FILESDIR}/${P}-out-of-bounds.patch" )
src_configure() {
local mycmakeargs=(
-DK3B_BUILD_API_DOCS=OFF
-DK3B_BUILD_WAVE_DECODER_PLUGIN=ON
-DK3B_ENABLE_HAL_SUPPORT=OFF
-DK3B_ENABLE_MUSICBRAINZ=OFF
-DK3B_DEBUG=$(usex debug)
-DK3B_ENABLE_DVD_RIPPING=$(usex dvd)
-DK3B_BUILD_EXTERNAL_ENCODER_PLUGIN=$(usex encode)
-DK3B_BUILD_FFMPEG_DECODER_PLUGIN=$(usex ffmpeg)
-DK3B_BUILD_FLAC_DECODER_PLUGIN=$(usex flac)
-DK3B_BUILD_LAME_ENCODER_PLUGIN=$(usex mp3)
-DK3B_BUILD_MAD_DECODER_PLUGIN=$(usex mad)
-DK3B_BUILD_MUSE_DECODER_PLUGIN=$(usex musepack)
-DK3B_BUILD_SNDFILE_DECODER_PLUGIN=$(usex sndfile)
-DK3B_BUILD_SOX_ENCODER_PLUGIN=$(usex sox)
-DK3B_ENABLE_TAGLIB=$(usex taglib)
-DK3B_BUILD_OGGVORBIS_DECODER_PLUGIN=$(usex vorbis)
-DK3B_BUILD_OGGVORBIS_ENCODER_PLUGIN=$(usex vorbis)
$(cmake-utils_use_find_package webkit Qt5WebKitWidgets)
)
kde5_src_configure
}
pkg_postinst() {
kde5_pkg_postinst
echo
elog "If you get warnings on start-up, uncheck the \"Check system"
elog "configuration\" option in the \"Misc\" settings window."
echo
local group=cdrom
use kernel_linux || group=operator
elog "Make sure you have proper read/write permissions on optical device(s)."
elog "Usually, it is sufficient to be in the ${group} group."
echo
}

@ -81,6 +81,8 @@ RDEPEND="${COMMON_DEPEND}
$(add_kdeapps_dep kdepim-runtime)
"
RESTRICT+=" test" # bug 616878
src_prepare() {
cmake-utils_src_prepare

@ -56,7 +56,10 @@ DEPEND="${RDEPEND}
$(add_kdeapps_dep poxml)
$(add_qt_dep qtconcurrent)
sys-devel/gettext
virtual/imagemagick-tools[png,svg]
handbook? ( || (
gnome-base/librsvg
virtual/imagemagick-tools[png,svg]
) )
"
DOCS=( AUTHORS CHANGES LICENSES README TODO )

@ -1,13 +0,0 @@
#!/bin/sh
#
# This file is executed at plasma shutdown.
# Uncomment the following lines to kill the agents
# that were started at session startup.
#if [ -n "${GPG_AGENT_INFO}" ]; then
# kill $(echo ${GPG_AGENT_INFO} | cut -d':' -f 2) >/dev/null 2>&1
#fi
#if [ -n "${SSH_AGENT_PID}" ]; then
# eval "$(ssh-agent -s -k)"
#fi

@ -1,29 +0,0 @@
# Agents startup file
#
# This file is sourced at plasma startup, so that
# the environment variables set here are available
# throughout the session.
# Uncomment the following lines to start gpg-agent
# and/or ssh-agent at plasma startup.
# If you do so, do not forget to uncomment the respective
# lines in PLASMADIR/shutdown/agent-shutdown.sh to
# properly kill the agents when the session ends.
#if [ -x /usr/bin/gpg-agent ]; then
# eval "$(/usr/bin/gpg-agent --daemon)"
#fi
#if [ -x /usr/bin/ssh-agent ]; then
# eval "$(/usr/bin/ssh-agent -s)"
#fi
# Uncomment the following lines to start rxvt-unicode which has the ability to
# run multiple terminals in one single process, thus starting up faster and
# saving resources.
# The --opendisplay ensures that the daemon quits when the X server terminates,
# therefore we don't need matching lines in agent-shutdown.sh.
#if [ -x /usr/bin/urxvtd ]; then
# /usr/bin/urxvtd --opendisplay --fork --quiet
#fi

@ -0,0 +1,40 @@
From a9b685f0dab7f21dfa3ed55011c035bab1c972d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Pekkarinen?= <koalinux@gmail.com>
Date: Tue, 1 Aug 2017 23:09:24 +0300
Subject: [PATCH] Source files in /etc/plasma/{startup,shutdown}
---
startkde/startplasmacompositor.cmake | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/startkde/startplasmacompositor.cmake b/startkde/startplasmacompositor.cmake
index 5bcf26a..e965f19 100644
--- a/startkde/startplasmacompositor.cmake
+++ b/startkde/startplasmacompositor.cmake
@@ -157,6 +157,11 @@ for prefix in `echo $scriptpath`; do
done
done
+# Gentoo part for FHS installs
+for file in "@GENTOO_PORTAGE_EPREFIX@/etc/plasma/startup/"*.sh; do
+ test -r "${file}" && . "${file}"
+done
+
echo 'startplasmacompositor: Starting up...' 1>&2
# Make sure that the KDE prefix is first in XDG_DATA_DIRS and that it's set at all.
@@ -232,6 +237,11 @@ fi
echo 'startplasmacompositor: Shutting down...' 1>&2
+# Gentoo part for FHS installs
+for file in "@GENTOO_PORTAGE_EPREFIX@/etc/plasma/shutdown/"*.sh; do
+ test -r "${file}" && . "${file}"
+done
+
unset KDE_FULL_SESSION
xprop -root -remove KDE_FULL_SESSION
unset KDE_SESSION_VERSION
--
2.13.0

@ -0,0 +1,34 @@
commit ae943198bf74d563adcb1f3d36ee4ba1b7b274a9
Author: Aleix Pol <aleixpol@kde.org>
Date: Fri Jul 28 13:21:38 2017 +0200
Prefer using https for kns providers
CCBUG: 382820
diff --git a/components/shellprivate/widgetexplorer/plasmoids.knsrc b/components/shellprivate/widgetexplorer/plasmoids.knsrc
index c683a257..03c7de0e 100644
--- a/components/shellprivate/widgetexplorer/plasmoids.knsrc
+++ b/components/shellprivate/widgetexplorer/plasmoids.knsrc
@@ -36,7 +36,7 @@ Name[x-test]=xxPlasma Widgetsxx
Name[zh_CN]=Plasma 部件
Name[zh_TW]=Plasma 元件
-ProvidersUrl=http://download.kde.org/ocs/providers.xml
+ProvidersUrl=https://download.kde.org/ocs/providers.xml
Categories=Plasma 5 Plasmoid
StandardResource=tmp
InstallationCommand=kpackagetool5 --install %f --type Plasma/Applet
diff --git a/wallpapers/image/wallpaper.knsrc b/wallpapers/image/wallpaper.knsrc
index 4a0cf2d6..2decc7e7 100644
--- a/wallpapers/image/wallpaper.knsrc
+++ b/wallpapers/image/wallpaper.knsrc
@@ -36,7 +36,7 @@ Name[x-test]=xxWallpapersxx
Name[zh_CN]=壁纸
Name[zh_TW]=桌布
-ProvidersUrl=http://download.kde.org/ocs/providers.xml
+ProvidersUrl=https://download.kde.org/ocs/providers.xml
Categories=KDE Wallpaper 800x600,KDE Wallpaper 1024x768,KDE Wallpaper 1280x1024,KDE Wallpaper 1440x900,KDE Wallpaper 1600x1200,KDE Wallpaper (other)
StandardResource=wallpaper
Uncompress=archive

@ -0,0 +1,69 @@
commit 7e2a29b0b18abe31df68c2f176124acfbc15c438
Author: Kai Uwe Broulik <kde@privat.broulik.de>
Date: Tue Aug 1 12:53:38 2017 +0200
[Notifications] Improve mouse handling
* Make links clickable again
* Don't pass visualParent to context menu as we already give it a position, fixes it being positioned incorrectly
* Open context menu on press already like is done everywhere else
* Give "Copy" the edit-copy icon
* Deselect text after copying again, otherwise it stays selected but the user cannot unselect it.
BUG: 382263
FIXED-IN: 5.10.5
Differential Revision: https://phabricator.kde.org/D7029
diff --git a/applets/notifications/package/contents/ui/NotificationItem.qml b/applets/notifications/package/contents/ui/NotificationItem.qml
index dabf1b90..c260d588 100644
--- a/applets/notifications/package/contents/ui/NotificationItem.qml
+++ b/applets/notifications/package/contents/ui/NotificationItem.qml
@@ -282,8 +282,6 @@ MouseArea {
wrapMode: Text.Wrap
textFormat: TextEdit.RichText
- onLinkActivated: Qt.openUrlExternally(link)
-
// ensure selecting text scrolls the view as needed...
onCursorRectangleChanged: {
var flick = bodyTextScrollArea.flickableItem
@@ -297,23 +295,33 @@ MouseArea {
anchors.fill: parent
acceptedButtons: Qt.RightButton | Qt.LeftButton
- onClicked: {
- if (mouse.button == Qt.RightButton)
+ onPressed: {
+ if (mouse.button === Qt.RightButton) {
contextMenu.open(mouse.x, mouse.y)
- else {
- notificationItem.clicked(mouse)
+ }
+ }
+
+ onClicked: {
+ if (mouse.button === Qt.LeftButton) {
+ var link = bodyText.linkAt(mouse.x, mouse.y)
+ if (link) {
+ Qt.openUrlExternally(link)
+ } else {
+ notificationItem.clicked(mouse)
+ }
}
}
PlasmaComponents.ContextMenu {
id: contextMenu
- visualParent: parent
PlasmaComponents.MenuItem {
text: i18n("Copy")
+ icon: "edit-copy"
onClicked: {
bodyText.selectAll()
bodyText.copy()
+ bodyText.deselect()
}
}
}

@ -0,0 +1,172 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
KDE_HANDBOOK="forceoptional"
KDE_TEST="forceoptional"
VIRTUALX_REQUIRED="test"
inherit kde5 qmake-utils
DESCRIPTION="KDE Plasma workspace"
KEYWORDS="~amd64 ~arm ~arm64 ~x86"
IUSE="+calendar geolocation gps prison qalculate +semantic-desktop"
REQUIRED_USE="gps? ( geolocation )"
COMMON_DEPEND="
$(add_frameworks_dep kactivities)
$(add_frameworks_dep kauth)
$(add_frameworks_dep kbookmarks)
$(add_frameworks_dep kcompletion)
$(add_frameworks_dep kconfig)
$(add_frameworks_dep kconfigwidgets)
$(add_frameworks_dep kcoreaddons)
$(add_frameworks_dep kcrash)
$(add_frameworks_dep kdbusaddons)
$(add_frameworks_dep kdeclarative)
$(add_frameworks_dep kdelibs4support)
$(add_frameworks_dep kglobalaccel)
$(add_frameworks_dep kguiaddons)
$(add_frameworks_dep ki18n)
$(add_frameworks_dep kiconthemes)
$(add_frameworks_dep kidletime)
$(add_frameworks_dep kio)
$(add_frameworks_dep kitemmodels)
$(add_frameworks_dep kitemviews)
$(add_frameworks_dep kjobwidgets)
$(add_frameworks_dep kjs)
$(add_frameworks_dep kjsembed)
$(add_frameworks_dep knewstuff)
$(add_frameworks_dep knotifications)
$(add_frameworks_dep knotifyconfig)
$(add_frameworks_dep kpackage)
$(add_frameworks_dep krunner)
$(add_frameworks_dep kservice)
$(add_frameworks_dep ktexteditor)
$(add_frameworks_dep ktextwidgets)
$(add_frameworks_dep kwallet)
$(add_frameworks_dep kwayland)
$(add_frameworks_dep kwidgetsaddons)
$(add_frameworks_dep kwindowsystem)
$(add_frameworks_dep kxmlgui)
$(add_frameworks_dep kxmlrpcclient)
$(add_frameworks_dep plasma)
$(add_frameworks_dep solid)
$(add_plasma_dep kscreenlocker)
$(add_plasma_dep kwin)
$(add_plasma_dep libksysguard)
$(add_qt_dep qtdbus)
$(add_qt_dep qtdeclarative 'widgets')
$(add_qt_dep qtgui 'jpeg')
$(add_qt_dep qtnetwork)
$(add_qt_dep qtscript)
$(add_qt_dep qtsql)
$(add_qt_dep qtwidgets)
$(add_qt_dep qtx11extras)
$(add_qt_dep qtxml)
media-libs/phonon[qt5]
sys-libs/zlib
x11-libs/libICE
x11-libs/libSM
x11-libs/libX11
x11-libs/libXau
x11-libs/libxcb
x11-libs/libXfixes
x11-libs/libXrender
x11-libs/libXtst
x11-libs/xcb-util
x11-libs/xcb-util-image
calendar? ( $(add_kdeapps_dep kholidays) )
geolocation? ( $(add_frameworks_dep networkmanager-qt) )
gps? ( sci-geosciences/gpsd )
prison? ( $(add_frameworks_dep prison) )
qalculate? ( sci-libs/libqalculate:= )
semantic-desktop? ( $(add_frameworks_dep baloo) )
"
RDEPEND="${COMMON_DEPEND}
$(add_frameworks_dep kded)
$(add_frameworks_dep kdesu)
$(add_kdeapps_dep kio-extras)
$(add_plasma_dep kde-cli-tools)
$(add_plasma_dep ksysguard)
$(add_plasma_dep milou)
$(add_plasma_dep plasma-integration)
$(add_qt_dep qdbus)
$(add_qt_dep qtgraphicaleffects)
$(add_qt_dep qtpaths)
$(add_qt_dep qtquickcontrols 'widgets')
app-text/iso-codes
x11-apps/mkfontdir
x11-apps/xmessage
x11-apps/xprop
x11-apps/xrdb
x11-apps/xset
x11-apps/xsetroot
!dev-libs/xembed-sni-proxy
!kde-plasma/freespacenotifier:4
!kde-plasma/libtaskmanager:4
!kde-plasma/kcminit:4
!kde-plasma/kdebase-startkde:4
!kde-plasma/klipper:4
!kde-plasma/krunner:4
!kde-plasma/ksmserver:4
!kde-plasma/ksplash:4
!kde-plasma/plasma-workspace:4
"
DEPEND="${COMMON_DEPEND}
$(add_qt_dep qtconcurrent)
x11-proto/xproto
"
PATCHES=(
"${FILESDIR}/${PN}-5.4-startkde-script.patch"
"${FILESDIR}/${PN}-5.10-startplasmacompositor-script.patch"
"${FILESDIR}/${P}-ghns-https.patch"
"${FILESDIR}/${P}-notifications.patch"
"${FILESDIR}/${P}-unused-dep.patch"
)
RESTRICT+=" test"
src_prepare() {
kde5_src_prepare
sed -e "s|\`qtpaths|\`$(qt5_get_bindir)/qtpaths|" \
-i startkde/startkde.cmake startkde/startplasmacompositor.cmake || die
}
src_configure() {
local mycmakeargs=(
$(cmake-utils_use_find_package calendar KF5Holidays)
$(cmake-utils_use_find_package geolocation KF5NetworkManagerQt)
$(cmake-utils_use_find_package prison KF5Prison)
$(cmake-utils_use_find_package qalculate Qalculate)
$(cmake-utils_use_find_package semantic-desktop KF5Baloo)
)
use gps && mycmakeargs+=( $(cmake-utils_use_find_package gps libgps) )
kde5_src_configure
}
src_install() {
kde5_src_install
# startup and shutdown scripts
insinto /etc/plasma/startup
doins "${FILESDIR}/10-agent-startup.sh"
insinto /etc/plasma/shutdown
doins "${FILESDIR}/10-agent-shutdown.sh"
}
pkg_postinst () {
kde5_pkg_postinst
echo
elog "To enable gpg-agent and/or ssh-agent in Plasma sessions,"
elog "edit ${EPREFIX}/etc/plasma/startup/10-agent-startup.sh and"
elog "${EPREFIX}/etc/plasma/shutdown/10-agent-shutdown.sh"
echo
}

@ -1,15 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>in-gentoo@baka.org</email>
<name>Seth Robertson</name>
<description>Maintainer</description>
</maintainer>
<maintainer type="project">
<email>proxy-maint@gentoo.org</email>
<name>Proxy Maintainers</name>
</maintainer>
<longdescription lang="en">
</longdescription>
<!-- maintainer-needed -->
<longdescription lang="en">
</longdescription>
</pkgmetadata>

@ -1,9 +1,9 @@
# Copyright 1999-2012 Gentoo Foundation
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI="2"
EAPI=6
inherit eutils base
inherit eutils
DESCRIPTION="New MH mail reader"
HOMEPAGE="http://www.nongnu.org/nmh/"
@ -15,8 +15,8 @@ KEYWORDS="~amd64 ~x86"
IUSE="gdbm"
DEPEND="gdbm? ( sys-libs/gdbm )
!gdbm? ( sys-libs/db )
>=sys-libs/ncurses-5.2
!gdbm? ( sys-libs/db:= )
>=sys-libs/ncurses-5.2:0=
net-libs/liblockfile
>=app-misc/editor-wrapper-3
!!media-gfx/pixie" # Bug #295996 media-gfx/pixie also uses show
@ -24,17 +24,16 @@ RDEPEND="${DEPEND}"
DOCS=( ChangeLog DATE MACHINES README )
src_prepare() {
# Patches from bug #22173.
epatch "${FILESDIR}"/${P}-inc-login.patch
epatch "${FILESDIR}"/${P}-install.patch
# bug #57886
epatch "${FILESDIR}"/${P}-m_getfld.patch
# bug #319937
epatch "${FILESDIR}"/${P}-db5.patch
# Allow parallel compiles/installs
epatch "${FILESDIR}"/${P}-parallelmake.patch
}
# Patches from bug #22173.
# bug #57886
# bug #319937
# Allow parallel compiles/installs
PATCHES=( "${FILESDIR}"/${P}-inc-login.patch
"${FILESDIR}"/${P}-install.patch
"${FILESDIR}"/${P}-m_getfld.patch
"${FILESDIR}"/${P}-db5.patch
"${FILESDIR}"/${P}-parallelmake.patch )
src_configure() {
# Bug 348816 & Bug 341741: The previous ebuild default of

@ -1,2 +1 @@
DIST libcdr-0.1.1.tar.xz 564668 SHA256 d0a6e0667e5a37fe059bcb81d5077fc2abffc7e7bac86fe302fbcf927d58df1f SHA512 a655b5390022fb5049d2f75fe836a693033943060d820942d59eb0a34548363ff183e0f32d22ec277d1f8b5c7ab89ab1fba933f17ef1239d14d053bd6a5cf624 WHIRLPOOL f7d5b6b1655f86ac3b843957e476ab17f2ef234bb5073678d182760cd6a370d24c98b14570474221d9f5ef9b24ffc76a5f4f82d596f466a7324dac95a04b9d77
DIST libcdr-0.1.3.tar.xz 596772 SHA256 66e28e502abef7f6f494ce03de037d532f5e7888cfdee62c01203c8325b33f22 SHA512 9811efb13f7dd72c69a98e81b44a261e913ffe87200486c8e07200d75790004d4fdf30e29f779b0ddd2ad09e3d1e8813ef501e9448c1789f89256f71bdb5fadd WHIRLPOOL 6772ac928a66f21c689f39a3abc762d043baf89d009d86ce79d68aa8b1354a4965a2f489bf8bd754c4a76bee3ac3695658ee4ec14ed7cf19986e48c22b0e4f97

@ -1,32 +0,0 @@
From 882a4b3f83a4b5097da53670c720a26f4e2750eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fridrich=20=C5=A0trba?= <fridrich.strba@bluewin.ch>
Date: Sun, 13 Dec 2015 20:37:16 +0100
Subject: [PATCH] Some boost 1.59 fixes
Change-Id: I0054c977a6d8ff5a9b93c147578e890476365999
---
src/lib/Makefile.am | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index 3f00cc5..e14fa8c 100644
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -13,8 +13,16 @@ libcdr_@CDR_MAJOR_VERSION@_@CDR_MINOR_VERSION@_include_HEADERS = \
$(top_srcdir)/inc/libcdr/CDRDocument.h \
$(top_srcdir)/inc/libcdr/CMXDocument.h
-AM_CXXFLAGS = -I$(top_srcdir)/inc $(REVENGE_CFLAGS) $(LCMS2_CFLAGS) $(ZLIB_CFLAGS) $(ICU_CFLAGS) $(DEBUG_CXXFLAGS) -DLIBCDR_BUILD=1
+AM_CXXFLAGS = -I$(top_srcdir)/inc \
+ $(REVENGE_CFLAGS) \
+ $(LCMS2_CFLAGS) \
+ $(ZLIB_CFLAGS) \
+ $(ICU_CFLAGS) \
+ $(DEBUG_CXXFLAGS) \
+ -DLIBCDR_BUILD=1 \
+ -DBOOST_ERROR_CODE_HEADER_ONLY \
+ -DBOOST_SYSTEM_NO_DEPRECATED
libcdr_@CDR_MAJOR_VERSION@_@CDR_MINOR_VERSION@_la_LIBADD = $(REVENGE_LIBS) $(LCMS2_LIBS) $(ZLIB_LIBS) $(ICU_LIBS) @LIBCDR_WIN32_RESOURCE@
libcdr_@CDR_MAJOR_VERSION@_@CDR_MINOR_VERSION@_la_DEPENDENCIES = @LIBCDR_WIN32_RESOURCE@
libcdr_@CDR_MAJOR_VERSION@_@CDR_MINOR_VERSION@_la_LDFLAGS = $(version_info) -export-dynamic -no-undefined

@ -1,51 +0,0 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
EGIT_REPO_URI="git://anongit.freedesktop.org/git/libreoffice/libcdr/"
inherit autotools eutils
[[ ${PV} == 9999 ]] && inherit git-r3
DESCRIPTION="Library parsing the Corel cdr documents"
HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/libcdr"
[[ ${PV} == 9999 ]] || SRC_URI="http://dev-www.libreoffice.org/src/${PN}/${P}.tar.xz"
LICENSE="MPL-2.0"
SLOT="0"
[[ ${PV} == 9999 ]] || \
KEYWORDS="hppa"
IUSE="doc static-libs"
RDEPEND="
dev-libs/icu:=
dev-libs/librevenge
media-libs/lcms:2
sys-libs/zlib
"
DEPEND="${RDEPEND}
dev-libs/boost
sys-devel/libtool
virtual/pkgconfig
doc? ( app-doc/doxygen )
"
src_prepare() {
epatch "${FILESDIR}/${PN}-0.1.1-boost-1.59.patch"
epatch_user
[[ -d m4 ]] || mkdir "m4"
eautoreconf
}
src_configure() {
econf \
--docdir="${EPREFIX}/usr/share/doc/${PF}" \
$(use_enable static-libs static) \
--disable-werror \
$(use_with doc docs)
}
src_install() {
default
prune_libtool_files --all
}

@ -1,56 +0,0 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
EGIT_REPO_URI="git://anongit.freedesktop.org/git/libreoffice/libvisio/"
inherit autotools
[[ ${PV} == 9999 ]] && inherit git-r3
DESCRIPTION="Library parsing the visio documents"
HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/libvisio"
[[ ${PV} == 9999 ]] || SRC_URI="http://dev-www.libreoffice.org/src/${PN}/${P}.tar.xz"
LICENSE="|| ( GPL-2+ LGPL-2.1 MPL-1.1 )"
SLOT="0"
[[ ${PV} == 9999 ]] || \
KEYWORDS="hppa"
IUSE="doc static-libs test tools"
RDEPEND="
dev-libs/icu:=
dev-libs/librevenge
dev-libs/libxml2
sys-libs/zlib
"
DEPEND="${RDEPEND}
dev-lang/perl
dev-libs/boost
dev-util/gperf
sys-devel/libtool
virtual/pkgconfig
doc? ( app-doc/doxygen )
test? ( dev-util/cppunit )
"
PATCHES=( "${FILESDIR}/${PN}-0.1.3-tests-without-tools.patch" )
src_prepare() {
default
[[ -d m4 ]] || mkdir "m4"
eautoreconf
}
src_configure() {
econf \
--disable-werror \
$(use_with doc docs) \
$(use_enable static-libs static) \
$(use_enable test tests) \
$(use_enable tools)
}
src_install() {
default
find "${D}" -name '*.la' -delete || die
}

@ -1 +1 @@
DIST cantata-2.0.1.tar.bz2 2151126 SHA256 122bda13c0b4078b84640dabef444b37d705d71c6f95209a2d949acd28a0bbca SHA512 69ae0c67970ec43f407c5ad11c0ddf254060a16de5023b2fdaf14ad9637ad8be06101ebe6c5cb07283e058400b24d80177b89f10a7be486cdb994aed1ff5ba02 WHIRLPOOL 138fab5ebbe9418b2c2d37b5c479fa7118a4c567f9ecd2a1fe2f4f1ff53e78803ca1f0192c126940ab2409b13448631a6e96e4e1542255378ff2f237df46ea3c
DIST cantata-2.1.0.tar.bz2 2207271 SHA256 9317afcae75c709ec733da069d4245b47e6e2c297a259eaf87a181fa9d1cd4c4 SHA512 bf03933785110d0d0c1dfbfc27f4974869ae7c79afe3cf1da1f3024c95d86733d8bea77f2a882887de79a7897ffcdac4262e58747dd4e979824943991675c5d2 WHIRLPOOL 5d58b84290c387d535e556553e64bba36520a099565c44bed1c4e9cf800c2a432ac09296b989a557e72d81a951c926b4bb638f2d2ab7976735059ebb74b8c8e2

@ -1,9 +1,9 @@
# Copyright 1999-2016 Gentoo Foundation
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
PLOCALES="cs de en_GB es fr hu ko pl ru zh_CN"
PLOCALES="cs de en_GB es fr hu it ja ko pl ru zh_CN"
inherit cmake-utils gnome2-utils l10n qmake-utils xdg
DESCRIPTION="Featureful and configurable Qt client for the music player daemon (MPD)"
@ -13,29 +13,31 @@ SRC_URI="https://github.com/CDrummond/cantata/releases/download/v${PV}/${P}.tar.
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="cdda cddb http-server mtp musicbrainz replaygain taglib udisks"
IUSE="cdda cddb cdio http-server mtp musicbrainz replaygain taglib udisks"
REQUIRED_USE="
?? ( cdda cdio )
cdda? ( udisks || ( cddb musicbrainz ) )
cddb? ( cdda taglib )
cddb? ( || ( cdio cdda ) taglib )
cdio? ( udisks || ( cddb musicbrainz ) )
mtp? ( taglib udisks )
musicbrainz? ( cdda taglib )
musicbrainz? ( || ( cdio cdda ) taglib )
replaygain? ( taglib )
"
RDEPEND="
dev-db/sqlite:3
dev-qt/qtconcurrent:5
dev-qt/qtcore:5
dev-qt/qtdbus:5
dev-qt/qtgui:5
dev-qt/qtnetwork:5
dev-qt/qtsql:5
dev-qt/qtsql:5[sqlite]
dev-qt/qtsvg:5
dev-qt/qtwidgets:5
dev-qt/qtxml:5
sys-libs/zlib
|| ( kde-frameworks/breeze-icons:5 kde-frameworks/oxygen-icons:* )
sys-libs/zlib
virtual/libudev:=
cdda? ( media-sound/cdparanoia )
cdio? ( dev-libs/libcdio-paranoia )
cddb? ( media-libs/libcddb )
mtp? ( media-libs/libmtp )
musicbrainz? ( media-libs/musicbrainz:5= )
@ -51,43 +53,36 @@ RDEPEND="
)
"
DEPEND="${RDEPEND}
dev-qt/qtconcurrent:5
dev-qt/linguist-tools:5
"
# cantata has no tests
RESTRICT="test"
PATCHES=(
"${FILESDIR}/${P}-mpris-true.patch"
"${FILESDIR}/${P}-mpris-plasma57.patch"
"${FILESDIR}/${P}-qt5-no-X11.patch"
)
src_prepare() {
remove_locale() {
rm "translations/${PN}_${1}".ts || die
}
cmake-utils_src_prepare
# Unbundle 3rd party libs
rm -rf 3rdparty/qtsingleapplication/ || die
rm -rf 3rdparty/libebur128/ || die
# qjson ebuild does not support Qt5 yet
rm -rf 3rdparty/qjson/ || die
rm -r 3rdparty/{ebur128,qtsingleapplication} || die
l10n_find_plocales_changes 'po' '' '.po'
l10n_find_plocales_changes "translations" "${PN}_" ".ts"
l10n_for_each_disabled_locale_do remove_locale
}
src_configure() {
local langs="$(l10n_get_locales)"
local mycmakeargs=(
-DCANTATA_HELPERS_LIB_DIR="$(get_libdir)"
-DCANTATA_TRANSLATIONS="${langs// /;}"
-DENABLE_CDPARANOIA=$(usex cdda)
-DENABLE_CDIOPARANOIA=$(usex cdio)
-DENABLE_CDDB=$(usex cddb)
-DENABLE_HTTP_SERVER=$(usex http-server)
-DENABLE_MTP=$(usex mtp)
-DENABLE_MUSICBRAINZ=$(usex musicbrainz)
-DENABLE_QT5=ON
-DLCONVERT_EXECUTABLE="$(qt5_get_bindir)/lconvert"
-DLRELEASE_EXECUTABLE="$(qt5_get_bindir)/lrelease"
-DENABLE_FFMPEG=$(usex replaygain)
-DENABLE_MPG123=$(usex replaygain)
@ -97,9 +92,7 @@ src_configure() {
-DENABLE_HTTP_STREAM_PLAYBACK=OFF
-DENABLE_REMOTE_DEVICES=OFF
-DENABLE_UDISKS2=ON
-DUSE_SYSTEM_MENU_ICON=OFF
)
# -DENABLE_KDE=$(usex kde) # not yet ported to KF5
cmake-utils_src_configure
}

@ -1,46 +0,0 @@
Work-around KDE 5.7 MPRIS issues.
diff --git a/gui/mainwindow.cpp b/gui/mainwindow.cpp
index cc2b532..37eec9e 100644
--- a/gui/mainwindow.cpp
+++ b/gui/mainwindow.cpp
@@ -1410,8 +1410,8 @@ void MainWindow::setRating()
}
}
-void MainWindow::readSettings()
-{
+void MainWindow::initMpris()
+{
#ifdef QT_QTDBUS_FOUND
if (Settings::self()->mpris()) {
if (!mpris) {
@@ -1424,6 +1424,16 @@ void MainWindow::readSettings()
mpris=0;
}
CurrentCover::self()->setEnabled(mpris || Settings::self()->showPopups() || 0!=Settings::self()->playQueueBackground() || Settings::self()->showCoverWidget());
+ #endif
+}
+
+void MainWindow::readSettings()
+{
+ #ifdef QT_QTDBUS_FOUND
+ // It appears as if the KDE MPRIS code does not like the MPRIS interface to be setup before the window is visible.
+ // to work-around this, initMpris in the next event loop iteration.
+ // See #863
+ QTimer::singleShot(0, this, SLOT(initMpris()));
#else
CurrentCover::self()->setEnabled(Settings::self()->showPopups() || 0!=Settings::self()->playQueueBackground() || Settings::self()->showCoverWidget());
#endif
diff --git a/gui/mainwindow.h b/gui/mainwindow.h
index 6d6e960..aa3a80a 100644
--- a/gui/mainwindow.h
+++ b/gui/mainwindow.h
@@ -268,6 +268,7 @@ public Q_SLOTS:
private Q_SLOTS:
void toggleContext();
void toggleMenubar();
+ void initMpris();
private:
int prevPage;

@ -1,100 +0,0 @@
Always return true for MPRIS CanPlay, CanPause, etc.
diff --git a/dbus/mpris.cpp b/dbus/mpris.cpp
index 4736d19..45a539a 100644
--- a/dbus/mpris.cpp
+++ b/dbus/mpris.cpp
@@ -65,6 +65,31 @@ Mpris::~Mpris()
QDBusConnection::sessionBus().unregisterService("org.mpris.MediaPlayer2.cantata");
}
+void Mpris::Pause()
+{
+ if (MPDState_Playing==MPDStatus::self()->state()) {
+ StdActions::self()->playPauseTrackAction->trigger();
+ }
+}
+
+void Mpris::Play()
+{
+ MPDStatus * const status = MPDStatus::self();
+ if (status->playlistLength() && MPDState_Playing!=status->state()) {
+ StdActions::self()->playPauseTrackAction->trigger();
+ }
+}
+
+QString Mpris::PlaybackStatus() const
+{
+ switch(MPDStatus::self()->state()) {
+ case MPDState_Playing: return QLatin1String("Playing");
+ case MPDState_Paused: return QLatin1String("Paused");
+ default:
+ case MPDState_Stopped: return QLatin1String("Stopped");
+ }
+}
+
qlonglong Mpris::Position() const
{
// Cant use MPDStatus, as we dont poll for track position, but use a timer instead!
diff --git a/dbus/mpris.h b/dbus/mpris.h
index 64a4fbe..a1578b9 100644
--- a/dbus/mpris.h
+++ b/dbus/mpris.h
@@ -71,37 +71,15 @@ class Mpris : public QObject
// org.mpris.MediaPlayer2.Player
void Next() { StdActions::self()->nextTrackAction->trigger(); }
void Previous() { StdActions::self()->prevTrackAction->trigger(); }
- void Pause() {
- if (MPDState_Playing==MPDStatus::self()->state()) {
- StdActions::self()->playPauseTrackAction->trigger();
- }
- }
-
+ void Pause();
void PlayPause() { StdActions::self()->playPauseTrackAction->trigger(); }
void Stop() { StdActions::self()->stopPlaybackAction->trigger(); }
void StopAfterCurrent() { StdActions::self()->stopAfterCurrentTrackAction->trigger(); }
-
- void Play() {
- MPDStatus * const status = MPDStatus::self();
-
- if (status->playlistLength() && MPDState_Playing!=status->state()) {
- StdActions::self()->playPauseTrackAction->trigger();
- }
- }
-
+ void Play();
void Seek(qlonglong pos) { emit setSeekId(-1, pos/1000000); }
void SetPosition(const QDBusObjectPath &, qlonglong pos) {emit setSeekId(-1, pos/1000000); }
void OpenUri(const QString &) { }
-
- QString PlaybackStatus() {
- switch(MPDStatus::self()->state()) {
- case MPDState_Playing: return QLatin1String("Playing");
- case MPDState_Paused: return QLatin1String("Paused");
- default:
- case MPDState_Stopped: return QLatin1String("Stopped");
- }
- }
-
+ QString PlaybackStatus() const;
QString LoopStatus() { return MPDStatus::self()->repeat() ? QLatin1String("Playlist") : QLatin1String("None"); }
void SetLoopStatus(const QString &s) { emit setRepeat(QLatin1String("None")!=s); }
QVariantMap Metadata() const;
@@ -115,11 +93,11 @@ class Mpris : public QObject
double MinimumRate() const { return 1.0; }
double MaximumRate() const { return 1.0; }
bool CanControl() const { return true; }
- bool CanPlay() const { return MPDState_Playing!=MPDStatus::self()->state() && MPDStatus::self()->playlistLength()>0; }
- bool CanPause() const { return MPDState_Playing==MPDStatus::self()->state(); }
- bool CanSeek() const { return -1!=MPDStatus::self()->songId(); }
- bool CanGoNext() const { return MPDState_Stopped!=MPDStatus::self()->state() && MPDStatus::self()->playlistLength()>1; }
- bool CanGoPrevious() const { return MPDState_Stopped!=MPDStatus::self()->state() && MPDStatus::self()->playlistLength()>1; }
+ bool CanPlay() const { return true; }
+ bool CanPause() const { return true; }
+ bool CanSeek() const { return true; }
+ bool CanGoNext() const { return true; }
+ bool CanGoPrevious() const { return true; }
// org.mpris.MediaPlayer2
bool CanQuit() const { return true; }

@ -1,14 +0,0 @@
diff --git a/support/CMakeLists.txt b/support/CMakeLists.txt
index fcdaf5c..f6160f0 100644
--- a/support/CMakeLists.txt
+++ b/support/CMakeLists.txt
@@ -89,7 +89,7 @@ if (NOT ENABLE_UBUNTU AND NOT ENABLE_WEB)
add_library(support STATIC ${SUPPORT_MOC_SRCS} ${SUPPORT_SRCS} ${SUPPORT_UI_HDRS} ${SUPPORT_RC_SRCS})
- if (X11_FOUND)
+ if (NOT ENABLE_QT5 AND X11_FOUND)
target_link_libraries(support ${X11_LIBRARIES})
- endif (X11_FOUND)
+ endif (NOT ENABLE_QT5 AND X11_FOUND)
endif (NOT ENABLE_UBUNTU AND NOT ENABLE_WEB)

@ -6,6 +6,7 @@
<name>Gentoo KDE Project</name>
</maintainer>
<use>
<flag name="cdio">Use <pkg>dev-libs/libcdio-paranoia</pkg> for CD support (instead of cdparanoia)</flag>
<flag name="http-server">Enable internal HTTP server to play non-MPD files</flag>
<flag name="replaygain">Enable ReplayGain support, for relative volume adjustments</flag>
</use>

@ -1 +1 @@
Wed, 02 Aug 2017 12:39:47 +0000
Thu, 03 Aug 2017 06:09:47 +0000

@ -1 +1 @@
Wed, 02 Aug 2017 12:39:48 +0000
Thu, 03 Aug 2017 06:09:47 +0000

@ -0,0 +1,13 @@
DEFINED_PHASES=configure install postinst postrm
DEPEND=sys-libs/ncurses:0= app-eselect/eselect-vi X? ( >=x11-proto/xproto-7.0.4 >=x11-libs/libX11-1.0.0 >=x11-libs/libXt-1.0.0 >=x11-libs/libXpm-3.5.4.2 >=x11-libs/libXft-2.1.8.2 ) virtual/pkgconfig
DESCRIPTION=A vi/ex clone
EAPI=6
HOMEPAGE=http://elvis.the-little-red-haired-girl.org
IUSE=X
KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~ppc-macos ~x86-macos ~m68k-mint ~sparc-solaris
LICENSE=Artistic
RDEPEND=sys-libs/ncurses:0= app-eselect/eselect-vi X? ( >=x11-proto/xproto-7.0.4 >=x11-libs/libX11-1.0.0 >=x11-libs/libXt-1.0.0 >=x11-libs/libXpm-3.5.4.2 >=x11-libs/libXft-2.1.8.2 )
SLOT=0
SRC_URI=ftp://ftp.cs.pdx.edu/pub/elvis/elvis-2.2_0.tar.gz
_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 8fec6b1eb195836560e70b66d98fb163 versionator c80ccf29e90adea7c5cae94b42eb76d0
_md5_=171d459ac3fd38ae07e4ce48dc782471

@ -1,14 +0,0 @@
DEFINED_PHASES=compile configure install prepare test
DEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/pbr-2.1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
DESCRIPTION=Golden Disk Image builder.
EAPI=6
HOMEPAGE=http://docs.openstack.org/developer/diskimage-builder/
IUSE=python_targets_python2_7
KEYWORDS=~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux
LICENSE=Apache-2.0
RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/pbr-2.1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/Babel-2.3.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/Babel-2.4.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pyyaml-3.10.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/flake8-2.5.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/flake8-2.6.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/stevedore-1.20.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] app-emulation/qemu sys-block/parted sys-fs/multipath-tools !dev-python/dib-utils[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
REQUIRED_USE=|| ( python_targets_python2_7 )
SLOT=0
SRC_URI=mirror://pypi/d/diskimage-builder/diskimage-builder-2.3.3.tar.gz
_eclasses_=distutils-r1 372bbe39047c0a2550319a3a82f3e063 multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing 284a473719153462f3e974d86c8cb81c python-r1 e9350ec46bb5c9f3504b4fbe8b8d8987 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 8fec6b1eb195836560e70b66d98fb163 xdg-utils b9389dfad0ee8f8e0b2a41b79fcf7120
_md5_=d511eb6fcbc19410fe9a240d93f65133

@ -1,14 +0,0 @@
DEFINED_PHASES=compile configure install prepare test
DEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/pbr-2.1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
DESCRIPTION=Golden Disk Image builder.
EAPI=6
HOMEPAGE=http://docs.openstack.org/developer/diskimage-builder/
IUSE=python_targets_python2_7
KEYWORDS=~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux
LICENSE=Apache-2.0
RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/pbr-2.1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/Babel-2.3.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/Babel-2.4.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pyyaml-3.10.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/flake8-2.5.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/flake8-2.6.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/stevedore-1.20.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] app-emulation/qemu sys-block/parted sys-fs/multipath-tools !dev-python/dib-utils[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
REQUIRED_USE=|| ( python_targets_python2_7 )
SLOT=0
SRC_URI=mirror://pypi/d/diskimage-builder/diskimage-builder-2.4.0.tar.gz
_eclasses_=distutils-r1 372bbe39047c0a2550319a3a82f3e063 multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing 284a473719153462f3e974d86c8cb81c python-r1 e9350ec46bb5c9f3504b4fbe8b8d8987 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 8fec6b1eb195836560e70b66d98fb163 xdg-utils b9389dfad0ee8f8e0b2a41b79fcf7120
_md5_=d511eb6fcbc19410fe9a240d93f65133

@ -1,14 +0,0 @@
DEFINED_PHASES=compile configure install prepare test
DEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/pbr-2.1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
DESCRIPTION=Golden Disk Image builder.
EAPI=6
HOMEPAGE=http://docs.openstack.org/developer/diskimage-builder/
IUSE=python_targets_python2_7
KEYWORDS=~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux
LICENSE=Apache-2.0
RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/pbr-2.1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/Babel-2.3.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/Babel-2.4.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pyyaml-3.10.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/flake8-2.5.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/flake8-2.6.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/stevedore-1.20.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] app-emulation/qemu sys-block/parted sys-fs/multipath-tools !dev-python/dib-utils[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
REQUIRED_USE=|| ( python_targets_python2_7 )
SLOT=0
SRC_URI=mirror://pypi/d/diskimage-builder/diskimage-builder-2.4.1.tar.gz
_eclasses_=distutils-r1 372bbe39047c0a2550319a3a82f3e063 multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing 284a473719153462f3e974d86c8cb81c python-r1 e9350ec46bb5c9f3504b4fbe8b8d8987 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 8fec6b1eb195836560e70b66d98fb163 xdg-utils b9389dfad0ee8f8e0b2a41b79fcf7120
_md5_=d511eb6fcbc19410fe9a240d93f65133

@ -1,14 +0,0 @@
DEFINED_PHASES=compile configure install prepare test
DEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/pbr-2.1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
DESCRIPTION=Golden Disk Image builder.
EAPI=6
HOMEPAGE=http://docs.openstack.org/developer/diskimage-builder/
IUSE=python_targets_python2_7
KEYWORDS=~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux
LICENSE=Apache-2.0
RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/pbr-2.1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/Babel-2.3.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/Babel-2.4.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/networkx-1.10[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pyyaml-3.10.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/flake8-2.5.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/flake8-2.6.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/stevedore-1.20.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] app-emulation/qemu sys-block/parted sys-fs/multipath-tools !dev-python/dib-utils[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
REQUIRED_USE=|| ( python_targets_python2_7 )
SLOT=0
SRC_URI=mirror://pypi/d/diskimage-builder/diskimage-builder-2.6.1.tar.gz
_eclasses_=distutils-r1 372bbe39047c0a2550319a3a82f3e063 multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing 284a473719153462f3e974d86c8cb81c python-r1 e9350ec46bb5c9f3504b4fbe8b8d8987 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 8fec6b1eb195836560e70b66d98fb163 xdg-utils b9389dfad0ee8f8e0b2a41b79fcf7120
_md5_=9506a69a1e421e9c9c24d12eadb599dd

@ -9,6 +9,6 @@ LICENSE=Apache-2.0
RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/pbr-2.1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/Babel-2.3.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/Babel-2.4.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/networkx-1.10[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pyyaml-3.10.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/flake8-2.5.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/flake8-2.6.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/stevedore-1.20.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] app-emulation/qemu sys-block/parted sys-fs/multipath-tools !dev-python/dib-utils[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
REQUIRED_USE=|| ( python_targets_python2_7 )
SLOT=0
SRC_URI=mirror://pypi/d/diskimage-builder/diskimage-builder-2.5.0.tar.gz
SRC_URI=mirror://pypi/d/diskimage-builder/diskimage-builder-2.8.0.tar.gz
_eclasses_=distutils-r1 372bbe39047c0a2550319a3a82f3e063 multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing 284a473719153462f3e974d86c8cb81c python-r1 e9350ec46bb5c9f3504b4fbe8b8d8987 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 8fec6b1eb195836560e70b66d98fb163 xdg-utils b9389dfad0ee8f8e0b2a41b79fcf7120
_md5_=9506a69a1e421e9c9c24d12eadb599dd

@ -1,13 +1,13 @@
DEFINED_PHASES=compile install prepare
DEPEND=dev-libs/libgcrypt:0 dev-libs/libpcre dev-libs/xalan-c dev-libs/xerces-c sys-apps/util-linux sys-libs/libcap acl? ( sys-apps/acl ) ldap? ( net-nds/openldap ) rpm? ( app-arch/rpm ) sys-apps/sed
DEPEND=dev-libs/libgcrypt:0 dev-libs/libpcre dev-libs/xalan-c dev-libs/xerces-c sys-apps/util-linux sys-libs/libcap acl? ( sys-apps/acl ) ldap? ( net-nds/openldap ) sys-apps/sed
DESCRIPTION=Free implementation of OVAL
EAPI=5
HOMEPAGE=http://oval.mitre.org/language/interpreter.html
IUSE=acl ldap rpm selinux
IUSE=acl ldap selinux
KEYWORDS=~amd64 ~x86
LICENSE=BSD
RDEPEND=dev-libs/libgcrypt:0 dev-libs/libpcre dev-libs/xalan-c dev-libs/xerces-c sys-apps/util-linux sys-libs/libcap acl? ( sys-apps/acl ) ldap? ( net-nds/openldap ) rpm? ( app-arch/rpm ) selinux? ( sys-libs/libselinux )
RDEPEND=dev-libs/libgcrypt:0 dev-libs/libpcre dev-libs/xalan-c dev-libs/xerces-c sys-apps/util-linux sys-libs/libcap acl? ( sys-apps/acl ) ldap? ( net-nds/openldap ) selinux? ( sys-libs/libselinux )
SLOT=0
SRC_URI=mirror://sourceforge/ovaldi/ovaldi-5.10.1.4-src.tar.bz2
_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 8fec6b1eb195836560e70b66d98fb163
_md5_=cbf6e4a5d8e5ac543b3bbcbdbd19485d
_md5_=a4053666047ffadfc188964cd01e7974

@ -5,8 +5,8 @@ EAPI=6
HOMEPAGE=http://www.vim.org/scripts/script.php?script_id=3396
KEYWORDS=amd64 x86
LICENSE=MIT
RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
RDEPEND=!app-vim/neocomplcache || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
SLOT=0
SRC_URI=mirror://gentoo/unite-4.0.tar.bz2 https://dev.gentoo.org/~radhermit/vim/unite-4.0.tar.bz2
_eclasses_=vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 6f0171b0a2f2fce005c13b4c0685a0d8
_md5_=3ca46d502cab009c4b24946849d1de13
_md5_=6e648dc4bd2d5c990f0264fb9717aa09

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

Loading…
Cancel
Save