gentoo resync : 03.12.2017

4 files changed, 152 insertions, 21 deletions

diff --git a/sys-apps/ccs-tools/Manifest b/sys-apps/ccs-tools/Manifest
index b79648566b16..dc4014ab2b67 100644
--- a/sys-apps/ccs-tools/Manifest
+++ b/sys-apps/ccs-tools/Manifest
@@ -1,4 +1,6 @@
+AUX ccs-tools-1.8.3_p20130214-GNU_SOURCE.patch 248 BLAKE2B d148183a08e932088b09898ec296647cfb247189fc07ae4722e182a06989c4d7fe962db9d70a03dca48c7571a7b69113a41a1bb6563a075e260492487e0aeda2 SHA512 6b9203a34368ed57de64f8c31196ae18d4311e942f3ad4be02ce5e3042f5640f6165326137df92283edd91a990716b3df2ff39dca0a729947f4c7d7d89334354
+AUX ccs-tools-1.8.3_p20130214-ncurses-underlinking.patch 3747 BLAKE2B f93a7a5bf11a732445eafbf0ce6d5ce2f8c31795911c568735b6967a3be7a69caba924441b5ad84bf5570a9f1253b60a64c88b54cba1544c03130419ee315635 SHA512 3780231c966a0f22dd6e70df9de6d2bd8f7596544b224e1d8bfe79ce6a5bfcf27a154c82f70b5e3f329cf49371beba4e32f98ca1da00063dea791e5fe063842c
 AUX ccs-tools-1.8.3_p20130214-warnings.patch 814 BLAKE2B 10a9966f726a47058388773500bc06bc6cebbdcf90eaaca5ecf8b2c1159618843645e55663892a5897c6741794b49cacf823a1fcee5e0e67e9a5c7e27ec3b892 SHA512 947caa5ce7f2c80e7e0b40042b09568c4fed731b530cf70c1fa24fa0f1a382dd41443f3db82a6aa6444c0ebcd25fd7de657c0f1990d69579e4645f3efa561e10
-DIST ccs-tools-1.8.3-20130214.tar.gz 227657 SHA256 56bb03f1977346f4c7dc3a0c5da8df4a0451a79558c26564478cb87fbf3e3ade SHA512 256adf873dd99b811f5cf55e6b74e1ccdc2e54a2399724b694f22825c4d5e3167e7768bddc4952363ef835ec2b8405d5704572a9b9e214f3102bf594374325ba WHIRLPOOL d7f200842a10ca2c83a46a933beb7c70436ea36c8aad3569c33392a11360b88dbf7589ac720994fec9d5c49c46f1e1c9f97ec320d2057680a6bb0edf13c066eb
-EBUILD ccs-tools-1.8.3_p20130214.ebuild 1419 BLAKE2B ad806bcaf81fa35d6e77065f8e81e5c7454c8fc985ae23c311a480251944126f10bdb06be70e940a09dca2a163b4403a03b601aceb2746dc1a7c49364ebaf570 SHA512 89fb1d587f3280fc687eb16694c41547ac48f3e79bfd71294992b3e0b2db151198352ee0648c7a361e1ddf45f6c01c7394da0eca108584e41f9ed9db16c6ccfc
+DIST ccs-tools-1.8.3-20130214.tar.gz 227657 BLAKE2B 318e3899b85ee322b4391816d642ae855eb7cb03c345725c95e7e01a8e6acb54db900ccdd2f85b6d4ecab5ef40768e80b559979d7b37bf42679a520379d2b56c SHA512 256adf873dd99b811f5cf55e6b74e1ccdc2e54a2399724b694f22825c4d5e3167e7768bddc4952363ef835ec2b8405d5704572a9b9e214f3102bf594374325ba
+EBUILD ccs-tools-1.8.3_p20130214.ebuild 1616 BLAKE2B 0fc1f24b41416b3d83a10e416887e45b44c0166a953340367b08a4281be95098dbd753697b5b407ed81940eaf461327411e22e16280d3b03b3e70f629e2c7eea SHA512 08c8e2fc104a462f242aac9d4ba0cf78b5ab95ea1c0c35d0faa4ad45ef4fb8006dfa548eb3b45455cd60dd29f23b731402f1277ca9f336fbede1089e60e65f76
 MISC metadata.xml 246 BLAKE2B a39fd02dccbd35c6c5397a9a4572fbbf21d00d18a4e237e31fdc245d1a7609e23b221b02cbe1f5fcf0193c6da67441e2665c75de9b9e79645086fe4c4802e058 SHA512 eb0505da84a5318fcae56426b5bd7228ff9115fec909f6482ec9c4030135a465e01fc0ed55426e53d54058cf2fcfa039f52201559340048fa1e7d4a0cf3984f9
diff --git a/sys-apps/ccs-tools/ccs-tools-1.8.3_p20130214.ebuild b/sys-apps/ccs-tools/ccs-tools-1.8.3_p20130214.ebuild
index d39fc9d54c65..4e3640cdef0a 100644
--- a/sys-apps/ccs-tools/ccs-tools-1.8.3_p20130214.ebuild
+++ b/sys-apps/ccs-tools/ccs-tools-1.8.3_p20130214.ebuild
@@ -1,10 +1,12 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=3
-inherit eutils multilib toolchain-funcs
+EAPI=6
+
+inherit flag-o-matic toolchain-funcs
 
 MY_P="${P/_p/-}"
