Sync with portage [Mon Jul 13 16:21:55 MSK 2020].

develop 1714
root 4 years ago
parent 27d4e9427c
commit 712779dd04

Binary file not shown.

Binary file not shown.

@ -1 +1,2 @@
DIST speech-dispatcher-0.8.7.tar.gz 1333677 BLAKE2B 0b08f1a1228fe1240e14b3d52913f8fa64a1f2ee9b563294b49ea8d3e5cfd3041aa5572ec72354b360dabd2d263deb79e418b95b6174a5b89ee541e9fd23c7e2 SHA512 0e7af02e8521aa8d397ea4d0329f9a8d56970beed645456dfedc738ececd2ccd8ecfdf66e92ae852878a473ba991175e1d4dc2b8b0148c958163682b49678375
DIST speech-dispatcher-0.9.1.tar.gz 1662222 BLAKE2B 03c3d79a9cbbe7e549f638992fb276ab2270a45a057708721666257699479b3feb81daddf26d8032ba3f7b9ab6b836c7f582ee22a532ff018c99820af3864d87 SHA512 35adb353d22b8dff8884cb20f3836f96f4f74b272bbd442d522a10a3d3b91a0da6705e6c216764f295208b5446c2077da620de2a81cafe5a0c4dd826e33753c2

@ -0,0 +1,466 @@
From f1c01ccc0ca3f82313ebff3f336d808acee225c8 Mon Sep 17 00:00:00 2001
From: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Fri, 6 Dec 2019 10:27:39 +0100
Subject: [PATCH] Fix global varibles definitions
---
src/clients/say/options.c | 24 +++++++++++++++++++
src/clients/say/options.h | 42 ++++++++++++++++-----------------
src/modules/festival_client.c | 2 ++
src/modules/festival_client.h | 2 +-
src/modules/module_utils.c | 20 ++++++++++++++++
src/modules/module_utils.h | 24 +++++++++----------
src/server/compare.c | 1 +
src/server/compare.h | 4 ++--
src/server/configuration.c | 3 +++
src/server/configuration.h | 4 ++--
src/server/speaking.c | 10 ++++++++
src/server/speaking.h | 14 +++++------
src/server/speechd.c | 33 ++++++++++++++++++++++++++
src/server/speechd.h | 44 +++++++++++++++++------------------
14 files changed, 160 insertions(+), 67 deletions(-)
diff --git a/src/clients/say/options.c b/src/clients/say/options.c
index f75ec7de..cb937d37 100644
--- a/src/clients/say/options.c
+++ b/src/clients/say/options.c
@@ -33,6 +33,30 @@
#include "options.h"
#include <i18n.h>
+signed int rate;
+signed int pitch;
+signed int pitch_range;
+signed int volume;
+
+int list_output_modules;
+char *output_module;
+char *sound_icon;
+char *language;
+char *voice_type;
+char *punctuation_mode;
+char *priority;
+int pipe_mode;
+SPDDataMode ssml_mode;
+int spelling;
+int wait_till_end;
+int stop_previous;
+int cancel_previous;
+int list_synthesis_voices;
+char *synthesis_voice;
+
+char *application_name;
+char *connection_name;
+
void options_print_help(char *argv[])
{
assert(argv);
diff --git a/src/clients/say/options.h b/src/clients/say/options.h
index 2fdd3b96..dede6dcc 100644
--- a/src/clients/say/options.h
+++ b/src/clients/say/options.h
@@ -22,29 +22,29 @@
#include <getopt.h>
#include "speechd_types.h"
-signed int rate;
-signed int pitch;
-signed int pitch_range;
-signed int volume;
+extern signed int rate;
+extern signed int pitch;
+extern signed int pitch_range;
+extern signed int volume;
-int list_output_modules;
-char *output_module;
-char *sound_icon;
-char *language;
-char *voice_type;
-char *punctuation_mode;
-char *priority;
-int pipe_mode;
-SPDDataMode ssml_mode;
-int spelling;
-int wait_till_end;
-int stop_previous;
-int cancel_previous;
-int list_synthesis_voices;
-char *synthesis_voice;
+extern int list_output_modules;
+extern char *output_module;
+extern char *sound_icon;
+extern char *language;
+extern char *voice_type;
+extern char *punctuation_mode;
+extern char *priority;
+extern int pipe_mode;
+extern SPDDataMode ssml_mode;
+extern int spelling;
+extern int wait_till_end;
+extern int stop_previous;
+extern int cancel_previous;
+extern int list_synthesis_voices;
+extern char *synthesis_voice;
-char *application_name;
-char *connection_name;
+extern char *application_name;
+extern char *connection_name;
static struct option long_options[] = {
{"rate", 1, 0, 'r'},
diff --git a/src/modules/festival_client.c b/src/modules/festival_client.c
index bb15cb86..f8327d46 100644
--- a/src/modules/festival_client.c
+++ b/src/modules/festival_client.c
@@ -75,6 +75,8 @@
/* For testing endianness */
int fapi_endian_loc = 1;
+int festival_connection_crashed;
+
static char *socket_receive_file_to_buff(int fd, int *size);
/* --- MANAGING FT STRUCTURES --- */
diff --git a/src/modules/festival_client.h b/src/modules/festival_client.h
index 21acdda2..dfbaac15 100644
--- a/src/modules/festival_client.h
+++ b/src/modules/festival_client.h
@@ -44,7 +44,7 @@
#define FESTIVAL_DEFAULT_SERVER_PORT 1314
#define FESTIVAL_DEFAULT_TEXT_MODE "fundamental"
-int festival_connection_crashed;
+extern int festival_connection_crashed;
typedef struct FT_Info {
int encoding;
diff --git a/src/modules/module_utils.c b/src/modules/module_utils.c
index 0a3d3308..99e71fcb 100644
--- a/src/modules/module_utils.c
+++ b/src/modules/module_utils.c
@@ -35,6 +35,26 @@ extern char *module_index_mark;
pthread_mutex_t module_stdout_mutex = PTHREAD_MUTEX_INITIALIZER;
+int log_level;
+
+AudioID *module_audio_id;
+
+SPDMsgSettings msg_settings;
+SPDMsgSettings msg_settings_old;
+
+int current_index_mark;
+
+int Debug;
+FILE *CustomDebugFile;
+
+configfile_t *configfile;
+configoption_t *module_dc_options;
+int module_num_dc_options;
+
+const char *module_name;
+
+char *module_index_mark;
+
char *do_message(SPDMessageType msgtype)
{
int ret;
diff --git a/src/modules/module_utils.h b/src/modules/module_utils.h
index 12382d3b..87c5f813 100644
--- a/src/modules/module_utils.h
+++ b/src/modules/module_utils.h
@@ -49,23 +49,23 @@ typedef struct SPDMarks {
gboolean stop;
} SPDMarks;
-int log_level;
+extern int log_level;
-AudioID *module_audio_id;
+extern AudioID *module_audio_id;
-SPDMsgSettings msg_settings;
-SPDMsgSettings msg_settings_old;
+extern SPDMsgSettings msg_settings;
+extern SPDMsgSettings msg_settings_old;
-int current_index_mark;
+extern int current_index_mark;
-int Debug;
-FILE *CustomDebugFile;
+extern int Debug;
+extern FILE *CustomDebugFile;
-configfile_t *configfile;
-configoption_t *module_dc_options;
-int module_num_dc_options;
+extern configfile_t *configfile;
+extern configoption_t *module_dc_options;
+extern int module_num_dc_options;
-const char *module_name;
+extern const char *module_name;
#define CLEAN_OLD_SETTINGS_TABLE() do { \
msg_settings_old.rate = -101;\
@@ -395,7 +395,7 @@ configoption_t *add_config_option(configoption_t * options,
#define INDEX_MARK_BODY_LEN 6
#define INDEX_MARK_BODY "__spd_"
-char *module_index_mark;
+extern char *module_index_mark;
/* This macro must be placed at the initialization of the module so that the
later functions are possible to use */
diff --git a/src/server/compare.c b/src/server/compare.c
index aa08ed79..8d36c39d 100644
--- a/src/server/compare.c
+++ b/src/server/compare.c
@@ -29,6 +29,7 @@
#include "compare.h"
/* Pointer to compare_message_uid */
+gint(*p_msg_lc) ();
gint(*p_msg_uid_lc) () = compare_message_uid;
gint compare_message_uid(gconstpointer element, gconstpointer value, gpointer x)
diff --git a/src/server/compare.h b/src/server/compare.h
index f0c730c5..380c9ed2 100644
--- a/src/server/compare.h
+++ b/src/server/compare.h
@@ -27,7 +27,7 @@ gint compare_message_uid(gconstpointer element, gconstpointer value,
gpointer x);
/* Pointer to function compare_message_uid */
-gint(*p_msg_lc) ();
-gint(*p_msg_uid_lc) ();
+extern gint(*p_msg_lc) ();
+extern gint(*p_msg_uid_lc) ();
#endif /* COMPARE_H */
diff --git a/src/server/configuration.c b/src/server/configuration.c
index a21b60c9..ba145995 100644
--- a/src/server/configuration.c
+++ b/src/server/configuration.c
@@ -33,6 +33,9 @@
#include "symbols.h"
#include <fdsetconv.h>
+configoption_t *spd_options;
+int spd_num_options;
+
static TFDSetClientSpecific *cl_spec_section;
/* So that gcc doesn't comply about casts to char* */
diff --git a/src/server/configuration.h b/src/server/configuration.h
index 5850c63b..bd87a0d5 100644
--- a/src/server/configuration.h
+++ b/src/server/configuration.h
@@ -29,8 +29,8 @@
#define SPEECHD_DEFAULT_PORT 6560
/* Loading options from DotConf */
-configoption_t *spd_options;
-int spd_num_options;
+extern configoption_t *spd_options;
+extern int spd_num_options;
configoption_t *load_config_options(int *num_options);
void free_config_options(configoption_t * opts, int *num);
diff --git a/src/server/speaking.c b/src/server/speaking.c
index 2160c250..61463f3f 100644
--- a/src/server/speaking.c
+++ b/src/server/speaking.c
@@ -46,6 +46,16 @@ static SPDPriority highest_priority = 0;
int SPEAKING = 0;
int poll_count;
+OutputModule *speaking_module;
+int speaking_uid;
+int speaking_gid;
+
+/* Pause and resume handling */
+int pause_requested;
+int pause_requested_fd;
+int pause_requested_uid;
+int resume_requested;
+
/*
Speak() is responsible for getting right text from right
queue in right time and saying it loud through the corresponding
diff --git a/src/server/speaking.h b/src/server/speaking.h
index 690db600..48752dfa 100644
--- a/src/server/speaking.h
+++ b/src/server/speaking.h
@@ -26,15 +26,15 @@
#include <speechd_types.h>
-OutputModule *speaking_module;
-int speaking_uid;
-int speaking_gid;
+extern OutputModule *speaking_module;
+extern int speaking_uid;
+extern int speaking_gid;
/* Pause and resume handling */
-int pause_requested;
-int pause_requested_fd;
-int pause_requested_uid;
-int resume_requested;
+extern int pause_requested;
+extern int pause_requested_fd;
+extern int pause_requested_uid;
+extern int resume_requested;
/* Speak() is responsible for getting right text from right
* queue in right time and saying it loud through corresponding
diff --git a/src/server/speechd.c b/src/server/speechd.c
index 8d3c1de4..6f6e51a5 100644
--- a/src/server/speechd.c
+++ b/src/server/speechd.c
@@ -65,6 +65,39 @@ gint server_timeout_source = 0;
int client_count = 0;
+struct SpeechdOptions SpeechdOptions;
+struct SpeechdStatus SpeechdStatus;
+
+pthread_t speak_thread;
+pthread_mutex_t logging_mutex;
+pthread_mutex_t element_free_mutex;
+pthread_mutex_t output_layer_mutex;
+pthread_mutex_t socket_com_mutex;
+
+GHashTable *fd_settings;
+GHashTable *language_default_modules;
+GHashTable *fd_uid;
+
+TSpeechDQueue *MessageQueue;
+GList *MessagePausedList;
+
+GList *client_specific_settings;
+
+GList *last_p5_block;
+
+TFDSetElement GlobalFDSet;
+
+int speaking_pipe[2];
+
+GHashTable *speechd_sockets_status;
+
+FILE *logfile;
+FILE *custom_logfile;
+char *custom_log_kind;
+FILE *debug_logfile;
+
+TSpeechDMode spd_mode;
+
static gboolean speechd_client_terminate(gpointer key, gpointer value, gpointer user);
static gboolean speechd_reload_dead_modules(gpointer user_data);
static gboolean speechd_load_configuration(gpointer user_data);
diff --git a/src/server/speechd.h b/src/server/speechd.h
index c0730b76..b23bbb69 100644
--- a/src/server/speechd.h
+++ b/src/server/speechd.h
@@ -123,7 +123,7 @@ typedef enum {
SPD_MODE_SINGLE /* */
} TSpeechDMode;
-TSpeechDMode spd_mode;
+extern TSpeechDMode spd_mode;
/* TSpeechDQueue is a queue for messages. */
typedef struct {
@@ -148,7 +148,7 @@ typedef struct {
#include "alloc.h"
#include "speaking.h"
-struct {
+extern struct SpeechdOptions {
char *communication_method;
int communication_method_set;
char *socket_path;
@@ -172,48 +172,48 @@ struct {
int server_timeout_set;
} SpeechdOptions;
-struct {
+extern struct SpeechdStatus {
int max_uid; /* The largest assigned uid + 1 */
int max_gid; /* The largest assigned gid + 1 */
int max_fd;
} SpeechdStatus;
/* speak() thread defined in speaking.c */
-pthread_t speak_thread;
-pthread_mutex_t logging_mutex;
-pthread_mutex_t element_free_mutex;
-pthread_mutex_t output_layer_mutex;
-pthread_mutex_t socket_com_mutex;
+extern pthread_t speak_thread;
+extern pthread_mutex_t logging_mutex;
+extern pthread_mutex_t element_free_mutex;
+extern pthread_mutex_t output_layer_mutex;
+extern pthread_mutex_t socket_com_mutex;
/* Table of all configured (and succesfully loaded) output modules */
extern GList *output_modules;
/* Table of settings for each active client (=each active socket)*/
-GHashTable *fd_settings;
+extern GHashTable *fd_settings;
/* Table of default output modules for different languages */
-GHashTable *language_default_modules;
+extern GHashTable *language_default_modules;
/* Table of relations between client file descriptors and their uids */
-GHashTable *fd_uid;
+extern GHashTable *fd_uid;
/* Speech Dispatcher main priority queue for messages */
-TSpeechDQueue *MessageQueue;
+extern TSpeechDQueue *MessageQueue;
/* List of messages from paused clients waiting for resume */
-GList *MessagePausedList;
+extern GList *MessagePausedList;
/* List of different entries of client-specific configuration */
-GList *client_specific_settings;
+extern GList *client_specific_settings;
/* Saves the last received priority progress message */
-GList *last_p5_block;
+extern GList *last_p5_block;
/* Global default settings */
-TFDSetElement GlobalFDSet;
+extern TFDSetElement GlobalFDSet;
/* Inter thread comm pipe */
-int speaking_pipe[2];
+extern int speaking_pipe[2];
/* Managing sockets communication */
-GHashTable *speechd_sockets_status;
+extern GHashTable *speechd_sockets_status;
typedef struct {
int awaiting_data;
int inside_block;
@@ -234,10 +234,10 @@ void MSG2(int level, char *kind, char *format, ...);
#define FATAL(msg) do { fatal_error(); MSG(-1,"Fatal error [%s:%d]:"msg, __FILE__, __LINE__); exit(EXIT_FAILURE); } while (0)
#define DIE(msg) do { MSG(0,"Error [%s:%d]:"msg, __FILE__, __LINE__); exit(EXIT_FAILURE); } while (0)
-FILE *logfile;
-FILE *custom_logfile;
-char *custom_log_kind;
-FILE *debug_logfile;
+extern FILE *logfile;
+extern FILE *custom_logfile;
+extern char *custom_log_kind;
+extern FILE *debug_logfile;
/* For debugging purposes, does nothing */
void fatal_error(void);

@ -1,26 +1,25 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
EAPI=7
PYTHON_COMPAT=( python3_6 )
inherit eutils ltprune python-r1
PYTHON_COMPAT=( python3_{6,7,8} )
inherit python-r1 systemd
DESCRIPTION="Speech synthesis interface"
HOMEPAGE="http://www.freebsoft.org/speechd"
SRC_URI="http://www.freebsoft.org/pub/projects/speechd/${P}.tar.gz"
HOMEPAGE="https://freebsoft.org/speechd"
SRC_URI="https://github.com/brailcom/speechd/releases/download/${PV}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
IUSE="alsa ao +espeak flite nas pulseaudio python"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
COMMON_DEPEND="python? ( ${PYTHON_DEPS} )
DEPEND="python? ( ${PYTHON_DEPS} )
>=dev-libs/dotconf-1.3
>=dev-libs/glib-2.28:2
>=dev-libs/glib-2.36:2
dev-libs/libltdl:0
>=media-libs/libsndfile-1.0.2
alsa? ( media-libs/alsa-lib )
@ -29,11 +28,13 @@ COMMON_DEPEND="python? ( ${PYTHON_DEPS} )
flite? ( app-accessibility/flite )
nas? ( media-libs/nas )
pulseaudio? ( media-sound/pulseaudio )"
DEPEND="${COMMON_DEPEND}
>=dev-util/intltool-0.40.0
virtual/pkgconfig"
RDEPEND="${COMMON_DEPEND}
RDEPEND="${DEPEND}
python? ( dev-python/pyxdg[${PYTHON_USEDEP}] )"
BDEPEND="
>=sys-devel/gettext-0.19.8
virtual/pkgconfig"
PATCHES=( "${FILESDIR}/${P}-fno-common.patch" )
src_configure() {
# bug 573732
@ -42,14 +43,18 @@ src_configure() {
local myeconfargs=(
--disable-python
--disable-static
--with-baratinoo=no
--with-ibmtts=no
--with-kali=no
$(use_with alsa)
$(use_with ao libao)
$(use_with espeak)
$(use_with flite)
$(use_with pulseaudio pulse)
$(use_with nas)
$(use_with pulseaudio pulse)
--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
)
econf ${myeconfargs[@]}
econf "${myeconfargs[@]}"
}
src_compile() {
@ -69,10 +74,7 @@ src_compile() {
}
src_install() {
emake DESTDIR="${D}" install
dodoc ANNOUNCE AUTHORS BUGS FAQ NEWS README*
prune_libtool_files --all
default
if use python; then
installation() {
@ -86,6 +88,8 @@ src_install() {
python_foreach_impl run_in_build_dir installation
python_replicate_script "${ED}"/usr/bin/spd-conf
fi
find "${D}" -name '*.la' -type f -delete || die
}
pkg_postinst() {
@ -103,7 +107,7 @@ pkg_postinst() {
editconfig="y"
fi
if [[ "${editconfig}" == "y" ]]; then
ewarn "You must edit ${EROOT}etc/speech-dispatcher/speechd.conf"
ewarn "You must edit ${EROOT}/etc/speech-dispatcher/speechd.conf"
ewarn "and make sure the settings there match your system."
ewarn
fi

Binary file not shown.

@ -5,7 +5,7 @@
<email>dilfridge@gentoo.org</email>
</maintainer>
<use>
<flag name="tsm_cit">IBM Tivoli Common Inventory Technology</flag>
<flag name="tsm_hw">Difference snapshot support for NetApp and N-Series file servers</flag>
<flag name="tsm-cit">IBM Tivoli Common Inventory Technology</flag>
<flag name="tsm-hw">Difference snapshot support for NetApp and N-Series file servers</flag>
</use>
</pkgmetadata>

@ -35,7 +35,7 @@ LICENSE="Apache-1.1 Apache-2.0 JDOM BSD-2 CC-PD Boost-1.0 MIT CPL-1.0 HPND Exola
SLOT="0"
KEYWORDS="-* ~amd64"
IUSE="acl java +tsm_cit +tsm_hw"
IUSE="acl java +tsm-cit +tsm-hw"
QA_PREBUILT="*"
# not available (yet?)
@ -86,10 +86,10 @@ src_unpack() {
for rpm in *.rpm; do
case ${rpm} in
TIVsm-APIcit.*|TIVsm-BAcit.*)
use tsm_cit && rpms="${rpms} ./${rpm}"
use tsm-cit && rpms="${rpms} ./${rpm}"
;;
TIVsm-BAhdw.*)
use tsm_hw && rpms="${rpms} ./${rpm}"
use tsm-hw && rpms="${rpms} ./${rpm}"
;;
TIVsm-JBB.*|*-filepath-*)
# "journal based backup" for all filesystems

@ -34,8 +34,8 @@ LICENSE="Apache-1.1 Apache-2.0 JDOM BSD-2 CC-PD Boost-1.0 MIT CPL-1.0 HPND Exola
|| ( BSD GPL-2+ ) gSOAP libpng tsm"
SLOT="0"
#KEYWORDS="-* ~amd64"
IUSE="acl java +tsm_cit +tsm_hw"
KEYWORDS="-* ~amd64"
IUSE="acl java +tsm-cit +tsm-hw"
QA_PREBUILT="*"
# not available (yet?)
@ -86,10 +86,10 @@ src_unpack() {
for rpm in *.rpm; do
case ${rpm} in
TIVsm-APIcit.*|TIVsm-BAcit.*)
use tsm_cit && rpms="${rpms} ./${rpm}"
use tsm-cit && rpms="${rpms} ./${rpm}"
;;
TIVsm-BAhdw.*)
use tsm_hw && rpms="${rpms} ./${rpm}"
use tsm-hw && rpms="${rpms} ./${rpm}"
;;
TIVsm-JBB.*|*-filepath-*)
# "journal based backup" for all filesystems

Binary file not shown.

@ -0,0 +1,20 @@
[Unit]
Description=LXD - main daemon
After=network-online.target lxcfs.service lxd.socket
Requires=network-online.target lxcfs.service lxd.socket
Documentation=man:lxd(1)
[Service]
EnvironmentFile=-/etc/environment
ExecStart=/usr/sbin/lxd --group lxd --logfile=/var/log/lxd/lxd.log
ExecStartPost=/usr/sbin/lxd waitready --timeout=600
KillMode=process
TimeoutStartSec=600s
TimeoutStopSec=30s
Restart=on-failure
LimitNOFILE=1048576
LimitNPROC=infinity
TasksMax=infinity
[Install]
Also=lxd-containers.service lxd.socket

@ -0,0 +1,12 @@
[Unit]
Description=LXD - unix socket
Documentation=man:lxd(1)
[Socket]
ListenStream=/var/lib/lxd/unix.socket
SocketGroup=lxd
SocketMode=0660
Service=lxd.service
[Install]
WantedBy=sockets.target

@ -0,0 +1,21 @@
[Unit]
Description=LXD - main daemon
After=network-online.target lxcfs.service lxd.socket
Requires=network-online.target lxcfs.service lxd.socket
Documentation=man:lxd(1)
[Service]
EnvironmentFile=-/etc/environment
ExecStartPre=/usr/libexec/lxc/lxc-apparmor-load
ExecStart=/usr/sbin/lxd --group lxd --logfile=/var/log/lxd/lxd.log
ExecStartPost=/usr/sbin/lxd waitready --timeout=600
KillMode=process
TimeoutStartSec=600s
TimeoutStopSec=30s
Restart=on-failure
LimitNOFILE=1048576
LimitNPROC=infinity
TasksMax=infinity
[Install]
Also=lxd-containers.service lxd.socket

@ -0,0 +1,16 @@
[Unit]
Description=LXD - container startup/shutdown
Documentation=man:lxd(1)
After=lxd.socket lxd.service
Requires=lxd.socket
[Service]
Type=oneshot
ExecStart=/usr/sbin/lxd activateifneeded
ExecStop=/usr/sbin/lxd shutdown
TimeoutStartSec=600s
TimeoutStopSec=600s
RemainAfterExit=yes
[Install]
WantedBy=multi-user.target

@ -0,0 +1,210 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
inherit autotools bash-completion-r1 eutils linux-info systemd
DESCRIPTION="Fast, dense and secure container management"
HOMEPAGE="https://linuxcontainers.org/lxd/introduction/ https://github.com/lxc/lxd"
SRC_URI="https://linuxcontainers.org/downloads/${PN}/${P}.tar.gz"
# Needs to include licenses for all bundled programs and libraries.
LICENSE="Apache-2.0 BSD BSD-2 LGPL-3 MIT MPL-2.0"
SLOT="0"
KEYWORDS="~amd64"
IUSE="apparmor +ipv6 nls"
DEPEND="app-arch/xz-utils
>=app-emulation/lxc-3.0.0[apparmor?,seccomp]
dev-lang/tcl
dev-libs/libuv
dev-libs/lzo
net-dns/dnsmasq[dhcp,ipv6?]"
RDEPEND="${DEPEND}
acct-group/lxd
net-firewall/ebtables
net-firewall/iptables[ipv6?]
sys-apps/iproute2[ipv6?]
sys-fs/fuse:0=
sys-fs/lxcfs
sys-fs/squashfs-tools
virtual/acl"
BDEPEND="dev-lang/go
nls? ( sys-devel/gettext )"
CONFIG_CHECK="
~BRIDGE
~DUMMY
~IP6_NF_NAT
~IP6_NF_TARGET_MASQUERADE
~IPV6
~IP_NF_NAT
~IP_NF_TARGET_MASQUERADE
~MACVLAN
~NETFILTER_XT_MATCH_COMMENT
~NET_IPGRE
~NET_IPGRE_DEMUX
~NET_IPIP
~NF_NAT_MASQUERADE
~VSOCKETS
~VXLAN
"
# Uses internet connection.
RESTRICT="test"
# Go magic.
QA_PREBUILT="/usr/lib/lxd/libdqlite.so.0.0.1
/usr/bin/fuidshift
/usr/bin/lxc
/usr/bin/lxc-to-lxd
/usr/bin/lxd-agent
/usr/bin/lxd-benchmark
/usr/bin/lxd-p2c
/usr/sbin/lxd"
EGO_PN="github.com/lxc/lxd"
GOPATH="${S}/_dist" # this seems to reset every now and then, though
common_op() {
local i
for i in dqlite raft; do
cd "${GOPATH}"/deps/${i} || die "failed to switch dir to ${i}"
"${@}"
cd "${S}" || die "failed to switch dir back from ${i} to ${S}"
done
}
src_prepare() {
default
export GOPATH="${S}/_dist"
sed -i \
-e "s:\./configure:./configure --prefix=/usr --libdir=${EPREFIX}/usr/lib/lxd:g" \
-e "s:make:make ${MAKEOPTS}:g" \
Makefile || die
sed -i 's#lib$#lib/lxd#' "${GOPATH}"/deps/libco/Makefile || die
sed -i 's#zfs version 2>/dev/null | cut -f 2 -d - | head -1#< /sys/module/zfs/version cut -f 1#' "${GOPATH}"/deps/raft/configure.ac || die
common_op eautoreconf
}
src_configure() {
export GOPATH="${S}/_dist"
export CO_CFLAGS="-I${GOPATH}/deps/libco/"
export CO_LIBS="${GOPATH}/deps/libco/"
export RAFT_CFLAGS="-I${GOPATH}/deps/raft/include/"
export RAFT_LIBS="${GOPATH}/deps/raft/.libs"
export SQLITE_CFLAGS="-I${GOPATH}/deps/sqlite"
export SQLITE_LIBS="${GOPATH}/deps/sqlite/.libs"
export PKG_CONFIG_PATH="${GOPATH}/sqlite/:${GOPATH}/libco/:${GOPATH}/raft/"
cd "${GOPATH}/deps/sqlite" || die
econf --enable-replication --disable-amalgamation --disable-tcl --libdir="${EPREFIX}/usr/lib/lxd"
common_op econf --libdir="${EPREFIX}"/usr/lib/lxd
}
src_compile() {
export GOPATH="${S}/_dist"
export CGO_CFLAGS="${CGO_CFLAGS} -I${GOPATH}/deps/sqlite/ -I${GOPATH}/deps/dqlite/include/ -I${GOPATH}/deps/raft/include/ -I${GOPATH}/deps/libco/"
export CGO_LDFLAGS="${CGO_LDFLAGS} -L${GOPATH}/deps/sqlite/.libs/ -L${GOPATH}/deps/dqlite/.libs/ -L${GOPATH}/deps/raft/.libs -L${GOPATH}/deps/libco/ -Wl,-rpath,${EPREFIX}/usr/lib/lxd"
export LD_LIBRARY_PATH="${GOPATH}/deps/sqlite/.libs/:${GOPATH}/deps/dqlite/.libs/:${GOPATH}/deps/raft/.libs:${GOPATH}/deps/libco/:${LD_LIBRARY_PATH}"
local j
for j in sqlite raft libco; do
cd "${GOPATH}"/deps/${j} || die
emake
done
ln -s libco.so.0.1.0 libco.so || die
cd "${GOPATH}/deps/dqlite" || die
emake CFLAGS="-I${GOPATH}/deps/sqlite -I${GOPATH}/deps/raft/include" LDFLAGS="-L${GOPATH}/deps/sqlite -L${GOPATH}/deps/raft"
cd "${S}" || die
for k in fuidshift lxd-agent lxd-benchmark lxd-p2c lxc lxc-to-lxd; do
go install -v -x ${EGO_PN}/${k} || die "failed compiling ${k}"
done
go install -v -x -tags libsqlite3 ${EGO_PN}/lxd || die "Failed to build the daemon"
use nls && emake build-mo
}
src_test() {
export GOPATH="${S}/_dist"
# This is mostly a copy/paste from the Makefile's "check" rule, but
# patching the Makefile to work in a non "fully-qualified" go namespace
# was more complicated than this modest copy/paste.
# Also: sorry, for now a network connection is needed to run tests.
# Will properly bundle test dependencies later.
go get -v -x github.com/rogpeppe/godeps || die
go get -v -x github.com/remyoudompheng/go-misc/deadcode || die
go get -v -x github.com/golang/lint/golint || die
go test -v ${EGO_PN}/lxd || die
}
src_install() {
local bindir="_dist/bin"
export GOPATH="${S}/_dist"
dosbin ${bindir}/lxd
for l in fuidshift lxd-agent lxd-benchmark lxd-p2c lxc lxc-to-lxd; do
dobin ${bindir}/${l}
done
for m in dqlite libco raft sqlite; do
cd "${GOPATH}"/deps/${m} || die "failed switching into ${GOPATH}/${m}"
emake DESTDIR="${D}" install
done
cd "${S}" || die
# We only need libraries, and we don't want anything to link against these.
rm "${ED}"/usr/bin/sqlite3 || die
rm -r "${ED}"/usr/include || die
rm -r "${ED}"/usr/lib/lxd/*.a || die
rm -r "${ED}"/usr/lib/lxd/pkgconfig || die
newbashcomp scripts/bash/lxd-client lxc
newconfd "${FILESDIR}"/lxd-4.0.0.confd lxd
newinitd "${FILESDIR}"/lxd-4.0.0.initd lxd
if use apparmor; then
systemd_newunit "${FILESDIR}"/lxd-4.0.0_apparmor.service lxd.service
else
systemd_newunit "${FILESDIR}"/lxd-4.0.0.service lxd.service
fi
systemd_newunit "${FILESDIR}"/lxd-containers-4.0.0.service lxd-containers.service
systemd_newunit "${FILESDIR}"/lxd-4.0.0.socket lxd.socket
dodoc AUTHORS doc/*
use nls && domo po/*.mo
}
pkg_postinst() {
elog
elog "Consult https://wiki.gentoo.org/wiki/LXD for more information,"
elog "including a Quick Start."
elog
elog "Optional features:"
optfeature "btrfs storage backend" sys-fs/btrfs-progs
optfeature "lvm2 storage backend" sys-fs/lvm2
optfeature "zfs storage backend" sys-fs/zfs
elog
elog "Be sure to add your local user to the lxd group."
}

@ -1,21 +1,24 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>stasibear@gentoo.org</email>
<name>Erik Mackdanz</name>
</maintainer>
<maintainer type="project">
<email>virtualization@gentoo.org</email>
<name>Gentoo Virtualization Project</name>
</maintainer>
<longdescription>
By combining the speed and density of containers with
the security of traditional virtual machines, LXD is
the next-generation of container hypervisor for Linux
from Canonical.
</longdescription>
<upstream>
<remote-id type="github">lxc/lxd</remote-id>
</upstream>
<maintainer type="person">
<email>stasibear@gentoo.org</email>
<name>Erik Mackdanz</name>
</maintainer>
<maintainer type="project">
<email>virtualization@gentoo.org</email>
<name>Gentoo Virtualization Project</name>
</maintainer>
<use>
<flag name="apparmor">Enable AppArmor support</flag>
</use>
<longdescription>
By combining the speed and density of containers with
the security of traditional virtual machines, LXD is
the next-generation of container hypervisor for Linux
from Canonical.
</longdescription>
<upstream>
<remote-id type="github">lxc/lxd</remote-id>
</upstream>
</pkgmetadata>

Binary file not shown.

@ -1,10 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>zlogene@gentoo.org</email>
<name>Mikle Kolyada</name>
</maintainer>
<!-- maintainer-needed -->
<use>
<flag name="atasmart">include libatasmart support to get disc temperature</flag>
<flag name="nvidia">allow thinkfan to read GPU temperature from the proprietary nVidia driver</flag>

Binary file not shown.

@ -1 +0,0 @@
DIST collector-0.7.3.tar.bz2 66069 BLAKE2B 55b76d24856c3edd483b02618a6a48cfa8d4427ff9e4f358cd7cfd03f050e12674dac1dadcb062229cc1f574a8251445374c55f024e78926b5adf59700384d31 SHA512 6ac846550311cbfb54580bf7971ec2fdf5a0e5321eaf75a97ff1eb91367ddbbf03421855750d21547c0910be7037a989a9be5a08d19eb9556b228faaf9c90035

@ -1,5 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
</pkgmetadata>

@ -1,37 +0,0 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
DISTUTILS_SINGLE_IMPL=1
PYTHON_COMPAT=( python2_7 )
PYTHON_REQ_USE="gdbm"
inherit distutils-r1
DESCRIPTION="python script for downloading webcomics"
HOMEPAGE="http://collector.skumleren.net/"
SRC_URI="http://collector.skumleren.net/releases/collector-${PV}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="amd64 ~ppc ~sparc x86"
IUSE=""
DEPEND=""
RDEPEND=""
S="${WORKDIR}/collector-${PV}"
DOCS=( Changelog README UPGRADE )
python_install() {
distutils-r1_python_install
python_fix_shebang "${ED}"usr/share/collector
}
pkg_postinst() {
ewarn "If you are upgrading from an earlier version of Collector, please"
ewarn "read UPGRADE. This new version will not be able to use your old"
ewarn "archives if you do not follow the upgrade instructions!"
}

Binary file not shown.

@ -14,7 +14,7 @@ SRC_URI="https://github.com/${PN}project/${PN}/archive/${COMMIT}.tar.gz -> ${P}.
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
IUSE="+boost debug examples graphicsmagick hunspell +minimal osg +pdf scripts +templates tk"
REQUIRED_USE="${PYTHON_REQUIRED_USE}

Binary file not shown.

@ -1 +1,2 @@
DIST evince-3.34.2.tar.xz 2565752 BLAKE2B 76497c34ce2eb460a3f2c3e790a7c44b9eeddd566854061d49fba2ba7cefa3b523d7bfe973d08b7ec1e8d967e4cbd63c73a668a346bd158a67752897f25827ee SHA512 51bfa4671e17a98c536790185ece6f4f77b956062901f840cd298cdc3e42eb7e8cabe9bfa84387f185cdf7462a322ef54bbc463b988a677af68561e55acd9f12
DIST evince-3.36.7.tar.xz 2580208 BLAKE2B 76ba6d206289f9981af24e5d82c9567c05984ad71efe83391aa1f8fdd94d31c284e600cf81eab9868e01f120f71cde1ae9b6ee6b7a4b1da47458d17b95b78d87 SHA512 dacc26d2d75c3dcadceb0a35c995ae3501bd91e84632cdf87decd359350e74032444707ea152e24c01fb57fe0ef2a426813a33919833cefdeb8699f8c642d910

@ -0,0 +1,107 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
GNOME2_LA_PUNT="yes"
GNOME2_EAUTORECONF="yes"
inherit gnome2 systemd
DESCRIPTION="Simple document viewer for GNOME"
HOMEPAGE="https://wiki.gnome.org/Apps/Evince"
LICENSE="GPL-2+ CC-BY-SA-3.0"
# subslot = evd3.(suffix of libevdocument3)-evv3.(suffix of libevview3)
SLOT="0/evd3.4-evv3.3"
IUSE="djvu dvi gstreamer gnome gnome-keyring +introspection nautilus nsplugin postscript spell t1lib tiff xps"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
# atk used in libview
# bundles unarr
COMMON_DEPEND="
dev-libs/atk
>=dev-libs/glib-2.38.0:2
>=dev-libs/libxml2-2.5:2
sys-libs/zlib:=
>=x11-libs/gdk-pixbuf-2.36.5:2
>=x11-libs/gtk+-3.22.0:3[introspection?]
gnome-base/gsettings-desktop-schemas
>=x11-libs/cairo-1.10:=
>=app-text/poppler-0.76.0[cairo]
>=app-arch/libarchive-3.2.0
djvu? ( >=app-text/djvu-3.5.22:= )
dvi? (
virtual/tex-base
dev-libs/kpathsea:=
t1lib? ( >=media-libs/t1lib-5:= ) )
gstreamer? (
media-libs/gstreamer:1.0
media-libs/gst-plugins-base:1.0
media-libs/gst-plugins-good:1.0 )
gnome? ( gnome-base/gnome-desktop:3= )
gnome-keyring? ( >=app-crypt/libsecret-0.5 )
introspection? ( >=dev-libs/gobject-introspection-1:= )
nautilus? ( >=gnome-base/nautilus-3.28.0 )
postscript? ( >=app-text/libspectre-0.2:= )
spell? ( >=app-text/gspell-1.6.0:= )
tiff? ( >=media-libs/tiff-3.6:0= )
xps? ( >=app-text/libgxps-0.2.1:= )
"
RDEPEND="${COMMON_DEPEND}
gnome-base/gvfs
gnome-base/librsvg
|| (
>=x11-themes/adwaita-icon-theme-2.17.1
>=x11-themes/hicolor-icon-theme-0.10 )
"
DEPEND="${COMMON_DEPEND}
app-text/docbook-xml-dtd:4.3
dev-libs/appstream-glib
dev-util/gdbus-codegen
dev-util/glib-utils
>=dev-util/gtk-doc-am-1.13
dev-util/itstool
>=sys-devel/gettext-0.19.8
virtual/pkgconfig
app-text/yelp-tools
"
# eautoreconf needs:
# app-text/yelp-tools
PATCHES=(
"${FILESDIR}"/3.30.2-internal-synctex.patch # don't automagically link to synctex from texlive-core - always use internal copy of this small parser for now; requires eautoreconf
)
src_prepare() {
gnome2_src_prepare
# Do not depend on adwaita-icon-theme, bug #326855, #391859
# https://gitlab.freedesktop.org/xdg/default-icon-theme/issues/7
sed -e 's/adwaita-icon-theme >= $ADWAITA_ICON_THEME_REQUIRED//g' \
-i configure || die "sed failed"
}
src_configure() {
gnome2_src_configure \
--disable-static \
--enable-pdf \
--enable-comics \
--enable-thumbnailer \
--with-platform=gnome \
--enable-dbus \
$(use_enable djvu) \
$(use_enable dvi) \
$(use_enable gstreamer multimedia) \
$(use_enable gnome libgnome-desktop) \
$(use_with gnome-keyring keyring) \
$(use_enable introspection) \
$(use_enable nautilus) \
$(use_enable nsplugin browser-plugin) \
$(use_enable postscript ps) \
$(use_with spell gspell) \
$(use_enable t1lib) \
$(use_enable tiff) \
$(use_enable xps) \
BROWSER_PLUGIN_DIR="${EPREFIX}"/usr/$(get_libdir)/nsbrowser/plugins \
--with-systemduserunitdir="$(systemd_get_userunitdir)"
}

@ -1 +0,0 @@
DIST xindy-2.4.tar.gz 498024 BLAKE2B 67cc7f96e4937e8130c66449226d581f121e7b06a82bde40f3f880e48e48e49805856e39c7670a34080731168ee7386beffe52fa6c3e8142a3d66f4c7ebb8ce3 SHA512 d718954c0c9efcf36dcc99518542b45b3fbbb922b98989c56feb542b00944003adb5834656add0aa88b1983f98e1d9d76e5355aaf9e6ad39f3e0dd109a18ade4

@ -1,21 +0,0 @@
--- xindy-2.4/configure.ac.orig 2010-05-10 16:12:10.000000000 -0700
+++ xindy-2.4/configure.ac 2010-09-28 23:43:39.591495118 -0700
@@ -42,12 +42,16 @@
# Test for building make-rules
AC_ARG_ENABLE(make-rules, AS_HELP_STRING([--enable-make-rules ],[build and install make-rules package (default is YES)]),[BUILDRULES=$enableval],[BUILDRULES=yes])
-test "$BUILDRULES" = "yes" && AC_PROG_LATEX
+if test "x$BUILDRULES" = "xyes"; then
+ AC_PROG_LATEX
+fi
AM_CONDITIONAL(BUILDRULES, test "$BUILDRULES" = "yes")
# Test for building Documentation
AC_ARG_ENABLE(docs, AS_HELP_STRING([--enable-docs ],[build and install documentation (default is YES)]),[BUILDDOCS=$enableval],[BUILDDOCS=yes])
-test "$BUILDDOCS" = "yes" && AC_PROG_PDFLATEX
+if test "x$BUILDDOCS" = "xyes"; then
+ AC_PROG_PDFLATEX
+fi
AM_CONDITIONAL(BUILDDOCS, test "$BUILDDOCS" = "yes")
# Checks for programs:

@ -1,22 +0,0 @@
--- xindy-2.4.orig/src/Makefile.am
+++ xindy-2.4/src/Makefile.am
@@ -41,7 +41,7 @@
DEFAULTS = defaults.xdy
DUMP_XINDY = dump-xindy.lsp
MEMFILE = xindy.mem
-CLISP = @CLISP@ -q -E iso-8859-1
+CLISP = @CLISP@ -q
xindy.mem: $(DEFAULTS) $(FAS) $(DUMP_XINDY)
rm -f $(MEMFILE)
--- xindy-2.4.orig/user-commands/xindy.in
+++ xindy-2.4/user-commands/xindy.in
@@ -777,7 +777,7 @@
sub call_xindy ( $$ ) {
my ($mem_file, $xindy_exp) = @_;
- my @command = ($clisp, '-M', $mem_file, '-E', 'iso-8859-1');
+ my @command = ($clisp, '-M', $mem_file);
if ( $interactive ) {
print "Proposed xindy expression:\n\n$xindy_exp\n" unless $quiet;
} else {

@ -1,13 +0,0 @@
https://bugs.gentoo.org/573794
--- xindy-2.4-orig/make-rules/inputenc/Makefile.am
+++ xindy-2.4/make-rules/inputenc/Makefile.am
@@ -43,7 +43,7 @@
latin.xdy : latin1.xdy latin2.xdy latin3.xdy
echo ';; Generated from latin?.xdy' >latin.xdy
echo >>latin.xdy
- sort -u latin?.xdy | grep -v '^;' >>latin.xdy
+ sort -u latin?.xdy | sed '/^;/d' >>latin.xdy
%.xdy %.idx :
$(PERL) $(srcdir)/make-testidx.pl TS1,T2A,T1 $* >$*.tex

@ -1,11 +0,0 @@
--- xindy-2.4/make-rules/inputenc/make-inp-rules.pl
+++ xindy-2.4/make-rules/inputenc/make-inp-rules.pl
@@ -8,7 +8,7 @@
while (<STDIN>) {
- if (/\\indexentry{(.+)--([8-9a-f][0-9a-f])\}\{1\}/) {
+ if (/\\indexentry\{(.+)--([8-9a-f][0-9a-f])\}\{1\}/) {
if (!($1 =~ /inputenc Error/)) {
$i = hex($2);
$macro = $1;

@ -1,25 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>tex@gentoo.org</email>
<name>Gentoo TeX Project</name>
</maintainer>
<maintainer type="project">
<email>common-lisp@gentoo.org</email>
<name>Gentoo Common Lisp Project</name>
</maintainer>
<longdescription lang="en">
xindy is an index processor that can be used to generate book-like indexes
for arbitrary document-preparation systems. This includes systems such as
TeX and LaTeX, the roff-family, SGML/XML-based systems (e.g., HTML) that
process some kind of text and generate indexing information. The kernel
system is not fixed to any specific system, but can be configured to work
together with such systems.
In comparison to other index processors xindy has several powerful features
that make it an ideal framework for describing and generating complex
indices, addressing especially international indexing. Have a look at
xindy's Overview that describes its most important features!
</longdescription>
</pkgmetadata>

@ -1,45 +0,0 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
inherit autotools
DESCRIPTION="A Flexible Indexing System"
HOMEPAGE="http://www.xindy.org/ https://github.com/jschrod/xindy.ctan"
SRC_URI="http://www.xindy.org/${P}.tar.gz"
# The latest development is now on the TeXlive SVN.
# The author jschrod backports it from time to time to his github repo.
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~alpha amd64 ~ia64 ppc x86"
IUSE="doc"
RDEPEND="virtual/latex-base
dev-texlive/texlive-fontsrecommended
>=dev-lisp/clisp-2.44.1-r1
dev-texlive/texlive-langcyrillic"
DEPEND="${RDEPEND}
dev-lang/perl
sys-devel/flex"
PATCHES=("${FILESDIR}"/${P}-configure.patch
"${FILESDIR}"/${P}-locale.patch
"${FILESDIR}"/${P}-nogrep.patch
"${FILESDIR}"/${P}-perl5.26.patch)
DOCS=(AUTHORS ChangeLog.Gour NEWS README)
src_prepare() {
default
eautoreconf
}
src_configure() {
econf $(use_enable doc docs)
}
src_compile() {
VARTEXFONTS="${T}/fonts" emake
}

Binary file not shown.

@ -1 +1,2 @@
DIST cpp-hocon-0.2.1.tar.gz 158108 BLAKE2B 4b7097768d4fcbc72df5c63fb036b12bb08108a0e1ef57ec182c64c2aa337b56197c8c10dea8f26f64a273b578d4c1b53a898024558d95e99d2ba1b3778c2414 SHA512 fcc377da7923b77436a6f2787d5b8b1b573f239de4f059c4a5949cbb1a755fd12024b9155f5e44cf60141181942f3e9a2a8fad07ee0b1d516fe2cd4a88d4ac8b
DIST cpp-hocon-0.3.0.tar.gz 159032 BLAKE2B a5503d28d4740c78ad13836d5e7c60fc56b06d8f60f3d977a1db1008e0e90e159f2bef4d9737215684a4318b3c6d0a5efa20da1c14cd94ceacdb597bc5eaaab8 SHA512 de997e6d90330f901863b7da0d6f6e069a31e052b6f31c1e3009a9559c863f08879ecf4e202c763ec32567dd3a1e436ff5d3bf0b3009a085ef3ee95e5ca6c7e5

@ -0,0 +1,23 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
inherit cmake
DESCRIPTION="Provides C++ support for the HOCON configuration file format"
HOMEPAGE="https://github.com/puppetlabs/cpp-hocon"
SRC_URI="https://github.com/puppetlabs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0/${PV}"
KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
IUSE="debug"
DEPEND="
>=dev-libs/boost-1.54:=[nls]
>=dev-libs/leatherman-0.9.3:=
"
RDEPEND="${DEPEND}"
#PATCHES=( "${FILESDIR}"/${PN}-0.2.1-cmake.patch )

@ -8,7 +8,4 @@
<upstream>
<remote-id type="github">puppetlabs/cpp-hocon</remote-id>
</upstream>
<longdescription lang="en">
A C++ port of the Typesafe Config library.
</longdescription>
</pkgmetadata>

@ -1,46 +0,0 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
inherit libtool eutils
MY_PV=${PV/_rc/.rc}
MY_PV=${MY_PV/_a/.a}
MY_P=${P/_rc/.rc}
MY_P=${MY_P/_a/.a}
DESCRIPTION="389 adminutil"
HOMEPAGE="http://port389.org/"
SRC_URI="http://port389.org/sources/${MY_P}.tar.bz2"
LICENSE="LGPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="debug"
COMMON_DEPEND=">=dev-libs/nss-3.11.4
>=dev-libs/nspr-4.6.4
>=dev-libs/svrcore-4.0.3
>=dev-libs/cyrus-sasl-2.1.19
>=dev-libs/icu-3.4:=
net-nds/openldap"
DEPEND="virtual/pkgconfig ${COMMON_DEPEND}"
RDEPEND="${COMMON_DEPEND}"
src_prepare() {
elibtoolize
}
src_configure() {
econf $(use_enable debug) \
--with-fhs \
--with-openldap \
--disable-rpath \
--disable-tests
}
src_install() {
emake DESTDIR="${D}" install
dodoc README NEWS
}

@ -1 +0,0 @@
DIST 389-adminutil-1.1.15.tar.bz2 283825 BLAKE2B 170797066b25303c6c582c95a935cf1d47b09b28a0c530588322fca2547416eeb5dba48561ccd06b7862dd5066e15abd1dcfeb168a9331e9a7f081bb5a14ae2e SHA512 5ed8d758ee47a2e276bab73696067dd2acd36f15ea5b93b32e3e244530920d74d95a4a4ff96cd325f22ae4ce2cc764fef03c90497c0181cbc1f0291f260d8ddf

@ -1,5 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
</pkgmetadata>

Binary file not shown.

@ -1,7 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>toolchain@gentoo.org</email>
</maintainer>
<!-- maintainer-needed -->
</pkgmetadata>

@ -1,3 +1,3 @@
DIST gjs-1.58.6.tar.xz 637972 BLAKE2B 553f29808723e48cee39c62e260d9c09f5db160756bf6c2fc45e532bee1d5c8babdd2bd5aee39fdff1300fc10de2c2a4e34d6b850e6e95c83ef217a8955379b6 SHA512 3e8fa8ccaabbbd07e74869fdc6188cffc19565798a6267fd3480d9320a2c9c5906c864e5d0c6e9e57f7bb79cc1706717b76b23c7cd89eb191477eb173b24aa74
DIST gjs-1.58.8.tar.xz 639372 BLAKE2B 53be0d5353213e7fdc6009aeed16db79f61ee5b800d66cd79f87e577b44adbb05ae741d73550237027a902d2e038c8e8247d3269bf058b64622a1a261f5a2501 SHA512 373b400b884096b6746c1ac7f2c2915857aa888dfb8bbf19bb8469fb75e081e4df36dcab06723f03654c34354a5a69a7865727ab9e36d3fb0d2b2652713e5cd6
DIST gjs-1.64.3.tar.xz 422436 BLAKE2B ade874085962f43fe7cd1412966557e4c40daf030b71a04b61f2b811b6056ae3abaff0cca04d9bf852dbb045a5a687dc27f5301c19235138f3d5d50be41f10c6 SHA512 9d92e52a7fef07853f3beb181798f89deb60b97b928d916cd827c99a6ab8f83abf7c352a1aa46be476a50e2efadfaf09befa54ccab0d51b0ac7127f2fe794801
DIST gjs-1.64.4.tar.xz 422496 BLAKE2B a96211f7240336dbb30c6965e405f59ee72e4288842837da8da8c6d3c59b7e04ebb6c7a8b0b02d38601c162ffdf1a1fef9f13e4db720c4c483f4a39dffd5dbb4 SHA512 21a15d7106ad6584fb1f02cb0a0a4cab211a3540adb8f2c03d35c211e3946b81935000a52351fedd95a18a7ff6b7f96e665fcafa3c411ff79f2b6cb332c82b42

@ -16,26 +16,25 @@ RESTRICT="!test? ( test )"
RDEPEND="
>=dev-libs/glib-2.58.0
dev-libs/libffi:=
>=dev-libs/gobject-introspection-1.61.2:=
readline? ( sys-libs/readline:0= )
dev-lang/spidermonkey:68
dev-libs/libffi:=
cairo? ( x11-libs/cairo[X] )
readline? ( sys-libs/readline:0= )
"
DEPEND="${RDEPEND}
sysprof? ( >=dev-util/sysprof-capture-3.33.2:3 )
virtual/pkgconfig
test? ( sys-apps/dbus
>=x11-libs/gtk+-3.20:3 )
>=x11-libs/gtk+-3.20:3[introspection] )
"
src_configure() {
# FIXME: add systemtap/dtrace support, like in glib:2
local emesonargs=(
$(meson_feature cairo)
$(meson_feature sysprof profiler)
$(meson_feature readline)
$(meson_feature sysprof profiler)
-Dinstalled_tests=false
)
meson_src_configure

@ -1,3 +1,2 @@
DIST libnfc-1.7.1.tar.bz2 484309 BLAKE2B 7a86394e8902421410d54de2b2710cee7ea34a6f950f6d76ec59d24d6e46798cd10a9725f405c729df44da84b810b5853a5eef0ec5f2a10ccbcf7585d33f34ef SHA512 6a03d197c450c0ab8f2d16ae8c1f80e206fa909ece84a32dbb962acd0f7ef693a419608cdaa4c2207a1d2593599e44479520d7413eace7fca19d3230442e506c
DIST libnfc-1.7.2.tar.bz2 534821 BLAKE2B 015634a696aeda77abdb53ab658504d0183b8d8d5899f368b122660d6527cf4d3ec988147082620d87d007ea33320acfde6cc013c9257b9c62fa4fb99528eeeb SHA512 c93ab10667998b6c6bf948082253715762ae91699d3e035f1149cebf6d3881cbc2ab570976c70cd12f886f76a18a82ac048fad0664512d1cd553c0fd1fdf7674
DIST libnfc-1.8.0.tar.bz2 553511 BLAKE2B 060ef4f24b3387393faf43f37a3a245177cb9697d42df1a8e8e5155af8b6e7b818b4bd710ff73929bde39274eda0235d111627cfd3931bd3fe9addde10af0fad SHA512 aa8762ecb5b94167d20346f2c81491bb5b634bcedbf2aae3e2efdb301bca89ceb7c2e15148d0934fdc1cce6d77ee0225e28e84893232999fdc09d8a90ae2a7c5

@ -1,43 +0,0 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
inherit toolchain-funcs
DESCRIPTION="Near Field Communications (NFC) library"
HOMEPAGE="http://www.libnfc.org/"
SRC_URI="https://github.com/nfc-tools/${PN}/releases/download/${P}/${P}.tar.bz2"
LICENSE="LGPL-3"
SLOT="0"
KEYWORDS="~amd64 ~arm ~x86"
IUSE="doc pcsc-lite readline static-libs usb"
RDEPEND="pcsc-lite? ( sys-apps/pcsc-lite )
readline? ( sys-libs/readline:0 )
usb? ( virtual/libusb:0 )"
DEPEND="${RDEPEND}
doc? ( app-doc/doxygen )"
src_configure() {
local drivers="arygon,pn532_uart,pn532_spi,pn532_i2c,acr122s"
use pcsc-lite && drivers+=",acr122_pcsc"
use usb && drivers+=",pn53x_usb,acr122_usb"
econf \
--with-drivers="${drivers}" \
$(use_enable doc) \
$(use_with readline) \
$(use_enable static-libs static)
}
src_compile() {
default
use doc && doxygen
}
src_install() {
default
use static-libs || find "${ED}" -name 'lib*.la' -delete
use doc && dohtml "${S}"/doc/html/*
}

@ -39,5 +39,6 @@ src_compile() {
src_install() {
default
use static-libs || find "${ED}" -name 'lib*.la' -delete
use doc && dohtml "${S}"/doc/html/*
use doc && HTML_DOCS=( "${S}"/doc/html/* )
einstalldocs
}

@ -39,5 +39,6 @@ src_compile() {
src_install() {
default
use static-libs || find "${ED}" -name 'lib*.la' -delete
use doc && dohtml "${S}"/doc/html/*
use doc && HTML_DOCS=( "${S}"/doc/html/* )
einstalldocs
}

@ -1 +1,2 @@
DIST quazip-0.8.1.tar.gz 150584 BLAKE2B 4a1d61b65b01eee06e1292ee88b543675c77ac922d0fb1726ac0afd447d74e8c8154db82da0ce95c2f2c303c036f2795e8938a412dc22e921ee09a0ef99278f6 SHA512 d65dab16c2cbc4d8bb23dae5b2fdff5ef787aaff2653b8e75c3fc8ba1701f5568a52bdde39009f83c5069a9fe3331cd1a49cf965822c4180e88bbc341faa2bfb
DIST quazip-0.9.1.tar.gz 155775 BLAKE2B 76710f94d055e86e1885f74b85f3e6b25f053eedbb73b4b11163e243d003ea3bad50cf1568fd2dbd37bc5db05fd0a6f8d49f48bd5df22d30b1aad3747e8ab780 SHA512 db31f3c7e3d7e95c25090ceb8379643e0b49ed69ece009dd015bee120b2b60f42e73408f580caed3138fa19ca64dcd23a05f16435abb54e2b8df21105c7b42c0

@ -0,0 +1,40 @@
From c061634452fe259dc5eb62395fbdb9159d4c9e09 Mon Sep 17 00:00:00 2001
From: Andreas Sturmlechner <asturm@gentoo.org>
Date: Thu, 9 Jul 2020 22:54:59 +0200
Subject: [PATCH] Disable static lib
---
quazip/CMakeLists.txt | 13 ++-----------
1 file changed, 2 insertions(+), 11 deletions(-)
diff --git a/quazip/CMakeLists.txt b/quazip/CMakeLists.txt
index 1efb5e2..84607f6 100644
--- a/quazip/CMakeLists.txt
+++ b/quazip/CMakeLists.txt
@@ -11,21 +11,12 @@ qt_wrap_cpp(MOC_SRCS ${PUBLIC_HEADERS})
set(SRCS ${SRCS} ${MOC_SRCS})
add_library(${QUAZIP_LIB_TARGET_NAME} SHARED ${SRCS})
-add_library(quazip_static STATIC ${SRCS})
-
-# Windows uses .lib extension for both static and shared library
-# *nix systems use different extensions for SHARED and STATIC library and by convention both libraries have the same name
-if (NOT WIN32)
- set_target_properties(quazip_static PROPERTIES OUTPUT_NAME quazip${QUAZIP_LIB_VERSION_SUFFIX})
-endif ()
target_include_directories(${QUAZIP_LIB_TARGET_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${ZLIB_INCLUDE_DIRS})
-target_include_directories(quazip_static PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${ZLIB_INCLUDE_DIRS})
-set_target_properties(${QUAZIP_LIB_TARGET_NAME} quazip_static PROPERTIES VERSION ${QUAZIP_LIB_VERSION} SOVERSION ${QUAZIP_LIB_SOVERSION} DEBUG_POSTFIX d)
+set_target_properties(${QUAZIP_LIB_TARGET_NAME} PROPERTIES VERSION ${QUAZIP_LIB_VERSION} SOVERSION ${QUAZIP_LIB_SOVERSION} DEBUG_POSTFIX d)
# Link against ZLIB_LIBRARIES if needed (on Windows this variable is empty)
target_link_libraries(${QUAZIP_LIB_TARGET_NAME} ${QT_QTMAIN_LIBRARY} ${QTCORE_LIBRARIES} ${ZLIB_LIBRARIES})
-target_link_libraries(quazip_static ${QT_QTMAIN_LIBRARY} ${QTCORE_LIBRARIES} ${ZLIB_LIBRARIES})
install(FILES ${PUBLIC_HEADERS} DESTINATION include/quazip${QUAZIP_LIB_VERSION_SUFFIX})
-install(TARGETS ${QUAZIP_LIB_TARGET_NAME} quazip_static LIBRARY DESTINATION ${LIB_DESTINATION} ARCHIVE DESTINATION ${LIB_DESTINATION} RUNTIME DESTINATION ${LIB_DESTINATION})
+install(TARGETS ${QUAZIP_LIB_TARGET_NAME} LIBRARY DESTINATION ${LIB_DESTINATION} ARCHIVE DESTINATION ${LIB_DESTINATION} RUNTIME DESTINATION ${LIB_DESTINATION})
--
2.27.0

@ -0,0 +1,31 @@
From 94b18d81752490b694d262a4889085e9d55bc5d5 Mon Sep 17 00:00:00 2001
From: Andreas Sturmlechner <asturm@gentoo.org>
Date: Thu, 9 Jul 2020 23:08:22 +0200
Subject: [PATCH] Fix pkgconfig include dir
---
quazip.pc.cmakein | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/quazip.pc.cmakein b/quazip.pc.cmakein
index e46d4c6..4cd8c86 100644
--- a/quazip.pc.cmakein
+++ b/quazip.pc.cmakein
@@ -1,12 +1,12 @@
prefix=@CMAKE_INSTALL_PREFIX@
exec_prefix=${prefix}
libdir=${prefix}/lib@LIB_SUFFIX@
-includedir=${prefix}/include
+includedir=${prefix}/include/quazip@QUAZIP_LIB_VERSION_SUFFIX@
Name: Quazip
Description: Quazip Library
Version: @QUAZIP_LIB_VERSION@
Libs: -lquazip@QUAZIP_LIB_VERSION_SUFFIX@
-Cflags:
+Cflags: -I${includedir}
Requires: Qt5Core
--
2.27.0

@ -0,0 +1,43 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
inherit cmake flag-o-matic qmake-utils
DESCRIPTION="Simple C++ wrapper over Gilles Vollant's ZIP/UNZIP package"
HOMEPAGE="https://stachenov.github.io/quazip/"
SRC_URI="https://github.com/stachenov/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="LGPL-2.1-with-linking-exception"
SLOT="0"
KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
IUSE=""
RDEPEND="
dev-qt/qtcore:5
dev-qt/qtnetwork:5
sys-libs/zlib[minizip]
"
DEPEND="${RDEPEND}"
PATCHES=(
"${FILESDIR}/${P}-no-static-lib.patch"
"${FILESDIR}/${P}-pkgconfig.patch"
)
src_configure() {
local libdir=$(get_libdir)
local mycmakeargs=(
-DLIB_SUFFIX=${libdir/lib/}
)
cmake_src_configure
}
src_install() {
cmake_src_install
# compatibility with not yet fixed rdeps (Gentoo bug #598136)
dosym libquazip5.so /usr/$(get_libdir)/libquazip.so
}

@ -1,2 +0,0 @@
DIST svrcore-4.0.4.tar.bz2 217076 BLAKE2B 1d5b1c6d397552f299554a19c21a81d1df8f449480095102d46bd2c9db8e4b667302f06fd199579dffb854f47fcb6f6ba54d505e3e6d3ccdfcf54dca07363f81 SHA512 4a63e2618ef8f508e71adf212eefae56e3c9d9898b924f405399bb99793de57bd178a3417f9e837c474e7960b6eb8a3cbe775b420c8fecbd974e89b4196b78fc
DIST svrcore-4.1.2.tar.bz2 263891 BLAKE2B 4d546406e18099857c1d77d479123332bdc721b51f5ad6bae74812b77704d3d6f8fa2ab67848355be7050fc3ee161c534fc7ee1692811fe9829da513f7cba29e SHA512 9d148ec9c568f1183e44006fec83b4e43b0cef56d5a04fce122fab1e9a0c0bfe39919de81c5a4d7adb2258fb7f16b4d327da20cdb4d948810e968c422d62ad40

@ -1,100 +0,0 @@
diff -uNr src/Makefile.am svrcore-4.0.4src/Makefile.am
--- src/Makefile.am 2006-12-14 18:07:32.000000000 +0100
+++ src/Makefile.am 2007-08-06 17:37:17.000000000 +0200
@@ -4,8 +4,8 @@
Makefile.win \
ntgetpin.rc
-lib_LTLIBRARIES = libsvrcore.la
-include_HEADERS = svrcore.h
+pkglib_LTLIBRARIES = libsvrcore.la
+pkginclude_HEADERS = svrcore.h
libsvrcore_la_SOURCES = alt.c \
cache.c \
errors.c \
diff -uNr svrcore.pc.in svrcore.pc.in
--- svrcore.pc.in 2006-12-14 18:07:32.000000000 +0100
+++ svrcore.pc.in 2007-08-06 17:38:12.000000000 +0200
@@ -1,11 +1,11 @@
prefix=@prefix@
exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
+libdir=@libdir@/@PACKAGE@
+includedir=@includedir@/@PACKAGE@
Name: svrcore
Description: Svrcore - Secure PIN handling using NSS crypto
Version: @VERSION@
Requires: @NSPR_NAME@ >= @NSPR_MIN_VER@ , @NSS_NAME@ >= @NSS_MIN_VER@
-Libs: -lsvrcore
+Libs: -L${libdir} -lsvrcore
Cflags: -I${includedir}
diff -ur m4.orig/nspr.m4 m4/nspr.m4
--- m4.orig/nspr.m4 2009-10-06 01:40:18.979484804 +0300
+++ m4/nspr.m4 2009-10-06 01:41:21.539982482 +0300
@@ -52,28 +52,6 @@
],
AC_MSG_RESULT(no))
-# see if we are doing an "in-tree" build with the other
-# mozilla components
-if test -z "$nspr_inc" -o -z "$nspr_lib" ; then
- for nsprpath in "../../dist" "../../dist/*.OBJ" ; do
- savedir=`pwd`
- cd $nsprpath
- abs_nsprpath=`pwd`
- cd $savedir
- if test -f "$abs_nsprpath/include/nspr/nspr.h" ; then
- nspr_inc="-I$abs_nsprpath/include/nspr"
- elif test -f "$abs_nsprpath/include/nspr.h" ; then
- nspr_inc="-I$abs_nsprpath/include"
- fi
- if test -d "$abs_nsprpath/lib" ; then
- nspr_lib="-L$abs_nsprpath/lib"
- fi
- if test -n "$nspr_inc" -a -n "$nspr_lib" ; then
- break
- fi
- done
-fi
-
# if NSPR is not found yet, try pkg-config
# last resort
if test -z "$nspr_inc" -o -z "$nspr_lib" ; then
diff -ur m4.orig/nss.m4 m4/nss.m4
--- m4.orig/nss.m4 2009-10-06 01:40:18.979484804 +0300
+++ m4/nss.m4 2009-10-06 01:41:31.291485717 +0300
@@ -52,32 +52,6 @@
],
AC_MSG_RESULT(no))
-# see if we are building "in tree" with the
-# other mozilla components
-if test -z "$nss_inc" -o -z "$nss_lib"; then
- nsslibpath=`echo ../../dist/*.OBJ/lib | cut -f1 -d' '`
- savedir=`pwd`
- cd $nsslibpath
- abs_nsslibpath=`pwd`
- cd $savedir
- nssincpath=../../dist/public/nss
- savedir=`pwd`
- cd $nssincpath
- abs_nssincpath=`pwd`
- cd $savedir
- if test -f "$abs_nssincpath/nss.h" ; then
- nss_inc="-I$abs_nssincpath"
- fi
- if test -d "$abs_nsslibpath" ; then
- nss_lib="-L$abs_nsslibpath"
- fi
- if test -n "$nss_inc" -a -n "$nss_lib" ; then
- AC_MSG_CHECKING(using in-tree NSS from $nssincpath $nsslibpath)
- else
- AC_MSG_CHECKING(could not find in-tree NSS in ../../dist)
- fi
-fi
-
# if NSS is not found yet, try pkg-config
# last resort
if test -z "$nss_inc" -o -z "$nss_lib"; then

@ -1,100 +0,0 @@
diff -uNr a/m4/nspr.m4 b/m4/nspr.m4
--- a/m4/nspr.m4 2016-04-22 06:30:23.000000000 +1000
+++ b/m4/nspr.m4 2016-06-08 15:06:49.923333338 +1000
@@ -52,28 +52,6 @@
],
AC_MSG_RESULT(no))
-# see if we are doing an "in-tree" build with the other
-# mozilla components
-if test -z "$nspr_inc" -o -z "$nspr_lib" ; then
- for nsprpath in "../../dist" "../../dist/*.OBJ" ; do
- savedir=`pwd`
- cd $nsprpath
- abs_nsprpath=`pwd`
- cd $savedir
- if test -f "$abs_nsprpath/include/nspr/nspr.h" ; then
- nspr_inc="-I$abs_nsprpath/include/nspr"
- elif test -f "$abs_nsprpath/include/nspr.h" ; then
- nspr_inc="-I$abs_nsprpath/include"
- fi
- if test -d "$abs_nsprpath/lib" ; then
- nspr_lib="-L$abs_nsprpath/lib"
- fi
- if test -n "$nspr_inc" -a -n "$nspr_lib" ; then
- break
- fi
- done
-fi
-
# if NSPR is not found yet, try pkg-config
# last resort
if test -z "$nspr_inc" -o -z "$nspr_lib" ; then
diff -uNr a/m4/nss.m4 b/m4/nss.m4
--- a/m4/nss.m4 2016-04-22 06:30:23.000000000 +1000
+++ b/m4/nss.m4 2016-06-08 15:06:49.923333338 +1000
@@ -52,32 +52,6 @@
],
AC_MSG_RESULT(no))
-# see if we are building "in tree" with the
-# other mozilla components
-if test -z "$nss_inc" -o -z "$nss_lib"; then
- nsslibpath=`echo ../../dist/*.OBJ/lib | cut -f1 -d' '`
- savedir=`pwd`
- cd $nsslibpath
- abs_nsslibpath=`pwd`
- cd $savedir
- nssincpath=../../dist/public/nss
- savedir=`pwd`
- cd $nssincpath
- abs_nssincpath=`pwd`
- cd $savedir
- if test -f "$abs_nssincpath/nss.h" ; then
- nss_inc="-I$abs_nssincpath"
- fi
- if test -d "$abs_nsslibpath" ; then
- nss_lib="-L$abs_nsslibpath"
- fi
- if test -n "$nss_inc" -a -n "$nss_lib" ; then
- AC_MSG_CHECKING(using in-tree NSS from $nssincpath $nsslibpath)
- else
- AC_MSG_CHECKING(could not find in-tree NSS in ../../dist)
- fi
-fi
-
# if NSS is not found yet, try pkg-config
# last resort
if test -z "$nss_inc" -o -z "$nss_lib"; then
diff -uNr a/src/Makefile.am b/src/Makefile.am
--- a/src/Makefile.am 2016-04-22 06:30:23.000000000 +1000
+++ b/src/Makefile.am 2016-06-08 15:06:49.923333338 +1000
@@ -10,8 +10,8 @@
Makefile.win \
ntgetpin.rc
-lib_LTLIBRARIES = libsvrcore.la
-include_HEADERS = svrcore.h
+pkglib_LTLIBRARIES = libsvrcore.la
+pkginclude_HEADERS = svrcore.h
libsvrcore_la_SOURCES = alt.c \
cache.c \
errors.c \
diff -uNr a/svrcore.pc.in b/svrcore.pc.in
--- a/svrcore.pc.in 2016-04-22 06:30:23.000000000 +1000
+++ b/svrcore.pc.in 2016-06-08 15:06:49.923333338 +1000
@@ -1,11 +1,11 @@
prefix=@prefix@
exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
+libdir=@libdir@/@PACKAGE@
+includedir=@includedir@/@PACKAGE@
Name: svrcore
Description: Svrcore - Secure PIN handling using NSS crypto
Version: @VERSION@
Requires: @NSPR_NAME@ >= @NSPR_MIN_VER@ , @NSS_NAME@ >= @NSS_MIN_VER@
-Libs: -lsvrcore
+Libs: -L${libdir} -lsvrcore
Cflags: -I${includedir}

@ -1,5 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
</pkgmetadata>

@ -1,40 +0,0 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
inherit multilib autotools eutils
DESCRIPTION="Mozilla LDAP C SDK"
HOMEPAGE="http://wiki.mozilla.org/LDAP_C_SDK"
SRC_URI="http://ftp.mozilla.org/pub/mozilla.org/directory/svrcore/releases/"${PV}"/src/"${P}".tar.bz2"
LICENSE="MPL-1.1 GPL-2 LGPL-2.1"
SLOT="0"
KEYWORDS="amd64 x86"
IUSE=""
DEPEND=">=dev-libs/nss-3.11
>=dev-libs/nspr-4.6"
RDEPEND="${DEPEND}"
src_prepare() {
epatch "${FILESDIR}"/"${P}"-gentoo.patch
eautoreconf
}
src_configure() {
econf --with-pic
}
src_install() {
default
# cope with libraries being in /usr/lib/svrcore
echo "LDPATH=/usr/$(get_libdir)/svrcore" > 08svrcore
dodir /etc/env.d
doenvd 08svrcore
dodoc ChangeLog INSTALL NEWS TODO README AUTHORS
}

@ -1,35 +0,0 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
inherit autotools
DESCRIPTION="Mozilla LDAP C SDK"
HOMEPAGE="http://www.port389.org/"
SRC_URI="http://www.port389.org/binaries/${P}.tar.bz2"
LICENSE="MPL-2.0"
SLOT="0"
KEYWORDS="~amd64 ~x86"
RDEPEND="
>=dev-libs/nss-3.11
>=dev-libs/nspr-4.6"
DEPEND="${RDEPEND}
virtual/pkgconfig"
PATCHES=( "${FILESDIR}/${PN}-4.1-gentoo.patch" )
src_prepare() {
default
eautoreconf
}
src_install() {
default
# cope with libraries being in /usr/lib/svrcore
echo "LDPATH='/usr/$(get_libdir)/${PN}'" > "${T}/08svrcore" || die "Unable to create env file"
doenvd "${T}/08svrcore"
}

@ -1 +1,2 @@
DIST xerces-c-3.2.2.tar.gz 7100953 BLAKE2B d167299797189ef181c384ac49095e8bc4cf4e0c7d646e72840a19f56c6eea060168d2c2d29c29ce6cc76dd44e403bea4c3dcde67f964b87f3abc807ad0b14ad SHA512 13709b47b61d957d736f34b774dbc7fbd85171eedebd0cada41fd1d17929e6c42904c882b1e1d4f9b4fd464938b62e5ebb127187b4974dfade6a593e31471e80
DIST xerces-c-3.2.3.tar.gz 7120270 BLAKE2B d622621657f33ada75a9ef330e77772b8f9cff717d8efc06f2a1fffea77360596e5192b48a6a015403a1045aa2492c626ba05f1de15eb5b997a80ca19b032db8 SHA512 206c5c31510224b8f6963b051f27968e4fe70374a0adb2c2990ac1f865b3bac41f63e6bfb7279faa21477f8878a3b9671ba70726fc75a84e51f037ef158639ad

@ -0,0 +1,116 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
inherit cmake-utils prefix
DESCRIPTION="A validating XML parser written in a portable subset of C++"
HOMEPAGE="https://xerces.apache.org/xerces-c/"
if [[ ${PV} == *9999 ]] ; then
ESVN_REPO_URI="https://svn.apache.org/repos/asf/xerces/c/trunk"
inherit subversion
else
SRC_URI="mirror://apache/xerces/c/3/sources/${P}.tar.gz"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
fi
LICENSE="Apache-2.0"
SLOT="0"
IUSE="cpu_flags_x86_sse2 curl doc elibc_Darwin elibc_FreeBSD examples iconv icu static-libs test threads"
RESTRICT="!test? ( test )"
RDEPEND="icu? ( dev-libs/icu:0= )
curl? ( net-misc/curl )
virtual/libiconv"
DEPEND="${RDEPEND}
doc? ( app-doc/doxygen )
test? ( dev-lang/perl )"
DOCS=( CREDITS KEYS NOTICE README )
pkg_setup() {
export ICUROOT="${EPREFIX}/usr"
if use iconv && use icu; then
ewarn "This package can use iconv or icu for loading messages"
ewarn "and transcoding, but not both. ICU takes precedence."
fi
}
src_configure() {
# 'cfurl' is only available on OSX and 'socket' isn't supposed to work.
# But the docs aren't clear about it, so we would need some testing...
local netaccessor
if use curl; then
netaccessor="curl"
elif use elibc_Darwin; then
netaccessor="cfurl"
else
netaccessor="socket"
fi
local msgloader
if use icu; then
msgloader="icu"
elif use iconv; then
msgloader="iconv"
else
msgloader="inmemory"
fi
local transcoder
if use icu; then
transcoder="icu"
elif use elibc_Darwin; then
transcoder="macosunicodeconverter"
elif use elibc_FreeBSD; then
transcoder="iconv"
else
transcoder="gnuiconv"
fi
# for interix maybe: transcoder="windows"
local mycmakeargs=(
-DCMAKE_INSTALL_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
-Dnetwork-accessor="${netaccessor}"
-Dmessage-loader="${msgloader}"
-Dtranscoder="${transcoder}"
-Dthreads:BOOL="$(usex threads)"
-Dsse2:BOOL="$(usex cpu_flags_x86_sse2)"
)
cmake-utils_src_configure
}
src_compile() {
cmake-utils_src_compile
use doc && cmake-utils_src_compile doc-style createapidocs doc-xml
}
src_install() {
cmake-utils_src_install
# package provides .pc files
find "${D}" -name '*.la' -delete || die
if use examples; then
# clean out object files, executables, Makefiles
# and the like before installing examples
find samples/ \( -type f -executable -o -iname 'runConfigure' -o -iname '*.o' \
-o -iname '.libs' -o -iname 'Makefile*' \) -exec rm -rf '{}' + || die
docinto examples
dodoc -r samples/.
docompress -x /usr/share/doc/${PF}/examples
fi
# To make sure an appropriate NLS msg file is around when using
# the iconv msgloader ICU has the messages compiled in.
if use iconv && ! use icu; then
doenvd "$(prefixify_ro "${FILESDIR}/50xerces-c")"
fi
}

@ -75,6 +75,7 @@ src_configure() {
# for interix maybe: transcoder="windows"
local mycmakeargs=(
-DCMAKE_INSTALL_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
-Dnetwork-accessor="${netaccessor}"
-Dmessage-loader="${msgloader}"
-Dtranscoder="${transcoder}"

Binary file not shown.

@ -1 +1,2 @@
DIST argcomplete-1.11.1.tar.gz 50773 BLAKE2B 15c92929fc20a10a1f1e29cf8714b74dd9ab0ce11e7f77acd4b15a907ad885f944f8540a8b37fef13ea67ee8eb76107e1c72746434f2710ded7331830494ff50 SHA512 523d542cf1430d8ad7b056e3b9c52769847c6e0bb9e266d71cc961e56816b7811f488a5c412f89b8de0d022a321d74733af87a50b3c0d698e796fb5e322d16ce
DIST argcomplete-1.12.0.tar.gz 53625 BLAKE2B 29b4f620537a087629c63dc71c6a0101d40967145680518b566b9c81e3e744c5d73e1ed016795f0ea4338be4e8f20b7df1968e388e1ff09308e012ed1ba6d0c0 SHA512 5e21e3caf1dcee661c0dadf28d7b127147325475fe3ae569fae8797a762c34b55125df9f52de8d76f0aa6dd4efdac260a358b325a7659beae02b1dedab501c18

@ -0,0 +1,35 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
PYTHON_COMPAT=( python{2_7,3_{6..9}} pypy3 )
inherit distutils-r1
DESCRIPTION="Bash tab completion for argparse"
HOMEPAGE="https://pypi.org/project/argcomplete/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
IUSE="test"
RESTRICT="!test? ( test )"
RDEPEND="
$(python_gen_cond_dep '
<dev-python/importlib_metadata-2[${PYTHON_USEDEP}]
' -2 python3_{5,6,7} pypy3)"
# pip is called as an external tool
BDEPEND="
test? (
app-shells/fish
app-shells/tcsh
dev-python/pexpect[${PYTHON_USEDEP}]
>=dev-python/pip-19
)"
python_test() {
"${EPYTHON}" test/test.py -v || die
}

@ -0,0 +1,15 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
PYTHON_COMPAT=( python3_{6..9} )
inherit distutils-r1
DESCRIPTION="A library for wrapping and filling UTF-8 CJK text"
HOMEPAGE="https://f.gallai.re/cjkwrap https://gitlab.com/fgallaire/cjkwrap"
SRC_URI="https://github.com/fgallaire/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="LGPL-3+"
SLOT="0"
KEYWORDS="~amd64 ~x86"

@ -1 +0,0 @@
DIST dnslib-0.9.6.tar.gz 60079 BLAKE2B 203f765683cdeefb0aab50138c548c585352dd38fad3fe834dc4919584a5e8b3912451e09050d30f42ed301716dce1c2b02b15464881355ab893c601a4635790 SHA512 c733803a9b25356c82afb4ce853a681545aebdb5fbd4f8a544eea9bb61ff354acc044a43357435e02b8b787a17fec99ea7e9f01b1c1e93a2e39945657c495105

@ -1,18 +0,0 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
PYTHON_COMPAT=( python3_6 pypy3 )
inherit distutils-r1
DESCRIPTION="Simple library to encode/decode DNS wire-format packets"
HOMEPAGE="https://pypi.org/project/dnslib/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
KEYWORDS="~amd64"
DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"

@ -1,11 +0,0 @@
<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>klausman@gentoo.org</email>
<name>Tobias Klausmann</name>
</maintainer>
<upstream>
<remote-id type="pypi">dnslib</remote-id>
</upstream>
</pkgmetadata>

@ -1,2 +1 @@
DIST PyBluez-0.18.tar.gz 74501 BLAKE2B 59ff94cd001f98ef113b0c705c11171ce61e1cb69d2eb596161a3c52764dad64ec2e3f6c5b8c1eedf2bcc463de781e60bcea84413866d10e47e742851bb23f43 SHA512 ddd185ad90f7c6235e25182afccfb586efa0d361f38140f33718dc2d29ca62f3aa68867d075820afffd5ee2fbd306b907b565fbdfdf32f906657f6a3a8c779da
DIST PyBluez-0.23.tar.gz 97562 BLAKE2B 6a234d5c41dc0bb9f08559431eafcf1d1fb1c881d2cb912cc048e2717bfe8a06f09aae045d2961c9ba5e087422cfc8249a1907368eb6dc45942175bcf97b1841 SHA512 78ce2c014d0055d0220163e7df94de5b6e891aa528ecf4f106f9dd0bdeb94244d18c752f93e62a133f3cec7053cb4646599e7588cf7ce5994ae7abe74ed05d47

@ -1,33 +0,0 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
PYTHON_COMPAT=( python2_7 )
inherit distutils-r1
MY_P="PyBluez-${PV}"
DESCRIPTION="Python bindings for Bluez Bluetooth Stack"
HOMEPAGE="https://github.com/karulis/pybluez"
SRC_URI="mirror://gentoo/${MY_P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="amd64 ppc x86"
IUSE="examples"
DEPEND="net-wireless/bluez"
RDEPEND="${DEPEND}"
S=${WORKDIR}/${MY_P}
python_install_all() {
if use examples; then
dodoc -r examples
docompress -x /usr/share/doc/${PF}/examples
fi
distutils-r1_python_install_all
}

@ -1,2 +1,3 @@
DIST pyfakefs-3.7.2.tar.gz 180195 BLAKE2B f1e76b652fc67f630fb45798974dc22455e9e99509829fbcaa479f36887c90207d7b6f087e89c9e113bb44df8c4221dc4676129663740812a9426d84a1d47401 SHA512 33bdbf7e21f1135c0ee048943a4b7dffec96e018285e4ee2e6a1c6a7f9e595e27348c83af3803d80322e7fd12a59985a6bf6342aa6211ba95c74ffa20929fb5a
DIST pyfakefs-4.0.2.tar.gz 177627 BLAKE2B a52bd900466203af6170bb9ce92f1e5f73f246d576f12390f5b52224de34fa69a3a4c426319b701953f040e343bcf267e20ea2a33df62c4a46f6397f760330aa SHA512 ba14cbc278ece50142d441b7731b01ba316ba9f11e5d442476e12b8b678490aace9578eb3b2fa2e47d6805795ceaf85574d3c5fb992a098585597c7e96d7143a
DIST pyfakefs-4.1.0.tar.gz 185920 BLAKE2B ee61e5ecda697150374bef035054038aed29e23958c58a3b135aae8dae7b397a194586ef6fd3ae70db1d136572a23a876d7f2dacb7e5814c1bedc9bb4502c3fe SHA512 946e21e34643db2b84e53d14bd9758c8edaa9e5e40b827fd74b245f018e8084995f55256900bf795c23a5aae29f124d9fcb80caf08442f6292adb80ee59d79b4

@ -0,0 +1,38 @@
From 1d6fabcaccf8dc716f7a49a67f5342d83ef37976 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
Date: Sun, 12 Jul 2020 21:26:33 +0200
Subject: [PATCH] Skip test_write_excel if openpyxl is not installed
test_write_excel fails if pandas are installed but openpyxl is not.
Adjust the condition around the case appropriately.
---
pyfakefs/tests/patched_packages_test.py | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/pyfakefs/tests/patched_packages_test.py b/pyfakefs/tests/patched_packages_test.py
index 05ed7ef..f8d8a1a 100644
--- a/pyfakefs/tests/patched_packages_test.py
+++ b/pyfakefs/tests/patched_packages_test.py
@@ -28,6 +28,11 @@ try:
except ImportError:
xlrd = None
+try:
+ import openpyxl
+except ImportError:
+ openpyxl = None
+
class TestPatchedPackages(fake_filesystem_unittest.TestCase):
def setUp(self):
@@ -57,6 +62,7 @@ class TestPatchedPackages(fake_filesystem_unittest.TestCase):
df = pd.read_excel(path)
assert (df.columns == [1, 2, 3, 4]).all()
+ if pd is not None and openpyxl is not None:
def test_write_excel(self):
self.fs.create_dir('/foo')
path = '/foo/bar.xlsx'
--
2.27.0

@ -0,0 +1,28 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
PYTHON_COMPAT=( python3_{6..9} pypy3 )
DISTUTILS_USE_SETUPTOOLS=rdepend
DISTUTILS_IN_SOURCE_BUILD=1
inherit distutils-r1
DESCRIPTION="a fake file system that mocks the Python file system modules"
HOMEPAGE="https://github.com/jmcgeheeiv/pyfakefs/ https://pypi.org/project/pyfakefs/"
SRC_URI="https://github.com/jmcgeheeiv/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
distutils_enable_tests pytest
PATCHES=(
"${FILESDIR}"/${P}-openpyxl.patch
)
python_test() {
"${EPYTHON}" -m pyfakefs.tests.all_tests -v || die "tests failed under ${EPYTHON}"
}

@ -1,26 +0,0 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
PYTHON_COMPAT=( python2_7 python3_{6,7,8,9} pypy3 )
inherit distutils-r1
DESCRIPTION="Virtualenv fixture for py.test"
HOMEPAGE="https://github.com/man-group/pytest-plugins https://pypi.org/project/pytest-fixture-config/"
SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
RDEPEND="
dev-python/pytest[${PYTHON_USEDEP}]
"
BDEPEND="
dev-python/setuptools[${PYTHON_USEDEP}]
dev-python/setuptools-git[${PYTHON_USEDEP}]
test? ( dev-python/six[${PYTHON_USEDEP}] )
"
distutils_enable_tests pytest

@ -1,3 +1,4 @@
DIST pytest-mock-1.11.2.tar.gz 22825 BLAKE2B d6843d1cb1afc0d5a242103ec4900d56418198b84fa037faf4b6841d7fbfd388273a819a26bfe051e6030690105e74211a27d2b864448598962b3e03788958fa SHA512 6dc927ce35001d088bddd9d79e024141b9e8163033b07af14b1f63330ef8b93dbf88649702f8fcc4f6ad314212fa5cbd39486b539811ec918450b3f7a716f96c
DIST pytest-mock-2.0.0.tar.gz 24665 BLAKE2B 31a3464e8bff5a2109716e95492ce1d59f2555769e69cccf4012bc268f88c5eeca99924006bdc78cc5e20cf227860d845bead9656aba1c081da58effb38ea100 SHA512 8bd7f634afebeae628470270c81f0198647bf8cd5b0fac438891d881d9823e40e814d598670bb9c9722b864990958e69d385c7c6a6e2adc81d2adcb303fbe0b0
DIST pytest-mock-3.1.1.tar.gz 25038 BLAKE2B 416a84af52980d6984b4a2fd63a75fc79bf27fead86e7d0950f6dfcf38bfc27befbf86bdf8d6361b19a4e45c0bf6965d7a57bea5e3fff29a361e0cdb542ef0a1 SHA512 8e55bd7dc45de2c35fbbbbf4385ea805e6546c8d894f3b351bc31fe1c6d9c790f9e14f79de01262c18634d9dfd5142be7520181f1195faccba1f0e8a06ffe675
DIST pytest-mock-3.2.0.tar.gz 25569 BLAKE2B e6a1ab23142cf3d7ac9385ac221bfce680c7b982cb489306557b60ca81563718cb9b7fcbb149cccb2cf6f06de5c3fa737d28b0711a3197fbbc86e432c5f4e614 SHA512 1ff442e26339ac41414a8678303fbc7eab573964661c664ef029c3b3377df4ab40173976316ef99e49dd208dc1e3c7cd0a0090f5453865343090cc9439f85fa9

@ -0,0 +1,37 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
DISTUTILS_USE_SETUPTOOLS=rdepend
PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 )
inherit distutils-r1
DESCRIPTION="Thin-wrapper around the mock package for easier use with pytest"
HOMEPAGE="https://github.com/pytest-dev/pytest-mock/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
IUSE=""
RDEPEND=">=dev-python/pytest-5[${PYTHON_USEDEP}]"
BDEPEND="
dev-python/setuptools_scm[${PYTHON_USEDEP}]"
distutils_enable_tests pytest
src_prepare() {
if has_version dev-python/mock; then
# test fails when standalone mock is installed
sed -e 's|^\(def \)\(test_standalone_mock(\)|\1_\2|' -i tests/test_pytest_mock.py || die
fi
distutils-r1_src_prepare
}
python_test() {
distutils_install_for_testing
pytest --assert=plain -vv || die "Tests fail with ${EPYTHON}"
}

@ -1,53 +0,0 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
DISTUTILS_USE_SETUPTOOLS=rdepend
PYTHON_COMPAT=( python{2_7,3_{6,7,8,9}} pypy3 )
inherit distutils-r1
DESCRIPTION="A goodie-bag of unix shell and environment tools for py.test"
HOMEPAGE="https://github.com/man-group/pytest-plugins https://pypi.org/project/pytest-shutil/"
SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
IUSE="test"
RESTRICT="!test? ( test )"
RDEPEND="
dev-python/pytest[${PYTHON_USEDEP}]
dev-python/six[${PYTHON_USEDEP}]
dev-python/contextlib2[${PYTHON_USEDEP}]
dev-python/execnet[${PYTHON_USEDEP}]
dev-python/path-py[${PYTHON_USEDEP}]
dev-python/mock[${PYTHON_USEDEP}]
dev-python/termcolor[${PYTHON_USEDEP}]
"
BDEPEND="
${RDEPEND}
dev-python/setuptools-git[${PYTHON_USEDEP}]
"
python_prepare_all() {
# keeps trying to install this in tests
sed -i 's:path.py::' setup.py || die
distutils-r1_python_prepare_all
}
python_test() {
# at this point let's not fix python2 stuff
if ! python_is_python3; then
ewarn "Tests broken on python2, not runninge tests for ${EPYTHON}"
return 0
fi
distutils_install_for_testing
esetup.py test || die "Tests failed under ${EPYTHON}"
}

@ -1,2 +1 @@
DIST pytest-virtualenv-1.2.11.tar.gz 9528 BLAKE2B 2ddcba76f89d207e8efaac8d59c6c1209fb9557fcfad586e1226b70d49ed8093aab602149335d23d497b0674e606d00d289fc291dd721aa7470f12ec221b5f61 SHA512 317ef8717f0ad4da6d38167f1f0dd65b6f1b3bd08bd1361fe6a27e6e422cd9fab62f3fac3848082bb24411505ecd41495fc1cbedb970d43945c8f6f8cfbbdf41
DIST pytest-virtualenv-1.7.0.tar.gz 15767 BLAKE2B 5ee65aff72c50c8facef682827f58a8053d658aa072f3a69d50d13335dda2da37ffc29af009b52a50349647a4a38e149ba1b9847115fc4b4c4f54f063198b14f SHA512 0463ebf44ae18ee50a60e421a22aaaf0e34f827ec8f21c8f0dc79cbdc253748f9d1e5b33e4f418b52f0d8fd45990e162bb6410686ebe9fdc02650c286901d474

@ -1,37 +0,0 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
inherit distutils-r1
DESCRIPTION="Virtualenv fixture for py.test"
HOMEPAGE="https://github.com/manahl/pytest-plugins https://pypi.org/project/pytest-virtualenv/"
SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
IUSE="test"
RDEPEND="
dev-python/pytest-fixture-config[${PYTHON_USEDEP}]
dev-python/pytest-shutil[${PYTHON_USEDEP}]
dev-python/pytest[${PYTHON_USEDEP}]
dev-python/virtualenv[${PYTHON_USEDEP}]
"
DEPEND="
dev-python/setuptools[${PYTHON_USEDEP}]
dev-python/setuptools-git[${PYTHON_USEDEP}]
test? (
${RDEPEND}
dev-python/mock[${PYTHON_USEDEP}]
)
"
RESTRICT="!test? ( test )"
python_test() {
esetup.py test
}

@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
RDEPEND="
dev-python/pytest-fixture-config[${PYTHON_USEDEP}]

@ -1,32 +0,0 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
DISTUTILS_USE_SETUPTOOLS=rdepend
PYTHON_COMPAT=( python{2_7,3_{6,7,8,9}} pypy3 )
inherit distutils-r1
DESCRIPTION="Virtualenv fixture for py.test"
HOMEPAGE="https://github.com/man-group/pytest-plugins https://pypi.org/project/pytest-virtualenv/"
SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
RDEPEND="
dev-python/pytest-fixture-config[${PYTHON_USEDEP}]
dev-python/pytest-shutil[${PYTHON_USEDEP}]
dev-python/pytest[${PYTHON_USEDEP}]
dev-python/virtualenv[${PYTHON_USEDEP}]
"
BDEPEND="
dev-python/setuptools-git[${PYTHON_USEDEP}]
test? (
dev-python/mock[${PYTHON_USEDEP}]
)
"
distutils_enable_tests setup.py

@ -1,3 +1,4 @@
DIST setuptools-44.1.0.zip 858569 BLAKE2B f59f154e121502a731e51294ccd293d60ffccadacf51e23b53bf7ceba38858948b86783238061136c827ac3373ea7ea8e6253d4bb53f3f1dd69284568ec65a68 SHA512 4dfb0f42d334b835758e865a26ecd1e725711fa2b9c38ddc273b8b3849fba04527bc97436d11ba1e98f1a42922aa0f0b9032e32998273c705fac6e10735eacbf
DIST setuptools-46.4.0.zip 865912 BLAKE2B 452d36132f5648c79c7e1616a93ff6a39ab2f64b2864ee397b4f57e7f72c47d418ff274f5decd35b0591b09800ad2a7cbd71c283550bd0e60a4d85744a57d4ec SHA512 31e58fd1d682089a45d23aa07c3c2c4c952ca016fa4c3416b2cba979d8b57369f80baef98ce857912e506e87d6cb456497a1ce1c75a0cdf1ee25d4e753b58726
DIST setuptools-49.1.1.zip 2173825 BLAKE2B 44a23a2bb8613b2dcf2368997c7d89ffbd957d7004c1872bbb64631955e5e8ed2f14a49d16fff4c384c42d56b486eb2ee07f2a3e3e72add97502f39309a17fee SHA512 d33c291edb64d015530e3bd66666a612539896018c5f6b6eff65719339ec75967c4f6200be36a60955f885ebc4cb86f9acd5f52d8fd2e1fb1e4919488a986603
DIST setuptools-49.2.0.zip 2174648 BLAKE2B 03d4d2f4df5e20a39bdf8940610e0e0ad02566bc594ba90f58f476a90882dff32f1126eb02a797027d126e45f0e3092d848214e4d28292850b5042a23cdfe6ea SHA512 72de34b2000fba981eb186b612a6b7ccec920c480966ebec4e178dc024db5628aeefde778c1bbd7dae9d38ae86aa9384a1b7d86f9c358429742daeba72ba9850

@ -27,15 +27,14 @@ RESTRICT="!test? ( test )"
BDEPEND="
app-arch/unzip
test? (
dev-python/mock[${PYTHON_USEDEP}]
dev-python/pip[${PYTHON_USEDEP}]
>=dev-python/pytest-3.7.0[${PYTHON_USEDEP}]
dev-python/pytest-fixture-config[${PYTHON_USEDEP}]
dev-python/pytest-virtualenv[${PYTHON_USEDEP}]
dev-python/wheel[${PYTHON_USEDEP}]
$(python_gen_cond_dep '
dev-python/futures[${PYTHON_USEDEP}]
' -2)
dev-python/mock[${PYTHON_USEDEP}]
dev-python/pip[${PYTHON_USEDEP}]
>=dev-python/pytest-3.7.0[${PYTHON_USEDEP}]
dev-python/pytest-fixture-config[${PYTHON_USEDEP}]
dev-python/pytest-virtualenv[${PYTHON_USEDEP}]
dev-python/wheel[${PYTHON_USEDEP}]
' -3)
)
"
PDEPEND="
@ -68,6 +67,11 @@ python_prepare_all() {
}
python_test() {
if ! python_is_python3; then
einfo "Tests are skipped on py2 to untangle deps"
return
fi
# test_easy_install raises a SandboxViolation due to ${HOME}/.pydistutils.cfg
# It tries to sandbox the test in a tempdir
HOME="${PWD}" pytest -vv ${PN} || die "Tests failed under ${EPYTHON}"

@ -21,15 +21,14 @@ RESTRICT="!test? ( test )"
BDEPEND="
app-arch/unzip
test? (
dev-python/mock[${PYTHON_USEDEP}]
dev-python/pip[${PYTHON_USEDEP}]
>=dev-python/pytest-3.7.0[${PYTHON_USEDEP}]
dev-python/pytest-fixture-config[${PYTHON_USEDEP}]
dev-python/pytest-virtualenv[${PYTHON_USEDEP}]
dev-python/wheel[${PYTHON_USEDEP}]
$(python_gen_cond_dep '
dev-python/futures[${PYTHON_USEDEP}]
' -2)
dev-python/mock[${PYTHON_USEDEP}]
dev-python/pip[${PYTHON_USEDEP}]
>=dev-python/pytest-3.7.0[${PYTHON_USEDEP}]
dev-python/pytest-fixture-config[${PYTHON_USEDEP}]
dev-python/pytest-virtualenv[${PYTHON_USEDEP}]
dev-python/wheel[${PYTHON_USEDEP}]
' -3)
)
"
PDEPEND="
@ -63,6 +62,11 @@ python_prepare_all() {
}
python_test() {
if ! python_is_python3; then
einfo "Tests are skipped on py2 to untangle deps"
return
fi
distutils_install_for_testing
# test_easy_install raises a SandboxViolation due to ${HOME}/.pydistutils.cfg
# It tries to sandbox the test in a tempdir

@ -0,0 +1,70 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
DISTUTILS_USE_SETUPTOOLS=no
PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 )
PYTHON_REQ_USE="xml(+)"
inherit distutils-r1
DESCRIPTION="Collection of extensions to Distutils"
HOMEPAGE="https://github.com/pypa/setuptools https://pypi.org/project/setuptools/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
LICENSE="MIT"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
BDEPEND="
app-arch/unzip
test? (
dev-python/mock[${PYTHON_USEDEP}]
dev-python/pip[${PYTHON_USEDEP}]
>=dev-python/pytest-3.7.0[${PYTHON_USEDEP}]
dev-python/pytest-fixture-config[${PYTHON_USEDEP}]
dev-python/pytest-virtualenv[${PYTHON_USEDEP}]
dev-python/wheel[${PYTHON_USEDEP}]
)
"
PDEPEND="
>=dev-python/certifi-2016.9.26[${PYTHON_USEDEP}]"
# Force in-source build because build system modifies sources.
DISTUTILS_IN_SOURCE_BUILD=1
DOCS=( {CHANGES,README}.rst docs/{easy_install.txt,pkg_resources.txt,setuptools.txt} )
python_prepare_all() {
# disable tests requiring a network connection
rm setuptools/tests/test_packageindex.py || die
# don't run integration tests
rm setuptools/tests/test_integration.py || die
# xpass-es for me on py3
#sed -e '/xfail.*710/s:(:(six.PY2, :' \
# -i setuptools/tests/test_archive_util.py || die
# avoid pointless dep on flake8
sed -i -e 's:--flake8::' -e 's:--cov::' pytest.ini || die
# disable the code disabling non-existing coverage plugin
sed -i -e 's:cov = .*:return:' conftest.py || die
distutils-r1_python_prepare_all
}
python_test() {
distutils_install_for_testing
# test_easy_install raises a SandboxViolation due to ${HOME}/.pydistutils.cfg
# It tries to sandbox the test in a tempdir
HOME="${PWD}" pytest -vv ${PN} || die "Tests failed under ${EPYTHON}"
}
python_install() {
export DISTRIBUTE_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT=1
distutils-r1_python_install
}

@ -0,0 +1,29 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
PYTHON_COMPAT=( python3_{6..9} )
inherit distutils-r1 eutils
DESCRIPTION="Module for creating simple ASCII tables"
HOMEPAGE="https://github.com/foutaise/texttable https://pypi.org/project/texttable/"
SRC_URI="https://github.com/foutaise/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
KEYWORDS="~amd64 ~x86"
RDEPEND="dev-python/wcwidth[${PYTHON_USEDEP}]"
distutils_enable_tests pytest
python_test() {
pytest -vv tests.py || die
}
pkg_postinst() {
elog "Optional features: "
optfeature "better wrapping of CJK text" dev-python/cjkwrap
}

Binary file not shown.

@ -1 +0,0 @@
DIST rack-mount-0.8.3.tgz 33944 BLAKE2B 7763b55aaff25168924c9e237b762231e346b757b56919e454db52485cfa015989a03c93b9d1f0ae0802ab35773d646d70bc87e5d02307052c3c2c9ffa295d60 SHA512 5f1d10b951c967bc4c36a81b5c7dae5c5ec8d5253ee804fa1e1b4446c962fa0882d4c59773bca9373d5eb37a18646aff0a2dff2b1636d3d9126cae0f1e10a638

@ -1,26 +0,0 @@
From 42e7ae47c2dac2d98272ac99239e40bd59398891 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=ADt=20Ondruch?= <v.ondruch@tiscali.cz>
Date: Tue, 9 Apr 2013 11:12:02 +0300
Subject: [PATCH] Fix Ruby 2.0.0 compatibility
#respond_to? now exclude protected methods.
---
lib/rack/mount/multimap.rb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lib/rack/mount/multimap.rb b/lib/rack/mount/multimap.rb
index 6b773e2..b88630b 100644
--- a/lib/rack/mount/multimap.rb
+++ b/lib/rack/mount/multimap.rb
@@ -125,7 +125,7 @@ def update_container(key)
end
def iterate_over_container(container)
- if container.respond_to?(:each_container_with_default)
+ if container.respond_to?(:each_container_with_default, true)
container.each_container_with_default do |value|
yield value
end
--
1.9.3

@ -1,15 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>ruby@gentoo.org</email>
<name>Gentoo Ruby Project</name>
</maintainer>
<longdescription>
Rack provides a common API for connecting web frameworks, web servers and layers
of software inbetween.
</longdescription>
<upstream>
<remote-id type="github">josh/rack-mount</remote-id>
</upstream>
</pkgmetadata>

@ -1,29 +0,0 @@
# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
USE_RUBY="ruby23 ruby24 ruby25 ruby26"
RUBY_FAKEGEM_TASK_DOC=""
RUBY_FAKEGEM_EXTRADOC="README.rdoc"
inherit versionator ruby-fakegem
DESCRIPTION="A stackable dynamic tree based Rack router"
HOMEPAGE="https://github.com/josh/rack-mount"
SRC_URI="https://github.com/josh/rack-mount/tarball/v${PV} -> ${P}.tgz"
RUBY_S="josh-${PN}-*"
LICENSE="MIT"
SLOT="$(get_version_component_range 1-2)"
KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
ruby_add_rdepend ">=dev-ruby/rack-1.0.0:*"
RUBY_PATCHES=( ${PN}-fix-ruby20.patch )
all_ruby_prepare() {
# Avoid fragile test depending on hash ordering.
sed -i -e '/foo=1&bar=2/ s:^:#:' test/test_utils.rb || die
}

Binary file not shown.

@ -1 +0,0 @@
DIST cdiff-1.0.tar.gz 33599 BLAKE2B 98e6e8689329bfbdc718e7f6bf3cfb6c6ff92de0b27a44f62f24e35710cf0391c6127833b7f8302aa31d9420147791fdc2861aa95acf5719ce250f7af4d8893f SHA512 74a41bdf9c0ffef5baff775dd32027d401547bdc8f40eb633e11107c74d0e9b31746cedbeffc4a3732ff9abe03a101aa3a7a509d3a0e0e080589c6f18bcb8cfe

@ -1,31 +0,0 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
PYTHON_COMPAT=( python3_6 )
inherit distutils-r1
DESCRIPTION="Colored, side-by-side diff terminal viewer"
HOMEPAGE="https://github.com/ymattw/cdiff"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
DEPEND="
dev-python/setuptools[${PYTHON_USEDEP}]
sys-apps/less"
RDEPEND="${DEPEND}"
DOCS=( CHANGES.rst README.rst )
RESTRICT="test"
python_test() {
${PYTHON} tests/test_cdiff.py || die "Unit tests failed."
./tests/regression.sh || die "Regression tests failed."
}

@ -1,21 +0,0 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
DESCRIPTION="Colored, side-by-side diff terminal viewer"
HOMEPAGE="https://github.com/ymattw/cdiff"
SRC_URI=""
LICENSE="BSD"
SLOT="0"
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
DEPEND=""
RDEPEND="dev-util/ydiff"
S="${WORKDIR}"
src_install() {
dosym ydiff /usr/bin/cdiff
}

@ -1,32 +0,0 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="5"
PYTHON_COMPAT=( python3_6 )
inherit distutils-r1 git-r3
DESCRIPTION="Colored, side-by-side diff terminal viewer"
HOMEPAGE="https://github.com/ymattw/cdiff"
EGIT_REPO_URI="https://github.com/ymattw/cdiff.git"
LICENSE="BSD"
SLOT="0"
KEYWORDS=""
IUSE=""
DEPEND="
dev-python/setuptools[${PYTHON_USEDEP}]
sys-apps/less"
RDEPEND="${DEPEND}"
PATCHES=( "${FILESDIR}"/${PN}-0.9.2-disable-unimportant-failing-test.patch )
DOCS=( CHANGES.rst README.rst )
python_test() {
${PYTHON} tests/test_cdiff.py || die "Unit tests failed."
./tests/regression.sh || die "Regression tests failed."
}

@ -1,11 +0,0 @@
--- a/tests/test_cdiff.py 2013-03-24 15:08:00.000000000 +0100
+++ b/tests/test_cdiff.py 2013-06-23 01:17:20.560520188 +0200
@@ -737,7 +737,7 @@
os.chdir(self._non_ws)
ret = cdiff.main()
os.chdir(self._cwd)
- self.assertNotEqual(ret, 0)
+# self.assertNotEqual(ret, 0)
def test_read_log(self):
sys.argv = [sys.argv[0], '--log']

@ -1,9 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
<upstream>
<remote-id type="pypi">cdiff</remote-id>
<remote-id type="github">ymattw/cdiff</remote-id>
</upstream>
</pkgmetadata>

Binary file not shown.

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

Loading…
Cancel
Save