root
5 years ago
parent
a01a7a8c32
commit
0d509c6385
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -1,216 +0,0 @@
|
||||
From 947ef7a44e94989f324e0d533499454d540fdef9 Mon Sep 17 00:00:00 2001
|
||||
Message-Id: <947ef7a44e94989f324e0d533499454d540fdef9.1547196492.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 cd386297ed..52a63885d6 100644
|
||||
--- a/src/Makefile.am
|
||||
+++ b/src/Makefile.am
|
||||
@@ -756,23 +756,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_DATA) $(srcdir)/$$f.sysconf \
|
||||
- $(DESTDIR)$(sysconfdir)/sysconfig/$$tgt; \
|
||||
- done
|
||||
-
|
||||
-uninstall-sysconfig:
|
||||
- for f in $(SYSCONF_FILES:%.sysconf=%) ; \
|
||||
- do \
|
||||
- tgt=`basename $$f`; \
|
||||
- rm -f $(DESTDIR)$(sysconfdir)/sysconfig/$$tgt; \
|
||||
- done
|
||||
- rmdir $(DESTDIR)$(sysconfdir)/sysconfig || :
|
||||
-
|
||||
SYSVINIT_FILES_IN += \
|
||||
locking/virtlockd.init.in \
|
||||
$(NULL)
|
||||
@@ -816,14 +799,14 @@ if WITH_LIBVIRTD
|
||||
if LIBVIRT_INIT_SCRIPT_RED_HAT
|
||||
initdir = $(sysconfdir)/rc.d/init.d
|
||||
|
||||
-install-init:: $(SYSVINIT_FILES) install-sysconfig
|
||||
+install-init:: $(SYSVINIT_FILES)
|
||||
$(MKDIR_P) $(DESTDIR)$(initdir)
|
||||
for f in $(SYSVINIT_FILES:%.init=%) ; \
|
||||
do \
|
||||
$(INSTALL_SCRIPT) $$f.init $(DESTDIR)$(initdir)/$$f; \
|
||||
done
|
||||
|
||||
-uninstall-init:: uninstall-sysconfig
|
||||
+uninstall-init::
|
||||
rm -f $(SYSVINIT_FILES:%.init=$(DESTDIR)$(initdir)/%)
|
||||
rmdir $(DESTDIR)$(initdir) || :
|
||||
|
||||
@@ -862,14 +845,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) || :
|
||||
|
||||
@@ -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 3c9d587032..2449b201d9 100644
|
||||
--- a/src/locking/virtlockd.service.in
|
||||
+++ b/src/locking/virtlockd.service.in
|
||||
@@ -7,8 +7,7 @@ Documentation=man:virtlockd(8)
|
||||
Documentation=https://libvirt.org
|
||||
|
||||
[Service]
|
||||
-EnvironmentFile=-/etc/sysconfig/virtlockd
|
||||
-ExecStart=@sbindir@/virtlockd $VIRTLOCKD_ARGS
|
||||
+ExecStart=@sbindir@/virtlockd
|
||||
ExecReload=/bin/kill -USR1 $MAINPID
|
||||
# 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 3d9ae36150..43736191d5 100644
|
||||
--- a/src/logging/virtlogd.service.in
|
||||
+++ b/src/logging/virtlogd.service.in
|
||||
@@ -7,8 +7,7 @@ Documentation=man:virtlogd(8)
|
||||
Documentation=https://libvirt.org
|
||||
|
||||
[Service]
|
||||
-EnvironmentFile=-/etc/sysconfig/virtlogd
|
||||
-ExecStart=@sbindir@/virtlogd $VIRTLOGD_ARGS
|
||||
+ExecStart=@sbindir@/virtlogd
|
||||
ExecReload=/bin/kill -USR1 $MAINPID
|
||||
# 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 7f689e08a8..239beeced9 100644
|
||||
--- a/src/remote/libvirtd.service.in
|
||||
+++ b/src/remote/libvirtd.service.in
|
||||
@@ -22,8 +22,7 @@ Documentation=https://libvirt.org
|
||||
|
||||
[Service]
|
||||
Type=notify
|
||||
-EnvironmentFile=-/etc/sysconfig/libvirtd
|
||||
-ExecStart=@sbindir@/libvirtd $LIBVIRTD_ARGS
|
||||
+ExecStart=@sbindir@/libvirtd
|
||||
ExecReload=/bin/kill -HUP $MAINPID
|
||||
KillMode=process
|
||||
Restart=on-failure
|
||||
diff --git a/tools/Makefile.am b/tools/Makefile.am
|
||||
index 613c9a77f0..224b511074 100644
|
||||
--- a/tools/Makefile.am
|
||||
+++ b/tools/Makefile.am
|
||||
@@ -339,15 +339,6 @@ install-data-local: install-init install-systemd install-nss \
|
||||
uninstall-local: uninstall-init uninstall-systemd uninstall-nss \
|
||||
uninstall-bash-completion
|
||||
|
||||
-install-sysconfig:
|
||||
- $(MKDIR_P) $(DESTDIR)$(sysconfdir)/sysconfig
|
||||
- $(INSTALL_DATA) $(srcdir)/libvirt-guests.sysconf \
|
||||
- $(DESTDIR)$(sysconfdir)/sysconfig/libvirt-guests
|
||||
-
|
||||
-uninstall-sysconfig:
|
||||
- rm -f $(DESTDIR)$(sysconfdir)/sysconfig/libvirt-guests
|
||||
- rmdir $(DESTDIR)$(sysconfdir)/sysconfig ||:
|
||||
-
|
||||
EXTRA_DIST += libvirt-guests.sh.in libvirt-guests.init.in
|
||||
|
||||
install-initscript: libvirt-guests.init
|
||||
@@ -362,8 +353,8 @@ uninstall-initscript:
|
||||
|
||||
if LIBVIRT_INIT_SCRIPT_RED_HAT
|
||||
BUILT_SOURCES += libvirt-guests.init
|
||||
-install-init: install-sysconfig install-initscript
|
||||
-uninstall-init: uninstall-sysconfig uninstall-initscript
|
||||
+install-init: install-initscript
|
||||
+uninstall-init: uninstall-initscript
|
||||
else ! LIBVIRT_INIT_SCRIPT_RED_HAT
|
||||
install-init:
|
||||
uninstall-init:
|
||||
@@ -394,12 +385,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 491ca62138..f0f417bffb 100644
|
||||
--- a/tools/libvirt-guests.service.in
|
||||
+++ b/tools/libvirt-guests.service.in
|
||||
@@ -10,7 +10,7 @@ Documentation=man:libvirtd(8)
|
||||
Documentation=https://libvirt.org
|
||||
|
||||
[Service]
|
||||
-EnvironmentFile=-/etc/sysconfig/libvirt-guests
|
||||
+EnvironmentFile=-/etc/libvirt/libvirt-guests.conf
|
||||
# Hack just call traditional service until we factor
|
||||
# out the code
|
||||
ExecStart=@libexecdir@/libvirt-guests.sh start
|
||||
diff --git a/tools/libvirt-guests.sysconf b/tools/libvirt-guests.sysconf
|
||||
index 669b046507..45b0b9ea46 100644
|
||||
--- a/tools/libvirt-guests.sysconf
|
||||
+++ b/tools/libvirt-guests.sysconf
|
||||
@@ -1,3 +1,10 @@
|
||||
+#
|
||||
+# Warning: This configuration file is only sourced by the systemd
|
||||
+# libvirt-guests.service unit. The coresponding openrc facility is in
|
||||
+# /etc/init.d/libvirtd and /etc/conf.d/libvirtd
|
||||
+#
|
||||
+
|
||||
+
|
||||
# URIs to check for running guests
|
||||
# example: URIS='default xen:///system vbox+tcp://host/system lxc:///system'
|
||||
#URIS=default
|
||||
--
|
||||
2.19.2
|
||||
|
||||
@ -1,196 +0,0 @@
|
||||
diff --git a/src/Makefile.am b/src/Makefile.am
|
||||
index 8c8dfe3..25ced3a 100644
|
||||
--- a/src/Makefile.am
|
||||
+++ b/src/Makefile.am
|
||||
@@ -756,23 +756,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_DATA) $(srcdir)/$$f.sysconf \
|
||||
- $(DESTDIR)$(sysconfdir)/sysconfig/$$tgt; \
|
||||
- done
|
||||
-
|
||||
-uninstall-sysconfig:
|
||||
- for f in $(SYSCONF_FILES:%.sysconf=%) ; \
|
||||
- do \
|
||||
- tgt=`basename $$f`; \
|
||||
- rm -f $(DESTDIR)$(sysconfdir)/sysconfig/$$tgt; \
|
||||
- done
|
||||
- rmdir $(DESTDIR)$(sysconfdir)/sysconfig || :
|
||||
-
|
||||
SYSVINIT_FILES_IN += \
|
||||
locking/virtlockd.init.in \
|
||||
$(NULL)
|
||||
@@ -816,14 +799,14 @@ if WITH_LIBVIRTD
|
||||
if LIBVIRT_INIT_SCRIPT_RED_HAT
|
||||
initdir = $(sysconfdir)/rc.d/init.d
|
||||
|
||||
-install-init: $(SYSVINIT_FILES) install-sysconfig
|
||||
+install-init: $(SYSVINIT_FILES)
|
||||
$(MKDIR_P) $(DESTDIR)$(initdir)
|
||||
for f in $(SYSVINIT_FILES:%.init=%) ; \
|
||||
do \
|
||||
$(INSTALL_SCRIPT) $$f.init $(DESTDIR)$(initdir)/$$f; \
|
||||
done
|
||||
|
||||
-uninstall-init: uninstall-sysconfig
|
||||
+uninstall-init:
|
||||
rm -f $(SYSVINIT_FILES:%.init=$(DESTDIR)$(initdir)/%)
|
||||
rmdir $(DESTDIR)$(initdir) || :
|
||||
|
||||
@@ -862,14 +845,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) || :
|
||||
|
||||
@@ -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
|
||||
--- a/src/locking/virtlockd.service.in
|
||||
+++ b/src/locking/virtlockd.service.in
|
||||
@@ -7,8 +7,7 @@ Documentation=man:virtlockd(8)
|
||||
Documentation=https://libvirt.org
|
||||
|
||||
[Service]
|
||||
-EnvironmentFile=-/etc/sysconfig/virtlockd
|
||||
-ExecStart=@sbindir@/virtlockd $VIRTLOCKD_ARGS
|
||||
+ExecStart=@sbindir@/virtlockd
|
||||
ExecReload=/bin/kill -USR1 $MAINPID
|
||||
# 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
|
||||
--- a/src/logging/virtlogd.service.in
|
||||
+++ b/src/logging/virtlogd.service.in
|
||||
@@ -7,8 +7,7 @@ Documentation=man:virtlogd(8)
|
||||
Documentation=https://libvirt.org
|
||||
|
||||
[Service]
|
||||
-EnvironmentFile=-/etc/sysconfig/virtlogd
|
||||
-ExecStart=@sbindir@/virtlogd $VIRTLOGD_ARGS
|
||||
+ExecStart=@sbindir@/virtlogd
|
||||
ExecReload=/bin/kill -USR1 $MAINPID
|
||||
# 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 7f689e0..239beec 100644
|
||||
--- a/src/remote/libvirtd.service.in
|
||||
+++ b/src/remote/libvirtd.service.in
|
||||
@@ -22,8 +22,7 @@ Documentation=https://libvirt.org
|
||||
|
||||
[Service]
|
||||
Type=notify
|
||||
-EnvironmentFile=-/etc/sysconfig/libvirtd
|
||||
-ExecStart=@sbindir@/libvirtd $LIBVIRTD_ARGS
|
||||
+ExecStart=@sbindir@/libvirtd
|
||||
ExecReload=/bin/kill -HUP $MAINPID
|
||||
KillMode=process
|
||||
Restart=on-failure
|
||||
diff --git a/tools/Makefile.am b/tools/Makefile.am
|
||||
index f2f84f7..1188d3c 100644
|
||||
--- a/tools/Makefile.am
|
||||
+++ b/tools/Makefile.am
|
||||
@@ -339,15 +339,6 @@ install-data-local: install-init install-systemd install-nss \
|
||||
uninstall-local: uninstall-init uninstall-systemd uninstall-nss \
|
||||
uninstall-bash-completion
|
||||
|
||||
-install-sysconfig:
|
||||
- $(MKDIR_P) $(DESTDIR)$(sysconfdir)/sysconfig
|
||||
- $(INSTALL_DATA) $(srcdir)/libvirt-guests.sysconf \
|
||||
- $(DESTDIR)$(sysconfdir)/sysconfig/libvirt-guests
|
||||
-
|
||||
-uninstall-sysconfig:
|
||||
- rm -f $(DESTDIR)$(sysconfdir)/sysconfig/libvirt-guests
|
||||
- rmdir $(DESTDIR)$(sysconfdir)/sysconfig ||:
|
||||
-
|
||||
EXTRA_DIST += libvirt-guests.sh.in libvirt-guests.init.in
|
||||
|
||||
install-initscript: libvirt-guests.init
|
||||
@@ -362,8 +353,8 @@ uninstall-initscript:
|
||||
|
||||
if LIBVIRT_INIT_SCRIPT_RED_HAT
|
||||
BUILT_SOURCES += libvirt-guests.init
|
||||
-install-init: install-sysconfig install-initscript
|
||||
-uninstall-init: uninstall-sysconfig uninstall-initscript
|
||||
+install-init: install-initscript
|
||||
+uninstall-init: uninstall-initscript
|
||||
else ! LIBVIRT_INIT_SCRIPT_RED_HAT
|
||||
install-init:
|
||||
uninstall-init:
|
||||
@@ -394,12 +385,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
|
||||
--- a/tools/libvirt-guests.service.in
|
||||
+++ b/tools/libvirt-guests.service.in
|
||||
@@ -10,7 +10,7 @@ Documentation=man:libvirtd(8)
|
||||
Documentation=https://libvirt.org
|
||||
|
||||
[Service]
|
||||
-EnvironmentFile=-/etc/sysconfig/libvirt-guests
|
||||
+EnvironmentFile=-/etc/libvirt/libvirt-guests.conf
|
||||
# Hack just call traditional service until we factor
|
||||
# out the code
|
||||
ExecStart=@libexecdir@/libvirt-guests.sh start
|
||||
diff --git a/tools/libvirt-guests.sysconf b/tools/libvirt-guests.sysconf
|
||||
index 669b046..45b0b9e 100644
|
||||
--- a/tools/libvirt-guests.sysconf
|
||||
+++ b/tools/libvirt-guests.sysconf
|
||||
@@ -1,3 +1,10 @@
|
||||
+#
|
||||
+# Warning: This configuration file is only sourced by the systemd
|
||||
+# libvirt-guests.service unit. The coresponding openrc facility is in
|
||||
+# /etc/init.d/libvirtd and /etc/conf.d/libvirtd
|
||||
+#
|
||||
+
|
||||
+
|
||||
# URIs to check for running guests
|
||||
# example: URIS='default xen:///system vbox+tcp://host/system lxc:///system'
|
||||
#URIS=default
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -1,168 +0,0 @@
|
||||
#!/bin/sh
|
||||
# ----------------------------------------------------------------------------
|
||||
# Copyright 2001-2004 The Apache Software Foundation.
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
# You may obtain a copy of the License at
|
||||
#
|
||||
# http://www.apache.org/licenses/LICENSE-2.0
|
||||
#
|
||||
# Unless required by applicable law or agreed to in writing, software
|
||||
# distributed under the License is distributed on an "AS IS" BASIS,
|
||||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
# ----------------------------------------------------------------------------
|
||||
|
||||
# Copyright (c) 2001-2002 The Apache Software Foundation. All rights
|
||||
# reserved.
|
||||
|
||||
FOREHEAD_VERSION=1.0-beta-5
|
||||
|
||||
if [ -z "$MAVEN_OPTS" ] ; then
|
||||
MAVEN_OPTS="-Xmx256m"
|
||||
fi
|
||||
|
||||
if [ -f "$HOME/.mavenrc" ] ; then
|
||||
. "$HOME/.mavenrc"
|
||||
fi
|
||||
|
||||
# OS specific support. $var _must_ be set to either true or false.
|
||||
cygwin=false;
|
||||
darwin=false;
|
||||
case "`uname`" in
|
||||
CYGWIN*) cygwin=true ;;
|
||||
Darwin*) darwin=true
|
||||
if [ -z "$JAVA_VERSION" ] ; then
|
||||
JAVA_VERSION="CurrentJDK"
|
||||
else
|
||||
echo "Using Java version: $JAVA_VERSION"
|
||||
fi
|
||||
if [ -z "$JAVA_HOME" ] ; then
|
||||
JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Versions/${JAVA_VERSION}/Home
|
||||
fi
|
||||
;;
|
||||
esac
|
||||
|
||||
# try a couple ways to find MAVEN_HOME
|
||||
|
||||
if [ -z ${MAVEN_HOME} ] && [ -d /opt/maven ] ; then
|
||||
MAVEN_HOME=/opt/maven
|
||||
fi
|
||||
|
||||
if [ -z ${MAVEN_HOME} ] && [ -d "$HOME/maven" ] ; then
|
||||
MAVEN_HOME="$HOME/maven"
|
||||
fi
|
||||
|
||||
# try to load from env.d file
|
||||
if [ -z ${MAVEN_HOME} ] && [ -f /etc/env.d/25maven ]; then
|
||||
MAVEN_HOME=$(source /etc/env.d/25maven; echo ${MAVEN_HOME})
|
||||
fi
|
||||
|
||||
# try to figure it out from how this script was invoked
|
||||
if [ -z ${MAVEN_HOME} ]; then
|
||||
## resolve links - $0 may be a link to maven's home
|
||||
PRG=$0
|
||||
progname=`basename $0`
|
||||
saveddir=`pwd`
|
||||
|
||||
# need this for relative symlinks
|
||||
cd `dirname $PRG`
|
||||
|
||||
while [ -h "$PRG" ] ; do
|
||||
ls=`ls -ld "$PRG"`
|
||||
link=`expr "$ls" : '.*-> \(.*\)$'`
|
||||
if expr "$link" : '.*/.*' > /dev/null; then
|
||||
PRG="$link"
|
||||
else
|
||||
PRG="`dirname $PRG`/$link"
|
||||
fi
|
||||
done
|
||||
|
||||
MAVEN_HOME=`dirname "$PRG"`/..
|
||||
|
||||
# make it fully qualified
|
||||
MAVEN_HOME=`cd "$MAVEN_HOME" && pwd`
|
||||
|
||||
cd $saveddir
|
||||
fi
|
||||
|
||||
[ -z "${MAVEN_HOME}" ] && exit "Was unable to determine MAVEN_HOME"
|
||||
|
||||
# For Cygwin, ensure paths are in UNIX format before anything is touched
|
||||
if $cygwin ; then
|
||||
[ -n "$MAVEN_HOME" ] &&
|
||||
MAVEN_HOME=`cygpath --unix "$MAVEN_HOME"`
|
||||
[ -n "$MAVEN_HOME_LOCAL" ] &&
|
||||
MAVEN_HOME_LOCAL=`cygpath --unix "$MAVEN_HOME_LOCAL"`
|
||||
[ -n "$JAVA_HOME" ] &&
|
||||
JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
|
||||
[ -n "$CLASSPATH" ] &&
|
||||
CLASSPATH=`cygpath --path --unix "$CLASSPATH"`
|
||||
fi
|
||||
|
||||
if [ -z "$JAVACMD" ] ; then
|
||||
if [ -n "$JAVA_HOME" ] ; then
|
||||
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
|
||||
# IBM's JDK on AIX uses strange locations for the executables
|
||||
JAVACMD="$JAVA_HOME/jre/sh/java"
|
||||
else
|
||||
JAVACMD="$JAVA_HOME/bin/java"
|
||||
fi
|
||||
else
|
||||
JAVACMD=java
|
||||
fi
|
||||
fi
|
||||
|
||||
if [ ! -x "$JAVACMD" ] ; then
|
||||
echo "Error: JAVA_HOME is not defined correctly."
|
||||
echo " We cannot execute $JAVACMD"
|
||||
exit
|
||||
fi
|
||||
|
||||
if [ -z "$JAVA_HOME" ] ; then
|
||||
echo "Warning: JAVA_HOME environment variable is not set."
|
||||
echo " If build fails because sun.* classes could not be found"
|
||||
echo " you will need to set the JAVA_HOME environment variable"
|
||||
echo " to the installation directory of java."
|
||||
fi
|
||||
|
||||
MAVEN_ENDORSED="${JAVA_HOME}/lib/endorsed:${MAVEN_HOME}/lib/endorsed"
|
||||
|
||||
# For Cygwin, switch paths to Windows format before running java
|
||||
if $cygwin; then
|
||||
[ -n "$MAVEN_HOME" ] &&
|
||||
MAVEN_HOME=`cygpath --path --windows "$MAVEN_HOME"`
|
||||
[ -n "$MAVEN_HOME_LOCAL" ] &&
|
||||
MAVEN_HOME_LOCAL=`cygpath --path --windows "$MAVEN_HOME_LOCAL"`
|
||||
[ -n "$JAVA_HOME" ] &&
|
||||
JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"`
|
||||
[ -n "$HOME" ] &&
|
||||
HOME=`cygpath --path --windows "$HOME"`
|
||||
[ -n "$MAVEN_ENDORSED" ] &&
|
||||
MAVEN_ENDORSED=`cygpath --path --windows "$MAVEN_ENDORSED"`
|
||||
fi
|
||||
|
||||
# For Darwin, use classes.jar for TOOLS_JAR
|
||||
TOOLS_JAR="${JAVA_HOME}/lib/tools.jar"
|
||||
if $darwin; then
|
||||
TOOLS_JAR="/System/Library/Frameworks/JavaVM.framework/Versions/${JAVA_VERSION}/Classes/classes.jar"
|
||||
fi
|
||||
|
||||
MAIN_CLASS=com.werken.forehead.Forehead
|
||||
if [ -n "$MAVEN_HOME_LOCAL" ]; then
|
||||
MAVEN_OPTS="$MAVEN_OPTS -Dmaven.home.local=${MAVEN_HOME_LOCAL}"
|
||||
fi
|
||||
|
||||
"$JAVACMD" \
|
||||
$MAVEN_OPTS \
|
||||
-Djavax.xml.parsers.SAXParserFactory=org.apache.xerces.jaxp.SAXParserFactoryImpl \
|
||||
-Djavax.xml.parsers.DocumentBuilderFactory=org.apache.xerces.jaxp.DocumentBuilderFactoryImpl \
|
||||
"-Djava.endorsed.dirs=${MAVEN_ENDORSED}" \
|
||||
-classpath "${MAVEN_HOME}/lib/forehead-${FOREHEAD_VERSION}.jar" \
|
||||
"-Dforehead.conf.file=${MAVEN_HOME}/bin/forehead.conf" \
|
||||
"-Dtools.jar=$TOOLS_JAR" \
|
||||
"-Dmaven.home=${MAVEN_HOME}" \
|
||||
$MAIN_CLASS "$@"
|
||||
|
||||
Binary file not shown.
@ -1,17 +0,0 @@
|
||||
Fix ocasional failure with parallel install
|
||||
Gentoo bug: https://bugs.gentoo.org/show_bug.cgi?id=322965
|
||||
R bug: https://bugs.r-project.org/bugzilla3/show_bug.cgi?id=14505
|
||||
|
||||
Patch by Sebastien Fabbro
|
||||
|
||||
--- src/include/Makefile.in.orig 2010-06-15 18:18:54.000000000 +0000
|
||||
+++ src/include/Makefile.in 2010-06-15 18:19:48.000000000 +0000
|
||||
@@ -81,7 +81,7 @@
|
||||
Rmath.h0: $(srcdir)/Rmath.h0.in $(top_builddir)/config.status
|
||||
@cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
|
||||
|
||||
-install: installdirs install-intl-@USE_INCLUDED_LIBINTL@
|
||||
+install: $(OBJ_HEADERS) installdirs install-intl-@USE_INCLUDED_LIBINTL@
|
||||
@for d in $(SUBDIRS); do \
|
||||
(cd $${d} && $(MAKE) $@) || exit 1; \
|
||||
done
|
||||
@ -1,20 +0,0 @@
|
||||
Update for zlib header changes for zlib > 1.2.5
|
||||
|
||||
Gentoo bug: https://bugs.gentoo.org/show_bug.cgi?id=383431
|
||||
R bug: https://bugs.r-project.org/bugzilla3/show_bug.cgi?id=14951
|
||||
|
||||
Patch by Michael Schreckenbauer
|
||||
|
||||
--- src/main/unzip.h.orig 2011-09-24 19:35:53.000000000 -0700
|
||||
+++ src/main/unzip.h 2011-09-24 19:37:06.000000000 -0700
|
||||
@@ -58,6 +58,10 @@
|
||||
#define ZLIB_FILEFUNC_SEEK_END (2)
|
||||
#define ZLIB_FILEFUNC_SEEK_SET (0)
|
||||
|
||||
+#ifndef OF
|
||||
+#define OF(x) x
|
||||
+#endif
|
||||
+
|
||||
#define ZLIB_FILEFUNC_MODE_READ (1)
|
||||
#define ZLIB_FILEFUNC_MODE_WRITE (2)
|
||||
#define ZLIB_FILEFUNC_MODE_READWRITEFILTER (3)
|
||||
@ -1,28 +0,0 @@
|
||||
Link with libm to fix unresolved symbols when linked with as-needed
|
||||
and add a soname to the standalone math library
|
||||
R bug: https://bugs.r-project.org/bugzilla3/show_bug.cgi?id=14953
|
||||
|
||||
Patch by Sebastien Fabbro
|
||||
Adapted to R-3.0.0 by Denis Dupeyron
|
||||
|
||||
--- src/nmath/standalone/Makefile.in.orig 2013-04-04 14:39:15.777544946 -0600
|
||||
+++ src/nmath/standalone/Makefile.in 2013-04-04 14:40:51.256153179 -0600
|
||||
@@ -64,7 +64,8 @@
|
||||
Rexeclibdir_LTLIBRARIES = $(libRmath_la)
|
||||
libRmath_la_SOURCES = $(SOURCES)
|
||||
libRmath_la_OBJECTS = $(OBJECTS:.o=.lo)
|
||||
-libRmath_la_LDFLAGS =
|
||||
+libRmath_la_LDFLAGS = -Wl,-soname=libRmath.so
|
||||
+libRmath_la_LIBADD = $(LIBM)
|
||||
|
||||
CLEANFILES = Makedeps *.d *.o *.lo test $(SOURCES)
|
||||
DISTCLEANFILES = Makefile $(Rexeclibdir_LIBRARIES) $(Rexeclibdir_LTLIBRARIES)
|
||||
@@ -117,7 +118,7 @@
|
||||
|
||||
## under peculiar circumstances, $(LIBM) here helps.
|
||||
$(libRmath_la): $(libRmath_la_OBJECTS)
|
||||
- $(DYLIB_LINK) -o $@ $(libRmath_la_LDFLAGS) $(libRmath_la_OBJECTS) $(LIBM)
|
||||
+ $(DYLIB_LINK) $(libRmath_la_LDFLAGS) $(libRmath_la_OBJECTS) $(libRmath_la_LIBADD) -o $@
|
||||
|
||||
test: $(srcdir)/test.c
|
||||
$(CC) -o $@ $(ALL_CPPFLAGS) $(ALL_CFLAGS) $(srcdir)/test.c \
|
||||
@ -1,20 +0,0 @@
|
||||
Index: R.m4
|
||||
===================================================================
|
||||
--- m4/R.m4 (revision 71152)
|
||||
+++ m4/R.m4 (revision 71889)
|
||||
@@ -3105,10 +3105,11 @@
|
||||
#include <string.h>
|
||||
#include <zlib.h>
|
||||
int main() {
|
||||
-#ifdef ZLIB_VERSION
|
||||
-/* Work around Debian bug: it uses 1.2.3.4 even though there was no such
|
||||
- version on the master site zlib.net */
|
||||
- exit(strncmp(ZLIB_VERSION, "1.2.5", 5) < 0);
|
||||
+#ifdef ZLIB_VERNUM
|
||||
+ if (ZLIB_VERNUM < 0x1250) {
|
||||
+ exit(1);
|
||||
+ }
|
||||
+ exit(0);
|
||||
#else
|
||||
exit(1);
|
||||
#endif
|
||||
Binary file not shown.
@ -1,60 +0,0 @@
|
||||
From f8fbbc9733035c96ffb085726bf24d15502e1095 Mon Sep 17 00:00:00 2001
|
||||
From: Mike Frysinger <vapier@gentoo.org>
|
||||
Date: Sun, 21 Apr 2019 13:02:16 +0200
|
||||
Subject: [PATCH 1/2] fix up install paths
|
||||
|
||||
This is similar to the Fedora patch, but this uses more common conventions
|
||||
like "DESTDIR" instead of "destdir".
|
||||
|
||||
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
|
||||
---
|
||||
Makefile | 2 +-
|
||||
src/Makefile | 11 ++++++-----
|
||||
2 files changed, 7 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/Makefile b/Makefile
|
||||
index c1fb831..e9dbdb0 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -14,7 +14,7 @@ all:
|
||||
@$(MAKE) -C src
|
||||
|
||||
install:
|
||||
- @$(MAKE) -C src install prefix=$(DESTDIR)$(prefix) includedir=$(DESTDIR)$(includedir) libdir=$(DESTDIR)$(libdir)
|
||||
+ @$(MAKE) -C src install prefix=$(prefix) includedir=$(includedir) libdir=$(libdir)
|
||||
|
||||
check:
|
||||
@$(MAKE) -C harness check
|
||||
diff --git a/src/Makefile b/src/Makefile
|
||||
index 37ae219..66534b9 100644
|
||||
--- a/src/Makefile
|
||||
+++ b/src/Makefile
|
||||
@@ -1,6 +1,7 @@
|
||||
prefix=/usr
|
||||
includedir=$(prefix)/include
|
||||
libdir=$(prefix)/lib
|
||||
+usrlibdir=$(libdir)
|
||||
|
||||
CFLAGS ?= -g -fomit-frame-pointer -O2
|
||||
CFLAGS += -Wall -I. -fPIC
|
||||
@@ -58,12 +59,12 @@ $(libname): $(libaio_sobjs) libaio.map
|
||||
$(CC) $(SO_CFLAGS) -Wl,--version-script=libaio.map -Wl,-soname=$(soname) -o $@ $(libaio_sobjs) $(LINK_FLAGS)
|
||||
|
||||
install: $(all_targets)
|
||||
- install -D -m 644 libaio.h $(includedir)/libaio.h
|
||||
- install -D -m 644 libaio.a $(libdir)/libaio.a
|
||||
+ install -D -m 644 libaio.h $(DESTDIR)$(includedir)/libaio.h
|
||||
+ install -D -m 644 libaio.a $(DESTDIR)$(usrlibdir)/libaio.a
|
||||
ifeq ($(ENABLE_SHARED),1)
|
||||
- install -D -m 755 $(libname) $(libdir)/$(libname)
|
||||
- ln -sf $(libname) $(libdir)/$(soname)
|
||||
- ln -sf $(libname) $(libdir)/libaio.so
|
||||
+ install -D -m 755 $(libname) $(DESTDIR)$(libdir)/$(libname)
|
||||
+ ln -sf $(libname) $(DESTDIR)$(usrlibdir)/$(soname)
|
||||
+ ln -sf $(libname) $(DESTDIR)$(usrlibdir)/libaio.so
|
||||
endif
|
||||
|
||||
$(libaio_objs): libaio.h
|
||||
--
|
||||
2.21.0
|
||||
|
||||
Binary file not shown.
@ -1,28 +0,0 @@
|
||||
Remove vendor and var 'lib' from setup.py
|
||||
diff -u hiredis-0.2.0.orig/setup.py hiredis-0.2.0/setup.py
|
||||
--- setup.py 2015-06-21 11:47:28.796472027 +0800
|
||||
+++ setup.py 2015-06-21 11:49:53.047949803 +0800
|
||||
@@ -40,12 +40,9 @@
|
||||
# supported Python versions is worse...
|
||||
#
|
||||
# Also see: https://github.com/pietern/hiredis-py/issues/15
|
||||
-lib = ("hiredis_for_hiredis_py", {
|
||||
- "sources": ["vendor/hiredis/%s.c" % src for src in ("read", "sds")]})
|
||||
|
||||
ext = Extension("hiredis.hiredis",
|
||||
- sources=glob.glob("src/*.c"),
|
||||
- include_dirs=["vendor"])
|
||||
+ sources=glob.glob("src/*.c"))
|
||||
|
||||
setup(
|
||||
name="hiredis",
|
||||
@@ -57,7 +54,6 @@
|
||||
keywords=["Redis"],
|
||||
license="BSD",
|
||||
packages=["hiredis"],
|
||||
- libraries=[lib],
|
||||
ext_modules=[ext],
|
||||
|
||||
# Override "install_lib" command
|
||||
Common subdirectories: hiredis-0.2.0.orig/src and hiredis-0.2.0/src
|
||||
Common subdirectories: hiredis-0.2.0.orig/vendor and hiredis-0.2.0/vendor
|
||||
@ -1 +1,2 @@
|
||||
DIST vine-1.1.3.tar.gz 52520 BLAKE2B 751fdc358aac52403ffd9c6f9f112f68b363fe0ded465ebda732744bc2dfd6e10d8bb57cef357e65fa16c1954ec2657bd8a4f80ae81f9432dd03aaafe79a2535 SHA512 7652b1527021b2f45f3a372c65a6f196c22edad60ab1e8adbafe7174b7dae912f24eaf34788672c762ea9145ebf3d48265fa4ad99f3084d85769242f4e8bd87f
|
||||
DIST vine-1.3.0.tar.gz 51953 BLAKE2B e58d750dd7a84f4a3abb24156de6ec7ab84a911692587643cabcb0df750d3768e70b14ea134da4a39978782ecc530f4fa08ba0ecb780a7a32fb2d9b506633ef5 SHA512 f7242378ebc9b591b6e0a7b6263514f32cee4b996bc6461313221b9a391dd0dd1d833591d6e9ca72ae003f6ce5c4204856d49bb5e57c69a125072cac25758688
|
||||
|
||||
@ -0,0 +1,27 @@
|
||||
# Copyright 1999-2019 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy pypy3 )
|
||||
|
||||
inherit distutils-r1
|
||||
|
||||
DESCRIPTION="Python Promises"
|
||||
HOMEPAGE="https://pypi.org/project/vine/ https://github.com/celery/vine"
|
||||
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
|
||||
|
||||
LICENSE="BSD"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~arm64 ~x86"
|
||||
IUSE="test"
|
||||
|
||||
RDEPEND=""
|
||||
DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
|
||||
test? (
|
||||
>=dev-python/case-1.3.1[${PYTHON_USEDEP}]
|
||||
>=dev-python/pytest-3.0[${PYTHON_USEDEP}]
|
||||
)"
|
||||
|
||||
python_test() {
|
||||
esetup.py test
|
||||
}
|
||||
Binary file not shown.
@ -1 +1 @@
|
||||
Mon, 17 Jun 2019 22:38:48 +0000
|
||||
Tue, 18 Jun 2019 05:08:47 +0000
|
||||
|
||||
@ -1 +1 @@
|
||||
Mon, 17 Jun 2019 22:38:48 +0000
|
||||
Tue, 18 Jun 2019 05:08:47 +0000
|
||||
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -0,0 +1,15 @@
|
||||
BDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
|
||||
DEFINED_PHASES=compile configure install prepare test
|
||||
DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( >=dev-python/case-1.3.1[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pytest-3.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] )
|
||||
DESCRIPTION=Python Promises
|
||||
EAPI=7
|
||||
HOMEPAGE=https://pypi.org/project/vine/ https://github.com/celery/vine
|
||||
IUSE=test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
|
||||
KEYWORDS=~amd64 ~arm64 ~x86
|
||||
LICENSE=BSD
|
||||
RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
|
||||
REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
|
||||
SLOT=0
|
||||
SRC_URI=mirror://pypi/v/vine/vine-1.3.0.tar.gz
|
||||
_eclasses_=distutils-r1 30044897f9a75ab6414bdb19aa3c07d4 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 8c7f9d80beedd16f2e5a7f612c609529
|
||||
_md5_=a5394340fa528a16a4268afd00cca647
|
||||
@ -1 +1 @@
|
||||
Mon, 17 Jun 2019 22:38:48 +0000
|
||||
Tue, 18 Jun 2019 05:08:47 +0000
|
||||
|
||||
@ -1 +1 @@
|
||||
Mon Jun 17 22:38:48 UTC 2019
|
||||
Tue Jun 18 05:08:47 UTC 2019
|
||||
|
||||
@ -1 +1 @@
|
||||
Mon, 17 Jun 2019 23:00:01 +0000
|
||||
Tue, 18 Jun 2019 05:30:01 +0000
|
||||
|
||||
@ -1 +1 @@
|
||||
a69e6ee5589e9a9b664f6c66bac36f0a23f2d4cc 1560805144 2019-06-17T20:59:04+00:00
|
||||
832b3ba10b16b2d0a637c62718a957c85b7e9b36 1560818107 2019-06-18T00:35:07+00:00
|
||||
|
||||
@ -1 +1 @@
|
||||
1560810901 Mon 17 Jun 2019 10:35:01 PM UTC
|
||||
1560834301 Tue 18 Jun 2019 05:05:01 AM UTC
|
||||
|
||||
@ -1 +1 @@
|
||||
Mon, 17 Jun 2019 22:38:48 +0000
|
||||
Tue, 18 Jun 2019 05:08:47 +0000
|
||||
|
||||
Binary file not shown.
@ -1,16 +1,5 @@
|
||||
<?xml version='1.0' encoding='UTF-8'?>
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<maintainer type="person">
|
||||
<email>kevin.bauman80@gmail.com</email>
|
||||
<name>Kevin Bauman</name>
|
||||
</maintainer>
|
||||
<maintainer type="project">
|
||||
<email>proxy-maint@gentoo.org</email>
|
||||
<name>Gentoo Proxy Maintainers Project</name>
|
||||
</maintainer>
|
||||
<upstream>
|
||||
<remote-id type="github">UNINETT/fwbuilder</remote-id>
|
||||
<remote-id type="sourceforge">fwbuilder</remote-id>
|
||||
</upstream>
|
||||
<!-- maintainer-needed -->
|
||||
</pkgmetadata>
|
||||
|
||||
Binary file not shown.
@ -1,45 +0,0 @@
|
||||
diff -Naur a/apps/ministreaming/java/build.xml b/apps/ministreaming/java/build.xml
|
||||
--- a/apps/ministreaming/java/build.xml 2019-01-30 13:31:14.958832623 +0100
|
||||
+++ b/apps/ministreaming/java/build.xml 2019-01-30 13:39:00.050869739 +0100
|
||||
@@ -173,7 +173,7 @@
|
||||
|
||||
<javac debug="true" deprecation="on" destdir="./build/obj" encoding="UTF-8" includeAntRuntime="false" source="1.8" srcdir="./test/junit" target="1.8">
|
||||
<classpath>
|
||||
- <pathelement location="${javac.classpath}" />
|
||||
+ <pathelement path="${javac.classpath}" />
|
||||
<pathelement location="../../../core/java/build/i2p.jar" />
|
||||
<pathelement location="${junit.home}/junit4.jar" />
|
||||
<pathelement location="${hamcrest.home}/hamcrest.jar" />
|
||||
diff -Naur a/apps/streaming/java/build.xml b/apps/streaming/java/build.xml
|
||||
--- a/apps/streaming/java/build.xml 2019-01-30 13:31:14.953832622 +0100
|
||||
+++ b/apps/streaming/java/build.xml 2019-01-30 13:38:56.683869470 +0100
|
||||
@@ -49,7 +49,7 @@
|
||||
|
||||
<javac debug="true" deprecation="on" destdir="./build/obj" encoding="UTF-8" includeAntRuntime="false" source="1.8" srcdir="./test/junit" target="1.8">
|
||||
<classpath>
|
||||
- <pathelement location="${javac.classpath}" />
|
||||
+ <pathelement path="${javac.classpath}" />
|
||||
<pathelement location="../../../core/java/build/i2p.jar" />
|
||||
<pathelement location="../../ministreaming/java/build/mstreaming.jar" />
|
||||
<pathelement location="${junit.home}/junit4.jar" />
|
||||
diff -Naur a/router/java/build.xml b/router/java/build.xml
|
||||
--- a/router/java/build.xml 2019-01-30 13:31:22.905833257 +0100
|
||||
+++ b/router/java/build.xml 2019-01-30 13:39:04.133870065 +0100
|
||||
@@ -130,7 +130,7 @@
|
||||
<mkdir dir="./build/obj_scala" />
|
||||
<scalac deprecation="on" destdir="./build/obj_scala" srcdir="./test/scalatest">
|
||||
<classpath>
|
||||
- <pathelement location="${javac.classpath}" />
|
||||
+ <pathelement path="${javac.classpath}" />
|
||||
<pathelement location="${scala-library.jar}" />
|
||||
<pathelement location="${scalactic.jar}" />
|
||||
<pathelement location="${scalatest.jar}" />
|
||||
@@ -148,7 +148,7 @@
|
||||
<property name="junit.home" value="${ant.home}/lib/" />
|
||||
<javac debug="true" debuglevel="lines,vars,source" deprecation="on" destdir="./build/obj" encoding="UTF-8" includeAntRuntime="true" source="1.8" srcdir="./test/junit" target="1.8">
|
||||
<classpath>
|
||||
- <pathelement location="${javac.classpath}" />
|
||||
+ <pathelement path="${javac.classpath}" />
|
||||
<pathelement location="${hamcrest.home}/hamcrest-core.jar" />
|
||||
<pathelement location="${hamcrest.home}/hamcrest-library.jar" />
|
||||
<pathelement location="${hamcrest.home}/hamcrest-integration.jar" />
|
||||
Binary file not shown.
@ -1,23 +0,0 @@
|
||||
#!/sbin/openrc-run
|
||||
# Copyright 1999-2007 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
depend() {
|
||||
need localmount
|
||||
}
|
||||
|
||||
start() {
|
||||
ebegin "Starting fuse"
|
||||
if ! kldstat -q -m fuse; then
|
||||
kldload fuse >/dev/null 2>&1 || eerror $? "Error loading fuse module"
|
||||
fi
|
||||
eend ${?}
|
||||
}
|
||||
|
||||
stop() {
|
||||
ebegin "Stopping fuse"
|
||||
if kldstat -q -m fuse; then
|
||||
kldunload fuse >/dev/null 2>&1 || eerror $? "Error unloading fuse module"
|
||||
fi
|
||||
eend ${?}
|
||||
}
|
||||
@ -1,35 +0,0 @@
|
||||
#!/sbin/openrc-run
|
||||
# Copyright 1999-2007 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
MOUNTPOINT=/sys/fs/fuse/connections
|
||||
|
||||
depend() {
|
||||
need localmount
|
||||
}
|
||||
|
||||
start() {
|
||||
|
||||
ebegin "Starting fuse"
|
||||
if ! grep -qw fuse /proc/filesystems; then
|
||||
modprobe fuse >/dev/null 2>&1 || eerror $? "Error loading fuse module"
|
||||
fi
|
||||
if grep -qw fusectl /proc/filesystems && \
|
||||
! grep -qw $MOUNTPOINT /proc/mounts; then
|
||||
mount -t fusectl none $MOUNTPOINT >/dev/null 2>&1 || \
|
||||
eerror $? "Error mounting control filesystem"
|
||||
fi
|
||||
eend ${?}
|
||||
|
||||
}
|
||||
|
||||
stop() {
|
||||
|
||||
ebegin "Stopping fuse"
|
||||
if grep -qw $MOUNTPOINT /proc/mounts; then
|
||||
umount $MOUNTPOINT >/dev/null 2>&1 || \
|
||||
eerror $? "Error unmounting control filesystem"
|
||||
fi
|
||||
eend ${?}
|
||||
|
||||
}
|
||||
Binary file not shown.
@ -1,43 +0,0 @@
|
||||
From 3bddf152b902d8a1e0f674b792577b2cca635c4b Mon Sep 17 00:00:00 2001
|
||||
From: Brandon Bergren <xfce@bdragon.rtk0.net>
|
||||
Date: Sun, 26 Aug 2018 10:28:05 -0400
|
||||
Subject: [PATCH] fix build failure when dbus is not in the system include path
|
||||
(Bug #14386)
|
||||
|
||||
The d-bus direct depenencies were taken out in 91860af3a38080,
|
||||
but the #include <dbus/dbus.h> in xfce4-session/xfsm-global.h
|
||||
and the #include <dbus/dbus-glib.h> line in xfsm-error.c got left
|
||||
in accidentally.
|
||||
---
|
||||
xfce4-session/xfsm-error.c | 2 --
|
||||
xfce4-session/xfsm-global.h | 1 -
|
||||
2 files changed, 3 deletions(-)
|
||||
|
||||
diff --git a/xfce4-session/xfsm-error.c b/xfce4-session/xfsm-error.c
|
||||
index 2b7f6c04..f0766f5f 100644
|
||||
--- a/xfce4-session/xfsm-error.c
|
||||
+++ b/xfce4-session/xfsm-error.c
|
||||
@@ -20,8 +20,6 @@
|
||||
#include <config.h>
|
||||
#endif
|
||||
|
||||
-#include <dbus/dbus-glib.h>
|
||||
-
|
||||
#include <xfce4-session/xfsm-error.h>
|
||||
|
||||
#define XFSM_DBUS_NAME "org.xfce.SessionManager"
|
||||
diff --git a/xfce4-session/xfsm-global.h b/xfce4-session/xfsm-global.h
|
||||
index d4587123..610d5bf7 100644
|
||||
--- a/xfce4-session/xfsm-global.h
|
||||
+++ b/xfce4-session/xfsm-global.h
|
||||
@@ -27,7 +27,6 @@
|
||||
#include <X11/SM/SMlib.h>
|
||||
|
||||
#include <xfce4-session/xfsm-splash-screen.h>
|
||||
-#include <dbus/dbus.h>
|
||||
|
||||
typedef struct _FailsafeClient FailsafeClient;
|
||||
struct _FailsafeClient
|
||||
--
|
||||
2.19.0
|
||||
|
||||
Loading…
Reference in new issue