+
 DESCRIPTION="TOMOYO Linux tools"
 HOMEPAGE="http://tomoyo.sourceforge.jp/"
 SRC_URI="mirror://sourceforge.jp/tomoyo/49693/${MY_P}.tar.gz"
@@ -13,35 +15,43 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
-
 RESTRICT="test"
 
-DEPEND="sys-libs/ncurses
-	sys-libs/readline"
-RDEPEND="${DEPEND}
+CDEPEND="
+	sys-libs/ncurses:0=
+	sys-libs/readline:0="
+RDEPEND="${CDEPEND}
 	sys-apps/which"
+DEPEND="${CDEPEND}
+	virtual/pkgconfig"
 
-S="${WORKDIR}/ccs-tools"
+S="${WORKDIR}/${PN}"
+PATCHES=(
+	"${FILESDIR}"/${P}-warnings.patch
+	"${FILESDIR}"/${P}-ncurses-underlinking.patch
+	"${FILESDIR}"/${P}-GNU_SOURCE.patch
+)
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-warnings.patch
+	default
 	sed -i \
-		-e "s:gcc:$(tc-getCC):" \
-		-e "s/\(CFLAGS.*:=\).*/\1 ${CFLAGS}/" \
 		-e "s:/usr/lib:/usr/$(get_libdir):g" \
 		-e "s:= /:= ${EPREFIX}/:g" \
 		Include.make || die
 }
 
