Sync with portage [Fri Jun 29 10:00:34 MSK 2018].

mhiretskiy 1166
root 6 years ago
parent e3b025ffbe
commit 0c83c1a5fe

Binary file not shown.

Binary file not shown.

@ -2,3 +2,4 @@ DIST ansible-2.4.3.0.tar.gz 6511115 BLAKE2B d43679c651f6aa5fd86c797a204645a8ee98
DIST ansible-2.4.4.0.tar.gz 6512938 BLAKE2B 51e397d2242209271a8aef211c3bdeb34a15e2061a202415749ecb4232e0521aff304d5585d536b1805f14ff476b0733d559eeabe6e44de7b273b8606b11b805 SHA512 f0dcf92f2c69931fa06e6dd3845c11592d5a7e44f19a99c4d6c361022708560170f2b74ad20eded61fa5812c90eed281b78396aa92e0b33717970afb5966dd72
DIST ansible-2.4.5.0.tar.gz 6515523 BLAKE2B b6d2eeae93ec8b61ca426682d702179d60674cdb95b2cc9fe413f32d429cdbcab804f34a6d0bcd51a6151dcc29297c6aef6025df52b859130b5ef4c552e85d68 SHA512 44d0e05730a9d7b5ee256c8c19a08c007d19d6523319e3c45b65206781d7384386bbde1a0f5b452b29c9b95a236140bf1c011b46f1c15592c47a15deccf8748e
DIST ansible-2.5.5.tar.gz 10150862 BLAKE2B 51184d11418c0a534c0176fcc6fde6da3c962e00502b354317b311d20122b28bbafbb8dfdfb7700a0153116c70396a882b538524395af590af16eeac043d0655 SHA512 a3d50539d2a109dc0bbcdb440e0800b917f63141dce935e6426cb6bdc51e3a93e02f05c23714c24ab00b19842a86677b8d2f2455d20ca15410fa8d3c8ba379ca
DIST ansible-2.6.0.tar.gz 10721104 BLAKE2B 894700762139339e43cde35d74bfcfda218a1325b45749d8ea94c1a19e210f98e2f0717ff39c54da97f9795380268da040158271f2e26986b5d2fe177e3dfe2e SHA512 0c7353eeb4a65b21439489ef8a101bb0455d24d88904011460548bfba218688b4a1fdc1d61d60d611c2bcce7f1c301c0d6bcb9f3e9db12eaf9c9ef2f96994af9

