gentoo resync : 30.06.2018

4 files changed, 0 insertions, 188 deletions

diff --git a/sys-process/criu/files/2.0/criu-2.0-automagic-libbsd.patch b/sys-process/criu/files/2.0/criu-2.0-automagic-libbsd.patch
deleted file mode 100644
index 3f39ef63f82f..000000000000
--- a/sys-process/criu/files/2.0/criu-2.0-automagic-libbsd.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/criu/Makefile.config b/criu/Makefile.config
-index aaaca1f..e977bcd 100644
---- a/criu/Makefile.config
-+++ b/criu/Makefile.config
-@@ -4,10 +4,12 @@ include ../scripts/feature-tests.mak
- 
- CONFIG_HEADER := include/config.h
- 
-+ifeq ($(SETPROCTITLE),yes)
- ifeq ($(call try-cc,$(FEATURE_TEST_LIBBSD_DEV),-lbsd),y)
-         LIBS	+= -lbsd
-         DEFINES	+= -DCONFIG_HAS_LIBBSD
- endif
-+endif
- 
- ifeq ($(call pkg-config-check,libselinux),y)
-         LIBS	+= -lselinux
diff --git a/sys-process/criu/files/2.2/criu-2.2-makefile.patch b/sys-process/criu/files/2.2/criu-2.2-makefile.patch
deleted file mode 100644
index e4e856d8ba72..000000000000
--- a/sys-process/criu/files/2.2/criu-2.2-makefile.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-diff --git a/Makefile.install b/Makefile.install
-index b3f5551..2349107 100644
---- a/Makefile.install
-+++ b/Makefile.install
-@@ -6,23 +6,10 @@ BINDIR		?= $(PREFIX)/bin
- SBINDIR		?= $(PREFIX)/sbin
- MANDIR		?= $(PREFIX)/share/man
- SYSTEMDUNITDIR	?= $(PREFIX)/lib/systemd/system/
--LOGROTATEDIR	?= $(PREFIX)/etc/logrotate.d/
-+LOGROTATEDIR	?= $(SYSCONFDIR)/etc/logrotate.d/
- LIBDIR		?= $(PREFIX)/lib
- INCLUDEDIR	?= $(PREFIX)/include/criu
- 
--#
--# For recent Debian/Ubuntu with multiarch support.
--DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH 2>/dev/null)
--ifneq "$(DEB_HOST_MULTIARCH)" ""
--        LIBDIR			?= $(PREFIX)/lib/$(DEB_HOST_MULTIARCH)
--else
--        #
--        # For most other systems
--        ifeq "$(shell uname -m)" "x86_64"
--                LIBDIR		?= $(PREFIX)/lib64
--        endif
--endif
--
- export BINDIR SBINDIR MANDIR SYSTEMDUNITDIR LOGROTATEDIR
- export INCLUDEDIR LIBDIR DESTDIR PREFIX
- 
-diff --git a/lib/Makefile b/lib/Makefile
-index f1c0821..3bef265 100644
---- a/lib/Makefile
-+++ b/lib/Makefile
-@@ -25,8 +25,12 @@ lib-c: c/$(CRIU_SO)
- #
- # Python bindings.
- lib-py:
-+ifeq ($(PYCRIU),yes)
- 	$(call msg-gen, $@)
- 	$(Q) $(MAKE) -C py all
-+else
-+	$(Q) echo "no py criu"
-+endif
- .PHONY: lib-py
- 
- all: lib-c lib-py
-@@ -43,7 +47,7 @@ clean:
- 	$(Q) $(RM) -r build usr
- .PHONY: clean
- 
--install: lib-c lib-py ../crit/crit c/criu.pc.in
-+install: lib-c ../crit/crit c/criu.pc.in
- 	$(E) "  INSTALL " $(CRIU_SO)
- 	$(Q) mkdir -p $(DESTDIR)$(LIBDIR)
- 	$(Q) install -m 755 c/$(CRIU_SO) $(DESTDIR)$(LIBDIR)/$(CRIU_SO).$(CRIU_SO_VERSION_MAJOR).$(CRIU_SO_VERSION_MINOR)
-@@ -55,8 +59,6 @@ install: lib-c lib-py ../crit/crit c/criu.pc.in
- 	$(Q) mkdir -p $(DESTDIR)$(LIBDIR)/pkgconfig
- 	$(Q) sed -e 's,@version@,$(CRIU_VERSION),' -e 's,@libdir@,$(LIBDIR),' -e 's,@includedir@,$(dir $(INCLUDEDIR)),' c/criu.pc.in > c/criu.pc
- 	$(Q) install -m 644 c/criu.pc $(DESTDIR)$(LIBDIR)/pkgconfig
--	$(E) "  INSTALL " crit
--	$(Q) python ../scripts/crit-setup.py install --root=$(DESTDIR) --prefix=$(PREFIX) --record $(CRIT_SETUP_FILES)
- .PHONY: install
- 
- uninstall:
-diff --git a/scripts/nmk/scripts/build.mk b/scripts/nmk/scripts/build.mk
-index bd40944..3cfbffa 100644
---- a/scripts/nmk/scripts/build.mk
-+++ b/scripts/nmk/scripts/build.mk
-@@ -87,7 +87,7 @@ builtin-name	:= $(strip $(builtin-name))
- 
- #
- # Link flags.
--ld_flags	:= $(strip $(LDFLAGS) $(ldflags-y))
-+ld_flags	:= $(strip $(RAW_LDFLAGS) $(ldflags-y))
- 
- #
- # $(obj) related rules.
diff --git a/sys-process/criu/files/2.2/criu-2.2-no-git.patch b/sys-process/criu/files/2.2/criu-2.2-no-git.patch
deleted file mode 100644
index 0622225c2905..000000000000
--- a/sys-process/criu/files/2.2/criu-2.2-no-git.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/Makefile b/Makefile
-index 7c85403..20992ed 100644
---- a/Makefile
-+++ b/Makefile
-@@ -179,9 +179,9 @@ test: zdtm
- # Generating tar requires tag matched CRIU_VERSION.
- # If not found then simply use GIT's describe with
- # "v" prefix stripped.
--head-name := $(shell git tag -l v$(CRIU_VERSION))
-+head-name := $(shell if [ -d ".git" ]; then git tag -l v$(CRIU_VERSION); fi)
- ifeq ($(head-name),)
--        head-name := $(shell git describe)
-+        head-name := $(shell if [ -d ".git" ]; then git describe; fi)
- endif
- tar-name := $(shell echo $(head-name) | sed -e 's/^v//g')
- criu-$(tar-name).tar.bz2:
diff --git a/sys-process/criu/files/2.9/criu-2.9-makefile.patch b/sys-process/criu/files/2.9/criu-2.9-makefile.patch
deleted file mode 100644
index 7ec91eebaa33..000000000000
--- a/sys-process/criu/files/2.9/criu-2.9-makefile.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-diff --git a/Makefile.install b/Makefile.install
-index dbc22e1..23fd1ae 100644
---- a/Makefile.install
-+++ b/Makefile.install
-@@ -6,24 +6,11 @@ BINDIR		?= $(PREFIX)/bin
- SBINDIR		?= $(PREFIX)/sbin
- MANDIR		?= $(PREFIX)/share/man
- SYSTEMDUNITDIR	?= $(PREFIX)/lib/systemd/system/
--LOGROTATEDIR	?= $(PREFIX)/etc/logrotate.d/
-+LOGROTATEDIR	?= $(SYSCONFDIR)/etc/logrotate.d/
- LIBDIR		?= $(PREFIX)/lib
- INCLUDEDIR	?= $(PREFIX)/include/criu
- LIBEXECDIR	?= $(PREFIX)/libexec
- 
--#
--# For recent Debian/Ubuntu with multiarch support.
--DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH 2>/dev/null)
--ifneq "$(DEB_HOST_MULTIARCH)" ""
--        LIBDIR			?= $(PREFIX)/lib/$(DEB_HOST_MULTIARCH)
--else
--        #
--        # For most other systems
--        ifeq "$(shell uname -m)" "x86_64"
--                LIBDIR		?= $(PREFIX)/lib64
--        endif
--endif
--
- export BINDIR SBINDIR MANDIR SYSTEMDUNITDIR LOGROTATEDIR
- export INCLUDEDIR LIBDIR DESTDIR PREFIX LIBEXECDIR
- 
-diff --git a/lib/Makefile b/lib/Makefile
-index 616f089..aab3189 100644
---- a/lib/Makefile
-+++ b/lib/Makefile
-@@ -25,8 +25,12 @@ lib-c: c/$(CRIU_SO)
- #
- # Python bindings.
- lib-py:
-+ifeq ($(PYCRIU),yes)
- 	$(call msg-gen, $@)
- 	$(Q) $(MAKE) -C py all
-+else
-+	$(Q) echo "no py criu"
-+endif
- .PHONY: lib-py
- 
- all: lib-c lib-py
-@@ -43,7 +47,7 @@ clean:
- 	$(Q) $(RM) -r build usr
- .PHONY: clean
- 
--install: lib-c lib-py ../crit/crit c/criu.pc.in
-+install: lib-c ../crit/crit c/criu.pc.in
- 	$(E) "  INSTALL " $(CRIU_SO)
- 	$(Q) mkdir -p $(DESTDIR)$(LIBDIR)
- 	$(Q) install -m 755 c/$(CRIU_SO) $(DESTDIR)$(LIBDIR)/$(CRIU_SO).$(CRIU_SO_VERSION_MAJOR).$(CRIU_SO_VERSION_MINOR)
-@@ -55,8 +59,6 @@ install: lib-c lib-py ../crit/crit c/criu.pc.in
- 	$(Q) mkdir -p $(DESTDIR)$(LIBDIR)/pkgconfig
- 	$(Q) sed -e 's,@version@,$(CRIU_VERSION),' -e 's,@libdir@,$(LIBDIR),' -e 's,@includedir@,$(dir $(INCLUDEDIR)),' c/criu.pc.in > c/criu.pc
- 	$(Q) install -m 644 c/criu.pc $(DESTDIR)$(LIBDIR)/pkgconfig
--	$(E) "  INSTALL " crit
--	$(Q) $(PYTHON_BIN) ../scripts/crit-setup.py install --root=$(DESTDIR) --prefix=$(PREFIX) --record $(CRIT_SETUP_FILES)
- .PHONY: install
- 
- uninstall:
-diff --git a/scripts/nmk/scripts/build.mk b/scripts/nmk/scripts/build.mk
-index 1860d58..e169b0c 100644
---- a/scripts/nmk/scripts/build.mk
-+++ b/scripts/nmk/scripts/build.mk
-@@ -87,7 +87,7 @@ builtin-name	:= $(strip $(builtin-name))
- 
- #
- # Link flags.
--ld_flags	:= $(strip $(LDFLAGS) $(ldflags-y))
-+ld_flags	:= $(strip $(RAW_LDFLAGS) $(ldflags-y))
- 
- #
- # $(obj) related rules.