From 65737cf14a7220bd9a487aa2af4ae0e79bd23e86 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 8 Jan 2018 21:45:04 +0000 Subject: gentoo resync : 08.01.2018 --- sys-apps/Manifest.gz | Bin 48483 -> 48503 bytes sys-apps/hdparm/Manifest | 2 +- sys-apps/hdparm/hdparm-9.52.ebuild | 2 +- sys-apps/iproute2/Manifest | 2 + .../files/iproute2-4.14.1-configure-nomagic.patch | 196 ++++++++++++++++++++ sys-apps/iproute2/iproute2-4.14.1-r3.ebuild | 152 ++++++++++++++++ sys-apps/mawk/Manifest | 4 +- sys-apps/mawk/mawk-1.3.4_p20160615.ebuild | 42 ----- sys-apps/mawk/mawk-1.3.4_p20161120.ebuild | 2 +- sys-apps/smartmontools/Manifest | 2 +- sys-apps/smartmontools/smartmontools-6.6.ebuild | 2 +- sys-apps/util-linux/Manifest | 3 +- sys-apps/util-linux/util-linux-2.31.1.ebuild | 202 +++++++++++++++++++++ sys-apps/util-linux/util-linux-2.31.ebuild | 202 --------------------- 14 files changed, 560 insertions(+), 253 deletions(-) create mode 100644 sys-apps/iproute2/files/iproute2-4.14.1-configure-nomagic.patch create mode 100644 sys-apps/iproute2/iproute2-4.14.1-r3.ebuild delete mode 100644 sys-apps/mawk/mawk-1.3.4_p20160615.ebuild create mode 100644 sys-apps/util-linux/util-linux-2.31.1.ebuild delete mode 100644 sys-apps/util-linux/util-linux-2.31.ebuild (limited to 'sys-apps') diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz index ffdf2e7bd161..8bb87b878e8f 100644 Binary files a/sys-apps/Manifest.gz and b/sys-apps/Manifest.gz differ diff --git a/sys-apps/hdparm/Manifest b/sys-apps/hdparm/Manifest index 0ec097e75887..3b1a3717600e 100644 --- a/sys-apps/hdparm/Manifest +++ b/sys-apps/hdparm/Manifest @@ -6,6 +6,6 @@ DIST hdparm-9.51.tar.gz 133725 BLAKE2B a507046d1026e901fb0feb9c61dac60d8bf8427f7 DIST hdparm-9.52.tar.gz 140737 BLAKE2B 0614bfb0844f088b533951c4636bf92879c4ff7e9bb4d150965e936eaa2a4e0ffd350689fc359757a2f9e80a6c93cd111a25b8e2824737e01b4deb6e543b2868 SHA512 7c37d1381c1dd2d46762a8cdcaba2015b0b051ee7bd135dbcf6346def51b085cc2f9ecd7e1ebdc67e12ab4b765df548d4757b3700ed6e7514c2b13ed40661c59 DIST hdparm-9.53.tar.gz 137009 BLAKE2B 934cec5d88033c14e7f2d182f2e1dc9f9dc63583208720fb748fd29b99cd54253fdcf7379443043787457c3fdabb83ddb55295f9f4abe0635ae2e4fd7e296bd1 SHA512 7d293d603c6bda5fa8ce389b69e6738c4ba920846a1f7443c89edd2f5085b056541afb1824921da4b38be43f992ee9a8cb7006bcc3156d3e5224823276c4d0c7 EBUILD hdparm-9.51.ebuild 1068 BLAKE2B da518c793f37b34bed3ba283e7152d4fd4ebca37548090db5dac52c14141b513f47e16ae06c89e0dafbeaf92af76728d158c8c7539cad5f91f2c623f865e8dcb SHA512 af88b4d68dbb6c844b170a0313bb0ba98b6a0b2e36b3b2b6e45a5e6f6f6129f2a2aafb6b0fa63177b2af717cac5c0e322f3ed00f7ffe6a6c941dfa8145d3d7bb -EBUILD hdparm-9.52.ebuild 1072 BLAKE2B 919c0a810911bb21a73a66dbc72388d78610a2ab5293940291dc5816e96eb8b5e75a5ac8363e747357315107313df6feba9fc29779b1f1c8bccab2660ac2e30f SHA512 c1cf1b166617abdf129001a6e63d18f27525e2e53b21064818ce7b451f489bee1b5bd1fbb0686c44a08b8ceb1749565d4ca1e2e43912e485a3290c2ff8468fa4 +EBUILD hdparm-9.52.ebuild 1071 BLAKE2B 2537da3a93604068c32b3c282aa172dd6c2f0243f01444b95e015549808e0f439b6042c4f5106713b70876ce57e4955b7e3a1bfbf57150a42dc79c414f420c7f SHA512 091045f7fbb4e1fe4b239d1cfbeaffe056111e5995d703092bf1f65c7b0866047e2786983da3391cfa59970da05f777e1ca49c5e337c57e955a63af47de9f5bd EBUILD hdparm-9.53.ebuild 1056 BLAKE2B 2bb3d67c186613200c7f17e6f13bfc058bf8c1d2c340e898ed687621a5e3f0e803f53a7d01f076551c96ad7b987453758bdda5d19fcb4aba1b541a53f5459c70 SHA512 d19fbe544788be2a9705938eddee7fe27178a9c282f75061c1fc20f11c7200a676b34586351c6b330258d71abef3c90d3c1f94251343a14c01e90adeb60bcf3c MISC metadata.xml 326 BLAKE2B 503d13af2b352e0b8d864559489f80ae98d7420c0a98ea46847126e792a93ffcbce3b524da7f6c3551702e07641cef62449c0c7f2ae6188d79df3f7e5a6b8685 SHA512 39219fcef0756910c51e804cf94170408208840e7b88d99b4583f8fcfb02e1664358f9d4bf4c3f1a1a619b6a87852bc4831c93f10215500842023132a85c2287 diff --git a/sys-apps/hdparm/hdparm-9.52.ebuild b/sys-apps/hdparm/hdparm-9.52.ebuild index db7a255297d8..9dfbcfbcde92 100644 --- a/sys-apps/hdparm/hdparm-9.52.ebuild +++ b/sys-apps/hdparm/hdparm-9.52.ebuild @@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/hdparm/${P}.tar.gz" LICENSE="BSD GPL-2" # GPL-2 only SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~arm-linux ~x86-linux" +KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~arm-linux ~x86-linux" IUSE="static" PATCHES=( diff --git a/sys-apps/iproute2/Manifest b/sys-apps/iproute2/Manifest index aaa35463cdc2..ad2e66f350ec 100644 --- a/sys-apps/iproute2/Manifest +++ b/sys-apps/iproute2/Manifest @@ -1,6 +1,7 @@ AUX iproute2-3.1.0-mtu.patch 1649 BLAKE2B cbecd9770391ca7c7f25b860a95bb5b2783073b333084874b18de85f5a9072ab3922e083f726ab1e6f58f0334b515968b1e3651abcd7fc6f603def0492da79cb SHA512 5479c2085b4aca958a89d3e265ebc3763c9e7cb273bd4046d7b7585209739f75ff04cc9b84d8eb9e3afae821ff788f0f0c7ab443260ab07943b6fad6946403e1 AUX iproute2-4.11.0-no-ipv6.patch 1360 BLAKE2B 43881c76622159e6ae7f7499eddfc251b0cf1e0a8fa077d3099c509706b056c51685c3dff66e3381a2ca0839dd32d1534a310dff4acf329836ddd1bec6eb8241 SHA512 8e548f19079eea1d3a5a91bb657bba961c9e9206147e0e0aea1aaf04d74b46e2687c906b78561d939f53f4a33ecb9e08ad8237f401068076df5842c78bc3b577 AUX iproute2-4.12.0-uclibc-ng-add-ipproto_mh.patch 1178 BLAKE2B e00d87fc26faa8433116e8d610a3197991a692951664238cf09228ce6e369417f82cc737ef56087fd8bdd3e50d11f9486dee3c858be9b60f4295039cc7b0bd7c SHA512 e433276513faabad15939fe7b716d8677211ff739a6b791c3bd4aa0014aae053a89395545fd55534f2fc16502d8d84bfc6b0ccf0154497a03e30947e4070f3af +AUX iproute2-4.14.1-configure-nomagic.patch 7334 BLAKE2B d1a79a653cdaa5907bc93a4283aa1576ec31d3d31a13898c7d923365c1f5068c5a76e52b33bfe2b9a190c273e35fb2125788bbd56ea03b4c01965c029660464b SHA512 0d09bc0a11ec32483a10db7e42a1620087f75063ce8bc24fed30f490eed2ee01d19bd092fb6cd392735c0c9434b13f70d562a469ed3d8a3b51b7fb25ceaf5af6 AUX iproute2-4.14.1-fix-tc-actions.patch 6665 BLAKE2B e2ff926f2122973bcbe61e16717b8a1c51b6b76a774b6ce03126b7664fc5beb47e4f38672910e822b19aadd5c369d00553b2e6b6c30c012e03ad37b023cac4f7 SHA512 cdde7bb5a0cb49471472a8412758023529976dcafefc6a759ce758fba1b0420c046ca6faf084df81ac11e7153ac820909b1b9ec41c04f643208b9db456cfda28 AUX iproute2-4.2.0-no-ipv6.patch 1336 BLAKE2B bafb155e6bbd902eb0fff7d8875cc4ef7956de0071273dd373ebd09ef46ba23eb22f4226a044585faa2a00c9e4c2854e57e0e06eb1ac735edea9dce2721cadcc SHA512 f4219a094f367c9f8fac089beeffca31abbbc5d4ade1681e23a92f3dd2e1a95f331322938936b0b1771ea5a56224e0f14008f4d38a8708357a5d2b2b70efbbd5 AUX iproute2-4.5.0-no-iptables.patch 1022 BLAKE2B 5e073c3e78491ae86b137ecbea2362c25c98011121cd7b59b8791227638918ad34c417f1ecd48459ef1901c7ff015463f15e5f8343d46d4b56e5555311e3c8d8 SHA512 3a3e7a66f1528dc8d03fc6a13f363ce890d0c23c2ab8df966144d8764e95cafca168bdb7dd79cf1a8dd1e54be36939f2e6465ca6176e3bfedd222eb29901f98e @@ -23,6 +24,7 @@ EBUILD iproute2-4.13.0.ebuild 4213 BLAKE2B 4a238544e35502f785f0916ec5bd255787b01 EBUILD iproute2-4.14.0.ebuild 4150 BLAKE2B 2c218117921dbae1ac920bd3eaede84faf2e6983fdc26c158b4e8405ee0cc9620eb1fdba31aeae169a813e080edbba57fae958bd9429fd0e804a8245cdcfe195 SHA512 1a1c39f742febf5b064bd471e0ea3ed018f81018895833962e110c60d00b3f85351dbb9db5557ad43b3f1988dff0e5bbad69d307ccc6fe1ea637a24e171dc690 EBUILD iproute2-4.14.1-r1.ebuild 3922 BLAKE2B c0fcd01bd73a71e460c4f760c5497d1db14997c31c5f6a0a8ea939acba001135861387486d67221fcc131126e02416f4dfee4ae0fbdbbcf6e0f240de21573c3e SHA512 a78d8387e2c67518136d19c982bd20c521b36c76b963a9e7565488648cc8ba18135e298b1252827af1a7c97ea553a33d66144f977d52ed50e1cafaf2ac64efe7 EBUILD iproute2-4.14.1-r2.ebuild 4099 BLAKE2B 4d82ea179fe7bd99e908f72c4394e891455c3fb5ebf54c2b83e0f0b87563a454d28b076729f3a28c9dabe84c2cfdeb6f967aa068f90966b0bf644bfba6142d00 SHA512 8cd2335b4db64932238443cbd5e1dd7ecc216f8837360a5ae07066210e30263c4c6a6f17de961c346533fc9e121f1e3af39b70f1199b9e507f33ef2f9cc061a7 +EBUILD iproute2-4.14.1-r3.ebuild 4267 BLAKE2B a38143923882628abcd8ef0ec26f41786d38a9cabd6f921e5916b6edb0c615ef0339557190471cf36f1c0f48e2283e4f40dac7628f06438ce3ba1082806198f4 SHA512 cea9d4f22d26ead507c532965a45bf9fc5e086b4b23d55d457b3386104d838d5a30395158d4d0a278e2df3c343715e73f46dbb3ed6ae2e57232e86a73d403d19 EBUILD iproute2-4.14.1.ebuild 3928 BLAKE2B 62ebf9cb809f16249dc923faa766c4ee5e907ae12f056184fb6e125a681ce20a644f6d59a2c3d0391fc2eae8c1e5da0de5bf36ba140994ad569297f0659400dd SHA512 1ea1ae406f9c86e119abcba8e4d0109643dea7c26c710531710234dd36babd862b5d6db9c4cb47fabebca5d3683bacc9e68f3fd40b37b45968965130a6084c59 EBUILD iproute2-4.4.0.ebuild 3874 BLAKE2B 38518bb4f4610a04231e03a0068b0cd232477202c2efeeab9c42883a155707d74535e7398347316bff6d4c7833ebe6893fcac246fc756780febd6e4b61f0a486 SHA512 d21f5f77a404fc3ecd70728c64af64a24080044a4634cb68078699e628120c1cba2c2b508cd34ad92e9202ccdac01596a6e988635b5c1a1e0113815d893a217a EBUILD iproute2-4.5.0.ebuild 3887 BLAKE2B 6788057f29e49ba641f790c571035d2a489a238a2821b3b5fe12c0973fa4c2aeef703826379944defe3b9997b889c071ce51f7ffe0ab5eeff68b644ced49faeb SHA512 a5d957f6660e3d1444a46511f8040f0bc7eb7a489a087e49e90a4e1d356f5346cb39a5dfdc98411d5e3eb1d6aca9e6d88f815ea133d501e5a640e099ef8e9ecc diff --git a/sys-apps/iproute2/files/iproute2-4.14.1-configure-nomagic.patch b/sys-apps/iproute2/files/iproute2-4.14.1-configure-nomagic.patch new file mode 100644 index 000000000000..919249b83929 --- /dev/null +++ b/sys-apps/iproute2/files/iproute2-4.14.1-configure-nomagic.patch @@ -0,0 +1,196 @@ +The hand-rolled configure script, for multiple options (selinux,mnl,elf), sets +a variable as well as modifying CFLAGS & LDLIBS. + +If config.mk is later amended to disable a feature, the CFLAGS/LDLIBS tweaks +are still in place. + +Push the CFLAGS/LDLIBS changes into new conditional Makefile code, so that they +are only passed when correctly needed. + +Prior Gentoo testcase for reproduction: +USE=minimal ebuild ... compile. +- Linking with libelf & libmnl based only on presence. +- Links based on libselinux based only on presence. + +Closes: https://bugs.gentoo.org/643722 +Signed-off-by: Robin H. Johnson + +diff -Nuar --exclude '*~' --exclude '.*.swp' --exclude '*.orig' iproute2-4.14.1.orig/bridge/Makefile iproute2-4.14.1/bridge/Makefile +--- iproute2-4.14.1.orig/bridge/Makefile 2017-11-13 10:09:57.000000000 -0800 ++++ iproute2-4.14.1/bridge/Makefile 2018-01-07 14:24:23.350726423 -0800 +@@ -1,6 +1,7 @@ + BROBJ = bridge.o fdb.o monitor.o link.o mdb.o vlan.o + + include ../config.mk ++include ../config.include + + all: bridge + +diff -Nuar --exclude '*~' --exclude '.*.swp' --exclude '*.orig' iproute2-4.14.1.orig/config.include iproute2-4.14.1/config.include +--- iproute2-4.14.1.orig/config.include 1969-12-31 16:00:00.000000000 -0800 ++++ iproute2-4.14.1/config.include 2018-01-07 14:25:34.406126921 -0800 +@@ -0,0 +1,22 @@ ++# We can only modify CFLAGS/LDLIBS after all the config options are known. ++ifeq ($(IP_CONFIG_SETNS),y) ++ CFLAGS += $(IP_CONFIG_SETNS_CFLAGS) ++endif ++ifeq ($(HAVE_ELF),y) ++ CFLAGS += $(HAVE_ELF_CFLAGS) ++ LDLIBS += $(HAVE_ELF_LDLIBS) ++endif ++ifeq ($(HAVE_SELINUX),y) ++ CFLAGS += $(HAVE_SELINUX_CFLAGS) ++ LDLIBS += $(HAVE_SELINUX_LDLIBS) ++endif ++ifeq ($(HAVE_MNL),y) ++ CFLAGS += $(HAVE_MNL_CFLAGS) ++ LDLIBS += $(HAVE_MNL_LDLIBS) ++endif ++ ++# Rules can only be declared after all variables in them are known. ++%.o: %.c ++ $(QUIET_CC)$(CC) $(CFLAGS) $(EXTRA_CFLAGS) -c -o $@ $< ++ ++# vim: ft=make: +diff -Nuar --exclude '*~' --exclude '.*.swp' --exclude '*.orig' iproute2-4.14.1.orig/configure iproute2-4.14.1/configure +--- iproute2-4.14.1.orig/configure 2017-11-13 10:09:57.000000000 -0800 ++++ iproute2-4.14.1/configure 2018-01-07 14:25:49.242419367 -0800 +@@ -223,7 +223,7 @@ + then + echo "IP_CONFIG_SETNS:=y" >>$CONFIG + echo "yes" +- echo "CFLAGS += -DHAVE_SETNS" >>$CONFIG ++ echo "IP_CONFIG_SETNS_CFLAGS += -DHAVE_SETNS" >>$CONFIG + else + echo "no" + fi +@@ -268,8 +268,8 @@ + echo "HAVE_ELF:=y" >>$CONFIG + echo "yes" + +- echo 'CFLAGS += -DHAVE_ELF' `${PKG_CONFIG} libelf --cflags` >> $CONFIG +- echo 'LDLIBS += ' `${PKG_CONFIG} libelf --libs` >>$CONFIG ++ echo 'HAVE_ELF_CFLAGS += -DHAVE_ELF' `${PKG_CONFIG} libelf --cflags` >> $CONFIG ++ echo 'HAVE_ELF_LDLIBS += ' `${PKG_CONFIG} libelf --libs` >>$CONFIG + else + echo "no" + fi +@@ -283,8 +283,8 @@ + echo "HAVE_SELINUX:=y" >>$CONFIG + echo "yes" + +- echo 'LDLIBS +=' `${PKG_CONFIG} --libs libselinux` >>$CONFIG +- echo 'CFLAGS += -DHAVE_SELINUX' `${PKG_CONFIG} --cflags libselinux` >>$CONFIG ++ echo 'HAVE_SELINUX_CFLAGS += -DHAVE_SELINUX' `${PKG_CONFIG} --cflags libselinux` >>$CONFIG ++ echo 'HAVE_SELINUX_LDLIBS +=' `${PKG_CONFIG} --libs libselinux` >>$CONFIG + else + echo "no" + fi +@@ -297,8 +297,8 @@ + echo "HAVE_MNL:=y" >>$CONFIG + echo "yes" + +- echo 'CFLAGS += -DHAVE_LIBMNL' `${PKG_CONFIG} libmnl --cflags` >>$CONFIG +- echo 'LDLIBS +=' `${PKG_CONFIG} libmnl --libs` >> $CONFIG ++ echo 'HAVE_MNL_CFLAGS += -DHAVE_LIBMNL' `${PKG_CONFIG} libmnl --cflags` >>$CONFIG ++ echo 'HAVE_MNL_LDLIBS +=' `${PKG_CONFIG} libmnl --libs` >> $CONFIG + else + echo "no" + fi +@@ -425,7 +425,3 @@ + echo -n "docs:" + check_docs + echo +- +-echo >> $CONFIG +-echo "%.o: %.c" >> $CONFIG +-echo ' $(QUIET_CC)$(CC) $(CFLAGS) $(EXTRA_CFLAGS) -c -o $@ $<' >> $CONFIG +diff -Nuar --exclude '*~' --exclude '.*.swp' --exclude '*.orig' iproute2-4.14.1.orig/devlink/Makefile iproute2-4.14.1/devlink/Makefile +--- iproute2-4.14.1.orig/devlink/Makefile 2017-11-13 10:09:57.000000000 -0800 ++++ iproute2-4.14.1/devlink/Makefile 2018-01-07 14:24:23.351726442 -0800 +@@ -1,4 +1,5 @@ + include ../config.mk ++include ../config.include + + ifeq ($(HAVE_MNL),y) + +diff -Nuar --exclude '*~' --exclude '.*.swp' --exclude '*.orig' iproute2-4.14.1.orig/genl/Makefile iproute2-4.14.1/genl/Makefile +--- iproute2-4.14.1.orig/genl/Makefile 2017-11-13 10:09:57.000000000 -0800 ++++ iproute2-4.14.1/genl/Makefile 2018-01-07 14:24:23.351726442 -0800 +@@ -1,6 +1,7 @@ + GENLOBJ=genl.o + + include ../config.mk ++include ../config.include + SHARED_LIBS ?= y + + CFLAGS += -fno-strict-aliasing +diff -Nuar --exclude '*~' --exclude '.*.swp' --exclude '*.orig' iproute2-4.14.1.orig/ip/Makefile iproute2-4.14.1/ip/Makefile +--- iproute2-4.14.1.orig/ip/Makefile 2017-11-13 10:09:57.000000000 -0800 ++++ iproute2-4.14.1/ip/Makefile 2018-01-07 14:24:23.351726442 -0800 +@@ -14,6 +14,7 @@ + RTMONOBJ=rtmon.o + + include ../config.mk ++include ../config.include + + ALLOBJ=$(IPOBJ) $(RTMONOBJ) + SCRIPTS=ifcfg rtpr routel routef +diff -Nuar --exclude '*~' --exclude '.*.swp' --exclude '*.orig' iproute2-4.14.1.orig/lib/Makefile iproute2-4.14.1/lib/Makefile +--- iproute2-4.14.1.orig/lib/Makefile 2017-11-13 10:09:57.000000000 -0800 ++++ iproute2-4.14.1/lib/Makefile 2018-01-07 14:24:23.351726442 -0800 +@@ -1,4 +1,5 @@ + include ../config.mk ++include ../config.include + + CFLAGS += -fPIC + +diff -Nuar --exclude '*~' --exclude '.*.swp' --exclude '*.orig' iproute2-4.14.1.orig/misc/Makefile iproute2-4.14.1/misc/Makefile +--- iproute2-4.14.1.orig/misc/Makefile 2017-11-13 10:09:57.000000000 -0800 ++++ iproute2-4.14.1/misc/Makefile 2018-01-07 14:24:23.351726442 -0800 +@@ -4,6 +4,7 @@ + TARGETS=ss nstat ifstat rtacct lnstat + + include ../config.mk ++include ../config.include + + ifeq ($(HAVE_BERKELEY_DB),y) + TARGETS += arpd +diff -Nuar --exclude '*~' --exclude '.*.swp' --exclude '*.orig' iproute2-4.14.1.orig/netem/Makefile iproute2-4.14.1/netem/Makefile +--- iproute2-4.14.1.orig/netem/Makefile 2017-11-13 10:09:57.000000000 -0800 ++++ iproute2-4.14.1/netem/Makefile 2018-01-07 14:24:23.351726442 -0800 +@@ -1,4 +1,5 @@ + include ../config.mk ++include ../config.include + + DISTGEN = maketable normal pareto paretonormal + DISTDATA = normal.dist pareto.dist paretonormal.dist experimental.dist +diff -Nuar --exclude '*~' --exclude '.*.swp' --exclude '*.orig' iproute2-4.14.1.orig/rdma/Makefile iproute2-4.14.1/rdma/Makefile +--- iproute2-4.14.1.orig/rdma/Makefile 2017-11-13 10:09:57.000000000 -0800 ++++ iproute2-4.14.1/rdma/Makefile 2018-01-07 14:24:23.352726462 -0800 +@@ -1,4 +1,5 @@ + include ../config.mk ++include ../config.include + + ifeq ($(HAVE_MNL),y) + +diff -Nuar --exclude '*~' --exclude '.*.swp' --exclude '*.orig' iproute2-4.14.1.orig/tc/Makefile iproute2-4.14.1/tc/Makefile +--- iproute2-4.14.1.orig/tc/Makefile 2017-11-13 10:09:57.000000000 -0800 ++++ iproute2-4.14.1/tc/Makefile 2018-01-07 14:24:23.352726462 -0800 +@@ -3,6 +3,7 @@ + emp_ematch.yacc.o emp_ematch.lex.o + + include ../config.mk ++include ../config.include + + SHARED_LIBS ?= y + +diff -Nuar --exclude '*~' --exclude '.*.swp' --exclude '*.orig' iproute2-4.14.1.orig/tipc/Makefile iproute2-4.14.1/tipc/Makefile +--- iproute2-4.14.1.orig/tipc/Makefile 2017-11-13 10:09:57.000000000 -0800 ++++ iproute2-4.14.1/tipc/Makefile 2018-01-07 14:24:23.352726462 -0800 +@@ -1,4 +1,5 @@ + include ../config.mk ++include ../config.include + + ifeq ($(HAVE_MNL),y) + diff --git a/sys-apps/iproute2/iproute2-4.14.1-r3.ebuild b/sys-apps/iproute2/iproute2-4.14.1-r3.ebuild new file mode 100644 index 000000000000..d515a2cfe560 --- /dev/null +++ b/sys-apps/iproute2/iproute2-4.14.1-r3.ebuild @@ -0,0 +1,152 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit toolchain-funcs flag-o-matic multilib + +if [[ ${PV} == "9999" ]] ; then + EGIT_REPO_URI="git://git.kernel.org/pub/scm/linux/kernel/git/shemminger/iproute2.git" + inherit git-r3 +else + SRC_URI="mirror://kernel/linux/utils/net/${PN}/${P}.tar.xz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" +fi + +DESCRIPTION="kernel routing and traffic control utilities" +HOMEPAGE="https://wiki.linuxfoundation.org/networking/iproute2" + +LICENSE="GPL-2" +SLOT="0" +IUSE="atm berkdb +iptables ipv6 minimal selinux" + +# We could make libmnl optional, but it's tiny, so eh +RDEPEND=" + !net-misc/arpd + !minimal? ( net-libs/libmnl virtual/libelf ) + iptables? ( >=net-firewall/iptables-1.4.20:= ) + berkdb? ( sys-libs/db:= ) + atm? ( net-dialup/linux-atm ) + selinux? ( sys-libs/libselinux ) +" +# We require newer linux-headers for ipset support #549948 and some defines #553876 +DEPEND=" + ${RDEPEND} + app-arch/xz-utils + iptables? ( virtual/pkgconfig ) + >=sys-devel/bison-2.4 + sys-devel/flex + >=sys-kernel/linux-headers-3.16 + elibc_glibc? ( >=sys-libs/glibc-2.7 ) +" + +PATCHES=( + "${FILESDIR}"/${PN}-3.1.0-mtu.patch #291907 + "${FILESDIR}"/${P}-fix-tc-actions.patch + "${FILESDIR}"/${P}-configure-nomagic.patch # bug 643722 +) + +src_prepare() { + if ! use ipv6 ; then + PATCHES+=( + "${FILESDIR}"/${PN}-4.11.0-no-ipv6.patch #326849 + ) + fi + + default + + sed -i \ + -e '/^CC :\?=/d' \ + -e "/^LIBDIR/s:=.*:=/$(get_libdir):" \ + -e "s:-O2:${CFLAGS} ${CPPFLAGS}:" \ + -e "/^HOSTCC/s:=.*:= $(tc-getBUILD_CC):" \ + -e "/^WFLAGS/s:-Werror::" \ + -e "/^DBM_INCLUDE/s:=.*:=${T}:" \ + Makefile || die + + # Use /run instead of /var/run. + sed -i \ + -e 's:/var/run:/run:g' \ + include/namespace.h \ + man/man8/ip-netns.8 || die + + # build against system headers + rm -r include/netinet #include/linux include/ip{,6}tables{,_common}.h include/libiptc + sed -i 's:TCPI_OPT_ECN_SEEN:16:' misc/ss.c || die + + use minimal && sed -i -e '/^SUBDIRS=/s:=.*:=lib tc ip:' Makefile +} + +src_configure() { + tc-export AR CC PKG_CONFIG + + # This sure is ugly. Should probably move into toolchain-funcs at some point. + local setns + pushd "${T}" >/dev/null + printf '#include \nint main(){return setns(0, 0);}\n' > test.c + ${CC} ${CFLAGS} ${CPPFLAGS} -D_GNU_SOURCE ${LDFLAGS} test.c >&/dev/null && setns=y || setns=n + echo 'int main(){return 0;}' > test.c + ${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} test.c -lresolv >&/dev/null || sed -i '/^LDLIBS/s:-lresolv::' "${S}"/Makefile + popd >/dev/null + + # run "configure" script first which will create "config.mk"... + econf + + # ...now switch on/off requested features via USE flags + # this is only useful if the test did not set other things, per bug #643722 + cat <<-EOF >> config.mk + TC_CONFIG_ATM := $(usex atm y n) + TC_CONFIG_XT := $(usex iptables y n) + TC_CONFIG_NO_XT := $(usex iptables n y) + # We've locked in recent enough kernel headers #549948 + TC_CONFIG_IPSET := y + HAVE_BERKELEY_DB := $(usex berkdb y n) + HAVE_MNL := $(usex minimal n y) + HAVE_ELF := $(usex minimal n y) + HAVE_SELINUX := $(usex selinux y n) + IP_CONFIG_SETNS := ${setns} + # Use correct iptables dir, #144265 #293709 + IPT_LIB_DIR := $(use iptables && ${PKG_CONFIG} xtables --variable=xtlibdir) + EOF +} + +src_compile() { + emake V=1 +} + +src_install() { + if use minimal ; then + into / + dosbin tc/tc + dobin ip/ip + return 0 + fi + + emake \ + DESTDIR="${D}" \ + LIBDIR="${EPREFIX%/}"/$(get_libdir) \ + SBINDIR="${EPREFIX%/}"/sbin \ + CONFDIR="${EPREFIX%/}"/etc/iproute2 \ + DOCDIR="${EPREFIX%/}"/usr/share/doc/${PF} \ + MANDIR="${EPREFIX%/}"/usr/share/man \ + ARPDDIR="${EPREFIX%/}"/var/lib/arpd \ + install + + dodir /bin + mv "${ED%/}"/{s,}bin/ip || die #330115 + + dolib.a lib/libnetlink.a + insinto /usr/include + doins include/libnetlink.h + # This local header pulls in a lot of linux headers it + # doesn't directly need. Delete this header that requires + # linux-headers-3.8 until that goes stable. #467716 + sed -i '/linux\/netconf.h/d' "${ED%/}"/usr/include/libnetlink.h || die + + if use berkdb ; then + dodir /var/lib/arpd + # bug 47482, arpd doesn't need to be in /sbin + dodir /usr/bin + mv "${ED%/}"/sbin/arpd "${ED%/}"/usr/bin/ || die + fi +} diff --git a/sys-apps/mawk/Manifest b/sys-apps/mawk/Manifest index d76eee8a06ba..5ca129610e6e 100644 --- a/sys-apps/mawk/Manifest +++ b/sys-apps/mawk/Manifest @@ -1,12 +1,10 @@ AUX mawk-1.3.4-sandbox-default.patch 2720 BLAKE2B 3f0a25b06f1045659b9dc7decbbd54c9355f94a6879cad0f121e825cb705652b14b7a4c4655f2fe89c2f921aea511f8b8755cd398d28ce9a47ffa6bfef158953 SHA512 bdceb22a51464de5786d469ffcc6fc7157a0aca3e3dc89553418a401de3735b95439691ccf5553d0746b3e793824821db85a2dfe14633db1ad5f1256fa3e65ab AUX mawk-1.3.4-sandbox.patch 3805 BLAKE2B a7d55816bea03fb949387c8a1acf310b6dbae60014601bc514f44cbf3a8632c275bf6b786b016e93450ecf60d61052b14b029e56d559656dc87fed72a66239af SHA512 03149ba3d3e0cd5fa6d50573cc50260346e91d82bfd510d8a069a3e076df49d2b85edd2b42632a34e21f9d82c384212272e99b1cf305b4c1a78e252b75da4eb3 DIST mawk-1.3.4-20150503.tgz 468794 BLAKE2B 10a2942f990d67ebea3cf75c83beefbc58f6ad4ffc560260f8206a8fc79b03d1e4cb8bb4ad23b256a547b10e4885c1a0813f054aa60ab5cb1b20c8d974a508d8 SHA512 ac9dde6948328d8db94458448abdf7389f8862ae6093315dd19ed9d1cbeab60fca1fc7b084cda4ce09505010f7108612585e3c4ba9663ddf3adb869bf1d9d7b6 -DIST mawk-1.3.4-20160615.tgz 466312 BLAKE2B ad8077e44a069b4ba19d1c1051d488ee7234b834aa0a04be6bda72cd5726c84185d4bb7de564e1a862c43de1de81d36ff8d2b11ee001ebbcaf624de6aabe19ab SHA512 97062fe278f1ec30db2233f9bd5a2f60557e2362a2c785bce94a7b9eec9065138cf1349bc145c18194b5af56c8e943e63c95baea839282a65ba09062bdcca2ae DIST mawk-1.3.4-20161120.tgz 461464 BLAKE2B 7481345b391198cc9ec47f6ad84f0f07e31c931a40d59bde401d00ea7bc74b728c8149f80187e5d73923496e2eef1ec70bc097aedf0b68630f73264d45d96ebd SHA512 c5edcbff4ab1e40eb9b178a045fcd426a5f3c93a3ab5bc1ca1fa85a0977b8c9060967fcbda4e4a6e9e68628f50a2814e22939676008dced529377d2cf9bda5b2 DIST mawk-1.3.4-20171017.tgz 460819 BLAKE2B 91cb4cd039ea7773b788db87389f8ec34914afc8b299fecfdd579fe89fc4e6d731bfdc9c06a2c6c3d75ab9e1022bf5dbe1c662962d6ccd8a8f6fe4f8589927ca SHA512 4ed6ca0ecca12e7409d3d364b72dc6a2b411c61bf53fe8aa0b0cac65a3bdb941921c0b81d94f34c8ac9f4922c8c7566d347b5e6b5c74518ae3a88904f9e20f27 EBUILD mawk-1.3.4_p20150503.ebuild 825 BLAKE2B 1d5b1fb1ac43e06b019f86bdf8ca9fa2d4392e27fee2160e13b46c90ee567979d70442be3aea5d96f73497502238d919da684a6268d7918802f8d57aa7389db8 SHA512 7f7b0386ae02ee8bd6b2a3df4218f3dd732b22e9154b8bd37ed15afbeba2a145aa02161e64b8e2be78d4e6d9c2b58e3d4fa4c7d5b557f434c1cdf21e593bd749 -EBUILD mawk-1.3.4_p20160615.ebuild 870 BLAKE2B c25882ed451d83bfea7ca5dd731a6d532396c91f7a38236ae2b884cb5f504341a937da1dd4bb22805b6f94488414756a182bcd6e3e5eaa21ef74e8c90805e7f0 SHA512 5841a8486c4a59f16c1add9e9aceb89fc428b29a29359ce17e451dd46f66c0501b4260463f4b152e1403e391d86c30638edef328ee31ae9ec1b0b4aa0238afe8 -EBUILD mawk-1.3.4_p20161120.ebuild 875 BLAKE2B 01638a2cfe4d444a8d0e17787db6f864693ef4d95e12306eb342a81966b61d1582747a2f9f4e27f9c9f0f8b5321fbd69e45039af3e684aa9fc632dc65d525f74 SHA512 dd783c806bcf1139e50bb7b3688261bf955ecf949ea66bfff3d3d1fb032e68b3e74f984a35adfd8846a4126988c7ffee9229a5831d2f1f1c6466a241734dcca5 +EBUILD mawk-1.3.4_p20161120.ebuild 873 BLAKE2B 90007cc447cf574c3077b37beb1d9fe5f68f0512779c8020312e5bab2d31d76501074ec20004bf05743c0ec4e1baa2f95ce0fee553a5a8d1482b39e4a99288d0 SHA512 c263fe5eaaab9709451d4e8ada4143c460303ca754cd96f0206671bd39c926ed227ce6f7814c549434d29a298fd3a2e6c3309c44f44ba09c0de2207eb1b45913 EBUILD mawk-1.3.4_p20171017-r1.ebuild 1037 BLAKE2B 9c36e6b12d6a7b1c6448ed423509032464388849efc66312b24c8e7ba3efc11d94c3f425077f949514609bfcabb10da2d849a1977c919d068350c8137c942d14 SHA512 550d5d3f9123d402ecf442a94c8ccd87959eb8669a490e766e16d7b93acb5d3d23562527c5aac727cec44f1d068b339016dd901ac192662f06da3803f7ecd6a6 EBUILD mawk-1.3.4_p20171017.ebuild 883 BLAKE2B deb941193402b058ecf23a7523698416660b09cfefcda6a51b2f2f50aaa72ba5b9230459826d82f9066b4bc8766c72f2a55583e21705f848df0ffa4d966509a5 SHA512 e072d0a8bb7125965bd3e0edea01eff17ef53b17baaf117fa7f5cd910acebd4cbc57f6725a6ae0419cf2eb177fcd3b8f4cdf5c5f0e7bb4d86fdbe86f7b75c9de MISC metadata.xml 359 BLAKE2B 988733eff41a4556cdb4f8d66adbe2864f33f4245ab1ba3a1456cb3b189fd12138cec7666d2fc125d275865a028274aaf5a41396430721ac96b913dc2f667f94 SHA512 bb64e60075207240fabd037108c2885b934d0dc0a72bdcce4c8c138555b1ebb4de811745235ee11fde75559ddf55f9488b71f53aab7e92df61099cba5ec28d2f diff --git a/sys-apps/mawk/mawk-1.3.4_p20160615.ebuild b/sys-apps/mawk/mawk-1.3.4_p20160615.ebuild deleted file mode 100644 index 2638e7629c4a..000000000000 --- a/sys-apps/mawk/mawk-1.3.4_p20160615.ebuild +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit toolchain-funcs - -MY_P=${P/_p/-} -DESCRIPTION="an (often faster than gawk) awk-interpreter" -HOMEPAGE="https://invisible-island.net/mawk/mawk.html" -SRC_URI="ftp://invisible-island.net/mawk/${MY_P}.tgz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos" - -RDEPEND="app-eselect/eselect-awk" -DEPEND="${RDEPEND}" - -S=${WORKDIR}/${MY_P} - -DOCS=( ACKNOWLEDGMENT CHANGES README ) - -src_prepare() { - tc-export BUILD_CC -} - -src_install() { - default - - exeinto /usr/share/doc/${PF}/examples - doexe examples/* - docompress -x /usr/share/doc/${PF}/examples -} - -pkg_postinst() { - eselect awk update ifunset -} - -pkg_postrm() { - eselect awk update ifunset -} diff --git a/sys-apps/mawk/mawk-1.3.4_p20161120.ebuild b/sys-apps/mawk/mawk-1.3.4_p20161120.ebuild index 953fb7c8d558..49769007c1be 100644 --- a/sys-apps/mawk/mawk-1.3.4_p20161120.ebuild +++ b/sys-apps/mawk/mawk-1.3.4_p20161120.ebuild @@ -12,7 +12,7 @@ SRC_URI="ftp://invisible-island.net/mawk/${MY_P}.tgz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos" +KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos" RDEPEND="app-eselect/eselect-awk" DEPEND="${RDEPEND}" diff --git a/sys-apps/smartmontools/Manifest b/sys-apps/smartmontools/Manifest index 8295cf946517..740e07502f05 100644 --- a/sys-apps/smartmontools/Manifest +++ b/sys-apps/smartmontools/Manifest @@ -8,6 +8,6 @@ DIST smartmontools-6.6.tar.gz 903847 BLAKE2B 6c18884cf763c146abceed47587de0e77cd EBUILD smartmontools-6.4-r1.ebuild 2534 BLAKE2B 3395b22b8bdd26c78404016cbb5f48a91b9858ffbff70ae3ca486fc3d32ca9603cbd752111693691a91b5c04982f07987391745514af782bf31d4644d8314223 SHA512 1b0d02e5d4a493cd7926a93c92b3b78951f3580228ca19864113dbb09f12ce936866d50d528bdfb66f94b88b8f99660fa5d7181a81008b4badfaa7ef362a187c EBUILD smartmontools-6.4.ebuild 1639 BLAKE2B 103e33da5b3605be940863b879ab2a4859036c3ce1206052b08cd9f0f88acca4d3f56513049a24ac57dcbd2e3c2413fdfcf4dc973fc19645c735feb2063ba122 SHA512 c9b07c80d4e4355bc2c4ebce895efe35ed70d5a31eab3eb8298c1cc947a42cb1c4bb81d57cb46816619580067aeec246f49bc581a788abb7c912d0ef898f8448 EBUILD smartmontools-6.5-r1.ebuild 4043 BLAKE2B cb6764d3186c03fc1df0878d00b7ced1d1e5036e8e3e7afeeb552e3d257cb51c3173edc07b738d111b41eb73f83f67967a9bd9ed071ab11478e12fdf5a0ea20c SHA512 7bc661356535cf00b2783f4a4bf323eae05c688d3db0ef81e7ccccb8d8aeeff24b2bbfca50b233d96b0f22d2aecf2d39f5bcd53d90b9076424b3c744f48341a5 -EBUILD smartmontools-6.6.ebuild 4088 BLAKE2B 859677f35897b545ab56bcf04e6890b5ffa0c0305d88568243f09904c30dfb64c35f532aadce4ada683532e4deecb4c4efc65c54fd1e50ac2a041094b7b37989 SHA512 a51bf9d5780f23772bd417c9b1d7e2bc40ec810660e8f49da2a949261886e43a6c477d3c041f7057cccdd1890b1027bca64501ad2bc4da148e65c97e686e4ab2 +EBUILD smartmontools-6.6.ebuild 4087 BLAKE2B 3a7b6732ad81fc307b7db7a5e59b9feadb6986ea0412287caceaf7a8c59683b38ca3582fae419181334223d91ebfade5af8d05e6cca29a37b1b8433468255fc8 SHA512 e73c6d0c224d4cefbbaeced1a7425bbcbf27ae286ee050f04882100b6e81294a2520cfedd30c143181952f72303d14aacf33576f3e9785a64c206b937dae4f3b EBUILD smartmontools-9999.ebuild 4094 BLAKE2B 2af97f4da8bb0b0f5a1c6f9bc275724d69b4687e3ab7890f021d9e2fa25fccab24769dde1a08d61464f8977b6cd8c912b906307feb119e9f94eb83ce204cf0c7 SHA512 3b284a9deccd3b3e9e02d38565bc2a844f3e9478f20811742c35e5bd57cec653471f742921f37a0a48f1d5a533e51eeda11455e6bfb5fbf93eaba478d3174f2a MISC metadata.xml 718 BLAKE2B 4172ef96f081f77b7f701d2f11ed1eae3cd7342815fd3643373f8bb60802a273d8308dc4ff8e8d36349f8361e04213ee2d94619045a16739aa2fa75560c7cfae SHA512 a6a07e57bd09402839295ee859481d784445afadb12ffd644c6de3af41a4a763225f63d098c328193123d72cdad3b98e278256bb3e67b104015399def014ee54 diff --git a/sys-apps/smartmontools/smartmontools-6.6.ebuild b/sys-apps/smartmontools/smartmontools-6.6.ebuild index 12dba68cb900..457eba7d44c9 100644 --- a/sys-apps/smartmontools/smartmontools-6.6.ebuild +++ b/sys-apps/smartmontools/smartmontools-6.6.ebuild @@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then inherit subversion else SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos" + KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos" fi DESCRIPTION="Tools to monitor storage systems to provide advanced warning of disk degradation" diff --git a/sys-apps/util-linux/Manifest b/sys-apps/util-linux/Manifest index e7a8eb58d078..46cf94d1cebb 100644 --- a/sys-apps/util-linux/Manifest +++ b/sys-apps/util-linux/Manifest @@ -4,9 +4,10 @@ AUX util-linux-2.31-too_generic_symbols_pt1.patch 5422 BLAKE2B 8274cdcdbfa56917a AUX util-linux-2.31-too_generic_symbols_pt2.patch 11096 BLAKE2B 2f1f278352c7fb2c47b0f094969e9b15860da7ca03cc10522d23f95a05721c9df1f3228cccdbe77a2a6fcf5a998556013d4776e86ab6661fac6b5ba1e00969a3 SHA512 e1b7610db8febf3d693ebafd405d46ed4d07555677ba0a77570292996069e30d663448de0e3a3b68d6624f36eba448c2249fe7431669a9a0193a3acaa8e01014 AUX util-linux-2.31-too_generic_symbols_pt3.patch 1118 BLAKE2B e2f098346f7359945c26e49012798d910e8f46c099df9421f4ef3fc8801be5f8d31621f660137f171175dee984ea7e53f7614876d142a2cdedc94b7d4011eb98 SHA512 7e63b0f98fd5dace2c904800124e94f9734fffdf04386bbc03a84b2975f9100851f902c46fc923c9c31210359b4e3675ba04d7a844cfcc1fb494bcc7b776bef8 DIST util-linux-2.30.2.tar.xz 4442624 BLAKE2B 7b76e255c9ee4d8b8f65f037a735808233edcdb8dce951038ae8983a3f4a6e493458622f6c7f6ce68d38672ac6dc5258b45b787c196dabede41cb19afc76e545 SHA512 b92ec16d5e8a405ad9ebbac8673bb49c5bf0a7f630118477f12c7a3c6b3b3ee5d56868632dd71fffd5c0434821207c2769f6859b9d398c2df770ec6487d7c32d +DIST util-linux-2.31.1.tar.xz 4510096 BLAKE2B f2e4a398fe4ecc0bbfb7c2240698e3a37deed57eb48a028ddfb578ecc057c1c928b2082d13014f0dfdaf5a8274ee3a13993fdbc19b7e05e5a992505ac90de79a SHA512 d45c1e62e39f5d5c7a642071e7ccce44fe4ecaafec54d8c9a4e9d526280a6e25723bfa0eb068401e291579c0d067661775bbe085190d13ff16493f47360b7760 DIST util-linux-2.31.tar.xz 4503892 BLAKE2B 8a9e2fc674cacbfabfc76cc0ab671f3fdb35d49de9f4ae8660b49df9e196878c2459d8fc57f6c9b6d2ad73cc56d970656ffcbc22deed97bb7a0cc28490a1fbb0 SHA512 48b668526e96a132736b882090d0e33c20b4b3a0e1760502d83118ed98ccc9423d310848a2bb73f82f85e9c19f6191075ae2c5269b007e76be1fbd7b6b88fbf5 EBUILD util-linux-2.30.2.ebuild 6077 BLAKE2B abd7234f5e2622b7a7d1489bd9f57fb3d33dce6556621cb8239ad8eb1260aafc4816cf878cbc5936893d50df263ff75073b79a49370ca9ef1b1dd9a8164c5332 SHA512 fdd4e1fdeef39a5cfdbe747a1e7bb2c35d4386efc8ed1264171156d85e00bc0465e9ec8b88a07e6cb7582659554ad98990f8bb728b581bfc41a3850121f1ce49 EBUILD util-linux-2.31-r1.ebuild 6185 BLAKE2B 8aae4e20de31ab9161b78af51d8038a98f8ea4909277aa9a499b1aa47fe7c6821a965241a218d4ce166a462889c2e6375cda43e580922ac90ee805f196142ce6 SHA512 4bc749571b57a6720c7bbae2ca8b63d79ae8e2f46de686ff1978b35531d4945e1cab3afd61ec6b76718c31151e3838f06044e15b8bd7143c161a5f7860c74bca -EBUILD util-linux-2.31.ebuild 6108 BLAKE2B 92ce3d425be12339dac8fb7296dc2e51dc2acff2d7d3382f4103b6c971a72c346564a2be31dcea835b58d5c88292cae7b2b8944408ab96d5d39d3db872e43ec7 SHA512 206118f5ff5fa5d4b21c734965c967d5eaf5934d57aef26199196b9800b89f252d17d676d4c288846062a0ff3d5304edeeda005f7dd62a427b3f6e19bc049da1 +EBUILD util-linux-2.31.1.ebuild 6108 BLAKE2B 6c27812bdb0f88e254fb030dd85224788dd7f40704492d679fd11e26b50fbd7ea2b4ae8c85d960c79049f8e7254873326ca63bb40c2a3b78295bcd30264fff59 SHA512 6c98e8ef184d56fc383d9df07fac71763d106413ef053a158e993894ea25f1685eb57e0da94203afdd75868c15f184c9e307d5cfd5223ac3ec6c3a001b583466 EBUILD util-linux-9999.ebuild 6108 BLAKE2B 92ce3d425be12339dac8fb7296dc2e51dc2acff2d7d3382f4103b6c971a72c346564a2be31dcea835b58d5c88292cae7b2b8944408ab96d5d39d3db872e43ec7 SHA512 206118f5ff5fa5d4b21c734965c967d5eaf5934d57aef26199196b9800b89f252d17d676d4c288846062a0ff3d5304edeeda005f7dd62a427b3f6e19bc049da1 MISC metadata.xml 947 BLAKE2B aeb1eef359b4be20e0df592245a2d432d92adf29336ecb1519bb4a97deed47c75bd14ca6c132f2e2ffe5c2d2ddcd7638ee38d03c7f8bcf8c8accb36a916663b5 SHA512 3822f7f3ccd120bbc788c64db0b79d55ad892bed99d01f8e0988c57ca7277a1936e03dbffd2898e68a2b6da25c301bc2cafb1da9658cdbbdfee1c9fb65e1699c diff --git a/sys-apps/util-linux/util-linux-2.31.1.ebuild b/sys-apps/util-linux/util-linux-2.31.1.ebuild new file mode 100644 index 000000000000..9b6633597d39 --- /dev/null +++ b/sys-apps/util-linux/util-linux-2.31.1.ebuild @@ -0,0 +1,202 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +PYTHON_COMPAT=( python2_7 python3_{4,5,6} ) + +inherit toolchain-funcs libtool flag-o-matic bash-completion-r1 \ + pam python-single-r1 multilib-minimal systemd + +MY_PV="${PV/_/-}" +MY_P="${PN}-${MY_PV}" + +if [[ ${PV} == 9999 ]] ; then + inherit git-r3 autotools + EGIT_REPO_URI="git://git.kernel.org/pub/scm/utils/util-linux/util-linux.git" +else + [[ "${PV}" = *_rc* ]] || \ + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux" + SRC_URI="mirror://kernel/linux/utils/util-linux/v${PV:0:4}/${MY_P}.tar.xz" +fi + +DESCRIPTION="Various useful Linux utilities" +HOMEPAGE="https://www.kernel.org/pub/linux/utils/util-linux/" + +LICENSE="GPL-2 LGPL-2.1 BSD-4 MIT public-domain" +SLOT="0" +IUSE="build caps +cramfs fdformat kill ncurses nls pam python +readline selinux slang static-libs +suid systemd test tty-helpers udev unicode" + +# Most lib deps here are related to programs rather than our libs, +# so we rarely need to specify ${MULTILIB_USEDEP}. +RDEPEND="caps? ( sys-libs/libcap-ng ) + cramfs? ( sys-libs/zlib ) + ncurses? ( >=sys-libs/ncurses-5.2-r2:0=[unicode?] ) + pam? ( sys-libs/pam ) + python? ( ${PYTHON_DEPS} ) + readline? ( sys-libs/readline:0= ) + selinux? ( >=sys-libs/libselinux-2.2.2-r4[${MULTILIB_USEDEP}] ) + slang? ( sys-libs/slang ) + !build? ( systemd? ( sys-apps/systemd ) ) + udev? ( virtual/libudev:= )" +DEPEND="${RDEPEND} + virtual/pkgconfig + nls? ( sys-devel/gettext ) + test? ( sys-devel/bc ) + virtual/os-headers" +RDEPEND+=" + kill? ( + !sys-apps/coreutils[kill] + !sys-process/procps[kill] + ) + !net-wireless/rfkill + !sys-process/schedutils + !sys-apps/setarch + ! "${T}"/fallocate.${ABI}.c + #define _GNU_SOURCE + #include + main() { return fallocate(0, 0, 0, 0); } + EOF + append-lfs-flags + $(tc-getCC) ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} "${T}"/fallocate.${ABI}.c -o /dev/null >/dev/null 2>&1 \ + || export ac_cv_func_fallocate=no + rm -f "${T}"/fallocate.${ABI}.c +} + +multilib_src_configure() { + lfs_fallocate_test + # The scanf test in a run-time test which fails while cross-compiling. + # Blindly assume a POSIX setup since we require libmount, and libmount + # itself fails when the scanf test fails. #531856 + tc-is-cross-compiler && export scanf_cv_alloc_modifier=ms + export ac_cv_header_security_pam_misc_h=$(multilib_native_usex pam) #485486 + export ac_cv_header_security_pam_appl_h=$(multilib_native_usex pam) #545042 + + local myeconfargs=( + --disable-chfn-chsh + --disable-login + --disable-nologin + --disable-su + --docdir='${datarootdir}'/doc/${PF} + --enable-agetty + --enable-bash-completion + --enable-fs-paths-extra="${EPREFIX}/usr/sbin:${EPREFIX}/bin:${EPREFIX}/usr/bin" + --enable-line + --enable-partx + --enable-raw + --enable-rename + --enable-rfkill + --enable-schedutils + --with-bashcompletiondir="$(get_bashcompdir)" + --with-systemdsystemunitdir=$(multilib_native_usex systemd "$(systemd_get_systemunitdir)" "no") + $(multilib_native_use_enable caps setpriv) + $(multilib_native_use_enable cramfs) + $(multilib_native_use_enable fdformat) + $(multilib_native_use_enable nls) + $(multilib_native_use_enable suid makeinstall-chown) + $(multilib_native_use_enable suid makeinstall-setuid) + $(multilib_native_use_enable tty-helpers mesg) + $(multilib_native_use_enable tty-helpers wall) + $(multilib_native_use_enable tty-helpers write) + $(multilib_native_use_with python) + $(multilib_native_use_with readline) + $(multilib_native_use_with slang) + $(multilib_native_use_with systemd) + $(multilib_native_use_with udev) + $(multilib_native_usex ncurses "$(use_with unicode ncursesw)" '--without-ncursesw') + $(multilib_native_usex ncurses "$(use_with !unicode ncurses)" '--without-ncurses') + $(tc-has-tls || echo --disable-tls) + $(use_enable unicode widechar) + $(use_enable kill) + $(use_enable static-libs static) + $(use_with selinux) + $(usex ncurses '' '--without-tinfo') + ) + ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" +} + +multilib_src_compile() { + if multilib_is_native_abi; then + default + else + # build libraries only + emake -f Makefile -f - mylibs \ + <<< 'mylibs: $(usrlib_exec_LTLIBRARIES) $(pkgconfig_DATA)' + fi +} + +multilib_src_test() { + multilib_is_native_abi && emake check +} + +multilib_src_install() { + if multilib_is_native_abi; then + default + else + emake DESTDIR="${D}" install-usrlib_execLTLIBRARIES \ + install-pkgconfigDATA install-uuidincHEADERS \ + install-nodist_blkidincHEADERS install-nodist_mountincHEADERS \ + install-nodist_smartcolsincHEADERS install-nodist_fdiskincHEADERS + fi + + if multilib_is_native_abi; then + # need the libs in / + gen_usr_ldscript -a blkid mount smartcols uuid + + use python && python_optimize + fi +} + +multilib_src_install_all() { + dodoc AUTHORS NEWS README* Documentation/{TODO,*.txt,releases/*} + + # e2fsprogs-libs didnt install .la files, and .pc work fine + find "${ED}" -name "*.la" -delete || die + + if use pam; then + newpamd "${FILESDIR}/runuser.pamd" runuser + newpamd "${FILESDIR}/runuser-l.pamd" runuser-l + fi +} + +pkg_postinst() { + if ! use tty-helpers; then + elog "The mesg/wall/write tools have been disabled due to USE=-tty-helpers." + fi + + if [[ -z ${REPLACING_VERSIONS} ]]; then + elog "The agetty util now clears the terminal by default. You" + elog "might want to add --noclear to your /etc/inittab lines." + fi +} diff --git a/sys-apps/util-linux/util-linux-2.31.ebuild b/sys-apps/util-linux/util-linux-2.31.ebuild deleted file mode 100644 index 6c4f284810f7..000000000000 --- a/sys-apps/util-linux/util-linux-2.31.ebuild +++ /dev/null @@ -1,202 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python2_7 python3_{4,5,6} ) - -inherit toolchain-funcs libtool flag-o-matic bash-completion-r1 \ - pam python-single-r1 multilib-minimal systemd - -MY_PV="${PV/_/-}" -MY_P="${PN}-${MY_PV}" - -if [[ ${PV} == 9999 ]] ; then - inherit git-r3 autotools - EGIT_REPO_URI="git://git.kernel.org/pub/scm/utils/util-linux/util-linux.git" -else - [[ "${PV}" = *_rc* ]] || \ - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux" - SRC_URI="mirror://kernel/linux/utils/util-linux/v${PV:0:4}/${MY_P}.tar.xz" -fi - -DESCRIPTION="Various useful Linux utilities" -HOMEPAGE="https://www.kernel.org/pub/linux/utils/util-linux/" - -LICENSE="GPL-2 LGPL-2.1 BSD-4 MIT public-domain" -SLOT="0" -IUSE="build caps +cramfs fdformat kill ncurses nls pam python +readline selinux slang static-libs +suid systemd test tty-helpers udev unicode" - -# Most lib deps here are related to programs rather than our libs, -# so we rarely need to specify ${MULTILIB_USEDEP}. -RDEPEND="caps? ( sys-libs/libcap-ng ) - cramfs? ( sys-libs/zlib ) - ncurses? ( >=sys-libs/ncurses-5.2-r2:0=[unicode?] ) - pam? ( sys-libs/pam ) - python? ( ${PYTHON_DEPS} ) - readline? ( sys-libs/readline:0= ) - selinux? ( >=sys-libs/libselinux-2.2.2-r4[${MULTILIB_USEDEP}] ) - slang? ( sys-libs/slang ) - !build? ( systemd? ( sys-apps/systemd ) ) - udev? ( virtual/libudev:= )" -DEPEND="${RDEPEND} - virtual/pkgconfig - nls? ( sys-devel/gettext ) - test? ( sys-devel/bc ) - virtual/os-headers" -RDEPEND+=" - kill? ( - !sys-apps/coreutils[kill] - !sys-process/procps[kill] - ) - !net-wireless/rfkill - !sys-process/schedutils - !sys-apps/setarch - ! "${T}"/fallocate.${ABI}.c - #define _GNU_SOURCE - #include - main() { return fallocate(0, 0, 0, 0); } - EOF - append-lfs-flags - $(tc-getCC) ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} "${T}"/fallocate.${ABI}.c -o /dev/null >/dev/null 2>&1 \ - || export ac_cv_func_fallocate=no - rm -f "${T}"/fallocate.${ABI}.c -} - -multilib_src_configure() { - lfs_fallocate_test - # The scanf test in a run-time test which fails while cross-compiling. - # Blindly assume a POSIX setup since we require libmount, and libmount - # itself fails when the scanf test fails. #531856 - tc-is-cross-compiler && export scanf_cv_alloc_modifier=ms - export ac_cv_header_security_pam_misc_h=$(multilib_native_usex pam) #485486 - export ac_cv_header_security_pam_appl_h=$(multilib_native_usex pam) #545042 - - local myeconfargs=( - --disable-chfn-chsh - --disable-login - --disable-nologin - --disable-su - --docdir='${datarootdir}'/doc/${PF} - --enable-agetty - --enable-bash-completion - --enable-fs-paths-extra="${EPREFIX}/usr/sbin:${EPREFIX}/bin:${EPREFIX}/usr/bin" - --enable-line - --enable-partx - --enable-raw - --enable-rename - --enable-rfkill - --enable-schedutils - --with-bashcompletiondir="$(get_bashcompdir)" - --with-systemdsystemunitdir=$(multilib_native_usex systemd "$(systemd_get_systemunitdir)" "no") - $(multilib_native_use_enable caps setpriv) - $(multilib_native_use_enable cramfs) - $(multilib_native_use_enable fdformat) - $(multilib_native_use_enable nls) - $(multilib_native_use_enable suid makeinstall-chown) - $(multilib_native_use_enable suid makeinstall-setuid) - $(multilib_native_use_enable tty-helpers mesg) - $(multilib_native_use_enable tty-helpers wall) - $(multilib_native_use_enable tty-helpers write) - $(multilib_native_use_with python) - $(multilib_native_use_with readline) - $(multilib_native_use_with slang) - $(multilib_native_use_with systemd) - $(multilib_native_use_with udev) - $(multilib_native_usex ncurses "$(use_with unicode ncursesw)" '--without-ncursesw') - $(multilib_native_usex ncurses "$(use_with !unicode ncurses)" '--without-ncurses') - $(tc-has-tls || echo --disable-tls) - $(use_enable unicode widechar) - $(use_enable kill) - $(use_enable static-libs static) - $(use_with selinux) - $(usex ncurses '' '--without-tinfo') - ) - ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" -} - -multilib_src_compile() { - if multilib_is_native_abi; then - default - else - # build libraries only - emake -f Makefile -f - mylibs \ - <<< 'mylibs: $(usrlib_exec_LTLIBRARIES) $(pkgconfig_DATA)' - fi -} - -multilib_src_test() { - multilib_is_native_abi && emake check -} - -multilib_src_install() { - if multilib_is_native_abi; then - default - else - emake DESTDIR="${D}" install-usrlib_execLTLIBRARIES \ - install-pkgconfigDATA install-uuidincHEADERS \ - install-nodist_blkidincHEADERS install-nodist_mountincHEADERS \ - install-nodist_smartcolsincHEADERS install-nodist_fdiskincHEADERS - fi - - if multilib_is_native_abi; then - # need the libs in / - gen_usr_ldscript -a blkid mount smartcols uuid - - use python && python_optimize - fi -} - -multilib_src_install_all() { - dodoc AUTHORS NEWS README* Documentation/{TODO,*.txt,releases/*} - - # e2fsprogs-libs didnt install .la files, and .pc work fine - find "${ED}" -name "*.la" -delete || die - - if use pam; then - newpamd "${FILESDIR}/runuser.pamd" runuser - newpamd "${FILESDIR}/runuser-l.pamd" runuser-l - fi -} - -pkg_postinst() { - if ! use tty-helpers; then - elog "The mesg/wall/write tools have been disabled due to USE=-tty-helpers." - fi - - if [[ -z ${REPLACING_VERSIONS} ]]; then - elog "The agetty util now clears the terminal by default. You" - elog "might want to add --noclear to your /etc/inittab lines." - fi -} -- cgit v1.2.3