@ -0,0 +1,66 @@
# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
PYTHON_COMPAT=( python2_7 python3_{5,6} )
inherit distutils-r1 eutils versionator
DESCRIPTION="Model-driven deployment, config management, and command execution framework"
HOMEPAGE="https://ansible.com/"
SRC_URI="https://releases.ansible.com/${PN}/${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
KEYWORDS="~amd64 ~x86 ~x64-macos"
IUSE="doc test"
RDEPEND="
dev-python/paramiko[${PYTHON_USEDEP}]
dev-python/jinja[${PYTHON_USEDEP}]
dev-python/pyyaml[${PYTHON_USEDEP}]
dev-python/setuptools[${PYTHON_USEDEP}]
dev-python/cryptography[${PYTHON_USEDEP}]
dev-python/httplib2[${PYTHON_USEDEP}]
dev-python/six[${PYTHON_USEDEP}]
dev-python/netaddr[${PYTHON_USEDEP}]
net-misc/sshpass
virtual/ssh
"
DEPEND="
dev-python/setuptools[${PYTHON_USEDEP}]
>=dev-python/packaging-16.6[${PYTHON_USEDEP}]
doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
test? (
${RDEPEND}
dev-python/nose[${PYTHON_USEDEP}]
>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
dev-python/passlib[${PYTHON_USEDEP}]
dev-python/coverage[${PYTHON_USEDEP}]
dev-python/unittest2[${PYTHON_USEDEP}]
dev-vcs/git
)"
# not included in release tarball
RESTRICT="test"
python_compile_all() {
if use doc; then
cd docs/docsite || die
export CPUS=4
emake -f Makefile.sphinx html
fi
}
python_test() {
nosetests -d -w test/units -v --with-coverage --cover-package=ansible --cover-branches || die
}
python_install_all() {
use doc && local HTML_DOCS=( docs/docsite/_build/html/. )
distutils-r1_python_install_all
doman docs/man/man1/*.1
dodoc -r examples
}

@ -24,7 +24,7 @@ RDEPEND="
pkg_setup() {
linux-info_pkg_setup
local CONFIG_CHECK="FUNCTION_TRACER FUNCTION_GRAPH_TRACER STACK_TRACER DYNAMIC_FTRACE"
local CONFIG_CHECK="~FUNCTION_TRACER ~FUNCTION_GRAPH_TRACER ~STACK_TRACER ~DYNAMIC_FTRACE"
check_extra_config
}

@ -14,7 +14,7 @@ SRC_URI="https://github.com/balabit/syslog-ng/releases/download/${P}/${P}.tar.gz
LICENSE="GPL-2+ LGPL-2.1+"
SLOT="0"
KEYWORDS="amd64 hppa ia64 sparc x86"
KEYWORDS="amd64 arm64 hppa ia64 sparc x86"
IUSE="amqp caps dbi geoip http ipv6 json libressl mongodb pacct python redis smtp spoof-source systemd tcpd"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
RESTRICT="test"

Binary file not shown.

@ -1,3 +1,4 @@
DIST brotli-1.0.2.tar.gz 23736359 BLAKE2B c5467dc52f97942d790b835d5e2c06d2046c3df249446b775d58e56feeb5d5fdd3e1e8e42c5eff92df2bc2b47afabd36389e14afead5fd376e18c8517d1e67f7 SHA512 b3ec98159e63b4169dea3e958d60d89247dc1c0f78aab27bfffb2ece659fa024df990d410aa15c12b2082d42e3785e32ec248dce2b116c7f34e98bb6337f9fc9
DIST brotli-1.0.3.tar.gz 23815300 BLAKE2B 9569267782a8159d290e0f1b524a985144d1ae68a45a732443aca973dd0407c50249ce62389848d97cbc33eba3062ba471064570418c36158b97935ae4b7fb73 SHA512 93adcf437d730ac403e444285ac8aefbb2c8a6b5e1b064e8ee33684c067287a8159e0ee73d2217c167881e87da73fa494792d963a15508fd42b2ac4a5b52823c
DIST brotli-1.0.4.tar.gz 23819000 BLAKE2B 5c0a7ed2cb7e15722c2f08dbaaaa5e74f10a03b95961d77db285fac437a489158cf8f7d43a55fac75eb5423951286accf0285e3e3471e34e35868a69dbf42f16 SHA512 7d41ad37ca0755ba9e08e7355fb031e24a53a5f6d44ff827adee6d9712765af02142cb463ef558f92449ce3b73e559cffb52315a329ab702f4c46927f993b616
DIST brotli-1.0.5.tar.gz 23825684 BLAKE2B b179f75f3e452bdd3fabbd74d9172bc0a00f797e7facf7a9061e5e81c52148297ea7dd8ab9954c3f596f59e2a96cb22ef057c4c02b1bba4ecf10db7b70e0711d SHA512 703cad94c7f250133d2cfe222f3183612c7649b184bba218907b805f423568046d42695f33acf7da95daf684be118c9d631cfa5706e5a195b611c716db4c839a

@ -0,0 +1,66 @@
# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
DISTUTILS_OPTIONAL="1"
inherit cmake-utils distutils-r1 eapi7-ver
DESCRIPTION="Generic-purpose lossless compression algorithm"
HOMEPAGE="https://github.com/google/brotli"
SLOT="0/$(ver_cut 1)"
RDEPEND="python? ( ${PYTHON_DEPS} )"
DEPEND="${RDEPEND}"
IUSE="python test"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
LICENSE="MIT python? ( Apache-2.0 )"
DOCS=( README.md CONTRIBUTING.md )
if [[ ${PV} == "9999" ]] ; then
SRC_URI=""
EGIT_REPO_URI="https://github.com/google/${PN}.git"
inherit git-r3
else
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
fi
src_prepare() {
cmake-utils_src_prepare
use python && distutils-r1_src_prepare
}
src_configure() {
local mycmakeargs=(
-DBUILD_SHARED_LIBS=ON
-DBUILD_TESTING="$(usex test)"
)
cmake-utils_src_configure
use python && distutils-r1_src_configure
}
src_compile() {
cmake-utils_src_compile
use python && distutils-r1_src_compile
}
python_test(){
esetup.py test || die
}
src_test() {
cmake-utils_src_test
use python && distutils-r1_src_test
}
src_install() {
cmake-utils_src_install
use python && distutils-r1_src_install
}

@ -10,7 +10,7 @@ SRC_URI="http://www.libarchive.org/downloads/${P}.tar.gz"
LICENSE="BSD BSD-2 BSD-4 public-domain"
SLOT="0/13"
KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~x64-cygwin ~amd64-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"
IUSE="acl +bzip2 +e2fsprogs expat +iconv kernel_linux libressl lz4 +lzma lzo nettle static-libs +threads xattr +zlib"
RDEPEND="

@ -0,0 +1,311 @@
From: Robert Luberda <robert@debian.org>
Date: Tue, 29 May 2018 23:59:09 +0200
Subject: Fix CVE-2018-10115
Apply "patch" taken from https://landave.io/files/patch_7zip_CVE-2018-10115.txt
Bugs-Debian: https://bugs.debian.org/897674
---
CPP/7zip/Compress/Rar1Decoder.cpp | 16 +++++++++++-----
CPP/7zip/Compress/Rar1Decoder.h | 3 ++-
CPP/7zip/Compress/Rar2Decoder.cpp | 17 +++++++++++++----
CPP/7zip/Compress/Rar2Decoder.h | 3 ++-
CPP/7zip/Compress/Rar3Decoder.cpp | 19 +++++++++++++++----
CPP/7zip/Compress/Rar3Decoder.h | 3 ++-
CPP/7zip/Compress/Rar5Decoder.cpp | 8 ++++++++
CPP/7zip/Compress/Rar5Decoder.h | 1 +
8 files changed, 54 insertions(+), 16 deletions(-)
diff --git a/CPP/7zip/Compress/Rar1Decoder.cpp b/CPP/7zip/Compress/Rar1Decoder.cpp
index 68030c7..8c890c8 100644
--- a/CPP/7zip/Compress/Rar1Decoder.cpp
+++ b/CPP/7zip/Compress/Rar1Decoder.cpp
@@ -29,7 +29,7 @@ public:
};
*/
-CDecoder::CDecoder(): m_IsSolid(false), _errorMode(false) { }
+CDecoder::CDecoder(): _isSolid(false), _solidAllowed(false), _errorMode(false) { }
void CDecoder::InitStructures()
{
@@ -345,7 +345,7 @@ void CDecoder::GetFlagsBuf()
void CDecoder::InitData()
{
- if (!m_IsSolid)
+ if (!_isSolid)
{
AvrPlcB = AvrLn1 = AvrLn2 = AvrLn3 = NumHuf = Buf60 = 0;
AvrPlc = 0x3500;
@@ -391,6 +391,11 @@ HRESULT CDecoder::CodeReal(ISequentialInStream *inStream, ISequentialOutStream *
if (inSize == NULL || outSize == NULL)
return E_INVALIDARG;
+ if (_isSolid && !_solidAllowed)
+ return S_FALSE;
+
+ _solidAllowed = false;
+
if (!m_OutWindowStream.Create(kHistorySize))
return E_OUTOFMEMORY;
if (!m_InBitStream.Create(1 << 20))
@@ -398,13 +403,13 @@ HRESULT CDecoder::CodeReal(ISequentialInStream *inStream, ISequentialOutStream *
m_UnpackSize = (Int64)*outSize;
m_OutWindowStream.SetStream(outStream);
- m_OutWindowStream.Init(m_IsSolid);
+ m_OutWindowStream.Init(_isSolid);
m_InBitStream.SetStream(inStream);
m_InBitStream.Init();
// CCoderReleaser coderReleaser(this);
InitData();
- if (!m_IsSolid)
+ if (!_isSolid)
{
_errorMode = false;
InitStructures();
@@ -475,6 +480,7 @@ HRESULT CDecoder::CodeReal(ISequentialInStream *inStream, ISequentialOutStream *
}
if (m_UnpackSize < 0)
return S_FALSE;
+ _solidAllowed = true;
return m_OutWindowStream.Flush();
}
@@ -491,7 +497,7 @@ STDMETHODIMP CDecoder::SetDecoderProperties2(const Byte *data, UInt32 size)
{
if (size < 1)
return E_INVALIDARG;
- m_IsSolid = ((data[0] & 1) != 0);
+ _isSolid = ((data[0] & 1) != 0);
return S_OK;
}
diff --git a/CPP/7zip/Compress/Rar1Decoder.h b/CPP/7zip/Compress/Rar1Decoder.h
index 01b606b..8abb3a3 100644
--- a/CPP/7zip/Compress/Rar1Decoder.h
+++ b/CPP/7zip/Compress/Rar1Decoder.h
@@ -38,7 +38,8 @@ public:
UInt32 LastLength;
Int64 m_UnpackSize;
- bool m_IsSolid;
+ bool _isSolid;
+ bool _solidAllowed;
bool _errorMode;
UInt32 ReadBits(int numBits);
diff --git a/CPP/7zip/Compress/Rar2Decoder.cpp b/CPP/7zip/Compress/Rar2Decoder.cpp
index 0580c8d..be8d842 100644
--- a/CPP/7zip/Compress/Rar2Decoder.cpp
+++ b/CPP/7zip/Compress/Rar2Decoder.cpp
@@ -80,7 +80,8 @@ static const UInt32 kHistorySize = 1 << 20;
static const UInt32 kWindowReservSize = (1 << 22) + 256;
CDecoder::CDecoder():
- m_IsSolid(false),
+ _isSolid(false),
+ _solidAllowed(false),
m_TablesOK(false)
{
}
@@ -320,6 +321,10 @@ HRESULT CDecoder::CodeReal(ISequentialInStream *inStream, ISequentialOutStream *
if (inSize == NULL || outSize == NULL)
return E_INVALIDARG;
+ if (_isSolid && !_solidAllowed)
+ return S_FALSE;
+ _solidAllowed = false;
+
if (!m_OutWindowStream.Create(kHistorySize))
return E_OUTOFMEMORY;
if (!m_InBitStream.Create(1 << 20))
@@ -330,12 +335,12 @@ HRESULT CDecoder::CodeReal(ISequentialInStream *inStream, ISequentialOutStream *
UInt64 pos = 0, unPackSize = *outSize;
m_OutWindowStream.SetStream(outStream);
- m_OutWindowStream.Init(m_IsSolid);
+ m_OutWindowStream.Init(_isSolid);
m_InBitStream.SetStream(inStream);
m_InBitStream.Init();
// CCoderReleaser coderReleaser(this);
- if (!m_IsSolid)
+ if (!_isSolid)
{
InitStructures();
if (unPackSize == 0)
@@ -343,6 +348,7 @@ HRESULT CDecoder::CodeReal(ISequentialInStream *inStream, ISequentialOutStream *
if (m_InBitStream.GetProcessedSize() + 2 <= m_PackSize) // test it: probably incorrect;
if (!ReadTables())
return S_FALSE;
+ _solidAllowed = true;
return S_OK;
}
if (!ReadTables())
@@ -386,6 +392,9 @@ HRESULT CDecoder::CodeReal(ISequentialInStream *inStream, ISequentialOutStream *
if (!ReadLastTables())
return S_FALSE;
+
+ _solidAllowed = true;
+
return m_OutWindowStream.Flush();
}
@@ -402,7 +411,7 @@ STDMETHODIMP CDecoder::SetDecoderProperties2(const Byte *data, UInt32 size)
{
if (size < 1)
return E_INVALIDARG;
- m_IsSolid = ((data[0] & 1) != 0);
+ _isSolid = ((data[0] & 1) != 0);
return S_OK;
}
diff --git a/CPP/7zip/Compress/Rar2Decoder.h b/CPP/7zip/Compress/Rar2Decoder.h
index 0e9005f..370bce2 100644
--- a/CPP/7zip/Compress/Rar2Decoder.h
+++ b/CPP/7zip/Compress/Rar2Decoder.h
@@ -138,7 +138,8 @@ class CDecoder :
Byte m_LastLevels[kMaxTableSize];
UInt64 m_PackSize;
- bool m_IsSolid;
+ bool _isSolid;
+ bool _solidAllowed;
bool m_TablesOK;
void InitStructures();
diff --git a/CPP/7zip/Compress/Rar3Decoder.cpp b/CPP/7zip/Compress/Rar3Decoder.cpp
index 6cb8a6a..7b85833 100644
--- a/CPP/7zip/Compress/Rar3Decoder.cpp
+++ b/CPP/7zip/Compress/Rar3Decoder.cpp
@@ -92,7 +92,8 @@ CDecoder::CDecoder():
_writtenFileSize(0),
_vmData(0),
_vmCode(0),
- m_IsSolid(false),
+ _isSolid(false),
+ _solidAllowed(false),
_errorMode(false)
{
Ppmd7_Construct(&_ppmd);
@@ -821,7 +822,7 @@ HRESULT CDecoder::CodeReal(ICompressProgressInfo *progress)
{
_writtenFileSize = 0;
_unsupportedFilter = false;
- if (!m_IsSolid)
+ if (!_isSolid)
{
_lzSize = 0;
_winPos = 0;
@@ -840,12 +841,15 @@ HRESULT CDecoder::CodeReal(ICompressProgressInfo *progress)
if (_errorMode)
return S_FALSE;
- if (!m_IsSolid || !TablesRead)
+ if (!_isSolid || !TablesRead)
{
bool keepDecompressing;
RINOK(ReadTables(keepDecompressing));
if (!keepDecompressing)
+ {
+ _solidAllowed = true;
return S_OK;
+ }
}
for (;;)
@@ -870,6 +874,9 @@ HRESULT CDecoder::CodeReal(ICompressProgressInfo *progress)
if (!keepDecompressing)
break;
}
+
+ _solidAllowed = true;
+
RINOK(WriteBuf());
UInt64 packSize = m_InBitStream.BitDecoder.GetProcessedSize();
RINOK(progress->SetRatioInfo(&packSize, &_writtenFileSize));
@@ -890,6 +897,10 @@ STDMETHODIMP CDecoder::Code(ISequentialInStream *inStream, ISequentialOutStream
if (!inSize)
return E_INVALIDARG;
+ if (_isSolid && !_solidAllowed)
+ return S_FALSE;
+ _solidAllowed = false;
+
if (!_vmData)
{
_vmData = (Byte *)::MidAlloc(kVmDataSizeMax + kVmCodeSizeMax);
@@ -928,7 +939,7 @@ STDMETHODIMP CDecoder::SetDecoderProperties2(const Byte *data, UInt32 size)
{
if (size < 1)
return E_INVALIDARG;
- m_IsSolid = ((data[0] & 1) != 0);
+ _isSolid = ((data[0] & 1) != 0);
return S_OK;
}
diff --git a/CPP/7zip/Compress/Rar3Decoder.h b/CPP/7zip/Compress/Rar3Decoder.h
index 2f72d7d..32c8943 100644
--- a/CPP/7zip/Compress/Rar3Decoder.h
+++ b/CPP/7zip/Compress/Rar3Decoder.h
@@ -191,7 +191,8 @@ class CDecoder:
CRecordVector<CTempFilter *> _tempFilters;
UInt32 _lastFilter;
- bool m_IsSolid;
+ bool _isSolid;
+ bool _solidAllowed;
bool _errorMode;
bool _lzMode;
diff --git a/CPP/7zip/Compress/Rar5Decoder.cpp b/CPP/7zip/Compress/Rar5Decoder.cpp
index dc8830f..a826d5a 100644
--- a/CPP/7zip/Compress/Rar5Decoder.cpp
+++ b/CPP/7zip/Compress/Rar5Decoder.cpp
@@ -72,6 +72,7 @@ CDecoder::CDecoder():
_writtenFileSize(0),
_dictSizeLog(0),
_isSolid(false),
+ _solidAllowed(false),
_wasInit(false),
_inputBuf(NULL)
{
@@ -801,7 +802,10 @@ HRESULT CDecoder::CodeReal()
*/
if (res == S_OK)
+ {
+ _solidAllowed = true;
res = res2;
+ }
if (res == S_OK && _unpackSize_Defined && _writtenFileSize != _unpackSize)
return S_FALSE;
@@ -821,6 +825,10 @@ STDMETHODIMP CDecoder::Code(ISequentialInStream *inStream, ISequentialOutStream
{
try
{
+ if (_isSolid && !_solidAllowed)
+ return S_FALSE;
+ _solidAllowed = false;
+
if (_dictSizeLog >= sizeof(size_t) * 8)
return E_NOTIMPL;
diff --git a/CPP/7zip/Compress/Rar5Decoder.h b/CPP/7zip/Compress/Rar5Decoder.h
index b0a4dd1..3db5018 100644
--- a/CPP/7zip/Compress/Rar5Decoder.h
+++ b/CPP/7zip/Compress/Rar5Decoder.h
@@ -271,6 +271,7 @@ class CDecoder:
Byte _dictSizeLog;
bool _tableWasFilled;
bool _isSolid;
+ bool _solidAllowed;
bool _wasInit;
UInt32 _reps[kNumReps];

@ -0,0 +1,165 @@
# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
WX_GTK_VER="3.0"
inherit toolchain-funcs wxwidgets
DESCRIPTION="Port of 7-Zip archiver for Unix"
HOMEPAGE="http://p7zip.sourceforge.net/"
SRC_URI="mirror://sourceforge/${PN}/${PN}_${PV}_src_all.tar.bz2"
LICENSE="LGPL-2.1 rar? ( unRAR )"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
IUSE="abi_x86_x32 doc kde +pch rar static wxwidgets"
REQUIRED_USE="kde? ( wxwidgets )"
RDEPEND="wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X] )"
DEPEND="${RDEPEND}
abi_x86_x32? ( >=dev-lang/yasm-1.2.0-r1 )
amd64? ( dev-lang/yasm )
x86? ( dev-lang/nasm )"
S=${WORKDIR}/${PN}_${PV}
DOCS=( ChangeLog README TODO )
PATCHES=(
"${FILESDIR}"/${P}-darwin.patch
"${FILESDIR}"/CVE-2016-9296.patch
"${FILESDIR}"/CVE-2017-17969.patch
"${FILESDIR}"/CVE-2018-5996.patch
"${FILESDIR}"/CVE-2018-10115.patch
)
src_prepare() {
default
if ! use pch; then
sed "s:PRE_COMPILED_HEADER=StdAfx.h.gch:PRE_COMPILED_HEADER=:g" -i makefile.* || die
fi
sed \
-e 's:-m32 ::g' \
-e 's:-m64 ::g' \
-e 's:-pipe::g' \
-e '/ALLFLAGS/s:-s ::' \
-e "/OPTFLAGS=/s:=.*:=${CXXFLAGS}:" \
-i makefile* || die
# remove non-free RAR codec
if use rar; then
ewarn "Enabling nonfree RAR decompressor"
else
sed \
-e '/Rar/d' \
-e '/RAR/d' \
-i makefile* CPP/7zip/Bundles/Format7zFree/makefile || die
rm -rf CPP/7zip/Compress/Rar || die
fi
if use abi_x86_x32; then
sed -i -e "/^ASM=/s:amd64:x32:" makefile* || die
cp -f makefile.linux_amd64_asm makefile.machine || die
elif use amd64; then
cp -f makefile.linux_amd64_asm makefile.machine || die
elif use x86; then
cp -f makefile.linux_x86_asm_gcc_4.X makefile.machine || die
elif [[ ${CHOST} == *-darwin* ]] ; then
# Mac OS X needs this special makefile, because it has a non-GNU
# linker, it doesn't matter so much for bitwidth, for it doesn't
# do anything with it
cp -f makefile.macosx_llvm_64bits makefile.machine
# bundles have extension .bundle but don't die because USE=-rar
# removes the Rar directory
sed -i -e '/strcpy(name/s/\.so/.bundle/' \
CPP/Windows/DLL.cpp || die
sed -i -e '/^PROG=/s/\.so/.bundle/' \
CPP/7zip/Bundles/Format7zFree/makefile.list \
$(use rar && echo CPP/7zip/Compress/Rar/makefile.list) || die
elif use x86-fbsd; then
# FreeBSD needs this special makefile, because it hasn't -ldl
sed -e 's/-lc_r/-pthread/' makefile.freebsd > makefile.machine
fi
if use static; then
sed -i -e '/^LOCAL_LIBS=/s/LOCAL_LIBS=/&-static /' makefile.machine || die
fi
if use kde || use wxwidgets; then
need-wxwidgets unicode
einfo "Preparing dependency list"
emake depend
fi
}
src_compile() {
emake CC=$(tc-getCC) CXX=$(tc-getCXX) all3
if use kde || use wxwidgets; then
emake CC=$(tc-getCC) CXX=$(tc-getCXX) -- 7zG
# emake -- 7zFM
fi
}
src_test() {
emake test test_7z test_7zr
}
src_install() {
# this wrappers can not be symlinks, p7zip should be called with full path
make_wrapper 7zr "/usr/$(get_libdir)/${PN}/7zr"
make_wrapper 7za "/usr/$(get_libdir)/${PN}/7za"
make_wrapper 7z "/usr/$(get_libdir)/${PN}/7z"
if use kde || use wxwidgets; then
make_wrapper 7zG "/usr/$(get_libdir)/${PN}/7zG"
# make_wrapper 7zFM "/usr/$(get_libdir)/${PN}/7zFM"
# make_desktop_entry 7zFM "${PN} FM" ${PN} "GTK;Utility;Archiving;Compression"
dobin GUI/p7zipForFilemanager
exeinto /usr/$(get_libdir)/${PN}
# doexe bin/7z{G,FM}
doexe bin/7zG
insinto /usr/$(get_libdir)/${PN}
doins -r GUI/Lang
doins -r DOC/MANUAL
insinto /usr/share/icons/hicolor/16x16/apps/
newins GUI/p7zip_16_ok.png p7zip.png
if use kde; then
rm GUI/kde4/p7zip_compress.desktop || die
insinto /usr/share/kservices5/ServiceMenus
doins GUI/kde4/*.desktop
dodir /usr/share/kde4/services/ServiceMenus # drop these lines after konqueror:4/krusader:4 are gone
for item in "${ED}"usr/share/kservices5/ServiceMenus/*.desktop; do
item="$(basename ${item})"
dosym "/usr/share/kservices5/ServiceMenus/${item}" "/usr/share/kde4/services/ServiceMenus/${item}"
done
fi
fi
dobin contrib/gzip-like_CLI_wrapper_for_7z/p7zip
doman contrib/gzip-like_CLI_wrapper_for_7z/man1/p7zip.1
exeinto /usr/$(get_libdir)/${PN}
doexe bin/7z bin/7za bin/7zr bin/7zCon.sfx
doexe bin/*$(get_modname)
if use rar; then
exeinto /usr/$(get_libdir)/${PN}/Codecs/
doexe bin/Codecs/*$(get_modname)
fi
doman man1/7z.1 man1/7za.1 man1/7zr.1
if use doc; then
dodoc DOC/*.txt
dohtml -r DOC/MANUAL/*
fi
}

Binary file not shown.

@ -1,3 +1,4 @@
DIST sbsigntool-0.8-ccan.tar.gz 113537 BLAKE2B 8fbf27463d30c1895930628a145be2d521ae4f6adb7af3299bf2f5f4319fd643df0a07347ef6851bd41d233af4c3fc5f77002771af1c43aa0f20665aef2390b8 SHA512 6857096879f116f1802eb6b44789cbea7bb24440bc0f16503aeadf5f276fa45943f322f844dbb9abee717655205d82b830143be3a7f4424fd4146b9360674a09
DIST sbsigntool-0.8.tar.gz 55537 BLAKE2B f81a530995b90f4030ae2bb36cdf4c5bab8fde5bbc4646029af008df9368968c1f1774317e8b0f94e6c75a33f0d79892f26d99c2987c92766f520a3b9a8e2e57 SHA512 ffc2661135dcdbdd218640f0a0657127c5519ade7ddaaa894898e382b4898829e5b877be51fce48bddd186667bf533f779cd5a323c79aad8b0e63b74f7a2c128
DIST sbsigntool-0.9.1.tar.gz 56497 BLAKE2B 22791bd4b490f36963a19e82da3ce7b93a56d948bf44d1ffdb62fa3291a3f815b2c19d68f9180b607c2b1438f656367ec1f9002f0b1225734d16a9aadc6d20ec SHA512 ae16232327c098bbc60a9701185d856d851cb7fa8f62be64d3c8f75c8b274b8521fcc4212226189def05db980690878ee6ac9a9b418166c92442aaf35e790d29
DIST sbsigntool_0.6.orig.tar.gz 212375 BLAKE2B fab9141c7fbfa01ec24f975503ac83be4ae0664251a1311afb3d95124fec3750ce20a5ffab35b6965d4ee4585ab4ee91f25ae49488214a983b6fc006071d0968 SHA512 ed314d1cb7278cf5f27d4c3cd17f2195678419a7f9e47770429b6f95df35f7df035331e60c45970183ddd9b150a9b752f876c777929598b0525872b3255af95c

@ -0,0 +1,152 @@
diff --git a/src/fileio.c b/src/fileio.c
index 032eb1e..09bc3aa 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -40,6 +40,7 @@
#include <openssl/pem.h>
#include <openssl/err.h>
#include <openssl/engine.h>
+#include <openssl/ui.h>
#include <ccan/talloc/talloc.h>
#include <ccan/read_write_all/read_write_all.h>
diff --git a/src/idc.c b/src/idc.c
index 236cefd..6d87bd4 100644
--- a/src/idc.c
+++ b/src/idc.c
@@ -238,7 +238,11 @@ struct idc *IDC_get(PKCS7 *p7, BIO *bio)
/* extract the idc from the signed PKCS7 'other' data */
str = p7->d.sign->contents->d.other->value.asn1_string;
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
idcbuf = buf = ASN1_STRING_data(str);
+#else
+ idcbuf = buf = ASN1_STRING_get0_data(str);
+#endif
idc = d2i_IDC(NULL, &buf, ASN1_STRING_length(str));
/* If we were passed a BIO, write the idc data, minus type and length,
@@ -289,7 +293,11 @@ int IDC_check_hash(struct idc *idc, struct image *image)
}
/* check hash against the one we calculated from the image */
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
buf = ASN1_STRING_data(str);
+#else
+ buf = ASN1_STRING_get0_data(str);
+#endif
if (memcmp(buf, sha, sizeof(sha))) {
fprintf(stderr, "Hash doesn't match image\n");
fprintf(stderr, " got: %s\n", sha256_str(buf));
diff --git a/src/sbattach.c b/src/sbattach.c
index a0c01b8..e89a23e 100644
--- a/src/sbattach.c
+++ b/src/sbattach.c
@@ -231,6 +231,7 @@ int main(int argc, char **argv)
return EXIT_FAILURE;
}
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
ERR_load_crypto_strings();
OpenSSL_add_all_digests();
OPENSSL_config(NULL);
@@ -239,6 +240,7 @@ int main(int argc, char **argv)
* module isn't present). In either case ignore the errors
* (malloc will cause other failures out lower down */
ERR_clear_error();
+#endif
image = image_load(image_filename);
if (!image) {
diff --git a/src/sbkeysync.c b/src/sbkeysync.c
index 7b17f40..419b1e7 100644
--- a/src/sbkeysync.c
+++ b/src/sbkeysync.c
@@ -208,7 +208,11 @@ static int x509_key_parse(struct key *key, uint8_t *data, size_t len)
goto out;
key->id_len = ASN1_STRING_length(serial);
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
key->id = talloc_memdup(key, ASN1_STRING_data(serial), key->id_len);
+#else
+ key->id = talloc_memdup(key, ASN1_STRING_get0_data(serial), key->id_len);
+#endif
key->description = talloc_array(key, char, description_len);
X509_NAME_oneline(X509_get_subject_name(x509),
@@ -927,6 +931,7 @@ int main(int argc, char **argv)
return EXIT_FAILURE;
}
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
ERR_load_crypto_strings();
OpenSSL_add_all_digests();
OpenSSL_add_all_ciphers();
@@ -936,6 +941,7 @@ int main(int argc, char **argv)
* module isn't present). In either case ignore the errors
* (malloc will cause other failures out lower down */
ERR_clear_error();
+#endif
ctx->filesystem_keys = init_keyset(ctx);
ctx->firmware_keys = init_keyset(ctx);
diff --git a/src/sbsign.c b/src/sbsign.c
index ff1fdfd..78d8d64 100644
--- a/src/sbsign.c
+++ b/src/sbsign.c
@@ -188,6 +188,7 @@ int main(int argc, char **argv)
talloc_steal(ctx, ctx->image);
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
ERR_load_crypto_strings();
OpenSSL_add_all_digests();
OpenSSL_add_all_ciphers();
@@ -197,6 +198,7 @@ int main(int argc, char **argv)
* module isn't present). In either case ignore the errors
* (malloc will cause other failures out lower down */
ERR_clear_error();
+#endif
if (engine)
pkey = fileio_read_engine_key(engine, keyfilename);
else
diff --git a/src/sbvarsign.c b/src/sbvarsign.c
index 7dcbe51..9319c8b 100644
--- a/src/sbvarsign.c
+++ b/src/sbvarsign.c
@@ -509,6 +509,7 @@ int main(int argc, char **argv)
return EXIT_FAILURE;
}
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
/* initialise openssl */
OpenSSL_add_all_digests();
OpenSSL_add_all_ciphers();
@@ -519,6 +520,7 @@ int main(int argc, char **argv)
* module isn't present). In either case ignore the errors
* (malloc will cause other failures out lower down */
ERR_clear_error();
+#endif
/* set up the variable signing context */
varname = argv[optind];
diff --git a/src/sbverify.c b/src/sbverify.c
index 3920d91..d0b203a 100644
--- a/src/sbverify.c
+++ b/src/sbverify.c
@@ -250,6 +250,7 @@ int main(int argc, char **argv)
verbose = false;
detached_sig_filename = NULL;
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
OpenSSL_add_all_digests();
ERR_load_crypto_strings();
OPENSSL_config(NULL);
@@ -258,6 +259,7 @@ int main(int argc, char **argv)
* module isn't present). In either case ignore the errors
* (malloc will cause other failures out lower down */
ERR_clear_error();
+#endif
for (;;) {
int idx;

@ -1,4 +1,4 @@
# Copyright 1999-2017 Gentoo Foundation
# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI="5"

@ -0,0 +1,52 @@
# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
inherit eutils autotools
DESCRIPTION="Utilities for signing and verifying files for UEFI Secure Boot"
HOMEPAGE="https://git.kernel.org/cgit/linux/kernel/git/jejb/sbsigntools.git/"
SRC_URI="https://git.kernel.org/pub/scm/linux/kernel/git/jejb/${PN}s.git/snapshot/${PN}s-${PV}.tar.gz -> ${P}.tar.gz
https://dev.gentoo.org/~tamiko/distfiles/${PN}-0.8-ccan.tar.gz"
LICENSE="GPL-3 LGPL-3 LGPL-2.1 CC0-1.0"
SLOT="0"
KEYWORDS="~amd64 ~arm64 ~x86"
IUSE="libressl"
RDEPEND="
!libressl? ( dev-libs/openssl:0= )
libressl? ( dev-libs/libressl:0= )
sys-apps/util-linux"
DEPEND="${RDEPEND}
sys-apps/help2man
sys-boot/gnu-efi
sys-libs/binutils-libs
virtual/pkgconfig"
S="${WORKDIR}/${PN}s-${PV}"
PATCHES=(
"${FILESDIR}"/${P}-openssl-1.1.0-compat.patch
)
src_prepare() {
mv "${WORKDIR}"/lib/ccan "${S}"/lib || die "mv failed"
rmdir "${WORKDIR}"/lib || die "rmdir failed"
local iarch
case ${ARCH} in
amd64) iarch=x86_64 ;;
arm64) iarch=aarch64 ;;
ia64) iarch=ia64 ;;
x86) iarch=ia32 ;;
*) die "unsupported architecture: ${ARCH}" ;;
esac
sed -i "/^EFI_ARCH=/s:=.*:=${iarch}:" configure.ac || die
sed -i 's/-m64$/& -march=x86-64/' tests/Makefile.am || die
sed -i "/^AR /s:=.*:= $(tc-getAR):" lib/ccan/Makefile.in || die #481480
default
eautoreconf
}

Binary file not shown.

@ -1,2 +1 @@
DIST buildah-1.0.tar.gz 2865669 BLAKE2B 7749ed00637fff9c2bcee63ef9e8985b3e6e2abff1c1f4787dc0730b9765576fac9173dd05cbc289aed3c0d20ff374a78976beb86c73adb221184415e4906a41 SHA512 17779e5bbc20fff6da607898620a8193e11ef13ddc033e7868776aab53a710e09428dca0450f11368d750bf7179fd4850ac3a8a445bd9537d987bd837853f4e5
DIST buildah-1.1.tar.gz 4253820 BLAKE2B ae30a677a2f569d87da0ab85732078912598cf25f7b22ad25540f5d89797983a8549eef1bc8d151d4e0be078b97e024df145bb882bdd8443becb07774bfb5875 SHA512 9957590d7413436195307746682496616fd2350b832242f33fb4cb07c1144addae445eeff062f403d26a68329f1153468489032bc9bbcf870839c760a720ef95

@ -1,46 +0,0 @@
# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
inherit bash-completion-r1 golang-vcs-snapshot
KEYWORDS="~amd64"
DESCRIPTION="A tool that facilitates building OCI images"
HOMEPAGE="https://github.com/projectatomic/buildah"
LICENSE="Apache-2.0"
SLOT="0"
IUSE=""
EGO_PN="${HOMEPAGE#*//}"
EGIT_COMMIT="v${PV}"
GIT_COMMIT="1ab80bc"
SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
RDEPEND="app-crypt/gpgme:=
app-emulation/skopeo
dev-libs/libgpg-error:=
dev-libs/libassuan:=
sys-fs/lvm2:=
sys-libs/libseccomp:="
DEPEND="${RDEPEND}"
RESTRICT="test"
S="${WORKDIR}/${P}/src/${EGO_PN}"
src_prepare() {
default
sed -e 's|^\(GIT_COMMIT := \).*|\1'${GIT_COMMIT}'|' -i Makefile || die
}
src_compile() {
GOPATH="${WORKDIR}/${P}" emake all
}
src_install() {
dodoc README.md
doman docs/*.1
dodoc -r docs/tutorials
dobin ${PN} imgtype
dobashcomp contrib/completions/bash/buildah
}
src_test() {
GOPATH="${WORKDIR}/${P}" emake test-unit
}

@ -12,7 +12,7 @@ SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
KEYWORDS="~amd64 ~x86"
KEYWORDS="amd64 x86"
IUSE="test"
RESTRICT="test"

@ -1,8 +1,8 @@
# Copyright 1999-2016 Gentoo Foundation
# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
inherit distutils-r1 eutils git-r3 multilib systemd

@ -1,3 +1,2 @@
DIST libvirt-4.1.0.tar.xz 15046956 BLAKE2B e5d4fb47d6308b2f74d464b8a4b236fcda96ca71357847ce7bc9c787e89111ed99538e9f7815287d14af24db1bc774012682843edc1e067cdf710e82d0b349c9 SHA512 62d1a228adf3270cc6defe3cbf92dac8c4ce2c434c4d97219571ccef799a4f6304cfd1ba9938338356641285f53ac71145d7b398523021c5ea1dc8e3d49cf894
DIST libvirt-4.2.0.tar.xz 15180120 BLAKE2B 0df6caef7f377e627a7ca1d169e1c8032d02fdfb5cc32a3036fbedd021063672114fcef09aa34e7218b56eef0fe64509024fbcd674a0c5f312a7afb9aa3e34a5 SHA512 ced3a7408e95f1663deec03b095780d0f805126506a064a11063d1f313f923eb0ff0ea95f99826514d8cb4e51c850f6f02904e06e5ef8106c38898a0cfe7f9ed
DIST libvirt-4.3.0.tar.xz 14667860 BLAKE2B bd4dfbcfba3b11036be979caf938ec7ca4fc04cc4bd6dfd5eec05c054ba4ebf953c0e86a080e65ab8a880f2bcc2f4d018283e870afcb64bd0b750247f3c96357 SHA512 cc61497121931019a8cc3fa8234d7cf95b0f0e1d77ab6fcd089db92759617b099eb83c57aa91768ae6ccf92c345cf72e1d9b202acb5132a159476fb86f1a6999
DIST libvirt-4.4.0.tar.xz 14668912 BLAKE2B 04f7a48618924bb8bbe1621572d260a01626687c66ed45d1a08d745210fc522fba63387a0433c0c55e41a5655267c094c16b7ff97f9e45b17419dfc83f465c79 SHA512 725b9b093a2aaeab6fdcb8df341a400ab363bcd50af8400dfd0593c41d8fbc8352f89147be9fbfde2e8418cc7298e090fe07ec7255b0aff1f0d001b93322f93f

@ -1,78 +0,0 @@
[PATCH] conf: avoid reporting errors when network driver is disabled
In previous releases all these methods were a no-op if the network
driver is disabled. These helper methods are called unconditionally for
all types of network interface, so must be no-ops if missing. Other code
will already generate an error if the network driver is disabled and a
NIC with type=network is used.
Signed-off-by: Daniel P. Berrangé <berrange redhat com>
---
src/conf/domain_conf.c | 23 +++++++++--------------
1 file changed, 9 insertions(+), 14 deletions(-)
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index c8d051fa9f..79d6bd378e 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -28979,10 +28979,13 @@ int
virDomainNetAllocateActualDevice(virDomainDefPtr dom,
virDomainNetDefPtr iface)
{
+ /* Just silently ignore if network driver isn't present. If something
+ * has tried to use a NIC with type=network, other code will already
+ * cause an error. This ensures type=bridge doesn't break when
+ * network driver is compiled out.
+ */
if (!netAllocate) {
- virReportError(VIR_ERR_NO_SUPPORT, "%s",
- _("Network device allocation not available"));
- return -1;
+ return 0;
}
return netAllocate(dom, iface);
@@ -28993,8 +28996,6 @@ virDomainNetNotifyActualDevice(virDomainDefPtr dom,
virDomainNetDefPtr iface)
{
if (!netNotify) {
- virReportError(VIR_ERR_NO_SUPPORT, "%s",
- _("Network device notification not available"));
return;
}
@@ -29007,9 +29008,7 @@ virDomainNetReleaseActualDevice(virDomainDefPtr dom,
virDomainNetDefPtr iface)
{
if (!netRelease) {
- virReportError(VIR_ERR_NO_SUPPORT, "%s",
- _("Network device release not available"));
- return -1;
+ return 0;
}
return netRelease(dom, iface);
@@ -29020,9 +29019,7 @@ virDomainNetBandwidthChangeAllowed(virDomainNetDefPtr iface,
virNetDevBandwidthPtr newBandwidth)
{
if (!netBandwidthChangeAllowed) {
- virReportError(VIR_ERR_NO_SUPPORT, "%s",
- _("Network device bandwidth change query not available"));
- return -1;
+ return 0;
}
return netBandwidthChangeAllowed(iface, newBandwidth);
@@ -29033,9 +29030,7 @@ virDomainNetBandwidthUpdate(virDomainNetDefPtr iface,
virNetDevBandwidthPtr newBandwidth)
{
if (!netBandwidthUpdate) {
- virReportError(VIR_ERR_NO_SUPPORT, "%s",
- _("Network device bandwidth update not available"));
- return -1;
+ return 0;
}
return netBandwidthUpdate(iface, newBandwidth);
--
2.14.3

@ -1,17 +1,34 @@
From a365e2d5b4af1ab2be743773412fe265579a9a0b Mon Sep 17 00:00:00 2001
Message-Id: <a365e2d5b4af1ab2be743773412fe265579a9a0b.1529989118.git.mprivozn@redhat.com>
From: Michal Privoznik <mprivozn@redhat.com>
Date: Tue, 26 Jun 2018 06:51:06 +0200
Subject: [PATCH] gentoo: do not use sysconf
Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
---
src/Makefile.am | 29 ++++++-----------------------
src/locking/virtlockd.service.in | 3 +--
src/logging/virtlogd.service.in | 3 +--
src/remote/libvirtd.service.in | 3 +--
tools/Makefile.am | 17 ++++-------------
tools/libvirt-guests.service.in | 2 +-
tools/libvirt-guests.sysconf | 7 +++++++
7 files changed, 21 insertions(+), 43 deletions(-)
diff --git a/src/Makefile.am b/src/Makefile.am
index 3bf2da5..6b3f37a 100644
index db8c8ebd1a..63d7a9ca46 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2165,23 +2165,6 @@ EXTRA_DIST += \
$(SYSCONF_FILES) \
$(NULL)
@@ -757,23 +757,6 @@ endif WITH_SETUID_RPC_CLIENT
EXTRA_DIST += $(SYSCONF_FILES)
-install-sysconfig:
- $(MKDIR_P) $(DESTDIR)$(sysconfdir)/sysconfig
- for f in $(SYSCONF_FILES:%.sysconf=%) ; \
- do \
- tgt=`basename $$f`; \
- $(INSTALL_SCRIPT) $(srcdir)/$$f.sysconf \
- $(INSTALL_DATA) $(srcdir)/$$f.sysconf \
- $(DESTDIR)$(sysconfdir)/sysconfig/$$tgt; \
- done
-
@ -23,11 +40,11 @@ index 3bf2da5..6b3f37a 100644
- done
- rmdir $(DESTDIR)$(sysconfdir)/sysconfig || :
-
SYSVINIT_FILES_IN = \
SYSVINIT_FILES_IN += \
locking/virtlockd.init.in \
logging/virtlogd.init.in \
@@ -2268,14 +2251,14 @@ uninstall-polkit::
endif ! WITH_POLKIT
$(NULL)
@@ -814,14 +797,14 @@ uninstall-logrotate:
endif ! WITH_LIBVIRTD
if LIBVIRT_INIT_SCRIPT_RED_HAT
-install-init:: $(SYSVINIT_FILES) install-sysconfig
@ -43,8 +60,43 @@ index 3bf2da5..6b3f37a 100644
rm -f $(SYSVINIT_FILES:%.init=$(DESTDIR)$(sysconfdir)/rc.d/init.d/%)
rmdir $(DESTDIR)$(sysconfdir)/rc.d/init.d || :
@@ -859,14 +842,14 @@ SYSTEMD_UNIT_FILES = $(notdir $(SYSTEMD_UNIT_FILES_IN:%.in=%))
BUILT_SOURCES += $(SYSTEMD_UNIT_FILES)
DISTCLEANFILES += $(SYSTEMD_UNIT_FILES)
-install-systemd: $(SYSTEMD_UNIT_FILES) install-sysconfig
+install-systemd: $(SYSTEMD_UNIT_FILES)
$(MKDIR_P) $(DESTDIR)$(SYSTEMD_UNIT_DIR)
for f in $(SYSTEMD_UNIT_FILES); \
do \
$(INSTALL_DATA) $$f $(DESTDIR)$(SYSTEMD_UNIT_DIR)/ ; \
done
-uninstall-systemd: uninstall-sysconfig
+uninstall-systemd:
rm -f $(SYSTEMD_UNIT_FILES:%=$(DESTDIR)$(SYSTEMD_UNIT_DIR)/%)
rmdir $(DESTDIR)$(SYSTEMD_UNIT_DIR) || :
else ! LIBVIRT_INIT_SCRIPT_SYSTEMD
@@ -884,7 +867,7 @@ EXTRA_DIST += $(UPSTART_FILES)
if WITH_LIBVIRTD
if LIBVIRT_INIT_SCRIPT_UPSTART
-install-upstart: install-sysconfig
+install-upstart:
$(MKDIR_P) $(DESTDIR)$(sysconfdir)/event.d
for f in $(UPSTART_FILES:%.upstart=%); \
do \
@@ -893,7 +876,7 @@ install-upstart: install-sysconfig
$(DESTDIR)$(sysconfdir)/event.d/$$tgt ; \
done
-uninstall-upstart: uninstall-sysconfig
+uninstall-upstart:
for f in $(UPSTART_FILES:%.upstart=%); \
do \
tgt=`basename $$f` ; \
diff --git a/src/locking/virtlockd.service.in b/src/locking/virtlockd.service.in
index 3c9d587..2449b20 100644
index 3c9d587032..2449b201d9 100644
--- a/src/locking/virtlockd.service.in
+++ b/src/locking/virtlockd.service.in
@@ -7,8 +7,7 @@ Documentation=man:virtlockd(8)
@ -58,7 +110,7 @@ index 3c9d587..2449b20 100644
# Loosing the locks is a really bad thing that will
# cause the machine to be fenced (rebooted), so make
diff --git a/src/logging/virtlogd.service.in b/src/logging/virtlogd.service.in
index 3d9ae36..4373619 100644
index 3d9ae36150..43736191d5 100644
--- a/src/logging/virtlogd.service.in
+++ b/src/logging/virtlogd.service.in
@@ -7,8 +7,7 @@ Documentation=man:virtlogd(8)
@ -72,10 +124,10 @@ index 3d9ae36..4373619 100644
# Loosing the logs is a really bad thing that will
# cause the machine to be fenced (rebooted), so make
diff --git a/src/remote/libvirtd.service.in b/src/remote/libvirtd.service.in
index 769702e..1830c72 100644
index 7f689e08a8..239beeced9 100644
--- a/src/remote/libvirtd.service.in
+++ b/src/remote/libvirtd.service.in
@@ -21,8 +21,7 @@ Documentation=https://libvirt.org
@@ -22,8 +22,7 @@ Documentation=https://libvirt.org
[Service]
Type=notify
@ -86,7 +138,7 @@ index 769702e..1830c72 100644
KillMode=process
Restart=on-failure
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 85e640b..99b9fa1 100644
index 1452d984a0..cef08741cb 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -336,15 +336,6 @@ install-data-local: install-init install-systemd install-nss \
@ -116,8 +168,23 @@ index 85e640b..99b9fa1 100644
else ! LIBVIRT_INIT_SCRIPT_RED_HAT
install-init:
uninstall-init:
@@ -391,12 +382,12 @@ EXTRA_DIST += libvirt-guests.service.in
SYSTEMD_UNIT_DIR = $(prefix)/lib/systemd/system
if LIBVIRT_INIT_SCRIPT_SYSTEMD
-install-systemd: libvirt-guests.service install-sysconfig libvirt-guests.sh
+install-systemd: libvirt-guests.service libvirt-guests.sh
$(MKDIR_P) $(DESTDIR)$(SYSTEMD_UNIT_DIR)
$(INSTALL_DATA) libvirt-guests.service \
$(DESTDIR)$(SYSTEMD_UNIT_DIR)/libvirt-guests.service
-uninstall-systemd: uninstall-sysconfig
+uninstall-systemd:
rm -f $(DESTDIR)$(SYSTEMD_UNIT_DIR)/libvirt-guests.service
rmdir $(DESTDIR)$(SYSTEMD_UNIT_DIR) ||:
diff --git a/tools/libvirt-guests.service.in b/tools/libvirt-guests.service.in
index 491ca62..f0f417b 100644
index 491ca62138..f0f417bffb 100644
--- a/tools/libvirt-guests.service.in
+++ b/tools/libvirt-guests.service.in
@@ -10,7 +10,7 @@ Documentation=man:libvirtd(8)
@ -130,7 +197,7 @@ index 491ca62..f0f417b 100644
# out the code
ExecStart=@libexecdir@/libvirt-guests.sh start
diff --git a/tools/libvirt-guests.sysconf b/tools/libvirt-guests.sysconf
index 08204ca..2da172b 100644
index 669b046507..45b0b9ea46 100644
--- a/tools/libvirt-guests.sysconf
+++ b/tools/libvirt-guests.sysconf
@@ -1,3 +1,10 @@
@ -142,63 +209,8 @@ index 08204ca..2da172b 100644
+
+
# URIs to check for running guests
# example: URIS='default xen:/// vbox+tcp://host/system lxc:///'
# example: URIS='default xen:///system vbox+tcp://host/system lxc:///system'
#URIS=default
diff --git a/src/Makefile.am b/src/Makefile.am
index 6b3f37a..48e7133 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2417,14 +2417,14 @@ SYSTEMD_UNIT_FILES = $(notdir $(SYSTEMD_UNIT_FILES_IN:%.in=%))
BUILT_SOURCES += $(SYSTEMD_UNIT_FILES)
DISTCLEANFILES += $(SYSTEMD_UNIT_FILES)
-install-systemd: $(SYSTEMD_UNIT_FILES) install-sysconfig
+install-systemd: $(SYSTEMD_UNIT_FILES)
$(MKDIR_P) $(DESTDIR)$(SYSTEMD_UNIT_DIR)
for f in $(SYSTEMD_UNIT_FILES); \
do \
$(INSTALL_DATA) $$f $(DESTDIR)$(SYSTEMD_UNIT_DIR)/ ; \
done
-uninstall-systemd: uninstall-sysconfig
+uninstall-systemd:
rm -f $(SYSTEMD_UNIT_FILES:%=$(DESTDIR)$(SYSTEMD_UNIT_DIR)/%)
rmdir $(DESTDIR)$(SYSTEMD_UNIT_DIR) || :
else ! LIBVIRT_INIT_SCRIPT_SYSTEMD
@@ -2496,7 +2496,7 @@ EXTRA_DIST += $(UPSTART_FILES)
if WITH_LIBVIRTD
if LIBVIRT_INIT_SCRIPT_UPSTART
-install-upstart: install-sysconfig
+install-upstart:
$(MKDIR_P) $(DESTDIR)$(sysconfdir)/event.d
for f in $(UPSTART_FILES:%.upstart=%); \
do \
@@ -2505,7 +2505,7 @@ install-upstart: install-sysconfig
$(DESTDIR)$(sysconfdir)/event.d/$$tgt ; \
done
-uninstall-upstart: uninstall-sysconfig
+uninstall-upstart:
for f in $(UPSTART_FILES:%.upstart=%); \
do \
tgt=`basename $$f` ; \
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 99b9fa1..37e037c 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -382,12 +382,12 @@ EXTRA_DIST += libvirt-guests.service.in
SYSTEMD_UNIT_DIR = $(prefix)/lib/systemd/system
if LIBVIRT_INIT_SCRIPT_SYSTEMD
-install-systemd: libvirt-guests.service install-sysconfig libvirt-guests.sh
+install-systemd: libvirt-guests.service libvirt-guests.sh
$(MKDIR_P) $(DESTDIR)$(SYSTEMD_UNIT_DIR)
$(INSTALL_DATA) libvirt-guests.service \
$(DESTDIR)$(SYSTEMD_UNIT_DIR)/libvirt-guests.service
-uninstall-systemd: uninstall-sysconfig
+uninstall-systemd:
rm -f $(DESTDIR)$(SYSTEMD_UNIT_DIR)/libvirt-guests.service
rmdir $(DESTDIR)$(SYSTEMD_UNIT_DIR) ||:
--
2.16.4

@ -1,383 +0,0 @@
# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
inherit autotools eutils user linux-info systemd readme.gentoo-r1 bash-completion-r1
if [[ ${PV} = *9999* ]]; then
inherit git-r3
EGIT_REPO_URI="git://libvirt.org/libvirt.git"
SRC_URI=""
KEYWORDS="amd64"
SLOT="0"
else
# Versions with 4 numbers are stable updates:
if [[ ${PV} =~ ^[0-9]+(\.[0-9]+){3} ]]; then
SRC_URI="http://libvirt.org/sources/stable_updates/${P}.tar.xz"
else
SRC_URI="http://libvirt.org/sources/${P}.tar.xz"
fi
KEYWORDS="amd64 ~arm64 x86"
SLOT="0/${PV}"
fi
DESCRIPTION="C toolkit to manipulate virtual machines"
HOMEPAGE="http://www.libvirt.org/"
LICENSE="LGPL-2.1"
IUSE="
apparmor audit +caps +dbus firewalld fuse glusterfs iscsi +libvirtd lvm
libssh lxc +macvtap nfs nls numa openvz parted pcap phyp policykit
+qemu rbd sasl selinux +udev uml +vepa virtualbox virt-network
wireshark-plugins xen zeroconf zfs
"
REQUIRED_USE="
firewalld? ( virt-network )
libvirtd? ( || ( lxc openvz qemu uml virtualbox xen ) )
lxc? ( caps libvirtd )
openvz? ( libvirtd )
policykit? ( dbus )
qemu? ( libvirtd )
uml? ( libvirtd )
vepa? ( macvtap )
virt-network? ( libvirtd )
virtualbox? ( libvirtd )
xen? ( libvirtd )"
# gettext.sh command is used by the libvirt command wrappers, and it's
# non-optional, so put it into RDEPEND.
# We can use both libnl:1.1 and libnl:3, but if you have both installed, the
# package will use 3 by default. Since we don't have slot pinning in an API,
# we must go with the most recent
RDEPEND="
app-misc/scrub
dev-libs/libgcrypt:0
dev-libs/libnl:3
>=dev-libs/libxml2-2.7.6
|| ( >=net-analyzer/netcat6-1.0-r2 >=net-analyzer/openbsd-netcat-1.105-r1 )
>=net-libs/gnutls-1.0.25:0=
net-libs/libssh2
net-libs/libtirpc
net-libs/rpcsvc-proto
>=net-misc/curl-7.18.0
sys-apps/dmidecode
>=sys-apps/util-linux-2.17
sys-devel/gettext
sys-libs/ncurses:0=
sys-libs/readline:=
apparmor? ( sys-libs/libapparmor )
audit? ( sys-process/audit )
caps? ( sys-libs/libcap-ng )
dbus? ( sys-apps/dbus )
firewalld? ( net-firewall/firewalld )
fuse? ( >=sys-fs/fuse-2.8.6:= )
glusterfs? ( >=sys-cluster/glusterfs-3.4.1 )
iscsi? ( sys-block/open-iscsi )
libssh? ( net-libs/libssh )
lvm? ( >=sys-fs/lvm2-2.02.48-r2[-device-mapper-only(-)] )
nfs? ( net-fs/nfs-utils )
numa? (
>sys-process/numactl-2.0.2
sys-process/numad
)
parted? (
>=sys-block/parted-1.8[device-mapper]
sys-fs/lvm2[-device-mapper-only(-)]
)
pcap? ( >=net-libs/libpcap-1.0.0 )
policykit? ( >=sys-auth/polkit-0.9 )
qemu? (
>=app-emulation/qemu-0.13.0
dev-libs/yajl
)
rbd? ( sys-cluster/ceph )
sasl? ( dev-libs/cyrus-sasl )
selinux? ( >=sys-libs/libselinux-2.0.85 )
virt-network? (
net-dns/dnsmasq[script]
net-firewall/ebtables
>=net-firewall/iptables-1.4.10[ipv6]
net-misc/radvd
sys-apps/iproute2[-minimal]
)
virtualbox? ( || ( app-emulation/virtualbox >=app-emulation/virtualbox-bin-2.2.0 ) )
wireshark-plugins? ( net-analyzer/wireshark:= )
xen? (
app-emulation/xen
app-emulation/xen-tools:=
)
udev? (
virtual/udev
>=x11-libs/libpciaccess-0.10.9
)
zeroconf? ( >=net-dns/avahi-0.6[dbus] )
zfs? ( sys-fs/zfs )"
DEPEND="${RDEPEND}
app-text/xhtml1
dev-lang/perl
dev-libs/libxslt
dev-perl/XML-XPath
virtual/pkgconfig"
PATCHES=(
"${FILESDIR}"/${PN}-4.1.0-do_not_use_sysconf.patch
"${FILESDIR}"/${PN}-1.2.16-fix_paths_in_libvirt-guests_sh.patch
"${FILESDIR}"/${PN}-3.10.0-r2-fix_paths_for_apparmor.patch
"${FILESDIR}"/${PN}-3.1.0-musl-fix-includes.patch # bug #609488
"${FILESDIR}"/${P}-unbreak_my_bridge.patch # bug 650660
)
pkg_setup() {
if use qemu; then
enewgroup qemu 77
enewuser qemu 77 -1 -1 "qemu,kvm"
fi
use policykit && enewgroup libvirt
# Check kernel configuration:
CONFIG_CHECK=""
use fuse && CONFIG_CHECK+="
~FUSE_FS"
use lvm && CONFIG_CHECK+="
~BLK_DEV_DM
~DM_MULTIPATH
~DM_SNAPSHOT"
use lxc && CONFIG_CHECK+="
~BLK_CGROUP
~CGROUP_CPUACCT
~CGROUP_DEVICE
~CGROUP_FREEZER
~CGROUP_NET_PRIO
~CGROUP_PERF
~CGROUPS
~CGROUP_SCHED
~CPUSETS
~IPC_NS
~MACVLAN
~NAMESPACES
~NET_CLS_CGROUP
~NET_NS
~PID_NS
~POSIX_MQUEUE
~SECURITYFS
~USER_NS
~UTS_NS
~VETH
~!GRKERNSEC_CHROOT_MOUNT
~!GRKERNSEC_CHROOT_DOUBLE
~!GRKERNSEC_CHROOT_PIVOT
~!GRKERNSEC_CHROOT_CHMOD
~!GRKERNSEC_CHROOT_CAPS"
kernel_is lt 4 7 && use lxc && CONFIG_CHECK+="
~DEVPTS_MULTIPLE_INSTANCES"
use macvtap && CONFIG_CHECK+="
~MACVTAP"
use virt-network && CONFIG_CHECK+="
~BRIDGE_EBT_MARK_T
~BRIDGE_NF_EBTABLES
~NETFILTER_ADVANCED
~NETFILTER_XT_CONNMARK
~NETFILTER_XT_MARK
~NETFILTER_XT_TARGET_CHECKSUM"
# Bandwidth Limiting Support
use virt-network && CONFIG_CHECK+="
~BRIDGE_EBT_T_NAT
~NET_ACT_POLICE
~NET_CLS_FW
~NET_CLS_U32
~NET_SCH_HTB
~NET_SCH_INGRESS
~NET_SCH_SFQ"
# Handle specific kernel versions for different features
kernel_is lt 3 6 && CONFIG_CHECK+=" ~CGROUP_MEM_RES_CTLR"
if kernel_is ge 3 6; then
CONFIG_CHECK+=" ~MEMCG ~MEMCG_SWAP "
kernel_is lt 4 5 && CONFIG_CHECK+=" ~MEMCG_KMEM "
fi
ERROR_USER_NS="Optional depending on LXC configuration."
if [[ -n ${CONFIG_CHECK} ]]; then
linux-info_pkg_setup
fi
}
src_prepare() {
touch "${S}/.mailmap"
default
if [[ ${PV} = *9999* ]]; then
# git checkouts require bootstrapping to create the configure script.
# Additionally the submodules must be cloned to the right locations
# bug #377279
./bootstrap || die "bootstrap failed"
(
git submodule status | sed 's/^[ +-]//;s/ .*//'
git hash-object bootstrap.conf
) >.git-module-status
fi
# Tweak the init script:
cp "${FILESDIR}/libvirtd.init-r16" "${S}/libvirtd.init" || die
sed -e "s/USE_FLAG_FIREWALLD/$(usex firewalld 'need firewalld' '')/" \
-e "s/USE_FLAG_AVAHI/$(usex zeroconf 'use avahi-daemon' '')/" \
-e "s/USE_FLAG_ISCSI/$(usex iscsi 'use iscsid' '')/" \
-e "s/USE_FLAG_RBD/$(usex rbd 'use ceph' '')/" \
-i "${S}/libvirtd.init" || die "sed failed"
eautoreconf
}
src_configure() {
local myeconfargs=(
$(use_with apparmor)
$(use_with apparmor apparmor-profiles)
$(use_with audit)
$(use_with caps capng)
$(use_with dbus)
$(use_with firewalld)
$(use_with fuse)
$(use_with glusterfs)
$(use_with glusterfs storage-gluster)
$(use_with iscsi storage-iscsi)
$(use_with libvirtd)
$(use_with libssh)
$(use_with lvm storage-lvm)
$(use_with lvm storage-mpath)
$(use_with lxc)
$(use_with macvtap)
$(use_enable nls)
$(use_with numa numactl)
$(use_with numa numad)
$(use_with openvz)
$(use_with parted storage-disk)
$(use_with pcap libpcap)
$(use_with phyp)
$(use_with policykit polkit)
$(use_with qemu)
$(use_with qemu yajl)
$(use_with rbd storage-rbd)
$(use_with sasl)
$(use_with selinux)
$(use_with udev)
$(use_with uml)
$(use_with vepa virtualport)
$(use_with virt-network network)
$(use_with wireshark-plugins wireshark-dissector)
$(use_with xen)
$(use_with xen xen-inotify)
$(use_with xen libxl)
$(use_with zeroconf avahi)
$(use_with zfs storage-zfs)
--without-hal
--without-netcf
--without-sanlock
--without-xenapi
--with-esx
--with-init-script=systemd
--with-qemu-group=$(usex caps qemu root)
--with-qemu-user=$(usex caps qemu root)
--with-remote
--with-storage-fs
--with-vmware
--disable-static
--disable-werror
--with-html-subdir=${PF}/html
--localstatedir=/var
)
if use virtualbox && has_version app-emulation/virtualbox-ose; then
myeconfargs+=( --with-vbox=/usr/lib/virtualbox-ose/ )
else
myeconfargs+=( $(use_with virtualbox vbox) )
fi
econf "${myeconfargs[@]}"
if [[ ${PV} = *9999* ]]; then
# Restore gnulib's config.sub and config.guess
# bug #377279
(cd .gnulib && git reset --hard > /dev/null)
fi
}
src_test() {
cd "${BUILD_DIR}"
# remove problematic tests, bug #591416, bug #591418
sed -i -e 's#commandtest$(EXEEXT) # #' \
-e 's#virfirewalltest$(EXEEXT) # #' \
-e 's#nwfilterebiptablestest$(EXEEXT) # #' \
-e 's#nwfilterxml2firewalltest$(EXEEXT)$##' \
tests/Makefile
export VIR_TEST_DEBUG=1
HOME="${T}" emake check || die "tests failed"
}
src_install() {
emake DESTDIR="${D}" \
SYSTEMD_UNIT_DIR="$(systemd_get_systemunitdir)" install
find "${D}" -name '*.la' -delete || die
# Remove bogus, empty directories. They are either not used, or
# libvirtd is able to create them on demand
rm -rf "${D}"/etc/sysconfig
rm -rf "${D}"/var
use libvirtd || return 0
# From here, only libvirtd-related instructions, be warned!
systemd_install_serviced \
"${FILESDIR}"/libvirtd.service.conf libvirtd.service
systemd_newtmpfilesd "${FILESDIR}"/libvirtd.tmpfiles.conf libvirtd.conf
newinitd "${S}/libvirtd.init" libvirtd || die
newinitd "${FILESDIR}/libvirt-guests.init-r2" libvirt-guests || die
newinitd "${FILESDIR}/virtlockd.init-r1" virtlockd || die
newinitd "${FILESDIR}/virtlogd.init-r1" virtlogd || die
newconfd "${FILESDIR}/libvirtd.confd-r5" libvirtd || die
newconfd "${FILESDIR}/libvirt-guests.confd" libvirt-guests || die
newbashcomp "${S}/tools/bash-completion/vsh" vsh
bashcomp_alias vsh virsh virt-admin
DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo-r2")
DISABLE_AUTOFORMATTING=true
readme.gentoo_create_doc
}
pkg_preinst() {
# we only ever want to generate this once
if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then
rm -rf "${D}"/etc/libvirt/qemu/networks/default.xml
fi
}
pkg_postinst() {
if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then
touch "${ROOT}"/etc/libvirt/qemu/networks/default.xml
fi
use libvirtd || return 0
# From here, only libvirtd-related instructions, be warned!
readme.gentoo_print_elog
}

@ -7,9 +7,9 @@ inherit autotools eutils user linux-info systemd readme.gentoo-r1 bash-completio
if [[ ${PV} = *9999* ]]; then
inherit git-r3
EGIT_REPO_URI="git://libvirt.org/libvirt.git"
EGIT_REPO_URI="https://libvirt.org/git/libvirt.git"
SRC_URI=""
KEYWORDS="amd64 x86"
KEYWORDS=""
SLOT="0"
else
# Versions with 4 numbers are stable updates:

@ -7,7 +7,7 @@ inherit autotools eutils user linux-info systemd readme.gentoo-r1 bash-completio
if [[ ${PV} = *9999* ]]; then
inherit git-r3
EGIT_REPO_URI="git://libvirt.org/libvirt.git"
EGIT_REPO_URI="https://libvirt.org/git/libvirt.git"
SRC_URI=""
KEYWORDS=""
SLOT="0"
@ -125,7 +125,6 @@ PATCHES=(
"${FILESDIR}"/${PN}-4.2.0-do_not_use_sysconf.patch
"${FILESDIR}"/${PN}-1.2.16-fix_paths_in_libvirt-guests_sh.patch
"${FILESDIR}"/${PN}-3.10.0-r2-fix_paths_for_apparmor.patch
"${FILESDIR}"/${PN}-3.1.0-musl-fix-includes.patch # bug #609488
)
pkg_setup() {

@ -7,7 +7,7 @@ inherit autotools eutils user linux-info systemd readme.gentoo-r1 bash-completio
if [[ ${PV} = *9999* ]]; then
inherit git-r3
EGIT_REPO_URI="git://libvirt.org/libvirt.git"
EGIT_REPO_URI="https://libvirt.org/git/libvirt.git"
SRC_URI=""
KEYWORDS=""
SLOT="0"
@ -122,7 +122,7 @@ DEPEND="${RDEPEND}
virtual/pkgconfig"
PATCHES=(
"${FILESDIR}"/${PN}-4.2.0-do_not_use_sysconf.patch
"${FILESDIR}"/${PN}-4.5.0-do_not_use_sysconf.patch
"${FILESDIR}"/${PN}-1.2.16-fix_paths_in_libvirt-guests_sh.patch
"${FILESDIR}"/${PN}-3.10.0-r2-fix_paths_for_apparmor.patch
)
@ -237,12 +237,6 @@ src_prepare() {
}
src_configure() {
#
# With 4.1.0 we should always enable networking support - otherwise not
# even minimal networking is available. Yes, this degrades
# USE=virt-network to a mere runtime-dep USE flag. But let's keep it
# for compatibility and convenience.
#
local myeconfargs=(
$(use_with apparmor)
$(use_with apparmor apparmor-profiles)
@ -276,6 +270,7 @@ src_configure() {
$(use_with udev)
$(use_with uml)
$(use_with vepa virtualport)
$(use_with virt-network network)
$(use_with wireshark-plugins wireshark-dissector)
$(use_with xen)
$(use_with xen xen-inotify)
@ -283,8 +278,6 @@ src_configure() {
$(use_with zeroconf avahi)
$(use_with zfs storage-zfs)
--with-network
--without-hal
--without-netcf
--without-sanlock
@ -343,9 +336,7 @@ src_install() {
# Remove bogus, empty directories. They are either not used, or
# libvirtd is able to create them on demand
rm -rf "${D}"/etc/sysconfig
rm -rf "${D}"/var/cache
rm -rf "${D}"/var/run
rm -rf "${D}"/var/log
rm -rf "${D}"/var
use libvirtd || return 0
# From here, only libvirtd-related instructions, be warned!

@ -3,3 +3,4 @@ DIST nemu-1.2.0.tar.gz 61953 BLAKE2B fa5c323b5d4808c812361ec49e1cb4d91f12f0da102
DIST nemu-1.3.0.tar.gz 70769 BLAKE2B 73108346c70f7ececd2b20cc91da323f2ecb40491400cd135825b44cfa7dbd3285b3a6de36d815c46d9655a7c23571084b321bc3deca5a6f564dae852b846120 SHA512 0ca74a3d0ef1f8032d74cecef71518c18b839dcab5deb2ec221aa47159bf40345517d1b8ec80bf1ff268b9b7dbcd90301ad3594583ddf75d517a23545db23c26
DIST nemu-1.4.0.tar.gz 84398 BLAKE2B 46ed3dfa392e8be472047612f4131e80ae3675c30b975320dbd21672bb8c5b3fc74dc0c5d1c4a5397f04c4bd725902d3f9b7d10808cab10fc89bb8199568cc10 SHA512 262b2eb7ead79b644110ecd4ea1858ef8d9775f3076e4df9f9c83149c148baf2b6db4645395301fabbda07f1e9e5577fe4f56a7eee010433ce02aa298fcee1a5
DIST nemu-1.4.1.tar.gz 82891 BLAKE2B 2f2d85631fbde50513b56e86deb87c7ab8bf5478473ad8c1d3a5e6f276ce2a6b476667129ef3ee872de825736d1765d30db8a393c0a8e8b4308b6b5788095334 SHA512 b96388e3cf5106a21f189b375cedcb23f885b0f24c3c9b0e54bb51c04299c061ce2890b9dd168deb0b3afc70effa132e673f1475e42278fc6a6d703f7071c398
DIST nemu-2.0.0.tar.gz 85769 BLAKE2B daadbd5925d56d3747b59a3a8f28ceeeb24a674e57f003cf07c67c24dc0ed73f024d35e2f02836d89c7568b7ac51bfc3c6131afb4864febdd6ac6f86a827bfee SHA512 74c489e35b96699fcc5f9cabdbe4445c1cdad5b06c2a18928e2270e169b76e009463177990c4f4d80b160e06118b0b4e87209132cc0ae0ee3d77e2d811865f5a

@ -0,0 +1,69 @@
# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
inherit cmake-utils linux-info
DESCRIPTION="ncurses interface for QEMU"
HOMEPAGE="https://lib.void.so/nemu"
SRC_URI="http://lib.void.so/src/${P}.tar.gz"
LICENSE="BSD-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="+vnc-client +ovf savevm debug"
RDEPEND="
virtual/udev:=
dev-db/sqlite:3=
virtual/libusb:1
app-emulation/qemu[vnc,virtfs]
sys-libs/ncurses:0=[unicode]
ovf? (
dev-libs/libxml2
app-arch/libarchive
)
vnc-client? ( net-misc/tigervnc )"
DEPEND="
${RDEPEND}
sys-devel/gettext"
src_configure() {
local mycmakeargs=(
-DNM_WITH_VNC_CLIENT=$(usex vnc-client)
-DNM_DEBUG=$(usex debug)
-DNM_SAVEVM_SNAPSHOTS=$(usex savevm)
-DNM_WITH_OVF_SUPPORT=$(usex ovf)
)
cmake-utils_src_configure
}
pkg_pretend() {
if use kernel_linux; then
if ! linux_config_exists; then
eerror "Unable to check your kernel"
else
CONFIG_CHECK="~VETH ~MACVTAP"
ERROR_VETH="You will need the Virtual ethernet pair device driver compiled"
ERROR_VETH+=" into your kernel or loaded as a module to use the"
ERROR_VETH+=" local network settings feature."
ERROR_MACVTAP="You will also need support for MAC-VLAN based tap driver."
check_extra_config
fi
fi
}
pkg_postinst() {
elog "For non-root usage execute script:"
elog "/usr/share/nemu/scripts/setup_nemu_nonroot.sh linux <username>"
elog "and add udev rule:"
elog "cp /usr/share/nemu/scripts/42-net-macvtap-perm.rules /lib/udev/rules.d"
if use savevm; then
elog ""
elog "QEMU must be patched with qemu-qmp-savevm-VERSION.patch"
elog "Get this patch from nEMU repository"
fi
}

@ -1,3 +1,2 @@
DIST qemu-2.11.1.tar.bz2 32819412 BLAKE2B 6b6d4e7b8dcf33aeedb0b33bad267da07ad17c2eeeb5fbd2c038d760bc03224e55ba0f03eb248c62bc0e8636c2c660ea76b367eaea96bee16388053f82c8b8a9 SHA512 1b692bbdfc3dc785738c7192aa2a3f9cf53d9f5bf3b3f49fa8692050dc50f7056c8a4d1b527d48ffb2a674a0fd3a46d87addd1eaaa758f35eec1ab5adfe32354
DIST qemu-2.12.0.tar.bz2 41196232 BLAKE2B f258e570558249ea647c3571908f90b8bacdcef9a1814009b98571cf0e96406194d44aa041fd0a97c9b673f39a9eaae8d873824745509778a6784cd85f8398b0 SHA512 91d829f44c431e4c1cd335f3efea5afff9da62d832b0296a92417463ea0826d09ce226c2ea8ac167fe7b99b6bb976c7cb1357aaf17735ee57af6602161e46346
DIST qemu-2.5.0.tar.bz2 25464996 BLAKE2B c2d36ed938644cb9e3a3541c16ceb09f1bc5f4897bc01d8974722fc167b4e5362e6674760ca7d22a8b157b20505d7643e2eea3810469e180c003857833f650aa SHA512 12153f94cc7f834fd6a85f25690c36f2331d88d414426fb8b9ac20a34e6f9222b1eda30b727674af583580fae90dfd6d0614a905dce1567d94cd049d426b9dd3

@ -44,6 +44,7 @@ src_configure() {
--disable-linux-user
--disable-system
--disable-strip
--disable-tools
--disable-werror
--enable-guest-agent
--python="${PYTHON}"

@ -20,8 +20,7 @@ LICENSE="GPL-2 BSD-2"
SLOT="0"
IUSE=""
RDEPEND="dev-libs/glib
x11-libs/pixman"
RDEPEND="dev-libs/glib"
DEPEND="${RDEPEND}
${PYTHON_DEPS}"
@ -44,6 +43,7 @@ src_configure() {
--disable-linux-user
--disable-system
--disable-strip
--disable-tools
--disable-werror
--enable-guest-agent
--python="${PYTHON}"

@ -1,83 +0,0 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
PYTHON_COMPAT=( python2_7 )
inherit eutils systemd udev python-any-r1
MY_PN="qemu"
MY_P="${MY_PN}-${PV}"
SRC_URI="http://wiki.qemu.org/download/${MY_P}.tar.bz2"
KEYWORDS="amd64 ~ppc ~ppc64 x86 ~x86-fbsd"
DESCRIPTION="QEMU Guest Agent (qemu-ga) for use when running inside a VM"
HOMEPAGE="http://wiki.qemu.org/Features/QAPI/GuestAgent"
LICENSE="GPL-2 BSD-2"
SLOT="0"
IUSE=""
RDEPEND=">=dev-libs/glib-2.22
!<app-emulation/qemu-1.1.1-r1
!<sys-apps/sysvinit-2.88-r5"
DEPEND="${RDEPEND}
${PYTHON_DEPS}"
S="${WORKDIR}/${MY_P}"
src_prepare() {
epatch "${FILESDIR}"/${PN}-2.5.0-sysmacros.patch #580924
epatch_user
}
src_configure() {
tc-export AR LD OBJCOPY
local myconf=(
--prefix=/usr
--sysconfdir=/etc
--libdir="/usr/$(get_libdir)"
--localstatedir=/
--disable-bsd-user
--disable-linux-user
--disable-system
--disable-strip
--disable-werror
--enable-guest-agent
--python="${PYTHON}"
--cc="$(tc-getCC)"
--cxx="$(tc-getCXX)"
--host-cc="$(tc-getBUILD_CC)"
)
echo "./configure ${myconf[*]}"
./configure "${myconf[@]}" || die
}
src_compile() {
emake V=1 qemu-ga
}
src_install() {
dobin qemu-ga
# Normal init stuff
newinitd "${FILESDIR}/qemu-ga.init-r1" qemu-guest-agent
newconfd "${FILESDIR}/qemu-ga.conf-r1" qemu-guest-agent
insinto /etc/logrotate.d
newins "${FILESDIR}/qemu-ga.logrotate" qemu-guest-agent
# systemd stuff
udev_newrules "${FILESDIR}/qemu-ga-systemd.udev" 99-qemu-guest-agent.rules
systemd_newunit "${FILESDIR}/qemu-ga-systemd.service" \
qemu-guest-agent.service
}
pkg_postinst() {
elog "You should add 'qemu-guest-agent' to the default runlevel."
elog "e.g. rc-update add qemu-guest-agent default"
}

Binary file not shown.

@ -1,4 +1,4 @@
# Copyright 1999-2017 Gentoo Foundation
# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@ -10,7 +10,7 @@ SRC_URI="mirror://gentoo/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x86-solaris"
KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x86-solaris"
IUSE=""
DEPEND=""

Binary file not shown.

@ -1,4 +1,4 @@
# Copyright 1999-2015 Gentoo Foundation
# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/p-f-m/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="amd64 x86"
KEYWORDS="amd64 s390 x86"
RDEPEND=">=dev-lang/perl-5.8
>=dev-perl/File-Stat-Bits-1.10.0

Binary file not shown.

@ -1 +1,2 @@
DIST obexftp-0.24-Source.tar.gz 88154 BLAKE2B 6124a59e8e8af555256fb910b1efd3ae630e97e71559fa3d5e488e911251d98f3f4ba543cb88723f0bc561b4753afc9b613410da51d7d8695182cdfb9cbaf7ab SHA512 785449665f5e9269d7bfd15f379bd8fbad321780292e56341e2089d6894255b7301fc23bb27a80e4e6f6317a130b658dedd307b7ece0fd31ef8f1a109c6f21b9
DIST obexftp-0.24.2-Source.tar.gz 110291 BLAKE2B 7de93f5f5a367481b22b49c7812357ab5f704830c83770378de13f9c4ffb5f114d48beafca193b52670563b397656ec185519a8d004eb1f9785787e8cc5caaff SHA512 91a5d7e52c00bbaf24837384ceadc987a89297e672b246df1370bbd669fae05459281bc46bb60ba562607bfbead321926cdf11422059cd918819d80321e190c2

@ -0,0 +1,53 @@
diff --git a/apps/CMakeLists.txt b/apps/CMakeLists.txt
index b5c84e4..63af134 100644
--- a/apps/CMakeLists.txt
+++ b/apps/CMakeLists.txt
@@ -5,14 +5,23 @@ add_definitions( -DVERSION="${obexftp_VERSION}" )
add_definitions ( -DHAVE_USB )
add_executable ( obexftp_app obexftp.c )
-target_link_libraries ( obexftp_app obexftp )
+target_link_libraries ( obexftp_app
+ PRIVATE multicobex
+ PRIVATE bfb
+ obexftp
+)
set_target_properties ( obexftp_app PROPERTIES
OUTPUT_NAME obexftp
)
add_executable ( obexftpd_app obexftpd.c )
-target_link_libraries ( obexftpd_app obexftp openobex )
+target_link_libraries ( obexftpd_app
+ PRIVATE multicobex
+ PRIVATE bfb
+ obexftp
+ openobex
+)
set_target_properties ( obexftpd_app PROPERTIES
OUTPUT_NAME obexftpd
)
diff --git a/fuse/CMakeLists.txt b/fuse/CMakeLists.txt
index 0c80d3d..ff5e3cd 100644
--- a/fuse/CMakeLists.txt
+++ b/fuse/CMakeLists.txt
@@ -13,6 +13,8 @@ if ( Fuse_FOUND )
)
target_link_libraries ( obexfs
+ PRIVATE multicobex
+ PRIVATE bfb
obexftp
${Fuse_LIBRARIES}
${EXPAT_LIBRARIES}
@@ -23,6 +25,8 @@ if ( Fuse_FOUND )
)
target_link_libraries ( obexautofs
+ PRIVATE multicobex
+ PRIVATE bfb
obexftp
${Fuse_LIBRARIES}
)

@ -0,0 +1,69 @@
# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
PYTHON_COMPAT=( python{2_7,3_5,3_6} )
USE_RUBY="ruby23 ruby24 ruby25"
inherit cmake-utils python-single-r1 ruby-single
DESCRIPTION="File transfer over OBEX for mobile phones"
HOMEPAGE="http://dev.zuckschwerdt.org/openobex/wiki/ObexFtp"
SRC_URI="mirror://sourceforge/openobex/${P}-Source.tar.gz"
SLOT="0"
LICENSE="GPL-2"
KEYWORDS="~amd64 ~hppa ~ppc ~x86"
# bluetooth support is not really optional, bug #529068
IUSE="perl python ruby tcl"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
RDEPEND="
>=dev-libs/openobex-1.7
net-wireless/bluez
perl? ( dev-lang/perl:= )
python? ( ${PYTHON_DEPS} )
ruby? ( ${RUBY_DEPS} )
tcl? ( dev-lang/tcl:0= )
"
DEPEND="${RDEPEND}
perl? ( dev-lang/swig )
python? ( dev-lang/swig )
ruby? ( dev-lang/swig )
tcl? ( dev-lang/swig )
virtual/pkgconfig
"
S=${WORKDIR}/${P}-Source
PATCHES=(
"${FILESDIR}"/${PN}-0.23-gentoo.patch
"${FILESDIR}"/${PN}-0.24-config.patch
"${FILESDIR}"/${PN}-0.24-enable_bluetooth.patch
"${FILESDIR}"/${PN}-0.24-python_sitedir.patch
"${FILESDIR}"/${PN}-0.24-norpath.patch
"${FILESDIR}"/${P}-parallel-build.patch
)
src_configure() {
# -DENABLE_BLUETOOTH=$(usex bluetooth)
local mycmakeargs=(
-DCMAKE_BUILD_TYPE=Release
-DCMAKE_SKIP_RPATH=ON
-DENABLE_PERL=$(usex perl)
-DENABLE_BLUETOOTH=yes
-DENABLE_PYTHON=$(usex python)
$(usex python -DPYTHON_SITE_DIR=$(python_get_sitedir) '')
-DENABLE_RUBY=$(usex ruby)
-DENABLE_TCL=$(usex tcl)
)
cmake-utils_src_configure
}
src_install() {
cmake-utils_src_install
rm -rf "${ED}"/usr/share/doc/${PN}/html || die #524866
}

Binary file not shown.

@ -1,4 +1,4 @@
# Copyright 1999-2017 Gentoo Foundation
# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@ -11,17 +11,16 @@ SRC_URI="mirror://sourceforge/barry/${P}.tar.bz2"
LICENSE="CC-BY-SA-3.0 GPL-2" #See logo/README for CCPL
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="boost desktop doc gui nls static-libs"
IUSE="boost doc gui nls static-libs"
RDEPEND=">=dev-cpp/libxmlpp-2.6:2.6
>=dev-libs/glib-2
dev-libs/glib:2
>=dev-libs/libtar-1.2.11-r2
>=media-libs/libsdl-1.2
>=sys-fs/fuse-2.5:=
sys-libs/zlib
virtual/libusb:1
boost? ( >=dev-libs/boost-1.33 )
desktop? ( >=net-libs/libgcal-0.9.6 )
gui? (
dev-cpp/glibmm:2
dev-cpp/gtkmm:2.4
@ -49,7 +48,7 @@ src_configure() {
$(use_enable static-libs static) \
$(use_enable boost) \
$(use_enable gui) \
$(use_enable desktop) \
--disable-desktop \
--disable-rpath
}
@ -86,7 +85,6 @@ src_install() {
dobashcomp "${S}"/bash/btool "${S}"/bash/bjavaloader
newicon -s scalable "${S}"/logo/${PN}_logo_icon.svg ${PN}.svg
use desktop && domenu "${S}"/menu/barrydesktop.desktop
use gui && domenu "${S}"/menu/barrybackup.desktop
prune_libtool_files
@ -98,14 +96,6 @@ pkg_preinst() {
pkg_postinst() {
gnome2_icon_cache_update
elog "Barry requires you to be a member of the \"usb\" group."
ewarn
ewarn "Barry and the in-kernel module 'BERRY_CHARGE' are incompatible."
ewarn
ewarn "Kernel-based USB suspending can discharge your blackberry."
ewarn "Use at least kernel 2.6.22 and/or disable CONFIG_USB_SUSPEND."
ewarn
}
pkg_postrm() {

@ -7,7 +7,6 @@
</longdescription>
<use>
<flag name="boost">Enable boost support</flag>
<flag name="desktop">Install the GUI desktop control panel</flag>
<flag name="gui">Install the GUI backup tool</flag>
</use>
<upstream>

Binary file not shown.

@ -1,4 +1,4 @@
# Copyright 1999-2017 Gentoo Foundation
# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@ -11,7 +11,7 @@ SRC_URI="https://github.com/silnrsi/teckit/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="|| ( CPL-0.5 LGPL-2.1 )"
SLOT="0"
KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="static-libs"
RDEPEND="sys-libs/zlib

@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Yelp/Tools"
LICENSE="|| ( GPL-2+ freedist ) GPL-2+" # yelp.m4 is GPL2 || freely distributable
SLOT="0"
KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux"
KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux"
IUSE=""
RDEPEND="

Binary file not shown.

@ -40,4 +40,5 @@ src_install() {
rmdir "${D}"usr/share/doc/${PN} || die
mv "${D}"usr/share/examples/${PN} "${D}"usr/share/doc/${PF}/examples || die
rmdir "${D}"usr/share/examples || die
rm -r "${D}"/usr/share/gpr/manifests || die
}

@ -18,20 +18,15 @@ SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="gnat_2016 gnat_2017 +gnat_2018 gmp iconv python readline +shared
static-libs static-pic syslog"
# gtk iconv postgres pygobject projects sqlite tools
RDEPEND="python? ( ${PYTHON_DEPS} )
dev-ada/gnatcoll-core[gnat_2018,shared?,static-libs?,static-pic?]
dev-ada/libgpr[gnat_2018,shared?,static-libs?,static-pic?]
dev-ada/xmlada[gnat_2018,shared?,static-libs?,static-pic?]
dev-lang/gnat-gpl:7.3.1
dev-ada/gnatcoll-core[gnat_2016=,gnat_2017=,gnat_2018=]
dev-ada/gnatcoll-core[shared?,static-libs?,static-pic?]
gmp? ( dev-libs/gmp:* )"
DEPEND="${RDEPEND}
dev-ada/gprbuild[gnat_2018]"
dev-ada/gprbuild[gnat_2016=,gnat_2017=,gnat_2018=]"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
!gnat_2016 !gnat_2017 gnat_2018"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} ) !gnat_2016"
S="${WORKDIR}"/${MYP}-src
@ -74,5 +69,6 @@ src_install() {
done
fi
done
rm -r "${D}"/usr/share/gpr/manifests || die
einstalldocs
}

@ -16,21 +16,25 @@ SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="gnat_2016 gnat_2017 +gnat_2018 +shared static-libs static-pic"
RDEPEND="dev-lang/gnat-gpl:7.3.1
dev-ada/libgpr[gnat_2018,shared?,static-libs?,static-pic?]
dev-ada/xmlada[gnat_2018,shared?,static-libs?,static-pic?]"
RDEPEND="
dev-ada/libgpr[gnat_2016=,gnat_2017=,gnat_2018=]
dev-ada/libgpr[shared?,static-libs?,static-pic?]"
DEPEND="${RDEPEND}
dev-ada/gprbuild[gnat_2018]
dev-ada/gprbuild[gnat_2016=,gnat_2017=,gnat_2018=]
!dev-ada/gnatcoll"
REQUIRED_USE="!gnat_2016 !gnat_2017 gnat_2018"
REQUIRED_USE="!gnat_2016"
S="${WORKDIR}"/${MYP}-src
PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
src_prepare() {
GCC_PV=7.3.1
if use gnat_2017; then
GCC_PV=6.3.0
else
GCC_PV=7.3.1
fi
default
sed -i \
-e "s:@GNATLS@:${CHOST}-gnatls-${GCC_PV}:g" \
@ -70,5 +74,6 @@ src_install() {
if use static-libs; then
emake install-static
fi
rm -r "${D}"/usr/share/gpr/manifests || die
einstalldocs
}

@ -18,19 +18,17 @@ KEYWORDS="~amd64 ~x86"
IUSE="gnat_2016 gnat_2017 +gnat_2018 gnatcoll_db2ada gnatinspect postgres
+shared sql sqlite static-libs static-pic xref"
RDEPEND="dev-lang/gnat-gpl:7.3.1
dev-ada/gnatcoll-core[gnat_2018,shared?,static-libs?,static-pic?]
dev-ada/libgpr[gnat_2018,shared?,static-libs?,static-pic?]
dev-ada/xmlada[gnat_2018,shared?,static-libs?,static-pic?]
RDEPEND="dev-ada/gnatcoll-core[gnat_2016=,gnat_2017=,gnat_2018=]
dev-ada/gnatcoll-core[shared?,static-libs?,static-pic?]
sqlite? ( dev-db/sqlite:3 )
postgres? ( dev-db/postgresql:* )
xref? (
dev-ada/gnatcoll-bindings[iconv,shared?,static-libs?,static-pic?]
)"
DEPEND="${RDEPEND}
dev-ada/gprbuild[gnat_2018]"
dev-ada/gprbuild[gnat_2016=,gnat_2017=,gnat_2018]"
REQUIRED_USE="!gnat_2016 !gnat_2017 gnat_2018
REQUIRED_USE="!gnat_2016
sqlite? ( sql )
xref? ( sqlite )
gnatinspect? ( xref )
@ -100,5 +98,6 @@ src_install() {
build $dir $lib ${dir}
fi
done
rm -r "${D}"/usr/share/gpr/manifests || die
einstalldocs
}

@ -63,5 +63,6 @@ src_install() {
emake DESTDIR="${D}" libgpr.install.${kind}
fi
done
rm -r "${D}"/usr/share/gpr/manifests || die
einstalldocs
}

@ -17,7 +17,7 @@ SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="gnat_2016 gnat_2017 +gnat_2018 +shared static-libs static-pic"
REQUIRED_USE="|| ( shared static-libs static-pic )
^^ ( gnat_2016 gnat_2017 gnat_2018 )"
!gnat_2016 ^^ ( gnat_2017 gnat_2018 )"
RDEPEND="gnat_2016? ( dev-lang/gnat-gpl:4.9.4 )
gnat_2017? ( dev-lang/gnat-gpl:6.3.0 )
@ -76,4 +76,5 @@ src_install () {
einstalldocs
dodoc xmlada-roadmap.txt
rm "${D}"/usr/share/doc/${PN}/.buildinfo || die
rm -r "${D}"/usr/share/gpr/manifests || die
}

Binary file not shown.

@ -294,14 +294,6 @@ src_configure() {
zero_config="--enable-zero"
fi
# Warn about potential problems with ccache enabled
if has ccache ${FEATURES}; then
ewarn 'ccache has been known to break IcedTea. Disable it before filing bugs.'
config+=" --enable-ccache"
else
config+=" --disable-ccache"
fi
# PaX breaks pch, bug #601016
if use pch && ! host-is-pax; then
config+=" --enable-precompiled-headers"
@ -329,6 +321,7 @@ src_configure() {
--docdir="${EPREFIX}/usr/share/doc/${PF}" \
--htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
--with-pkgversion="Gentoo ${PF}" \
--disable-ccache \
--disable-downloading --disable-Werror --disable-tests \
--disable-systemtap-tests --enable-improved-font-rendering \
--enable-system-jpeg --enable-system-zlib \

Binary file not shown.

@ -26,6 +26,7 @@ src_prepare() {
}
src_compile() {
export VARTEXFONTS=${T}/fonts
emake all \
CFLAGS="${CFLAGS}" \
CC="$(tc-getCC)"

@ -26,6 +26,7 @@ PATCHES=(
)
src_compile() {
export VARTEXFONTS=${T}/fonts
emake all \
CFLAGS="${CFLAGS}" \
CC="$(tc-getCC)"

Binary file not shown.

@ -1,7 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
<maintainer type="person">
<email>juippis@gmail.com</email>
</maintainer>
<maintainer type="project">
<email>proxy-maint@gentoo.org</email>
<name>Proxy Maintainers</name>
</maintainer>
<use>
<flag name="bmp">Enable WBMP image loader</flag>
<flag name="dds">Enable DDS image loader</flag>

@ -1,4 +1,3 @@
DIST glib-2.50.3.tar.xz 7589284 BLAKE2B 8648e5d9e8f4c943ca3ec5a5ec01f380f55f76555bf4ec731e211b33d0e23c29ea2a9323e2e839f35f89f292863df76d4e8c622fc44c0e5905eb904576618dbd SHA512 ef35806c15170b6608445f255136c0bebd2d433adf903c2af2865f6a57b4f2fcfc1e4a7cea1a0dac48ff5fe26248fbf7886dba4a8d209506f0a94160df8fb7af
DIST glib-2.52.3.tar.xz 7679972 BLAKE2B 8d9f6b714571bd04ab9717fbf9ded8556664e43dcdb7dd59436b8b7f1a8a5cdf98e9ce60ca1ead941af1d57688044fefb6c749fa735084622a3482b058864ff6 SHA512 a068f2519cfb82de8d4b7f004e7c1f15e841cad4046430a83b02b359d011e0c4077cdff447a1687ed7c68f1a11b4cf66b9ed9fc23ab5f0c7c6be84eb0ddc3017
DIST glib-2.54.3-patchset.tar.xz 39488 BLAKE2B 0bebd1f8eadd1796c355dbad20739ec2428a5b67e363e6ea61e2bab1e672506c438c80c602e87ec7d221ad92ad5c52adf7b57fb13441835e41f1e1208c26c6db SHA512 3d880c2681893da9267c8b2ba9a695eddbb1cef63f4ea26e052ce2f69e1e9d78eccdb27b235cbf0693ecd262bd70d020b24f82fc72ab11a4dbc2c929cfb72942
DIST glib-2.54.3.tar.xz 7836536 BLAKE2B 140e7cf09a41b72a5b22e5b87e9674cbfdfe1b82f3cf5f0fd3ecb2ed6b1f62a90f8b4c0bc2f655e297f91394f771f6ecad210357e31f104ee49ca178be6b9d76 SHA512 23eb4458684624f80c17aa784eab42a38eec87bb5979fcfe56f0bc63b5c7bcf8251a0d4ea916fe2c8109ff5b14a4b60c6260755d079ff984c0d8e6a2871d307d

@ -1,52 +0,0 @@
From ec02a1875f29ecb8e46c0d8c1403cd00a0b3a9e4 Mon Sep 17 00:00:00 2001
From: Iain Lane <iain@orangesquash.org.uk>
Date: Mon, 13 Mar 2017 16:52:11 +0000
Subject: [PATCH] tests/gdatetime: Use a real rather than invented timezone
The tzdata maintainers had previously invented abbreviations for
timezones. As of their 2017a release, the one we were testing ("BRT")
has been dropped.
Switch to testing PST, which is a real timezone abbreviation.
https://bugzilla.gnome.org/show_bug.cgi?id=779799
---
glib/tests/gdatetime.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/glib/tests/gdatetime.c b/glib/tests/gdatetime.c
index dcb8a8f..c54031d 100644
--- a/glib/tests/gdatetime.c
+++ b/glib/tests/gdatetime.c
@@ -635,22 +635,22 @@ test_GDateTime_new_full (void)
g_date_time_unref (dt);
#ifdef G_OS_UNIX
- tz = g_time_zone_new ("America/Recife");
+ tz = g_time_zone_new ("America/Tijuana");
#elif defined G_OS_WIN32
- tz = g_time_zone_new ("E. South America Standard Time");
+ tz = g_time_zone_new ("Pacific Standard Time");
#endif
- dt = g_date_time_new (tz, 2010, 5, 24, 8, 4, 0);
+ dt = g_date_time_new (tz, 2010, 11, 24, 8, 4, 0);
g_time_zone_unref (tz);
g_assert_cmpint (2010, ==, g_date_time_get_year (dt));
- g_assert_cmpint (5, ==, g_date_time_get_month (dt));
+ g_assert_cmpint (11, ==, g_date_time_get_month (dt));
g_assert_cmpint (24, ==, g_date_time_get_day_of_month (dt));
g_assert_cmpint (8, ==, g_date_time_get_hour (dt));
g_assert_cmpint (4, ==, g_date_time_get_minute (dt));
g_assert_cmpint (0, ==, g_date_time_get_second (dt));
#ifdef G_OS_UNIX
- g_assert_cmpstr ("BRT", ==, g_date_time_get_timezone_abbreviation (dt));
+ g_assert_cmpstr ("PST", ==, g_date_time_get_timezone_abbreviation (dt));
#elif defined G_OS_WIN32
- g_assert_cmpstr ("E. South America Standard Time", ==,
+ g_assert_cmpstr ("Pacific Standard Time", ==,
g_date_time_get_timezone_abbreviation (dt));
#endif
g_assert (!g_date_time_is_daylight_savings (dt));
--
2.10.1

@ -1,303 +0,0 @@
# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# Until bug #537330 glib is a reverse dependency of pkgconfig and, then
# adding new dependencies end up making stage3 to grow. Every addition needs
# then to be think very closely.
EAPI=6
PYTHON_COMPAT=( python2_7 )
# Completely useless with or without USE static-libs, people need to use
# pkg-config
GNOME2_LA_PUNT="yes"
inherit autotools bash-completion-r1 epunt-cxx flag-o-matic gnome2 libtool linux-info \
multilib multilib-minimal pax-utils python-r1 toolchain-funcs versionator virtualx
DESCRIPTION="The GLib library of C routines"
HOMEPAGE="https://www.gtk.org/"
SRC_URI="${SRC_URI}
https://pkgconfig.freedesktop.org/releases/pkg-config-0.28.tar.gz" # pkg.m4 for eautoreconf
LICENSE="LGPL-2+"
SLOT="2"
IUSE="dbus debug fam kernel_linux +mime selinux static-libs systemtap test utils xattr"
REQUIRED_USE="
utils? ( ${PYTHON_REQUIRED_USE} )
test? ( ${PYTHON_REQUIRED_USE} )
"
KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
# Added util-linux multilib dependency to have libmount support (which
# is always turned on on linux systems, unless explicitly disabled, but
# this ebuild does not do that anyway) (bug #599586)
RDEPEND="
!<dev-util/gdbus-codegen-${PV}
>=dev-libs/libpcre-8.13:3[${MULTILIB_USEDEP},static-libs?]
>=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
>=virtual/libffi-3.0.13-r1[${MULTILIB_USEDEP}]
>=virtual/libintl-0-r2[${MULTILIB_USEDEP}]
>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
kernel_linux? ( sys-apps/util-linux[${MULTILIB_USEDEP}] )
selinux? ( >=sys-libs/libselinux-2.2.2-r5[${MULTILIB_USEDEP}] )
xattr? ( >=sys-apps/attr-2.4.47-r1[${MULTILIB_USEDEP}] )
fam? ( >=virtual/fam-0-r1[${MULTILIB_USEDEP}] )
utils? (
${PYTHON_DEPS}
>=dev-util/gdbus-codegen-${PV}[${PYTHON_USEDEP}]
virtual/libelf:0=
)
"
DEPEND="${RDEPEND}
app-text/docbook-xml-dtd:4.1.2
>=dev-libs/libxslt-1.0
>=sys-devel/gettext-0.11
>=dev-util/gtk-doc-am-1.20
systemtap? ( >=dev-util/systemtap-1.3 )
test? (
sys-devel/gdb
${PYTHON_DEPS}
>=dev-util/gdbus-codegen-${PV}[${PYTHON_USEDEP}]
>=sys-apps/dbus-1.2.14 )
!<dev-util/gtk-doc-1.15-r2
"
PDEPEND="!<gnome-base/gvfs-1.6.4-r990
dbus? ( gnome-base/dconf )
mime? ( x11-misc/shared-mime-info )
"
# shared-mime-info needed for gio/xdgmime, bug #409481
# dconf is needed to be able to save settings, bug #498436
# Earlier versions of gvfs do not work with glib
MULTILIB_CHOST_TOOLS=(
/usr/bin/gio-querymodules$(get_exeext)
)
pkg_setup() {
if use kernel_linux ; then
CONFIG_CHECK="~INOTIFY_USER"
if use test ; then
CONFIG_CHECK="~IPV6"
WARNING_IPV6="Your kernel needs IPV6 support for running some tests, skipping them."
fi
linux-info_pkg_setup
fi
}
src_prepare() {
# Prevent build failure in stage3 where pkgconfig is not available, bug #481056
mv -f "${WORKDIR}"/pkg-config-*/pkg.m4 "${S}"/m4macros/ || die
if use test; then
# Disable tests requiring dev-util/desktop-file-utils when not installed, bug #286629, upstream bug #629163
if ! has_version dev-util/desktop-file-utils ; then
ewarn "Some tests will be skipped due dev-util/desktop-file-utils not being present on your system,"
ewarn "think on installing it to get these tests run."
sed -i -e "/appinfo\/associations/d" gio/tests/appinfo.c || die
sed -i -e "/g_test_add_func/d" gio/tests/desktop-app-info.c || die
fi
# gdesktopappinfo requires existing terminal (gnome-terminal or any
# other), falling back to xterm if one doesn't exist
if ! has_version x11-terms/xterm && ! has_version x11-terms/gnome-terminal ; then
ewarn "Some tests will be skipped due to missing terminal program"
sed -i -e "/appinfo\/launch/d" gio/tests/appinfo.c || die
fi
# https://bugzilla.gnome.org/show_bug.cgi?id=722604
sed -i -e "/timer\/stop/d" glib/tests/timer.c || die
sed -i -e "/timer\/basic/d" glib/tests/timer.c || die
ewarn "Tests for search-utils have been skipped"
sed -i -e "/search-utils/d" glib/tests/Makefile.am || die
else
# Don't build tests, also prevents extra deps, bug #512022
sed -i -e 's/ tests//' {.,gio,glib}/Makefile.am || die
fi
# Fix tests with timezone-data-2017a and newer
eapply "${FILESDIR}"/${P}-fix-gdatetime-tests.patch
# gdbus-codegen is a separate package
eapply "${FILESDIR}"/${PN}-2.50.0-external-gdbus-codegen.patch
# Leave python shebang alone - handled by python_replicate_script
# We could call python_setup and give configure a valid --with-python
# arg, but that would mean a build dep on python when USE=utils.
sed -e '/${PYTHON}/d' \
-i glib/Makefile.{am,in} || die
# Also needed to prevent cross-compile failures, see bug #267603
eautoreconf
gnome2_src_prepare
epunt_cxx
}
multilib_src_configure() {
# Avoid circular depend with dev-util/pkgconfig and
# native builds (cross-compiles won't need pkg-config
# in the target ROOT to work here)
if ! tc-is-cross-compiler && ! $(tc-getPKG_CONFIG) --version >& /dev/null; then
if has_version sys-apps/dbus; then
export DBUS1_CFLAGS="-I/usr/include/dbus-1.0 -I/usr/$(get_libdir)/dbus-1.0/include"
export DBUS1_LIBS="-ldbus-1"
fi
export LIBFFI_CFLAGS="-I$(echo /usr/$(get_libdir)/libffi-*/include)"
export LIBFFI_LIBS="-lffi"
export PCRE_CFLAGS=" " # test -n "$PCRE_CFLAGS" needs to pass
export PCRE_LIBS="-lpcre"
fi
# These configure tests don't work when cross-compiling.
if tc-is-cross-compiler ; then
# https://bugzilla.gnome.org/show_bug.cgi?id=756473
case ${CHOST} in
hppa*|metag*) export glib_cv_stack_grows=yes ;;
*) export glib_cv_stack_grows=no ;;
esac
# https://bugzilla.gnome.org/show_bug.cgi?id=756474
export glib_cv_uscore=no
# https://bugzilla.gnome.org/show_bug.cgi?id=756475
export ac_cv_func_posix_get{pwuid,grgid}_r=yes
fi
local myconf
case "${CHOST}" in
*-mingw*) myconf="${myconf} --with-threads=win32" ;;
*) myconf="${myconf} --with-threads=posix" ;;
esac
# libelf used only by the gresource bin
ECONF_SOURCE="${S}" gnome2_src_configure ${myconf} \
$(usex debug --enable-debug=yes ' ') \
$(use_enable xattr) \
$(use_enable fam) \
$(use_enable kernel_linux libmount) \
$(use_enable selinux) \
$(use_enable static-libs static) \
$(use_enable systemtap dtrace) \
$(use_enable systemtap systemtap) \
$(multilib_native_use_enable utils libelf) \
--disable-compile-warnings \
--enable-man \
--with-pcre=system \
--with-xml-catalog="${EPREFIX}/etc/xml/catalog"
if multilib_is_native_abi; then
local d
for d in glib gio gobject; do
ln -s "${S}"/docs/reference/${d}/html docs/reference/${d}/html || die
done
fi
}
multilib_src_test() {
export XDG_CONFIG_DIRS=/etc/xdg
export XDG_DATA_DIRS=/usr/local/share:/usr/share
export G_DBUS_COOKIE_SHA1_KEYRING_DIR="${T}/temp"
export LC_TIME=C # bug #411967
unset GSETTINGS_BACKEND # bug #596380
python_setup
# Related test is a bit nitpicking
mkdir "$G_DBUS_COOKIE_SHA1_KEYRING_DIR"
chmod 0700 "$G_DBUS_COOKIE_SHA1_KEYRING_DIR"
# Hardened: gdb needs this, bug #338891
if host-is-pax ; then
pax-mark -mr "${BUILD_DIR}"/tests/.libs/assert-msg-test \
|| die "Hardened adjustment failed"
fi
# Need X for dbus-launch session X11 initialization
virtx emake check
}
multilib_src_install() {
gnome2_src_install completiondir="$(get_bashcompdir)"
keepdir /usr/$(get_libdir)/gio/modules
}
multilib_src_install_all() {
einstalldocs
if use utils ; then
python_replicate_script "${ED}"/usr/bin/gtester-report
else
rm "${ED}usr/bin/gtester-report"
rm "${ED}usr/share/man/man1/gtester-report.1"
fi
# Do not install charset.alias even if generated, leave it to libiconv
rm -f "${ED}/usr/lib/charset.alias"
# Don't install gdb python macros, bug 291328
rm -rf "${ED}/usr/share/gdb/" "${ED}/usr/share/glib-2.0/gdb/"
}
pkg_preinst() {
gnome2_pkg_preinst
# Make gschemas.compiled belong to glib alone
local cache="usr/share/glib-2.0/schemas/gschemas.compiled"
if [[ -e ${EROOT}${cache} ]]; then
cp "${EROOT}"${cache} "${ED}"/${cache} || die
else
touch "${ED}"/${cache} || die
fi
multilib_pkg_preinst() {
# Make giomodule.cache belong to glib alone
local cache="usr/$(get_libdir)/gio/modules/giomodule.cache"
if [[ -e ${EROOT}${cache} ]]; then
cp "${EROOT}"${cache} "${ED}"/${cache} || die
else
touch "${ED}"/${cache} || die
fi
}
# Don't run the cache ownership when cross-compiling, as it would end up with an empty cache
# file due to inability to create it and GIO might not look at any of the modules there
if ! tc-is-cross-compiler ; then
multilib_foreach_abi multilib_pkg_preinst
fi
}
pkg_postinst() {
# force (re)generation of gschemas.compiled
GNOME2_ECLASS_GLIB_SCHEMAS="force"
gnome2_pkg_postinst
multilib_pkg_postinst() {
gnome2_giomodule_cache_update \
|| die "Update GIO modules cache failed (for ${ABI})"
}
if ! tc-is-cross-compiler ; then
multilib_foreach_abi multilib_pkg_postinst
else
ewarn "Updating of GIO modules cache skipped due to cross-compilation."
ewarn "You might want to run gio-querymodules manually on the target for"
ewarn "your final image for performance reasons and re-run it when packages"
ewarn "installing GIO modules get upgraded or added to the image."
fi
}
pkg_postrm() {
gnome2_pkg_postrm
if [[ -z ${REPLACED_BY_VERSION} ]]; then
multilib_pkg_postrm() {
rm -f "${EROOT}"usr/$(get_libdir)/gio/modules/giomodule.cache
}
multilib_foreach_abi multilib_pkg_postrm
rm -f "${EROOT}"usr/share/glib-2.0/schemas/gschemas.compiled
fi
}

@ -9,4 +9,4 @@ SRC_URI="https://github.com/buytenh/ivykis/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0"
KEYWORDS="amd64 ~arm ~arm64 hppa ia64 ppc ppc64 sparc x86"
KEYWORDS="amd64 ~arm arm64 hppa ia64 ppc ppc64 sparc x86"

@ -14,7 +14,7 @@ SRC_URI="mirror://gentoo/texlive-${PV#*_p}-source.tar.xz
LICENSE="GPL-2"
SLOT="0/${PV%_p*}"
KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="doc source static-libs"
DEPEND="!<app-text/texlive-core-2013

@ -10,7 +10,7 @@ SRC_URI="https://${PN}.freedesktop.org/releases/${P}.tar.xz"
LICENSE="BSD BSD-2 BSD-4 ISC"
SLOT="0"
KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
IUSE="static-libs"
DEPEND=">=sys-kernel/linux-headers-3.17"

@ -10,7 +10,7 @@ SRC_URI="https://${PN}.freedesktop.org/releases/${P}.tar.xz"
LICENSE="BSD BSD-2 BSD-4 ISC"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
IUSE="static-libs"
DEPEND=">=sys-kernel/linux-headers-3.17"

@ -11,7 +11,7 @@ SRC_URI="https://www.nih.at/libzip/${P}.tar.xz"
LICENSE="BSD"
SLOT="0/5"
KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
IUSE="bzip2 static-libs"
RDEPEND="

@ -1 +1,2 @@
DIST openobex-1.7.1-Source.tar.gz 131091 BLAKE2B a30e96a89edeb2f07ab78b1e7eaa341de62b9ad15b0251eaac93300cbf21b073034c672eb753e9dfd44c678a99e4bf0b10cf5c1e5841565ab727c2e082d66d92 SHA512 df38b363bd4c6eb6c0181fc7858fb03ac2bdfa85d8496faaa514d5cc4473b33c883956d4e1c94c3fefa5e44e5eed35a8dfcab889ce6ca8c29694f2b18334754e
DIST openobex-1.7.2-Source.tar.gz 127248 BLAKE2B c0405aef2f15f16e31641f4a60ac01da26c2a61a5114b8f3990f0fcf64bd55c730ff7aa5f524b450c1e6b5653b9616c0861686102594818ba3bdf2314a3c51ff SHA512 22f1b0d99e7186da9fa12b510ef9dbb6f7d76777d58b235ab2f627703d07b6f6b0488cdc9c6d8c0ab7bc86d6d19117c55fff9273fed02736c0210f9b1788bf4d

@ -0,0 +1,37 @@
# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
inherit cmake-utils udev
DESCRIPTION="Implementation of the OBEX protocol used for transferring data to mobile devices"
HOMEPAGE="https://sourceforge.net/projects/openobex/"
SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}-Source.tar.gz"
LICENSE="GPL-2 LGPL-2.1"
SLOT="0/2"
KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
IUSE="bluetooth irda usb"
RDEPEND="
bluetooth? ( net-wireless/bluez:= )
usb? ( virtual/libusb:= )"
DEPEND="${RDEPEND}
virtual/pkgconfig"
S=${WORKDIR}/${P}-Source
src_configure() {
local mycmakeargs=(
-DOPENOBEX_BLUETOOTH=$(usex bluetooth)
-DOPENOBEX_IRDA=$(usex irda)
-DOPENOBEX_USB=$(usex usb)
# TODO: enable them. patch would be appreciated.
-DBUILD_DOCUMENTATION=OFF
-DCMAKE_INSTALL_UDEVRULESDIR="$(get_udevdir)/rules.d"
)
cmake-utils_src_configure
}

@ -12,7 +12,7 @@ SRC_URI="mirror://gentoo/texlive-${PV#*_p}-source.tar.xz"
LICENSE="BSD"
SLOT="0"
KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
IUSE="iconv static-libs"
DEPEND="iconv? ( virtual/libiconv )

@ -29,7 +29,7 @@ REQUIRED_USE="|| ( java lua mono perl php python ruby tcl )
python? ( ${PYTHON_REQUIRED_USE} )
ruby? ( || ( $(ruby_get_use_targets) ) )"
COMMONDEPEND="dev-libs/xapian:0/30
COMMONDEPEND=">=dev-libs/xapian-1.4.5:0/30
lua? ( dev-lang/lua:= )
perl? ( dev-lang/perl:= )
python? (
@ -275,7 +275,7 @@ src_install() {
fi
if use java; then
java-pkg_dojar java/built/xapian_jni.jar
java-pkg_dojar java/built/xapian.jar
# TODO: make the build system not install this...
java-pkg_doso java/.libs/libxapian_jni.so
rm -rf "${D}var" || die "could not remove java cruft!"

@ -8,7 +8,7 @@ inherit perl-module
DESCRIPTION="A wrapper for perl's configuration"
SLOT="0"
KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd"
KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 s390 sparc x86 ~amd64-fbsd"
IUSE="test"
RDEPEND="

@ -8,7 +8,7 @@ inherit perl-module
DESCRIPTION="Various portability utilities for module builders"
SLOT="0"
KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd"
KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 s390 sparc x86 ~amd64-fbsd"
IUSE="test"
RDEPEND="

@ -1,4 +1,4 @@
# Copyright 1999-2017 Gentoo Foundation
# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="Open an HTML file with automatic charset detection"
SLOT="0"
KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RDEPEND="

@ -11,7 +11,7 @@ inherit perl-module
DESCRIPTION="JSON::XS - JSON serialising/deserialising, done correctly and fast"
SLOT="0"
KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x64-macos ~x86-solaris"
KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-fbsd ~x64-macos ~x86-solaris"
IUSE="test"
RDEPEND="

Binary file not shown.

@ -12,7 +12,7 @@ DESCRIPTION="Perl extension for using OpenSSL"
LICENSE="openssl"
SLOT="0"
KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-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"
KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-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"
IUSE="libressl test minimal examples"
RDEPEND="

@ -11,7 +11,7 @@ DESCRIPTION="Minimal try/catch with proper localization of \$@"
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 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
KEYWORDS="alpha amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test minimal"
RDEPEND="

@ -11,7 +11,7 @@ inherit perl-module
DESCRIPTION="Perl binding for libxml2"
SLOT="0"
KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="test minimal"
RDEPEND="

@ -0,0 +1,71 @@
# Copyright 1999-2018 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} )
inherit distutils-r1
DISTUTILS_IN_SOURCE_BUILD=1
DESCRIPTION="Library for rapid development of hardware-accelerated multitouch applications"
HOMEPAGE="https://kivy.org/"
SRC_URI="https://github.com/kivy/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="cairo camera doc examples garden gstreamer +sdl spell test"
RDEPEND="
dev-python/pillow[${PYTHON_USEDEP}]
cairo? ( dev-python/pycairo[${PYTHON_USEDEP}] )
camera? ( media-libs/opencv:0/2.4[$(python_gen_usedep 'python2_7')] )
garden? ( dev-python/kivy-garden[${PYTHON_USEDEP}] )
gstreamer? ( dev-python/gst-python:1.0[${PYTHON_USEDEP}] )
sdl? ( media-libs/libsdl2
media-libs/sdl2-ttf
media-libs/sdl2-image
media-libs/sdl2-mixer )
!sdl? ( dev-python/pygame[${PYTHON_USEDEP}] )
spell? ( dev-python/pyenchant[${PYTHON_USEDEP}] )"
DEPEND="${RDEPEND}
dev-python/cython[${PYTHON_USEDEP}]
dev-python/setuptools[${PYTHON_USEDEP}]
doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
test? ( dev-python/nose[${PYTHON_USEDEP}] )"
S="${WORKDIR}/${P,,}"
python_prepare_all() {
# sed -e '/data_files=/d' -i "${S}/setup.py" || die
# sed -e 's/PYTHON = python/PYTHON ?= python/' -i Makefile || die
export USE_SDL2=$(usex sdl 1 0)
export USE_GSTREAMER=$(usex gstreamer 1 0)
export KIVY_USE_SETUPTOOLS=1
distutils-r1_python_prepare_all
}
python_compile() {
esetup.py build_ext --inplace
esetup.py build
}
python_compile_all() {
use doc && emake html
}
python_test() {
emake test PYTHON="${PYTHON}"
}
python_install_all() {
use doc && HTML_DOCS=( doc/build/html/. )
if use examples; then
insinto "/usr/share/doc/${PF}/examples/${f}/"
doins "${S}/examples"/* "${S}/examples"/*/*
fi
distutils-r1_python_install_all
}

@ -1,2 +1,3 @@
DIST Kivy-1.10.0.tar.gz 24266702 BLAKE2B 3f1dab7c69e322d5856d1772d0902eaf5d4598957df1573e0c617ca872afa446797266f1ecd4a99da81bc7dcc40a051294d96c11e51a7fe2c505224bf0edaa42 SHA512 8049c92407e464558ecff913ff076c1b8f125b85a35b9eba64af49b35df545402ec2bac907ee545265a368b8cdbb33e02d74429dce13c53dd6feac735ace9cb4
DIST Kivy-1.10.1.tar.gz 24318169 BLAKE2B 3032034717ad580af437eb280ad8474f057e1ab9f797edf3358db1073eda6e65ee8765862e39e77818debdf0a2a972ce3701b305ddfba307d9a8bfe2ce8edbc5 SHA512 2208e1a148dd1a7c507336419e7388de87d2ab340db055e09fce99837d50639e2e38f275e383503e5bdfc4b9d3def8176d758a80bf3455467604a4219c19d642
DIST kivy-1.9.1.tar.gz 16363833 BLAKE2B 1f81ab0688e9ddc617da5e7d56523568e396f010587c971285996ca5544367a4f63bb6493f279ea66f6606b2808394614c25a96e97018ef0ae1e70d74eb9cd7e SHA512 1ae3ff3979a89e41c0af6493b7523835c1d01ee36fcd524f15d329b8fa875c6ca9bd25db3a844597fbc5370ff86b55ce177d3e66cc169223b02eb114c88c9989

Binary file not shown.

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

@ -1,3 +1,2 @@
DIST bokeh-0.11.1.tar.gz 3383140 BLAKE2B 68a368d7817e4066378018e6283177d5b8cc7e8328a9d2db0b678514016fd54c3d6c7d837e4df0ab0668539fe403a036cb660ea475aded6bbc685a138dffc087 SHA512 18cfee85698f1ba548c34fb223dc57e36584951064e65fac83cb8388b129914a8f67970a133ef2d1a67c06e50cbfb565a27d33dc9c90f5027a1739d400894706
DIST bokeh-0.12.4.tar.gz 5584657 BLAKE2B 21cd2aefcb4fa80a979fc6144ced679fe26f830769a5d8a3768ba9847ff247a1d8e4ec42ea84823211af04aafcd2672c083e64995fbba46f31cc0842e8cfe051 SHA512 bab043278cf580a7d6df9749d7ceca763fc77849de37a8ea7e5a674714a5e49c240ea41ec964fd00cb6d71901fd349f10ee732df5dc5a853e0a2ea8a9c97b1ef
DIST bokeh-0.12.6.tar.gz 13720124 BLAKE2B e8fc1c42b530622bf6de8e13e81ae45e6d47985cef1ed81a2e32bfaef2a246a09c25210728cf434da6d4a0ef8f47ade1be5ee9e9318cc0a071bff36b317069a1 SHA512 7a293169521b690bb2cdcefe3667f869e75f2b718d6122af63201e2fb2e530eba931b3fa2ee3474a8ead758039cbb7d756acc0349e2f0820d72a4f754b9301b2

@ -1,72 +0,0 @@
# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
PYTHON_COMPAT=( python2_7 python3_{4,5} )
inherit distutils-r1
DESCRIPTION="Statistical and interactive HTML plots for Python"
HOMEPAGE="https://bokeh.pydata.org/en/latest/
https://github.com/bokeh/bokeh
https://pypi.org/project/bokeh/"
SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
IUSE="examples test"
RDEPEND="
dev-python/jinja[${PYTHON_USEDEP}]
dev-python/numpy[${PYTHON_USEDEP}]
dev-python/python-dateutil[${PYTHON_USEDEP}]
dev-python/pyyaml[${PYTHON_USEDEP}]
dev-python/requests[${PYTHON_USEDEP}]
dev-python/six[${PYTHON_USEDEP}]
virtual/python-futures[${PYTHON_USEDEP}]
>=www-servers/tornado-4.3[${PYTHON_USEDEP}]
"
DEPEND="
dev-python/jinja[${PYTHON_USEDEP}]
dev-python/numpy[${PYTHON_USEDEP}]
dev-python/python-dateutil[${PYTHON_USEDEP}]
dev-python/pyyaml[${PYTHON_USEDEP}]
dev-python/packaging[${PYTHON_USEDEP}]
dev-python/setuptools[${PYTHON_USEDEP}]
dev-python/six[${PYTHON_USEDEP}]
>=net-libs/nodejs-4.1
>=www-servers/tornado-4.3[${PYTHON_USEDEP}]
test? (
dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
dev-python/boto[${PYTHON_USEDEP}]
dev-python/colorama[${PYTHON_USEDEP}]
dev-python/flake8[${PYTHON_USEDEP}]
dev-python/pandas[${PYTHON_USEDEP}]
dev-python/pytest[${PYTHON_USEDEP}]
dev-python/flexx[${PYTHON_USEDEP}]
dev-python/mock[${PYTHON_USEDEP}]
dev-python/pillow[${PYTHON_USEDEP}]
dev-python/pytest[${PYTHON_USEDEP}]
dev-python/pytest-cov[${PYTHON_USEDEP}]
dev-python/pytest-rerunfailures[${PYTHON_USEDEP}]
dev-python/pytest-xdist[${PYTHON_USEDEP}]
dev-python/selenium[${PYTHON_USEDEP}]
sci-libs/scipy[${PYTHON_USEDEP}]
)
"
python_compile() {
esetup.py build --build-js
}
python_test() {
cd "${BUILD_DIR}"/lib || die
py.test -m 'not (js or examples or integration)' -vv || die
}
python_install_all() {
use examples && local EXAMPLES=( examples/. )
distutils-r1_python_install_all
}

@ -67,6 +67,9 @@ python_test() {
}
python_install_all() {
use examples && local EXAMPLES=( examples/. )
if use examples; then
insinto "/usr/share/doc/${PF}/examples/"
doins examples/*
fi
distutils-r1_python_install_all
}

@ -36,6 +36,8 @@ DOCS=( AUTHORS CHANGELOG sample.theme light.theme )
# Req'd for clean build by each impl
DISTUTILS_IN_SOURCE_BUILD=1
RESTRICT="test" #659110
python_compile_all() {
if use doc; then
sphinx-build -b html -c doc/sphinx/source/ \

@ -1,9 +1,9 @@
# Copyright 1999-2016 Gentoo Foundation
# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
PYTHON_COMPAT=( python2_7 python3_{4,5} pypy )
PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
inherit distutils-r1

@ -4,3 +4,4 @@ DIST docker-py-3.1.4.tar.gz 202064 BLAKE2B 6ee3672cd1f62cd570d3939805465698879d7
DIST docker-py-3.2.0.tar.gz 205546 BLAKE2B 0784408a0373721e30cc101bf9e20e93af4721ace3841721b851efa49874163a1684239db6a56b7e91e83ad77eb4290dde61f53d70d6656853cedaff95da90b2 SHA512 fa36b65a047aec6dbec07b2ee5ac895b333acc804e372b5b3ccae587045fa03613f4083c66cd6289e188fd78c6f7012c4252e9bbf9f30a980fb94f32efba03b7
DIST docker-py-3.2.1.tar.gz 205815 BLAKE2B fc9b23f57f64e3d25a922b896619f3d03780d446f03adb987c6a203df2c41fbc03b202cc8dac30392158dd0da4d600372b6af284d785179c0cf58f7048735da3 SHA512 c66f960bd507d8c4ed99e56480c24d11b13cf49420eee2f0934cede7516a8a9b984e5e0540a1d82d830768d3a5f0218dddd61255d55e7bd1b984072cd6e48a44
DIST docker-py-3.3.0.tar.gz 206523 BLAKE2B dd5b1edda8b4c31c3febcedf8352262f090c6232419a0751181c1e765220905b93b50f26091123c31b7193aeb5d94e30f1ba49d114d1c2006a2c60ebaca80865 SHA512 ed2dedd57df344ab576053ac6d458808c67ce5aeeacddb1729ea5ebd0fb741e8f08cf9ed472e28d40eaba3a45f6c26727bff0ab7ece832bc3238f441ed149c05
DIST docker-py-3.4.0.tar.gz 207877 BLAKE2B b9a1d95f934fddc576253f9bb1d3060feaf9671d7bfa16e2c8ce2e672407dd880fa20b0e6956ff49430a20c21fdec2bf44d2a07e49ad854b374ea518a7528464 SHA512 90e6e64a911f7602cb71f7b6f0e0174b490254f249fcf3d4ce55a8733391881cc12776737c240263f387c4465707c50a6fa54bf44550cfa7ada808614494a1a5

@ -0,0 +1,50 @@
# Copyright 1999-2018 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} )
inherit distutils-r1
DESCRIPTION="Python client for Docker"
HOMEPAGE="https://github.com/docker/docker-py"
SRC_URI="https://github.com/docker/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="~amd64 ~arm64 ~x86"
IUSE="doc test"
RDEPEND="
>=dev-python/docker-pycreds-0.2.3[${PYTHON_USEDEP}]
!~dev-python/requests-2.18.0[${PYTHON_USEDEP}]
>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
>=dev-python/six-1.4.0[${PYTHON_USEDEP}]
>=dev-python/websocket-client-0.32.0[${PYTHON_USEDEP}]
$(python_gen_cond_dep '>=dev-python/backports-ssl-match-hostname-3.5[${PYTHON_USEDEP}]' 'python2_7' 'python3_4' )
$(python_gen_cond_dep '>=dev-python/ipaddress-1.0.16[${PYTHON_USEDEP}]' 'python2_7' )
"
DEPEND="
dev-python/setuptools[${PYTHON_USEDEP}]
test? (
${RDEPEND}
>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
dev-python/pytest-runner[${PYTHON_USEDEP}]
>=dev-python/pytest-2.9.1[${PYTHON_USEDEP}]
)
doc? (
dev-python/recommonmark[${PYTHON_USEDEP}]
>=dev-python/sphinx-1.4.6[${PYTHON_USEDEP}]
)
"
python_compile_all() {
if use doc; then
sphinx-build docs html || die "docs failed to build"
HTML_DOCS=( html/. )
fi
}
python_test() {
py.test tests/unit/ || die "tests failed under ${EPYTHON}"
}

@ -1,8 +1,8 @@
# Copyright 1999-2016 Gentoo Foundation
# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
PYTHON_COMPAT=( python2_7 python3_{4,5} )
PYTHON_COMPAT=( python2_7 )
inherit distutils-r1

@ -1,4 +1,4 @@
# Copyright 1999-2017 Gentoo Foundation
# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
SLOT="0"
LICENSE="BSD"
KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-solaris"
KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-solaris"
IUSE=""
DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"

@ -3,7 +3,7 @@
EAPI=6
PYTHON_COMPAT=( python2_7 python3_{4,5} )
PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
inherit java-pkg-2 distutils-r1

@ -1,3 +1,2 @@
DIST libvirt-python-4.1.0.tar.gz 186312 BLAKE2B 45ba81eb738e72e2561ab597c5cc395ae2260c7d93575391d2ce14622faf706052ea5d83adf6ca6a52c35cda4a9e80348f163f48ba318f5d0056b26a33961d25 SHA512 533c46c6827b0c3397713b39a7c6486e1bad40571907aa48da7818ad15569d4e01e33ffc787beb9486fc84b361985aa1d30ea474555d55494143f71dfea26947
DIST libvirt-python-4.2.0.tar.gz 186496 BLAKE2B a4d556a0159c338f2a3a5fc8e6072b084aab427170b66f00dce5b8c4649bfd7d821e02846de906584a454acf2f1db34718a2f48110cf5c8faf6594a72b6e8f2b SHA512 4c06d7de470ff22ee5983598e66d26a3e850998311c8061952f9f6b5be0a7a0f437e2b214d3d66bf465acec9afb925dfb6dd0cd756ed78e818d19e15e7cfdf6a
DIST libvirt-python-4.3.0.tar.gz 187111 BLAKE2B 7266ca1b5836429e13a03dab0e2f5085521c72e2d6952d7a9de514eace286477ad7b237c5d70f86fac49ab2201c8724149af72d4c1f688ac8736257045babc6f SHA512 4b2b4a2590e968ff4401d8429319c94b1b9c08a40b089f461af5a4912acf2c504f60652c80b161c253c00e41d22c100c2e180159e45d84c352c59dca69172cfc
DIST libvirt-python-4.4.0.tar.gz 188431 BLAKE2B dc2dfc64139c3bb2a80516c345b1256311b1b2ceaa832de2ef60afe5422adabee626b25dffa96a1bd8428f4d0bd54ed5264d887522700a941aa646b4b43a7f8c SHA512 b4e740895c22aca20d8fc1cfadc9276e91e0a74aa7bad75d15de14be6704be8386055b700ea65045acfaabf3bfe8fa51e5d814e625e46d01b3ac0221419d25da

@ -1,46 +0,0 @@
# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
PYTHON_COMPAT=( python{2_7,3_4,3_5} )
MY_P="${P/_rc/-rc}"
inherit distutils-r1
if [[ ${PV} = *9999* ]]; then
inherit git-r3
EGIT_REPO_URI="git://libvirt.org/libvirt-python.git"
SRC_URI=""
KEYWORDS="amd64 x86"
RDEPEND="app-emulation/libvirt:=[-python(-)]"
else
SRC_URI="http://libvirt.org/sources/python/${MY_P}.tar.gz"
KEYWORDS="amd64 ~arm64 x86"
RDEPEND="app-emulation/libvirt:0/${PV}"
fi
S="${WORKDIR}/${P%_rc*}"
DESCRIPTION="libvirt Python bindings"
HOMEPAGE="https://www.libvirt.org"
LICENSE="LGPL-2"
SLOT="0"
IUSE="examples test"
DEPEND="${RDEPEND}
virtual/pkgconfig
test? ( dev-python/lxml[${PYTHON_USEDEP}]
dev-python/nose[${PYTHON_USEDEP}] )"
python_test() {
esetup.py test
}
python_install_all() {
if use examples; then
dodoc -r examples
docompress -x /usr/share/doc/${PF}/examples
fi
distutils-r1_python_install_all
}

@ -11,9 +11,9 @@ inherit distutils-r1
if [[ ${PV} = *9999* ]]; then
inherit git-r3
EGIT_REPO_URI="git://libvirt.org/libvirt-python.git"
EGIT_REPO_URI="https://libvirt.org/git/libvirt-python.git"
SRC_URI=""
KEYWORDS="amd64 x86"
KEYWORDS=""
RDEPEND="app-emulation/libvirt:=[-python(-)]"
else
SRC_URI="http://libvirt.org/sources/python/${MY_P}.tar.gz"

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

Loading…
Cancel
Save