-src_test() {
-	cd "${S}/kernel_test"
-	emake || die
-	./testall.sh || die
+src_configure() {
+	append-cflags -Wall -Wno-unused-but-set-variable
+	append-cppflags "$($(tc-getPKG_CONFIG) --cflags ncurses)"
+	append-libs "$($(tc-getPKG_CONFIG) --libs ncurses)"
+
+	tc-export CC
 }
 
-src_install() {
-	emake INSTALLDIR="${D}" install || die
-	dodoc README.ccs
+src_test() {
+	cd kernel_test || die
+	emake
+	./testall.sh || die
 }
 
 pkg_postinst() {
@@ -57,5 +67,5 @@ pkg_postinst() {
 }
 
 pkg_config() {
-	/usr/$(get_libdir)/ccs/init_policy
+	"${EPREFIX}"/usr/$(get_libdir)/ccs/init_policy
 }
diff --git a/sys-apps/ccs-tools/files/ccs-tools-1.8.3_p20130214-GNU_SOURCE.patch b/sys-apps/ccs-tools/files/ccs-tools-1.8.3_p20130214-GNU_SOURCE.patch
new file mode 100644
index 000000000000..651bed1b5d08
--- /dev/null
+++ b/sys-apps/ccs-tools/files/ccs-tools-1.8.3_p20130214-GNU_SOURCE.patch
@@ -0,0 +1,11 @@
+--- a/usr_sbin/ccstools.h
++++ b/usr_sbin/ccstools.h
+@@ -23,7 +23,7 @@
+ #define _FILE_OFFSET_BITS 64
+ #define _LARGEFILE_SOURCE
+ #define _LARGEFILE64_SOURCE
+-#define _GNU_SOURCE
++
+ #include <arpa/inet.h>
+ #include <asm/types.h>
+ #include <dirent.h>
diff --git a/sys-apps/ccs-tools/files/ccs-tools-1.8.3_p20130214-ncurses-underlinking.patch b/sys-apps/ccs-tools/files/ccs-tools-1.8.3_p20130214-ncurses-underlinking.patch
new file mode 100644
index 000000000000..638e6f556712
--- /dev/null
+++ b/sys-apps/ccs-tools/files/ccs-tools-1.8.3_p20130214-ncurses-underlinking.patch
@@ -0,0 +1,108 @@
+--- a/Include.make
++++ b/Include.make
+@@ -3,6 +3,3 @@
+ USRSBINDIR      := /usr/sbin
+ USRLIBDIR       := /usr/lib
+ MAN8            := /usr/share/man/man8
+-ifndef CFLAGS
+-CFLAGS          := -Wall -O2
+-endif
+--- a/kernel_test/Makefile
++++ b/kernel_test/Makefile
+@@ -20,7 +20,7 @@
+ #
+ 
+ .c:
+-	$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ $<
++	$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LIBS)
+ 
+ #
+ # Delete all test programs.
+--- a/sbin/Makefile
++++ b/sbin/Makefile
+@@ -5,11 +5,11 @@
+ all: $(BUILD_FILES)
+ 
+ install: all
+-	mkdir -p -m 0755 $(INSTALLDIR)$(SBINDIR)
+-	$(INSTALL) -m 0700 $(BUILD_FILES) $(INSTALLDIR)$(SBINDIR)
++	mkdir -p -m 0755 $(DESTDIR)$(SBINDIR)
++	$(INSTALL) -m 0700 $(BUILD_FILES) $(DESTDIR)$(SBINDIR)
+ 
+ .c:
+-	$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ $<
++	$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LIBS)
+ 
+ clean:
+ 	rm -f -- $(BUILD_FILES)
+--- a/usr_lib_ccs/Makefile
++++ b/usr_lib_ccs/Makefile
+@@ -6,12 +6,12 @@
+ all: $(BUILD_FILES)
+ 
+ install: all
+-	mkdir -p -m 0755 $(INSTALLDIR)/$(USRLIBDIR)/ccs
+-	$(INSTALL) -m 0755 $(BUILD_FILES) $(INSTALLDIR)/$(USRLIBDIR)/ccs/
+-	$(INSTALL) -m 0644 ../README.ccs ../COPYING.ccs $(INSTALLDIR)/$(USRLIBDIR)/ccs/
++	mkdir -p -m 0755 $(DESTDIR)/$(USRLIBDIR)/ccs
++	$(INSTALL) -m 0755 $(BUILD_FILES) $(DESTDIR)/$(USRLIBDIR)/ccs/
++	$(INSTALL) -m 0644 ../README.ccs ../COPYING.ccs $(DESTDIR)/$(USRLIBDIR)/ccs/
+ 
+ .c:
+-	$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ $<
++	$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LIBS)
+ 
+ clean:
+ 	rm -f -- $(BUILD_FILES)
+--- a/usr_sbin/Makefile
++++ b/usr_sbin/Makefile
+@@ -19,27 +19,27 @@
+ LDFLAGS_PIC := $(filter-out -pie,$(filter-out -fPIE,$(LDFLAGS)))
+ 
+ libccstools.so: ccstools.c ccstools.h
+-	$(CC) $(CPPFLAGS) $(CFLAGS_PIC) $(LDFLAGS_PIC) -fPIC ccstools.c -shared -Wl,-soname,libccstools.so.3 -o libccstools.so.3.0.2
++	$(CC) $(CPPFLAGS) $(CFLAGS_PIC) $(LDFLAGS_PIC) -fPIC ccstools.c -shared -Wl,-soname,libccstools.so.3 -o libccstools.so.3.0.2 $(LIBS)
+ 	ln -sf libccstools.so.3.0.2 libccstools.so
+ 
+ .c:
+-	$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ $< -lccstools -L. 
++	$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ $< -lccstools -L. $(LIBS)
+ 
+ ccs-editpolicy: ccstools.h editpolicy*.c readline.h /usr/include/curses.h libccstools.so
+-	$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o ccs-editpolicy editpolicy*.c -lncurses -lccstools -L. -DCOLOR_ON
++	$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o ccs-editpolicy editpolicy*.c -lccstools -L. -DCOLOR_ON $(LIBS)
+ 
+ ccs-queryd: ccstools.h ccs-queryd.c readline.h /usr/include/curses.h libccstools.so
+-	$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o ccs-queryd ccs-queryd.c -lncurses -lccstools -L.
++	$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o ccs-queryd ccs-queryd.c -lccstools -L. $(LIBS)
+ 
+ install: all
+-	mkdir -p -m 0755 $(INSTALLDIR)$(USRLIBDIR)
+-	$(INSTALL) -m 0755 libccstools.so.3.0.2 $(INSTALLDIR)$(USRLIBDIR)
+-	ln -sf libccstools.so.3.0.2 $(INSTALLDIR)$(USRLIBDIR)/libccstools.so.3
+-ifeq ($(INSTALLDIR),)
++	mkdir -p -m 0755 $(DESTDIR)$(USRLIBDIR)
++	$(INSTALL) -m 0755 libccstools.so.3.0.2 $(DESTDIR)$(USRLIBDIR)
++	ln -sf libccstools.so.3.0.2 $(DESTDIR)$(USRLIBDIR)/libccstools.so.3
++ifeq ($(DESTDIR),)
+ 	ldconfig || true
+ endif
+-	mkdir -p -m 0755 $(INSTALLDIR)$(USRSBINDIR)
+-	$(INSTALL) -m 0755 $(BUILD_FILES) $(INSTALLDIR)$(USRSBINDIR)
++	mkdir -p -m 0755 $(DESTDIR)$(USRSBINDIR)
++	$(INSTALL) -m 0755 $(BUILD_FILES) $(DESTDIR)$(USRSBINDIR)
+ 
+ clean:
+ 	rm -f -- $(BUILD_FILES) libccstools.so*
+--- a/usr_share_man/Makefile
++++ b/usr_share_man/Makefile
+@@ -1,7 +1,7 @@
+ include ../Include.make
+ 
+ install:
+-	mkdir -p -m 0755 $(INSTALLDIR)$(MAN8)
+-	$(INSTALL) -m 0644 man8/* $(INSTALLDIR)$(MAN8)
++	mkdir -p -m 0755 $(DESTDIR)$(MAN8)
++	$(INSTALL) -m 0644 man8/* $(DESTDIR)$(MAN8)
+ 
+ .PHONY: install