diff options
Diffstat (limited to 'sys-process')
22 files changed, 144 insertions, 545 deletions
diff --git a/sys-process/Manifest.gz b/sys-process/Manifest.gz Binary files differindex 47ff63baa110..f882d6ecebe4 100644 --- a/sys-process/Manifest.gz +++ b/sys-process/Manifest.gz diff --git a/sys-process/fcron/Manifest b/sys-process/fcron/Manifest index 74332f3a5978..b58af3cca2d2 100644 --- a/sys-process/fcron/Manifest +++ b/sys-process/fcron/Manifest @@ -1,6 +1,7 @@ AUX crontab.2 1098 BLAKE2B f7fe284c580292df08c7591c61802d0df1fa496e79a11d1c67bb37249f8548b5b2073ff8e94de02ed4dfcccf07c11443a1d1a1b08697115f311bf77536921704 SHA512 5e1a23ad70fb79275c8a29137284ccb13f1fbb4387ba61875065e003aafe03aeb1709819bf2803a70494f15c42a69883c9c5272219f625e7c5ff53c4459e5d42 AUX fcron-3.1.1-noreadline.patch 716 BLAKE2B 766336a43f54b067073c3a9c6def5ebd2d3f3280324bcb63f50c0c85de20d753b82693f6a8886b321c54fedd866cade90dacee69e28a132488ac14c65c8f7902 SHA512 152aaa299abd8ec546dc73ca7527d3162c14cec47cc670d82c7312f0fe64545a2c0c9ed82ae79ee4fe028ca009d37f6f4843e4c2ec6e6ee7cf7e8b97dc61ec71 AUX fcron-3.2.1-configure-fix-audit-parameter-check.patch 815 BLAKE2B 2e1a592702ff4e6c702d49390dbbeb0d5b6a16658f59f2719918f238a382d0dd81ddf2dc049a077e1e29f5f748b4772b5fdb4ec5446be5887356d9ab46200f6c SHA512 c2942a729d584dc72936695b19844951675a98c2783836e7ff3a8e4ea63fe470dc0dadedb83c9737b78978f2c8d4a4af62191ffb27e4ba6817ea4c70c9c2a8b8 +AUX fcron-3.2.1-musl-getopt-order.patch 1420 BLAKE2B 69da87a05cae2e750eb1cf09a4a716aad900b1109db8fc9c94da87193e04fb640d14d9d369894db93caa18acd1e8934fc2ffcf708b982ed17ed8bb825a40d4cc SHA512 684e921840deccb7f0bda56ba39304d7637d03ac61d9d80669b09501b86f5867e37fca0d88ae0710c175cea3d978533e4a8d8bfcfbfa6b1f7aefc6e29e3827c5 AUX fcron.confd 134 BLAKE2B 3ab11ae5641f1c2f049da2aec3d1561fa3b10b7fe5d29701e5fb1e8b75a613c110924999ed0afed3b7118196636c1c3198b4499127e4065200791d821ab737ce SHA512 58a66cd495fcb6a9b49f1d244357dfd61188a0c09d2c02a93c9250b8d77d9b89aff41d947e25fd4c1248f39b6a97f045e760b52cdf2f065145a8bfe74b7bf25e AUX fcron.init-r5 2633 BLAKE2B 3e3a1991f67f9e9ed2021c8ed0f7442032feb88af89088caad2fd0c090e8c588a8621b45a7b320309065f1a5bef743aa00bf9cb2e531ddb55104ccdba43c9350 SHA512 bf53158d6326a742fc3af0cdf196f76a2930f61e58c8a7f4488d3a17aa18bdbd12a3258034f649ae9998627caec7c55bf4c392265525a8fa7c6614cc38f2d0e0 AUX fcron.init.4 2589 BLAKE2B e84ffd9d1b5a3cd1ee60c426cde67a3e7bd5a853d2cbdd943ffd382280675cec07c83191231d22b98aaffbd2966fcbf39e9856051d3e248331b4a6bc04d138eb SHA512 6f5197e979333eabe6fbe7c3c44488db6e82067037d2de37b28c791467ecd27c3df7b4fda0b04f1d04929e7a643d76c42f5d0af64256b9dff7848ef892775e0d @@ -8,6 +9,6 @@ AUX fcrontab.2 226 BLAKE2B 4fc55d14c44797b1dcc34000de1a9ffa43b1a52037db5dcec7685 DIST fcron-3.2.1.src.tar.gz 601142 BLAKE2B 184b74f9d64186b7d3aae87d48ed0107525fd0c73bb8db86408bd246592ff4fbcbc04f8ca0064868a8555d7c6be2f183172d62daeed75275cd836517da504d0f SHA512 ddfd3e3a297b843c924aacccffaa5c1c6b300497f39daa1cdb90dc4cf4bc757042b0b2c1f055c119c8128c64d830ee0e8757091610432f5ffcacca25d369e5cd DIST fcron-3.3.0_beta.tar.gz 592481 BLAKE2B b862dac8e70621e299ec2fbbc75a0e8843e7a085190fa7a18f9444f6f41f28cf55ef0dcd7234a388b9b3e6689f25019a581ded2ae6002643bb3dc472a59207bb SHA512 e5b76e23af774997d9ee1ef58d17009cea95d10b19a2d22b550b178a39bb7c439c055b440eb99c4286db6622901e5deb029318e4425e8cd098766452ffc15bc6 EBUILD fcron-3.2.1-r1.ebuild 6952 BLAKE2B 1b47fad42d9a420746fb053a0044d5d409bc3c4ae3430e151f384ab2aa66feeb3197bfa9a3a892ceb0acccdcea8016de7db59c302a2aa285d287099bf667accf SHA512 79304f14e5cfad7741fd9cb467bd80da28f5bea49b019b849412f931a9edbdf2a54444bf534ef2a48e150def03ce1fea666ca4041cae5b645bc884513dd3d572 -EBUILD fcron-3.2.1-r2.ebuild 7004 BLAKE2B 21db3b4e8a2da2dc3171d0f4697379e20f19e79ac6bc0200d2d8dd6cac656ab1aeceab6c64a513031fa781acd572d621f66838ddce9ad43d30ead6905873101b SHA512 aa53fe077985dcc8bc9f86f06ba0897d4f46c1a9725f702a519e0dec4ddcd1d792ef8ce0cd1a38c56aa0a4453a76ba5c0e614766e001d4e09eb6afc8dde9b02b -EBUILD fcron-3.3.0_beta-r1.ebuild 7023 BLAKE2B 068472be889f7eb0c3db4e6ca84f62e01c1bce2c759b8c1f60855e98d343316afc35e8ae45dbb825c50af53be9d4ea33158034b4746f393364f6578f2df4c793 SHA512 8de93d73933bcbd232083d2a498f2d90e3c6c026a32566489cb7a8347e992170cf79dd65f373185eef71f3575194716e0b884233f138a8fc34cebbe47c5492db +EBUILD fcron-3.2.1-r3.ebuild 7055 BLAKE2B bbde5773441644b87eb0bd3b33413f887587ac6e812272f696a2b89d054148d620b2d37b55dc6add9a6a13f53a3bd10e953530641e2190b69c347ea131349a37 SHA512 6ceb99b7e198b91ef1228a47764b90e46dc87a3068e75d853e77e85102aae3942ec444e3fccdc20679db5202c6c9dde3f4760eaa2d0617f9d2bafaf90890a686 +EBUILD fcron-3.3.0_beta-r1.ebuild 7074 BLAKE2B 7bc0e9cb9923bad03c0b2f5842c0af7b45fb847c3b0b09a3599b0c3eb17d865a8850275aec27279f15c91abd6d45b9638e57462d5b0a0a6986dc3c9a6677c7ae SHA512 2a14df2de11e12d6e31ed709ca20d0868231192c5e3d65735979b4349cd93e3cdc3aaa85de15e93338b134cbfdb0c19b08d41e5cbcfcc93ccb9165038c67916a MISC metadata.xml 1276 BLAKE2B 8cc80ae3ae21b829b950e45eecb14fa88b709ec0c52c5d08bb1b05797852dcdfd16d7041ea716dcb63a204abe5fa6dbacf9c49035352a60a074e35123cdfa893 SHA512 2c697d3ab08cbdd0fb8baab0478c8bb36de4afb1753e070ebb9a67a40159b945b066cb9479585189b20ca7dfe57ba83cf6d23d507888d73d8a8fbd4432e52222 diff --git a/sys-process/fcron/fcron-3.2.1-r2.ebuild b/sys-process/fcron/fcron-3.2.1-r3.ebuild index 604e9afb710b..fe5f30de4ec0 100644 --- a/sys-process/fcron/fcron-3.2.1-r2.ebuild +++ b/sys-process/fcron/fcron-3.2.1-r3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI="6" @@ -28,6 +28,7 @@ RDEPEND="${DEPEND} PATCHES=( "${FILESDIR}"/${PN}-3.1.1-noreadline.patch "${FILESDIR}"/${PN}-3.2.1-configure-fix-audit-parameter-check.patch + "${FILESDIR}"/${PN}-3.2.1-musl-getopt-order.patch ) pkg_setup() { diff --git a/sys-process/fcron/fcron-3.3.0_beta-r1.ebuild b/sys-process/fcron/fcron-3.3.0_beta-r1.ebuild index 10f03c92f516..f842946849e1 100644 --- a/sys-process/fcron/fcron-3.3.0_beta-r1.ebuild +++ b/sys-process/fcron/fcron-3.3.0_beta-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI="6" @@ -31,6 +31,7 @@ RDEPEND="${DEPEND} PATCHES=( "${FILESDIR}"/${PN}-3.1.1-noreadline.patch "${FILESDIR}"/${PN}-3.2.1-configure-fix-audit-parameter-check.patch + "${FILESDIR}"/${PN}-3.2.1-musl-getopt-order.patch ) S="${WORKDIR}/${MY_P}" diff --git a/sys-process/fcron/files/fcron-3.2.1-musl-getopt-order.patch b/sys-process/fcron/files/fcron-3.2.1-musl-getopt-order.patch new file mode 100644 index 000000000000..801baad91710 --- /dev/null +++ b/sys-process/fcron/files/fcron-3.2.1-musl-getopt-order.patch @@ -0,0 +1,24 @@ +diff -Naur fcron-3.2.1.orig/script/check_system_crontabs.bash fcron-3.2.1/script/check_system_crontabs.bash +--- fcron-3.2.1.orig/script/check_system_crontabs.bash 2015-03-28 04:45:42.000000000 -0400 ++++ fcron-3.2.1/script/check_system_crontabs.bash 2018-02-05 17:47:04.735425134 -0500 +@@ -256,7 +256,7 @@ + sed -i -e "s/@yearly/0 0 1 1 */g" -e "s/@annually/0 0 1 1 */g" -e "s/@monthly/0 0 1 * */g" -e "s/@weekly/0 0 * * 0/g" -e "s/@daily/0 0 * * */g" -e "s/@midnight/0 0 * * */g" -e "s/@hourly/0 * * * */g" $FCRONTAB_FILE_TMP + + # notify fcron about the updated file +- $FCRONTAB_PROG $FCRONTAB_FILE_TMP -u systab ++ $FCRONTAB_PROG -u systab $FCRONTAB_FILE_TMP + } + + NEED_REBUILD=0 +diff -Naur fcron-3.2.1.orig/script/check_system_crontabs.sh fcron-3.2.1/script/check_system_crontabs.sh +--- fcron-3.2.1.orig/script/check_system_crontabs.sh 2015-03-28 04:45:42.000000000 -0400 ++++ fcron-3.2.1/script/check_system_crontabs.sh 2018-02-05 17:45:48.673612299 -0500 +@@ -265,7 +265,7 @@ + sed -i -e "s/@yearly/0 0 1 1 */g" -e "s/@annually/0 0 1 1 */g" -e "s/@monthly/0 0 1 * */g" -e "s/@weekly/0 0 * * 0/g" -e "s/@daily/0 0 * * */g" -e "s/@midnight/0 0 * * */g" -e "s/@hourly/0 * * * */g" "$FCRONTAB_FILE_TMP" + + # notify fcron about the updated file +- "$FCRONTAB_PROG" -c "$FCRON_CONFIG_FILE" "$FCRONTAB_FILE_TMP" -u systab ++ "$FCRONTAB_PROG" -c "$FCRON_CONFIG_FILE" -u systab "$FCRONTAB_FILE_TMP" + } + + NEED_REBUILD=0 diff --git a/sys-process/htop/Manifest b/sys-process/htop/Manifest index 10e47fa45f6c..b28cb647d276 100644 --- a/sys-process/htop/Manifest +++ b/sys-process/htop/Manifest @@ -1,11 +1,7 @@ -AUX htop-1.0.3-tinfo.patch 2588 BLAKE2B 6968919b13c4b9f9d56fb3a247d3b582a325325b6d946a47fe097ec0d0d7ad8b86086f224c1396b33b2ce68f9592ee9f6ef0932ff404dd99f03a11ba5cd638a8 SHA512 071a24efb5536baae05478bb2035da0c6f1f42c7d99be92d6e8f534d78ea5ba90bdb4a8fd4d9fa27cad2097f2b593bf60dd9fa6a84758eb2f3cfbc5a58f02bf4 -AUX htop-2.0.0-tinfo.patch 3850 BLAKE2B 697aad23ca2a5bc1b11e4ae4af5907cb5f020c1ae22f403fe2611430ebced96d066043aafaccbbef73ccdd93ffde776ea188f6984a1438030f2808ae81896813 SHA512 8b2d64eaafa1dbf7217371750e9cd8bccaed80ff416f2773ce387dda8fbb81093f52392fc6b6b7377fc22b7831d5d9601ab54319df6681df090cd11ee93eb4fd AUX htop-2.0.2-tinfo.patch 3655 BLAKE2B 505aacb774b54e4c7d9238942ff74cc96d0f5c93c7b74e9531e41e2ffa994b4d475b16620b65b824c28da2856294ef7fcd3562d9c318d4adbcc30bb512431b0f SHA512 33273ddcb89e955ef499854fb9361b65bafa83cce8e91f4ef62dd70fc29e58e169148c957d9cd0c5a123b9e5fe66f838212c8066bff12ada38c430087d02b210 -DIST htop-1.0.3.tar.gz 399306 BLAKE2B 3ce3aad0f72102c2aa6d9c7a198eef5e1591dec41f6fabfbe03f2626e08d0967c023adba8285c94e5b5ac05d3b05ec78964035f0bd70bbdff9f429f9cb052097 SHA512 4c5c784b093bcad06eb2e8d8bb215e14f6e838a3d47d8da8402344c270c1724f85d0bcde2899571ba5d0e5a02274a0c3390a76fed61785b2604b51351f08f232 -DIST htop-2.0.1.tar.gz 477196 BLAKE2B 03b6d7a71cbf261413e828d8678daecc969c76439a1241734d7bed13f7f8a3d22b40ebc4845c924ea6c61ddae20f1b90f78790c634908cf4d161ecb314e57c72 SHA512 57991a55b69028c01549b067ec749099466df5b08a0ed9a65dd779e6d2c8ee0a5d9c330bb6c727b04a349146ad441b7115718e433d1f8232f74b28903fb351ff +AUX htop-2.1.0-sysmacros.patch 1070 BLAKE2B 66dbe1cd52dcd972a2d9a9cd927ef0fd16e77c95b9c00b6953620a02e7af32d16d3e92ee7620f7dd39c9eb465575b82817fb57ea348fa55767886aeff1a2cca6 SHA512 e84be1b866209f0eef4f62021725757c57bdad3ef99aab79c4ce3d6f48d1c6dab1189d37681f91b929c091f76311dba9aba0388b61c7253a9fa5f1e939e2df0b DIST htop-2.0.2.tar.gz 476364 BLAKE2B f5519977b4bd6d189cb7f379a9f9b535a4b67a575b30056a43e259ab39a69f84083d310bbefefe8408c7ca99918f1ea9ae775808b9afe9d0f78097ac6bb88dc7 SHA512 1c9bf71a36c56b301667aa6d03756fc757fbcb63e848d9581d10db3df6193cdeb00e55ceb6e2392794ac03ea034b04459a8fe550b3ac2318cd86263a74c78cda -EBUILD htop-1.0.3-r1.ebuild 1936 BLAKE2B 1dcbd58958402db5241d1c339cd520cab5289030223ba3236237056cf5eddf7b44bb09e9853d756880faa7ba657d13eabf2fb06f333fab1b9f5fa9643ac49475 SHA512 cbfad60ba2750f95b99ed0d51094a457c20a67954d8b3bf9878ff666c8b378e913415bd86703d1b1dc3f51ba63afd40ef7976eb9de902c81ba3221897355c487 -EBUILD htop-1.0.3.ebuild 2097 BLAKE2B b745c373730e7a55ae378a09e9596c7505825d3764218b33daccc87d7e3c9a25dd1e0cf63f71ae5cdf94d4fd79ed731dca69f4124f1541830503350825eabca8 SHA512 ee81709d86fa64b5e9900f99f75f6f08bbb1ad2c64a9c456e53a85fd94067e53103707b46f8b96d0e771f983b7613fe860e14c018e379efba557906bb9b2cbfb -EBUILD htop-2.0.1.ebuild 1388 BLAKE2B 729cf548b2c3d85bf9f9f4b321e789ef6ffa0571274f568167beaa66a686d92c73a74dd55275279b9f684da0003b6c46638ed01eb00ed559496e35432509ec0b SHA512 fcf3f2f083d5d26f2946402d83e721bff4c395b8497c551cc4be3ac25f78e904a3df8c6e78970689398526bf84bcc17be5e1e43e81b96cad452fe516251df6dd +DIST htop-2.1.0.tar.gz 302938 BLAKE2B 3e290a3dbb0bf5424780ba5dcb9de8ea478bf4cabbbde202c19eb3db7e0f8d1e108ec3ea41544ac095097c39100417c72477dab96f104a6317f4edd06d69199f SHA512 203e8f4abd63334330fc673f6c9609adbeab763d80f553d8b48670091d18dd347599a9ce2dbbac374fa4a13fa904948711a441fa676f52ab1612bd2b4ee4c6eb EBUILD htop-2.0.2.ebuild 1390 BLAKE2B d38a5264ba9f0f2c8467f3dc2ad61440c50945a2ae2b8782879e93084b405253899a8430aff263181b9b11bc74376d8a9f087bcbf4e29908e3c9bdd607cf8d6d SHA512 82e5bc99fe341b7492f219193fb74c241ba035455e0faae7cea42635a99069c6d195157d8bb6e13277483e47d5df37a579dcf57c0a6e0a33ec31d983b9b9f5c7 -MISC metadata.xml 830 BLAKE2B 58122259f59445d2b2872e1a9e9eae179c3ce4726139dc310fcb6095ff58388a76f5aed2c0570195fdbd92495f8a2c05c254d1daa6288c2a5168f26e9958e5e8 SHA512 0019a634b333e013f48aacd2c59825a7650cb02c3a6f31b57963e16845cef07d1f6b4108fece6cd12ed29d5730c52aa87d43d81303b359bbbc661b4b60e19d05 +EBUILD htop-2.1.0.ebuild 1379 BLAKE2B 28b200bb48a064344f3608bf9664c875e1822221ced53ec4ede8dae44fa7e945826ead71532a286e25408ff64c50e2f5ecf4d9091ede63ec2224e54046723cea SHA512 b82a6c3c7bdc507f1e7ac2aad70472d5e237f218af2c7564dbd1070c45c90d093e0a5bfac40f7b9629e7ff4d4595065dd5f1e903902428a03eeb25d12548acc7 +MISC metadata.xml 750 BLAKE2B 57d419667fbc0053cb2f24908a4e43fefecca832bd86e8d562a4a43090b82f049c62457388ffe8bc4c1f3d49e1119da50f8221686b69956f4ea9426259fb6f3a SHA512 e35d8a5177f9e5bb3136759a7c4c0de5dee4366e3380952c8d72dbdfab46be5f880b77450046f02846c7baa1892e88835c8480808333934ec1bec04c34cd9072 diff --git a/sys-process/htop/files/htop-1.0.3-tinfo.patch b/sys-process/htop/files/htop-1.0.3-tinfo.patch deleted file mode 100644 index 62a887baf376..000000000000 --- a/sys-process/htop/files/htop-1.0.3-tinfo.patch +++ /dev/null @@ -1,62 +0,0 @@ -diff --git a/Makefile.am b/Makefile.am -index 820e2e5..85f49e9 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -36,6 +36,8 @@ SUFFIXES = .h - BUILT_SOURCES = $(myhtopheaders) - htop_SOURCES = $(myhtopheaders) $(myhtopsources) config.h - -+htop_LDADD = $(NCURSES_LIBS) -+ - profile: - $(MAKE) all CFLAGS="-pg" AM_CPPFLAGS="-pg -O2 -DNDEBUG" - -diff --git a/configure.ac b/configure.ac -index 2b934e8..3593885 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -20,6 +20,7 @@ AM_PROG_CC_C_O - AC_DISABLE_SHARED - AC_ENABLE_STATIC - AC_PROG_LIBTOOL -+PKG_PROG_PKG_CONFIG - - # Checks for libraries. - AC_CHECK_LIB([m], [ceil], [], [missing_libraries="$missing_libraries libm"]) -@@ -89,20 +90,24 @@ fi - - AC_ARG_ENABLE(unicode, [AC_HELP_STRING([--enable-unicode], [enable Unicode support])], ,enable_unicode="yes") - if test "x$enable_unicode" = xyes; then -- AC_CHECK_LIB([ncursesw], [refresh], [], [ -- missing_libraries="$missing_libraries libncursesw" -- AC_MSG_ERROR([You may want to use --disable-unicode or install libncursesw.]) -+ PKG_CHECK_MODULES([NCURSES], [ncursesw],[ -+ AC_CHECK_LIB([ncursesw], [refresh], [], [ -+ missing_libraries="$missing_libraries libncursesw" -+ AC_MSG_ERROR([You may want to use --disable-unicode or install libncursesw.]) -+ ]) -+ AC_CHECK_HEADERS([ncursesw/curses.h],[:], -+ [AC_CHECK_HEADERS([ncurses/ncurses.h],[:], -+ [AC_CHECK_HEADERS([ncurses/curses.h],[:], -+ [AC_CHECK_HEADERS([ncurses.h],[:],[missing_headers="$missing_headers $ac_header"])])])]) - ]) -- AC_CHECK_HEADERS([ncursesw/curses.h],[:], -- [AC_CHECK_HEADERS([ncurses/ncurses.h],[:], -- [AC_CHECK_HEADERS([ncurses/curses.h],[:], -- [AC_CHECK_HEADERS([ncurses.h],[:],[missing_headers="$missing_headers $ac_header"])])])]) - else -- AC_CHECK_LIB([ncurses], [refresh], [], [missing_libraries="$missing_libraries libncurses"]) -- AC_CHECK_HEADERS([curses.h],[:], -- [AC_CHECK_HEADERS([ncurses/curses.h],[:], -- [AC_CHECK_HEADERS([ncurses/ncurses.h],[:], -- [AC_CHECK_HEADERS([ncurses.h],[:],[missing_headers="$missing_headers $ac_header"])])])]) -+ PKG_CHECK_MODULES([NCURSES], [ncurses],[ -+ AC_CHECK_LIB([ncurses], [refresh], [], [missing_libraries="$missing_libraries libncurses"]) -+ AC_CHECK_HEADERS([curses.h],[:], -+ [AC_CHECK_HEADERS([ncurses/curses.h],[:], -+ [AC_CHECK_HEADERS([ncurses/ncurses.h],[:], -+ [AC_CHECK_HEADERS([ncurses.h],[:],[missing_headers="$missing_headers $ac_header"])])])]) -+ ]) - fi - - if test ! -z "$missing_libraries"; then diff --git a/sys-process/htop/files/htop-2.0.0-tinfo.patch b/sys-process/htop/files/htop-2.0.0-tinfo.patch deleted file mode 100644 index e04019519e0c..000000000000 --- a/sys-process/htop/files/htop-2.0.0-tinfo.patch +++ /dev/null @@ -1,82 +0,0 @@ ---- htop-2.0.0/configure.ac -+++ htop-2.0.0/configure.ac -@@ -23,6 +23,7 @@ - AC_DISABLE_SHARED - AC_ENABLE_STATIC - AC_PROG_LIBTOOL -+PKG_PROG_PKG_CONFIG - - # Checks for platform. - # ---------------------------------------------------------------------- -@@ -175,32 +176,36 @@ - - AC_ARG_ENABLE(unicode, [AC_HELP_STRING([--enable-unicode], [enable Unicode support])], ,enable_unicode="yes") - if test "x$enable_unicode" = xyes; then -- HTOP_CHECK_SCRIPT([ncursesw6], [addnwstr], [HAVE_LIBNCURSESW], "ncursesw6-config", -- HTOP_CHECK_SCRIPT([ncursesw], [addnwstr], [HAVE_LIBNCURSESW], "ncursesw5-config", -- HTOP_CHECK_SCRIPT([ncurses], [addnwstr], [HAVE_LIBNCURSESW], "ncurses5-config", -- HTOP_CHECK_LIB([ncursesw6], [addnwstr], [HAVE_LIBNCURSESW], -- HTOP_CHECK_LIB([ncursesw], [addnwstr], [HAVE_LIBNCURSESW], -- HTOP_CHECK_LIB([ncurses], [addnwstr], [HAVE_LIBNCURSESW], -- missing_libraries="$missing_libraries libncursesw" -- AC_MSG_ERROR([You may want to use --disable-unicode or install libncursesw.]) -- )))))) -- -- AC_CHECK_HEADERS([ncursesw/curses.h],[:], -- [AC_CHECK_HEADERS([ncurses/ncurses.h],[:], -- [AC_CHECK_HEADERS([ncurses/curses.h],[:], -- [AC_CHECK_HEADERS([ncurses.h],[:],[missing_headers="$missing_headers $ac_header"])])])]) -+ PKG_CHECK_MODULES([NCURSES], [ncursesw],[ -+ HTOP_CHECK_SCRIPT([ncursesw6], [addnwstr], [HAVE_LIBNCURSESW], "ncursesw6-config", -+ HTOP_CHECK_SCRIPT([ncursesw], [addnwstr], [HAVE_LIBNCURSESW], "ncursesw5-config", -+ HTOP_CHECK_SCRIPT([ncurses], [addnwstr], [HAVE_LIBNCURSESW], "ncurses5-config", -+ HTOP_CHECK_LIB([ncursesw6], [addnwstr], [HAVE_LIBNCURSESW], -+ HTOP_CHECK_LIB([ncursesw], [addnwstr], [HAVE_LIBNCURSESW], -+ HTOP_CHECK_LIB([ncurses], [addnwstr], [HAVE_LIBNCURSESW], -+ missing_libraries="$missing_libraries libncursesw" -+ AC_MSG_ERROR([You may want to use --disable-unicode or install libncursesw.]) -+ )))))) -+ -+ AC_CHECK_HEADERS([ncursesw/curses.h],[:], -+ [AC_CHECK_HEADERS([ncurses/ncurses.h],[:], -+ [AC_CHECK_HEADERS([ncurses/curses.h],[:], -+ [AC_CHECK_HEADERS([ncurses.h],[:],[missing_headers="$missing_headers $ac_header"])])])]) -+ ]) - else -- HTOP_CHECK_SCRIPT([ncurses6], [refresh], [HAVE_LIBNCURSES], "ncurses6-config", -- HTOP_CHECK_SCRIPT([ncurses], [refresh], [HAVE_LIBNCURSES], "ncurses5-config", -- HTOP_CHECK_LIB([ncurses6], [refresh], [HAVE_LIBNCURSES], -- HTOP_CHECK_LIB([ncurses], [refresh], [HAVE_LIBNCURSES], -- missing_libraries="$missing_libraries libncurses" -- )))) -+ PKG_CHECK_MODULES([NCURSES], [ncurses],[ -+ HTOP_CHECK_SCRIPT([ncurses6], [refresh], [HAVE_LIBNCURSES], "ncurses6-config", -+ HTOP_CHECK_SCRIPT([ncurses], [refresh], [HAVE_LIBNCURSES], "ncurses5-config", -+ HTOP_CHECK_LIB([ncurses6], [refresh], [HAVE_LIBNCURSES], -+ HTOP_CHECK_LIB([ncurses], [refresh], [HAVE_LIBNCURSES], -+ missing_libraries="$missing_libraries libncurses" -+ )))) - -- AC_CHECK_HEADERS([curses.h],[:], -- [AC_CHECK_HEADERS([ncurses/curses.h],[:], -- [AC_CHECK_HEADERS([ncurses/ncurses.h],[:], -- [AC_CHECK_HEADERS([ncurses.h],[:],[missing_headers="$missing_headers $ac_header"])])])]) -+ AC_CHECK_HEADERS([curses.h],[:], -+ [AC_CHECK_HEADERS([ncurses/curses.h],[:], -+ [AC_CHECK_HEADERS([ncurses/ncurses.h],[:], -+ [AC_CHECK_HEADERS([ncurses.h],[:],[missing_headers="$missing_headers $ac_header"])])])]) -+ ]) - fi - - if test "$my_htop_platform" = "freebsd"; then ---- htop-2.0.0/Makefile.am -+++ htop-2.0.0/Makefile.am -@@ -85,6 +85,8 @@ - BUILT_SOURCES = $(myhtopheaders) $(myhtopplatheaders) - htop_SOURCES = $(myhtopheaders) $(myhtopplatheaders) $(myhtopsources) $(myhtopplatsources) config.h - -+htop_LDADD = $(NCURSES_LIBS) -+ - target: - echo $(htop_SOURCES) - diff --git a/sys-process/htop/files/htop-2.1.0-sysmacros.patch b/sys-process/htop/files/htop-2.1.0-sysmacros.patch new file mode 100644 index 000000000000..08f023b442e5 --- /dev/null +++ b/sys-process/htop/files/htop-2.1.0-sysmacros.patch @@ -0,0 +1,38 @@ +From 25c50af220c2de4542b440b7470a644caf2a3b65 Mon Sep 17 00:00:00 2001 +From: Lars Wendler <polynomial-c@gentoo.org> +Date: Mon, 5 Feb 2018 16:02:19 +0100 +Subject: [PATCH] Add <sys/sysmacros.h> to two files. + +Future glibc releases will no longer include sysmacros implicitly. +--- + Process.c | 1 + + linux/LinuxProcessList.c | 1 + + 2 files changed, 2 insertions(+) + +diff --git a/Process.c b/Process.c +index 1836080..5122afb 100644 +--- a/Process.c ++++ b/Process.c +@@ -19,6 +19,7 @@ in the source distribution for its full text. + #include <sys/param.h> + #include <sys/stat.h> + #include <sys/types.h> ++#include <sys/sysmacros.h> + #include <unistd.h> + #include <stdlib.h> + #include <signal.h> +diff --git a/linux/LinuxProcessList.c b/linux/LinuxProcessList.c +index 6f2631a..7522fb1 100644 +--- a/linux/LinuxProcessList.c ++++ b/linux/LinuxProcessList.c +@@ -25,6 +25,7 @@ in the source distribution for its full text. + #include <time.h> + #include <assert.h> + #include <sys/types.h> ++#include <sys/sysmacros.h> + #include <fcntl.h> + + #ifdef HAVE_DELAYACCT +-- +2.16.1 + diff --git a/sys-process/htop/htop-1.0.3-r1.ebuild b/sys-process/htop/htop-1.0.3-r1.ebuild deleted file mode 100644 index 3f35a581888a..000000000000 --- a/sys-process/htop/htop-1.0.3-r1.ebuild +++ /dev/null @@ -1,74 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -AUTOTOOLS_AUTORECONF=true - -inherit autotools-utils linux-info - -DESCRIPTION="interactive process viewer" -HOMEPAGE="http://hisham.hm/htop/" -SRC_URI="http://hisham.hm/htop/releases/${PV}/${P}.tar.gz" - -LICENSE="BSD GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux" -IUSE="kernel_FreeBSD kernel_linux oom openvz unicode vserver" - -RDEPEND="sys-libs/ncurses:0=[unicode?]" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -DOCS=( ChangeLog README ) - -CONFIG_CHECK="~TASKSTATS ~TASK_XACCT ~TASK_IO_ACCOUNTING ~CGROUPS" - -# config.h problems -AUTOTOOLS_IN_SOURCE_BUILD=1 - -PATCHES=("${FILESDIR}/${P}-tinfo.patch") - -pkg_setup() { - if use kernel_FreeBSD && ! [[ -f ${ROOT}/compat/linux/proc/stat && -f ${ROOT}/compat/linux/proc/meminfo ]]; then - echo - eerror "htop requires linprocfs mounted at /compat/linux/proc to build and function." - eerror "To mount it, type:" - [ -d /compat/linux/proc ] || eerror "mkdir -p /compat/linux/proc" - eerror "mount -t linprocfs none /compat/linux/proc" - eerror "Alternatively, place this information into /etc/fstab" - echo - die "htop needs /compat/linux/proc mounted" - fi - - if ! has_version sys-process/lsof; then - ewarn "To use lsof features in htop(what processes are accessing" - ewarn "what files), you must have sys-process/lsof installed." - fi - - linux-info_pkg_setup -} - -src_prepare() { - rm missing || die - - autotools-utils_src_prepare -} - -src_configure() { - [[ $CBUILD != $CHOST ]] && export ac_cv_file__proc_{meminfo,stat}=yes #328971 - - local myeconfargs=() - - use kernel_FreeBSD && myeconfargs+=( --with-proc=/compat/linux/proc ) - - myeconfargs+=( - $(use_enable openvz) - $(use_enable kernel_linux cgroup) - $(use_enable vserver) - $(use_enable unicode) - $(use_enable oom) - --enable-taskstats - ) - autotools-utils_src_configure -} diff --git a/sys-process/htop/htop-1.0.3.ebuild b/sys-process/htop/htop-1.0.3.ebuild deleted file mode 100644 index 1665da56d72f..000000000000 --- a/sys-process/htop/htop-1.0.3.ebuild +++ /dev/null @@ -1,82 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -PYTHON_COMPAT=( python2_7 ) - -AUTOTOOLS_AUTORECONF=true - -inherit autotools-utils linux-info python-any-r1 - -DESCRIPTION="interactive process viewer" -HOMEPAGE="http://hisham.hm/htop/" -SRC_URI="http://hisham.hm/htop/releases/${PV}/${P}.tar.gz" - -LICENSE="BSD GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux" -IUSE="kernel_FreeBSD kernel_linux oom openvz unicode vserver" - -RDEPEND="sys-libs/ncurses:0=[unicode?]" -DEPEND="${RDEPEND} - ${PYTHON_DEPS} - virtual/pkgconfig" - -DOCS=( ChangeLog README ) - -CONFIG_CHECK="~TASKSTATS ~TASK_XACCT ~TASK_IO_ACCOUNTING ~CGROUPS" - -# config.h problems -AUTOTOOLS_IN_SOURCE_BUILD=1 - -PATCHES=("${FILESDIR}/${P}-tinfo.patch") - -pkg_setup() { - if use kernel_FreeBSD && ! [[ -f ${ROOT}/compat/linux/proc/stat && -f ${ROOT}/compat/linux/proc/meminfo ]]; then - echo - eerror "htop requires linprocfs mounted at /compat/linux/proc to build and function." - eerror "To mount it, type:" - [ -d /compat/linux/proc ] || eerror "mkdir -p /compat/linux/proc" - eerror "mount -t linprocfs none /compat/linux/proc" - eerror "Alternatively, place this information into /etc/fstab" - echo - die "htop needs /compat/linux/proc mounted" - fi - - if ! has_version sys-process/lsof; then - ewarn "To use lsof features in htop(what processes are accessing" - ewarn "what files), you must have sys-process/lsof installed." - fi - - python-any-r1_pkg_setup - linux-info_pkg_setup -} - -src_prepare() { - rm missing || die - - sed \ - -e '1c\#!'"${EPREFIX}"'/usr/bin/python' \ - -i scripts/MakeHeader.py || die - - autotools-utils_src_prepare -} - -src_configure() { - [[ $CBUILD != $CHOST ]] && export ac_cv_file__proc_{meminfo,stat}=yes #328971 - - local myeconfargs=() - - use kernel_FreeBSD && myeconfargs+=( --with-proc=/compat/linux/proc ) - - myeconfargs+=( - $(use_enable openvz) - $(use_enable kernel_linux cgroup) - $(use_enable vserver) - $(use_enable unicode) - $(use_enable oom) - --enable-taskstats - ) - autotools-utils_src_configure -} diff --git a/sys-process/htop/htop-2.0.1.ebuild b/sys-process/htop/htop-2.1.0.ebuild index a2b10fdb96a6..1ba6ab8008f8 100644 --- a/sys-process/htop/htop-2.0.1.ebuild +++ b/sys-process/htop/htop-2.1.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -11,7 +11,7 @@ SRC_URI="http://hisham.hm/htop/releases/${PV}/${P}.tar.gz" LICENSE="BSD GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux" IUSE="kernel_FreeBSD kernel_linux openvz unicode vserver" RDEPEND="sys-libs/ncurses:0=[unicode?]" @@ -23,7 +23,7 @@ DOCS=( ChangeLog README ) CONFIG_CHECK="~TASKSTATS ~TASK_XACCT ~TASK_IO_ACCOUNTING ~CGROUPS" PATCHES=( - "${FILESDIR}/${PN}-2.0.0-tinfo.patch" + "${FILESDIR}/${P}-sysmacros.patch" ) pkg_setup() { @@ -45,9 +45,7 @@ src_prepare() { src_configure() { [[ $CBUILD != $CHOST ]] && export ac_cv_file__proc_{meminfo,stat}=yes #328971 - local myeconfargs=() - - myeconfargs+=( + local myeconfargs=( # fails to build against recent hwloc versions --disable-hwloc --enable-taskstats diff --git a/sys-process/htop/metadata.xml b/sys-process/htop/metadata.xml index 31af477b5ce7..b3278785fded 100644 --- a/sys-process/htop/metadata.xml +++ b/sys-process/htop/metadata.xml @@ -10,7 +10,6 @@ <name>Lars Wendler</name> </maintainer> <use> - <flag name="oom">Add column to track the OOM-killer score of processes</flag> <flag name="openvz">Enable openvz support</flag> <flag name="vserver">Enable vserver support</flag> </use> diff --git a/sys-process/nmon/Manifest b/sys-process/nmon/Manifest index 2580f6447ba6..293a0c41bd53 100644 --- a/sys-process/nmon/Manifest +++ b/sys-process/nmon/Manifest @@ -2,4 +2,4 @@ DIST lmon16f.c 271123 BLAKE2B d0ac71e061fdeadc59f0c07d46ed711570d439f8058b1fe30f DIST lmon16g.c 267681 BLAKE2B ff7484b7853418e679720fcc76257fb7fe0208f8cf43806c76f5d189c370f995313c325d6e9821b686fa3917cc552af9e9b94ce9f9aed6efe98d2d07032d7c31 SHA512 87287183db48338a281438efc7a8b74249cf88c0a0799e826a9a89b0eb39835b0ba223c7ea6decc217848179f4991909b3cf307aa7eec8a3a4604ebf8a4e8ebe EBUILD nmon-16f.ebuild 961 BLAKE2B a8eb37bcdcc374432dfbbddff81e8715a01d5c9675f3ae936dfd9c24b975a9afbca1c612e87f2c266855a88c0700a22668718ac6d367887bff5ad80548ab878e SHA512 d8aee18fc9778aee3a733ff81bd326dbc877f4de582b3b3489a0063700d4809bc7571728763a720b5ed48074f620f5d51a00b20e92b4ee8780137b470314fca1 EBUILD nmon-16g.ebuild 963 BLAKE2B cc9b8bf039b008db1c6d34cf3625f8f9e16b8db5a5b5d6a7d521c0514cb83e729fea7cf1078f8dfff4748802feada596c29e320098f0333392bb4dc386a6b28e SHA512 c1d8cfea464ada9feb245075c8d4094f42ef444fc1f4ff53286a2170b8a6561ed50eb5c151cd0bd75880e6f5508c87b72867a4aaa25447b8dd36a473755b42dd -MISC metadata.xml 541 BLAKE2B 90ac74b95783122e0f4c4b3eb0fe470a9b9ed7f64dfbc0ab192d98a1b830349dbab72cecca70cfbb3750d734fae906ecdef89ae902d3007766de5b89e7be69e6 SHA512 aad83c0e01dae9b89900b1d762be4442e39e0da5c3b26522c50853da3e9f69161428d66a52589c7ca5fe663d84bc7241edd36a47a79c20c29e8205d5cd08bf12 +MISC metadata.xml 433 BLAKE2B ac6a0efd845d02c926f079773da5d75dc7c2ad1c582637b1a711e6f4a23a4d3e9ca1a8257b4033402e23f2904ad55099c791146b00a7eef9eb6362bff015d326 SHA512 6c9688990c2c3b2b7e484b2e9366653f80e47af42c6c75ae6cac06bd98d6d4252a6ab782e0155c25417165da6cf2e4deec95c16384d712b8e6d97f6d19becbca diff --git a/sys-process/nmon/metadata.xml b/sys-process/nmon/metadata.xml index 01c56e510ab2..2774e2ffd6a4 100644 --- a/sys-process/nmon/metadata.xml +++ b/sys-process/nmon/metadata.xml @@ -4,12 +4,10 @@ <maintainer type="person"> <email>nelo@wallus.de</email> <name>Nelo-Thara Wallus</name> - <description>Proxied by Polynomial-C</description> </maintainer> <maintainer type="person"> <email>polynomial-c@gentoo.org</email> <name>Lars Wendler</name> - <description>Proxy maintainer for Nelo</description> </maintainer> <upstream> <remote-id type="sourceforge">nmon</remote-id> diff --git a/sys-process/numactl/Manifest b/sys-process/numactl/Manifest index 2c8be55f3c90..1f861760cf9d 100644 --- a/sys-process/numactl/Manifest +++ b/sys-process/numactl/Manifest @@ -1,14 +1,8 @@ AUX numactl-2.0.10-numademo-cflags.patch 504 BLAKE2B f2346a298b86b9c667d0d9550af881f09fed1d56e507379f59f480cb8b6da8a57ad406273bec044eb8a95f9bb6b6a0f80fcb3288ba9da113725c6b8e2ed0748c SHA512 15266d98c375241fd84146a010f329265644666ab90d517865675618a8f793ea6bdc39e7c8b64836fa5b393afad1cd3c89452e838d751adbb315668a2cd29b78 AUX numactl-2.0.11-sysmacros.patch 1391 BLAKE2B f761353e82bbb79a70839c34f4ad0759c24b3671bfa8c8ba2869beff4528e9b0241d4b208097c5b6c381dbd4ee532fc6d3b8934f6cac70290ddd48217d0b9185 SHA512 39c5841000650af58ae4f6b15a2e2af7b4fb45e7514537f1d081cc0be74bf13aaa3d336a31ef15386b897cc3478ec58b8c194850e99ca2605f5f25be1650a63f AUX numactl-2.0.8-cpuid-pic.patch 697 BLAKE2B 0446f983eab3eefa553027c70e373d6693cb7325979d5ca3cb9aaa2f9f00f5c6545fb2d949e0fb068a857b9cb41e2dbda176ba27e12eeeb664841b3fbaaec9ae SHA512 d9624110a7f8459c13b67eb990f05bc54ffe55818d586691b307dcc4ca5861f064a7269f1038cba5f8abf0f2b6d359d30e4f8d6e904a7e5c0da3404ef1bd4d51 -AUX numactl-2.0.8-static_libs.patch 2761 BLAKE2B 89f0e99ef99a72cb7352f4f62d1d104af12c38722e75ddc322ed12869d42fce9f1075ba3b7a6956f74647e989188ee44c3554c0901ee0092b4a176bfde69503d SHA512 828dbcd719671c8ca81745d5670d48c071a8b353b9e42bbbaf9eeffd41b607a53ae24ddd6f0be422a2e6f61899635228da0926d7d8dedd143f52fde5bc5dbe05 -AUX numactl-2.0.9-testsuite_fix.patch 262 BLAKE2B d343ec139068302b7c4ff3f41611af3989b34177ad4684801ce3ca99109745350b92d46a7d09d14bff5141e780f9686da3555f3b15862e185090ed08cccc92e2 SHA512 8b9d952076eb04f0093d25c87f25e3f68f9a02a96daa4b574414f75092ded757fd587419584e8ea1883c0881aa2d462cf04904a479c0a925784e111e4b95a6c8 -AUX numactl-2.0.9-testsuite_path.patch 716 BLAKE2B f1171ae82ac1dab068b19223e4a76ca7fbbe774a470865df2baa0f15348186a2909411d019ffafc39f5e09ef0bb1cbf6abe9fc537227b7e6c803398863def4aa SHA512 ed6ba9f225f551d473231c187b962e7c6dd2d20ded491a07fab6ec1edebd27c0eed7186e6eeee0c665eb2139425b23dd4a1162cca0eab31e8f063d48a4908629 -DIST numactl-2.0.10.tar.gz 98999 BLAKE2B 292dad14cfe9ae2c3fbf8d7b27a2ff6d0f86de1f57ff8dd291cbabd93f385048543fd4a17b4c60ecc10f66d3bc2cbfe86c7c4fa48ab5c3081692091b05ffea9c SHA512 3a82b28bbc724a2340950ac33396055da852ee06e5b1d3414cd83dd6f9e26fbb648faae35ce4009c76d6a180f3067a8f3fb18e3ffaa6b6db68adfc0877e94975 DIST numactl-2.0.11.tar.gz 408175 BLAKE2B 0767d555d5254e780ef50bd66215e84208e88fb37422fd86443e53ee52faef4242ff21e6028bdb92c4e1fa7815cdb23e87cd084763539dc1d560097f43bd563f SHA512 1969d7ee0ff3de0d6f1fa42ec089a17cdb3f92cb35d453b8f8b2eec49724c43787ecbd213357013a8f2500a260b0df9844d515815ca3a0376314a0eed050a0d4 -DIST numactl-2.0.9.tar.gz 341455 BLAKE2B 6b56a3c326829e4f148f5b081e219339a3c2a207098209d48be2e27f44893bb2d2365a51c85c1d9ce2a2442003095098a8e1547ff517e80d0019c726224a879f SHA512 483cbb1607da0f3bf0923202ea565100ea430b19502bdbd322f043f75dc945cc0f47878c0ed28badab23561c37da0b04aa12d07656bb4666c4f8d02a0d256407 -EBUILD numactl-2.0.10-r2.ebuild 1341 BLAKE2B 34844cf4bcf3e043f09005757967f8583bd2d09c3df0f6d8ef6d98cface0f908c21fdbabb78a37e440f5f6680fb73434bbaf9f8874d471e37ffed8faef73ff64 SHA512 ca84553e42fdfc562ffa94d4add751b0005d9696891556a49961e6941e49b1334e786f0c385cbc37c7cea22fb2bc9345bae1998eb14f86d287c07ce9c5f7f331 EBUILD numactl-2.0.11-r1.ebuild 1668 BLAKE2B 14394a9c9620741f45c43b11d8272253f3fb643626aa654edc5fbde9bbe1796e4fa48fc2d4248ff7fc2e6469f04658c0aeb2119de101d30208dd1f3e61c79fec SHA512 f7a4265e81b14d1d5b6814ecddc5640f30fb1ca9c7cf7e8750a754bd397e7327d9af00598a7c19b8906f405487205cbee62f1937faee83fb56a5d1adbe48d740 EBUILD numactl-2.0.11.ebuild 1527 BLAKE2B 64b4e024b16d1ba057f3bc61613229ff5659613149567ee52440205baac3a793a390724104883da1241daafaf11fccffd764ec68efef41c138b904be800f6c1f SHA512 0a0a6eff479e075be84a48dbe2994c1ce884ad3dee6da4d2d83c770ec7db42cdde077bcd3e17c23166bf19eb83eeecbeb86d1b7c48df34c3146bfece8db481dd -EBUILD numactl-2.0.9.ebuild 1555 BLAKE2B e80edc04ec99c91504b620ffb2b7541566ad5265a60a76c62b4f16722d2c0662841f12c2948ef870e051b637740235eb6cba96c1c60af78a74cfd513cee2db15 SHA512 9fc857360e0dc121a0737f2109b017d0d5c5474b349ce34aa7632301f44991303b4fd6479f3d23d81c4d629553ed580f7468d1ebc5f001530eed7e1d76fd3833 +EBUILD numactl-9999.ebuild 1690 BLAKE2B cf85c89004e9fe9a623cafba56475984e24a309ba67a9531c1f38c3cdf9fc9fff622e68d12eacbedb1d0f2fae530269449f8062e879d01b46c4af4ef3579bb3f SHA512 3df636c1a1a8f4a70d6f1b6abcd83e9d7102e8a66e28fcb07f8dcc779a72be23e7d29e9ffa2e3569d316c5b322f3578ff4e6af1ce44f44a530457b183ee7aa39 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555 diff --git a/sys-process/numactl/files/numactl-2.0.8-static_libs.patch b/sys-process/numactl/files/numactl-2.0.8-static_libs.patch deleted file mode 100644 index efb84ff6240a..000000000000 --- a/sys-process/numactl/files/numactl-2.0.8-static_libs.patch +++ /dev/null @@ -1,86 +0,0 @@ -Build static libs without -fPIC and only if BUILD_STATIC=yes - -https://bugs.gentoo.org/379849 - -Patch written by Kacper Kowalik <xarthisius@gentoo.org> ---- a/Makefile -+++ b/Makefile -@@ -7,6 +7,8 @@ - # for compatibility with old releases - CFLAGS += ${OPT_CFLAGS} - override CFLAGS += -I. -+# build static libraries by default -+BUILD_STATIC ?= yes - - # find out if compiler supports __thread - THREAD_SUPPORT := $(shell if $(CC) $(CFLAGS) threadtest.c -o threadtest \ -@@ -24,6 +26,7 @@ - - CLEANFILES := numactl.o libnuma.o numactl numademo numademo.o distance.o \ - memhog libnuma.so libnuma.so.1 numamon numamon.o syscall.o bitops.o \ -+ distance.pic.o libnuma.pic.o syscall.pic.o \ - memhog.o util.o stream_main.o stream_lib.o shm.o stream clearcache.o \ - test/pagesize test/tshared test/mynode.o test/tshared.o mt.o empty.o empty.c \ - test/mynode test/ftok test/prefered test/randmap \ -@@ -40,11 +43,16 @@ - libdir := ${prefix}/$(shell ./getlibdir) - docdir := ${prefix}/share/doc - -+NUMA_LIBS = libnuma.so -+ifeq ($(BUILD_STATIC),yes) -+NUMA_LIBS+= libnuma.a -+endif -+ - all: numactl migratepages migspeed libnuma.so numademo numamon memhog \ - test/tshared stream test/mynode test/pagesize test/ftok test/prefered \ - test/randmap test/nodemap test/distance test/tbitmap test/move_pages \ - test/mbind_mig_pages test/migrate_pages test/realloc_test libnuma.a \ -- test/node-parse numastat -+ test/node-parse numastat ${NUMA_LIBS} - - numactl: numactl.o util.o shm.o bitops.o libnuma.so - -@@ -81,13 +89,14 @@ - - libnuma.so.1: versions.ldscript - --libnuma.so.1: libnuma.o syscall.o distance.o affinity.o sysfs.o rtnetlink.o -+libnuma.so.1: libnuma.pic.o syscall.pic.o distance.pic.o affinity.pic.o sysfs.pic.o rtnetlink.pic.o - ${CC} ${LDFLAGS} -shared -Wl,-soname=libnuma.so.1 -Wl,--version-script,versions.ldscript -Wl,-init,numa_init -Wl,-fini,numa_fini -o libnuma.so.1 $(filter-out versions.ldscript,$^) - - libnuma.so: libnuma.so.1 - ln -sf libnuma.so.1 libnuma.so - --libnuma.o : CFLAGS += -fPIC -+%.pic.o: %.c -+ ${CC} -fPIC ${CPPFLAGS} ${CFLAGS} -c $< -o $@ - - AR ?= ar - RANLIB ?= ranlib -@@ -95,16 +104,6 @@ - $(AR) rc $@ $^ - $(RANLIB) $@ - --distance.o : CFLAGS += -fPIC -- --syscall.o : CFLAGS += -fPIC -- --affinity.o : CFLAGS += -fPIC -- --sysfs.o : CFLAGS += -fPIC -- --rtnetlink.o : CFLAGS += -fPIC -- - test/tshared: test/tshared.o libnuma.so - - test/mynode: test/mynode.o libnuma.so -@@ -143,7 +148,9 @@ - mkdir -p ${libdir} - install -m 0755 libnuma.so.1 ${libdir} - cd ${libdir} ; ln -sf libnuma.so.1 libnuma.so -+ifeq ($(BUILD_STATIC),yes) - install -m 0644 libnuma.a ${libdir} -+endif - mkdir -p ${prefix}/include - install -m 0644 numa.h numaif.h numacompat1.h ${prefix}/include - install -m 0755 numastat ${prefix}/bin diff --git a/sys-process/numactl/files/numactl-2.0.9-testsuite_fix.patch b/sys-process/numactl/files/numactl-2.0.9-testsuite_fix.patch deleted file mode 100644 index 27a97fdf2509..000000000000 --- a/sys-process/numactl/files/numactl-2.0.9-testsuite_fix.patch +++ /dev/null @@ -1,12 +0,0 @@ -Tests fail with /bin/dash - -Singned-off-by: Lars Wendler <polynomial-c@gentoo.org> - ---- numactl-2.0.9/test/printcpu -+++ numactl-2.0.9/test/printcpu -@@ -1,4 +1,4 @@ --#!/bin/sh -+#!/bin/bash - #print cpu it is running on - declare -a arr - arr=( $(< /proc/self/stat) ) diff --git a/sys-process/numactl/files/numactl-2.0.9-testsuite_path.patch b/sys-process/numactl/files/numactl-2.0.9-testsuite_path.patch deleted file mode 100644 index 018fc6dbcd18..000000000000 --- a/sys-process/numactl/files/numactl-2.0.9-testsuite_path.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -Naur numactl-2.0.10-orig/test/bind_range numactl-2.0.10/test/bind_range ---- numactl-2.0.10-orig/test/bind_range 2015-05-03 22:23:31.095600314 -0400 -+++ numactl-2.0.10/test/bind_range 2015-05-03 22:25:29.107592557 -0400 -@@ -93,8 +93,8 @@ - - HIGHESTCPU=$(grep 'processor' /proc/cpuinfo | tail -n1 | cut -f2 -d':') - HIGHESTCPU=$(echo $HIGHESTCPU | cut -f2 -d' ') --HIGHESTNODE=$(numactl -H | grep -e 'node [0-9]* cpus' | tail -n1 | cut -f2 -d' ') --LOWESTNODE=$(numactl -H | grep -e 'node [0-9]* cpus' | head -n1 | cut -f2 -d' ') -+HIGHESTNODE=$(../numactl -H | grep -e 'node [0-9]* cpus' | tail -n1 | cut -f2 -d' ') -+LOWESTNODE=$(../numactl -H | grep -e 'node [0-9]* cpus' | head -n1 | cut -f2 -d' ') - - get_mask - diff --git a/sys-process/numactl/numactl-2.0.10-r2.ebuild b/sys-process/numactl/numactl-2.0.10-r2.ebuild deleted file mode 100644 index 9fb85bfcce33..000000000000 --- a/sys-process/numactl/numactl-2.0.10-r2.ebuild +++ /dev/null @@ -1,49 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit autotools eutils toolchain-funcs multilib-minimal - -DESCRIPTION="Utilities and libraries for NUMA systems" -HOMEPAGE="http://oss.sgi.com/projects/libnuma/" -SRC_URI="ftp://oss.sgi.com/www/projects/libnuma/download/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -# ARM lacks the __NR_migrate_pages syscall. -KEYWORDS="~amd64 -arm ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux" -IUSE="" - -ECONF_SOURCE=${S} - -src_prepare() { - epatch "${FILESDIR}"/${PN}-2.0.8-cpuid-pic.patch #456238 - epatch "${FILESDIR}"/${PN}-2.0.10-numademo-cflags.patch #540856 - eautoreconf -} - -src_test() { - if [ -d /sys/devices/system/node ]; then - einfo "The only generically safe test is regress2." - einfo "The other test cases require 2 NUMA nodes." - emake regress2 - else - ewarn "You do not have baseline NUMA support in your kernel, skipping tests." - fi -} - -multilib_src_compile() { - multilib_is_native_abi && default || emake libnuma.la -} - -multilib_src_install() { - emake DESTDIR="${D}" install$(multilib_is_native_abi || echo "-libLTLIBRARIES install-includeHEADERS") -} - -multilib_src_install_all() { - DOCS=( README TODO CHANGES DESIGN ) - einstalldocs - # delete man pages provided by the man-pages package #238805 - rm -r "${ED}"/usr/share/man/man[25] || die -} diff --git a/sys-process/numactl/numactl-2.0.9.ebuild b/sys-process/numactl/numactl-2.0.9.ebuild deleted file mode 100644 index 15331a31a4d5..000000000000 --- a/sys-process/numactl/numactl-2.0.9.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="4" - -inherit eutils toolchain-funcs multilib - -DESCRIPTION="Utilities and libraries for NUMA systems" -HOMEPAGE="http://oss.sgi.com/projects/libnuma/" -SRC_URI="ftp://oss.sgi.com/www/projects/libnuma/download/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -# ARM lacks the __NR_migrate_pages syscall. -KEYWORDS="amd64 -arm ia64 ppc ppc64 x86 ~amd64-linux" -IUSE="static-libs" - -src_prepare() { - echo "printf $(get_libdir)" > getlibdir - epatch "${FILESDIR}"/${PN}-2.0.8-static_libs.patch - epatch "${FILESDIR}"/${PN}-2.0.8-cpuid-pic.patch #456238 - epatch "${FILESDIR}"/${PN}-2.0.9-testsuite_fix.patch - epatch "${FILESDIR}"/${P}-testsuite_path.patch - rm numastat || die #466108 -} - -src_compile() { - emake \ - AR="$(tc-getAR)" \ - CC="$(tc-getCC)" \ - RANLIB="$(tc-getRANLIB)" \ - CFLAGS="${CFLAGS}" \ - BENCH_CFLAGS="" \ - THREAD_SUPPORT=$(tc-has-tls && echo yes || echo no) \ - BUILD_STATIC=$(usex static-libs) -} - -src_test() { - if [ -d /sys/devices/system/node ]; then - einfo "The only generically safe test is regress2." - einfo "The other test cases require 2 NUMA nodes." - cd test - ./regress2 || die - else - ewarn "You do not have baseline NUMA support in your kernel, skipping tests." - fi -} - -src_install() { - emake install prefix="${ED}/usr" BUILD_STATIC=$(usex static-libs) - # delete man pages provided by the man-pages package #238805 - rm -rf "${ED}"/usr/share/man/man[25] - doman *.8 # makefile doesnt get them all - dodoc README TODO CHANGES DESIGN -} diff --git a/sys-process/numactl/numactl-9999.ebuild b/sys-process/numactl/numactl-9999.ebuild new file mode 100644 index 000000000000..3dad0c6eacec --- /dev/null +++ b/sys-process/numactl/numactl-9999.ebuild @@ -0,0 +1,65 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit autotools toolchain-funcs multilib-minimal + +DESCRIPTION="Utilities and libraries for NUMA systems" +HOMEPAGE="https://github.com/numactl/numactl" +if [[ "${PV}" = 9999* ]] ; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/numactl/numactl.git" +else + SRC_URI="ftp://oss.sgi.com/www/projects/libnuma/download/${P}.tar.gz" + # ARM lacks the __NR_migrate_pages syscall. + KEYWORDS="~amd64 -arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux" +fi + +LICENSE="GPL-2" +SLOT="0" +IUSE="static-libs" + +PATCHES=( + "${FILESDIR}"/${PN}-2.0.10-numademo-cflags.patch #540856 +) + +src_prepare() { + default + eautoreconf + # We need to copy the sources or else tests will fail + multilib_copy_sources +} + +multilib_src_configure() { + ECONF_SOURCE="${S}" econf $(use_enable static-libs static) +} + +multilib_src_compile() { + multilib_is_native_abi && default || emake libnuma.la +} + +multilib_src_test() { + if multilib_is_native_abi ; then + if [ -d /sys/devices/system/node ]; then + einfo "The only generically safe test is regress2." + einfo "The other test cases require 2 NUMA nodes." + emake regress2 + else + ewarn "You do not have baseline NUMA support in your kernel, skipping tests." + fi + fi +} + +multilib_src_install() { + emake DESTDIR="${D}" \ + install$(multilib_is_native_abi || echo "-libLTLIBRARIES install-includeHEADERS") + find "${ED%/}"/usr/ -name libnuma.la -delete || die +} + +multilib_src_install_all() { + local DOCS=( README TODO CHANGES DESIGN ) + einstalldocs + # delete man pages provided by the man-pages package #238805 + rm -r "${ED%/}"/usr/share/man/man[25] || die +} |