diff options
Diffstat (limited to 'sys-apps')
63 files changed, 554 insertions, 506 deletions
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz Binary files differindex dae2c52ad8b2..09fd59c3dadd 100644 --- a/sys-apps/Manifest.gz +++ b/sys-apps/Manifest.gz diff --git a/sys-apps/arrayprobe/Manifest b/sys-apps/arrayprobe/Manifest index c527c8302010..a85bafa25d11 100644 --- a/sys-apps/arrayprobe/Manifest +++ b/sys-apps/arrayprobe/Manifest @@ -1,5 +1,5 @@ -AUX 2.0-ida_headers.patch 16391 BLAKE2B b004f86dcea5e4789245bf9582d96356fa969a0a46ce994d59e9ef614057891d227989804a82488609974e06328814f014822a827c52038024f6bb71d9d663c1 SHA512 ff3e06dce610866362a020137b4c9c45802ce4a2566bcf01930c6351ef51aa60a2ad80bc97a7207f8644f58a5c1fe7722d0ccd20f7740eb06ebac8c896f9ebab -AUX 2.0-malloc-strlen.patch 1152 BLAKE2B fb8c24e8bcba49d2cd52e15017da72b5f691dcef84d3774eea789aee81bf0b9ddec8843ed96c97c75da0f3ee53c7d771215c9a08388ebcf865ea6cd5c36f5828 SHA512 19f112d1e830ebe769025f3327e793d79d9f943324393a5d466bbda852a319201525a469d0f41bbc0d4d4d2ef8212c525d6300c80d5fc994df444b96f3729bc6 -DIST arrayprobe-2.0.tar.gz 83831 SHA256 ccb560b5c7e8b378d110cad6e9245884e7e673acfa3c4016ef33acd699f1f4d0 SHA512 4664e20604697edf2f848447419b26ff860dd302b3d3e5aa0f3977855c590b5acbe23c39b684a2ecb1603c86cf7762e86bfc7125421ccad7f322e387c4178870 WHIRLPOOL 56eec2322f806f25e411614e12e9c584208202203f6d070846c73d04c0b379103ad2c45d3a6638a8cf6d66ea51173fbf0dcd91af3b01702a39848bb8a503cd34 -EBUILD arrayprobe-2.0-r2.ebuild 559 BLAKE2B 2454b9340be56d75938eb7f59d9f7c0cc14a50c9d9f00a75aaa85aaba73c25719fc9afa95a0aef2b9bda8a8156ebf2c9e5e87ee9d5a08a1009ef2287bd3367c9 SHA512 43b644482c826a3f5510e55d129c7f6268722b89180d09e80008f35e4eaef7fa7068bed3e3cd1c10f222631d558f47a96e15997f4f39dc201572897e7d6370fc +AUX 2.0-ida_headers.patch 15371 BLAKE2B 2a551fd71e90255abb853fd9ab544e839fa4a44b7b65c1951d867dd7583c62ab420b4c7d2d70ab30ab8035aa1fc8cd8fdd83f0a48d853a6827e88ca99ff254c4 SHA512 73d4addbaaecbffe762c7b0866c2ddca62efadf3e00997939be2c859508f93b24516fdae95ab001f438c8c8493f382043d7214f01f5d0eb4e1fcf272ab9d9461 +AUX 2.0-malloc-strlen.patch 1080 BLAKE2B 55a1ba7f3c18bc4d2b1bef277a250a9cab8aff7eaf9760981a564a3df671875fd47be0b658b01bd379d1682788c856271c66046ea412cca3838a2da4ff202a16 SHA512 6eca6fdc118ab21451640540f4ab76213a8a79d9e6bb4cbb1519535c8b44b955824486fdeab622cf6fe1ad421b36012399d029ae2679deb159a56918e7003981 +DIST arrayprobe-2.0.tar.gz 83831 BLAKE2B 6a9b76260c91b271068be914161bd99c4ce2285c58ce98c689f6bef32200701430bb65306e74a1d9277d7a4d9e4aa0adf4af60af0c4264020ae07a73f49a51de SHA512 4664e20604697edf2f848447419b26ff860dd302b3d3e5aa0f3977855c590b5acbe23c39b684a2ecb1603c86cf7762e86bfc7125421ccad7f322e387c4178870 +EBUILD arrayprobe-2.0-r2.ebuild 558 BLAKE2B 4b94a0963538e77755d008decd74b4f26d3a787058bc4864252843c452548a37192ead816eb8b33de43f6fba62fb29f561b618bb01bc61705ccc3dba749f575c SHA512 af2f61ca914863caa32b63c21fda428e63817b1cec1f4d401f89cea5e4cc3ae50a982fde8d04486df1ce4b1afbd0b9ec8c46569dd54d4e4612c165f7babd7bda MISC metadata.xml 330 BLAKE2B 30259c749509242f02c31dd55057f4ab4ba7e13cdda877ef28e5a66c6d4da5b12684bbb6a2e144cae18cb6dc9bbc1b5c1fb14b1bfcf17474151a6624a1041036 SHA512 a7b0f31767ddd2a38acc2af4700f6129e6a78553f6bee63827d7706064570dccd5e5bf48b407b9e534bef4bbc6b384c326a79121079e68d25e3494601b3b0e1b diff --git a/sys-apps/arrayprobe/arrayprobe-2.0-r2.ebuild b/sys-apps/arrayprobe/arrayprobe-2.0-r2.ebuild index 98fae16e7682..5f961969810b 100644 --- a/sys-apps/arrayprobe/arrayprobe-2.0-r2.ebuild +++ b/sys-apps/arrayprobe/arrayprobe-2.0-r2.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI="4" +EAPI=6 -inherit eutils autotools +inherit autotools DESCRIPTION="Utility to report status of an HP (Compaq) array controller (both IDA & CCISS)" HOMEPAGE="http://www.strocamp.net/opensource/arrayprobe.php" @@ -14,8 +14,12 @@ SLOT="0" KEYWORDS="amd64 ~ia64 x86" IUSE="" +PATCHES=( + "${FILESDIR}/${PV}-malloc-strlen.patch" + "${FILESDIR}/${PV}-ida_headers.patch" +) + src_prepare() { - epatch "${FILESDIR}/${PV}-malloc-strlen.patch" - epatch "${FILESDIR}/${PV}-ida_headers.patch" + default eautoreconf } diff --git a/sys-apps/arrayprobe/files/2.0-ida_headers.patch b/sys-apps/arrayprobe/files/2.0-ida_headers.patch index fbdb20b87ea6..3cd744b32a33 100644 --- a/sys-apps/arrayprobe/files/2.0-ida_headers.patch +++ b/sys-apps/arrayprobe/files/2.0-ida_headers.patch @@ -1,6 +1,5 @@ -diff -Naur arrayprobe-2.0.old/cciss_events.h arrayprobe-2.0/cciss_events.h ---- arrayprobe-2.0.old/cciss_events.h 2005-12-27 10:51:29.000000000 +0100 -+++ arrayprobe-2.0/cciss_events.h 2010-01-13 15:46:53.000000000 +0100 +--- a/cciss_events.h ++++ b/cciss_events.h @@ -27,8 +27,12 @@ #define QWORD __u64 @@ -14,9 +13,8 @@ diff -Naur arrayprobe-2.0.old/cciss_events.h arrayprobe-2.0/cciss_events.h #define CompareEvent(event,par_class,par_subclass,par_detail) \ ((event.class.class==par_class) && \ -diff -Naur arrayprobe-2.0.old/configure.ac arrayprobe-2.0/configure.ac ---- arrayprobe-2.0.old/configure.ac 2006-01-03 13:58:31.000000000 +0100 -+++ arrayprobe-2.0/configure.ac 2010-01-13 15:42:49.000000000 +0100 +--- a/configure.ac ++++ b/configure.ac @@ -19,38 +19,6 @@ dnl Check for compile.h (2.6.x kernels only? AC_CHECK_HEADERS(linux/compiler.h) @@ -56,9 +54,8 @@ diff -Naur arrayprobe-2.0.old/configure.ac arrayprobe-2.0/configure.ac # Checks for typedefs, structures, and compiler characteristics. AC_C_CONST -diff -Naur arrayprobe-2.0.old/cpqarray.h arrayprobe-2.0/cpqarray.h ---- arrayprobe-2.0.old/cpqarray.h 1970-01-01 01:00:00.000000000 +0100 -+++ arrayprobe-2.0/cpqarray.h 2010-01-13 15:40:11.000000000 +0100 +--- a/cpqarray.h ++++ b/cpqarray.h @@ -0,0 +1,126 @@ +/* + * Disk Array driver for Compaq SMART2 Controllers @@ -186,9 +183,8 @@ diff -Naur arrayprobe-2.0.old/cpqarray.h arrayprobe-2.0/cpqarray.h +#endif + +#endif /* CPQARRAY_H */ -diff -Naur arrayprobe-2.0.old/ida_cmd.h arrayprobe-2.0/ida_cmd.h ---- arrayprobe-2.0.old/ida_cmd.h 1970-01-01 01:00:00.000000000 +0100 -+++ arrayprobe-2.0/ida_cmd.h 2010-01-13 15:40:29.000000000 +0100 +--- a/ida_cmd.h ++++ b/ida_cmd.h @@ -0,0 +1,349 @@ +/* + * Disk Array driver for Compaq SMART2 Controllers @@ -539,9 +535,8 @@ diff -Naur arrayprobe-2.0.old/ida_cmd.h arrayprobe-2.0/ida_cmd.h +#pragma pack() + +#endif /* ARRAYCMD_H */ -diff -Naur arrayprobe-2.0.old/ida_ioctl.h arrayprobe-2.0/ida_ioctl.h ---- arrayprobe-2.0.old/ida_ioctl.h 1970-01-01 01:00:00.000000000 +0100 -+++ arrayprobe-2.0/ida_ioctl.h 2010-01-13 15:44:46.000000000 +0100 +--- a/ida_ioctl.h ++++ b/ida_ioctl.h @@ -0,0 +1,87 @@ +/* + * Disk Array driver for Compaq SMART2 Controllers @@ -630,9 +625,8 @@ diff -Naur arrayprobe-2.0.old/ida_ioctl.h arrayprobe-2.0/ida_ioctl.h +} ida_ioctl_t; + +#endif /* IDA_IOCTL_H */ -diff -Naur arrayprobe-2.0.old/probe.c arrayprobe-2.0/probe.c ---- arrayprobe-2.0.old/probe.c 2006-01-03 14:11:17.000000000 +0100 -+++ arrayprobe-2.0/probe.c 2010-01-13 15:45:22.000000000 +0100 +--- a/probe.c ++++ b/probe.c @@ -33,10 +33,9 @@ #include <getopt.h> #include <errno.h> diff --git a/sys-apps/arrayprobe/files/2.0-malloc-strlen.patch b/sys-apps/arrayprobe/files/2.0-malloc-strlen.patch index 8d955a8f933d..2732f75b939a 100644 --- a/sys-apps/arrayprobe/files/2.0-malloc-strlen.patch +++ b/sys-apps/arrayprobe/files/2.0-malloc-strlen.patch @@ -1,5 +1,5 @@ ---- probe.c.old 2010-01-13 12:15:32.000000000 +0100 -+++ probe.c 2010-01-13 12:16:44.000000000 +0100 +--- a/probe.c ++++ b/probe.c @@ -354,7 +354,7 @@ int drivenum = event.detail.logstatchange.logicaldrivenumber; logdrvs[drivenum].state.state = event.detail.logstatchange.newlogicaldrivestate; diff --git a/sys-apps/audio-entropyd/Manifest b/sys-apps/audio-entropyd/Manifest index b50190aa89e9..eb009cd8af0d 100644 --- a/sys-apps/audio-entropyd/Manifest +++ b/sys-apps/audio-entropyd/Manifest @@ -3,6 +3,6 @@ AUX audio-entropyd-2.0.1-uclibc.patch 708 BLAKE2B e8a0de327545ee60de5a07336a774e AUX audio-entropyd.conf-2 340 BLAKE2B bc392532820685f9195865b061dccde9869db030242dfdcedef3f4bad062e940f59166942364c533ddb6bfac2ffc77b8d4434fa7af9331d28f532ac6b9a7a888 SHA512 9922bcdf6e5be49dd158ccd2e14328b1d314d756a9b61bd5c262baef25136e56517c9087097e22808106b09c5e877fe143d024f2c63ae8b12d2d316b6d371dd0 AUX audio-entropyd.init-2 651 BLAKE2B f60cbbd9da6ab7ef56697fff5bab221e51b250a65e2095f2ef7c1b50e968fac1cc5c615d45355d2d51545c2f7af7f82598584b3c459b1cb936542f7cd88abcd3 SHA512 61ff99fca907c555f45312c0250511a7c0f7bb757ea7da3d7c6c33932884d9bfdc2148dac466d96fb023ab10bb0d78c3134f488a8486bc38da3743ec2200df57 AUX audio-entropyd.service 127 BLAKE2B b0e3f4efdfeca0c9dae7b71ee78c7a87dcced1e71db874999fdfcf4e903ff3f201bdf7ebbeec59370085ac58a182aa42aa69d69ae17ef6e1c0bd9a3b5787e470 SHA512 991948b7638f90a7f909492374b70a0f6964a3406df1f5794c25b46523e3c09b2a1d89dfd3c08e6f2925fe5d94a59b5645c0a9bee4746e7d670bacb5831f4001 -DIST audio-entropyd-2.0.3.tgz 16681 SHA256 6fbaf1c4f77e988f4656cd079309d5eb6bd36cbae89c2ee01324c5690adaf3ff SHA512 d21c2d547235accdd460bcaf1ff5f5696db2988d385c3c52aad0d651865386409682f8747d1823765f0c0925bf28f38abdfc0b114d239f494c7eb699c5ed3ebf WHIRLPOOL e653b7cccda00323b5f17a675d72cef1a9adf9915dcd27041e63993073a378d92ab5779d25434ecd48ecbb74b45abc4217e4b629c98ba3885589727ef90edf6d -EBUILD audio-entropyd-2.0.3-r1.ebuild 934 BLAKE2B 3a380cec0fd9b58a77227a422ec46c0d1aa0b530efbad71d2b85fc2931d47d6dc23a5a2fed81f63ee4d87079eea3f5a895f9a8971c2e7a69e78a1e63272b0f1c SHA512 131e1cb96b30b19aaa64ffa8d6c9af98127a6f11621e13e447135164f2bdfe510429671b9f9081c61c6be5cc883777ea7e4352a905721d037a98cdb0c54f7b17 +DIST audio-entropyd-2.0.3.tgz 16681 BLAKE2B 36f9d7942f718af8e828ce6598ab8ea35945de1c60959e7bc2314b2440037f8bb661085a4cad12e62627d935797842616e486180945ff283937b499de163f068 SHA512 d21c2d547235accdd460bcaf1ff5f5696db2988d385c3c52aad0d651865386409682f8747d1823765f0c0925bf28f38abdfc0b114d239f494c7eb699c5ed3ebf +EBUILD audio-entropyd-2.0.3-r1.ebuild 950 BLAKE2B 07ba723f506e0b7c0adf260aa44d66f91dc282c38d114a7565f0f5a14e709ab44bb9541cca1c8bd2d2c2fcfe96e4c4019a75669577c5114fc07372cd5458775b SHA512 6b39d24475311b0df75f9f6587d941c0623175d67e6d7a7edfe1f8771c2303fa8d1da6f7491a719cbc34494ca62bb966a92abd8462256d7fd0569b6797151cc0 MISC metadata.xml 241 BLAKE2B c8f88ee6d9aac6183d5396334b96c86d85a097f9b1ce5b1b83da16b07072c909ee26095c350e45c95530f131b11d6555655340f7409ce8d3b2c7a6326d7d04dc SHA512 dafca7f08962c7d0cc66f603d499915103b4994e2453329857da0d3456363a80bc69c6c35ee537ca013b9969c44ac61d99bab5150a0474b8b970d08d11ad6b56 diff --git a/sys-apps/audio-entropyd/audio-entropyd-2.0.3-r1.ebuild b/sys-apps/audio-entropyd/audio-entropyd-2.0.3-r1.ebuild index 5e5a60fb72c6..cab08ef38cf8 100644 --- a/sys-apps/audio-entropyd/audio-entropyd-2.0.3-r1.ebuild +++ b/sys-apps/audio-entropyd/audio-entropyd-2.0.3-r1.ebuild @@ -1,8 +1,9 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=4 -inherit eutils systemd toolchain-funcs +EAPI=6 + +inherit systemd toolchain-funcs DESCRIPTION="Audio-entropyd generates entropy-data for the /dev/random device" HOMEPAGE="http://www.vanheusden.com/aed/" @@ -13,25 +14,32 @@ SLOT="0" KEYWORDS="amd64 ppc ~sparc x86" IUSE="selinux" -RDEPEND="selinux? ( sec-policy/selinux-entropyd ) +DEPEND="media-libs/alsa-lib:=" +RDEPEND="${DEPEND} media-sound/alsa-utils - media-libs/alsa-lib" + selinux? ( sec-policy/selinux-entropyd )" + +PATCHES=( + "${FILESDIR}"/${PN}-2.0.1-uclibc.patch + "${FILESDIR}"/${PN}-2.0.1-ldflags.patch +) src_prepare() { - epatch "${FILESDIR}/${PN}-2.0.1-uclibc.patch" \ - "${FILESDIR}/${PN}-2.0.1-ldflags.patch" + default + sed -i -e "s:^OPT_FLAGS=.*:OPT_FLAGS=${CFLAGS}:" \ -e "/^WARNFLAGS/s: -g::" Makefile || die } -src_compile() { - emake CC="$(tc-getCC)" +src_configure() { + tc-export CC } src_install() { dosbin audio-entropyd - dodoc README TODO - systemd_dounit "${FILESDIR}/${PN}.service" - newinitd "${FILESDIR}/${PN}.init-2" ${PN} - newconfd "${FILESDIR}/${PN}.conf-2" ${PN} + einstalldocs + + systemd_dounit "${FILESDIR}"/${PN}.service + newinitd "${FILESDIR}"/${PN}.init-2 ${PN} + newconfd "${FILESDIR}"/${PN}.conf-2 ${PN} } diff --git a/sys-apps/bar/Manifest b/sys-apps/bar/Manifest index ba9483bc6682..c89008725869 100644 --- a/sys-apps/bar/Manifest +++ b/sys-apps/bar/Manifest @@ -1,3 +1,3 @@ -DIST bar_1.11.1.tar.gz 187144 SHA256 fa0f5ec5c8400316c2f4debdc6cdcb80e186e668c2e4471df4fec7bfcd626503 SHA512 18a0cf1946155252fc84bce64a1789a2a497c8a870a8494e4b2caecde567121dc6404855c021900358659702a33f8c4f749e9cd0bb1eb761cd650e2c56347035 WHIRLPOOL b5e144841d92af9f23cc66ba81ad921a81729d58189ef8e82694b124e9f77fb36dc2f8f379a957c699b09ed405b5cf9891adb50f89a62e1ce2477ce48fe3ae5c -EBUILD bar-1.11.1.ebuild 908 BLAKE2B cdf7685d2048bf6da316badda0daa18d02246d39ce51e804e04c3ac560b5323595fa908d785b4dba5525f27239ce2d93b55809cc09624cbd6af33d6d5b62ba8e SHA512 9642be469d7cea827c41ff7404089f4c6fcef742192dbdededfab69e76643f74076b146f98c810c8788242cc7c85ba4028a0ba0f736b72bf284b9e51ef14b054 +DIST bar_1.11.1.tar.gz 187144 BLAKE2B 9181ade20a9450bdc7c4ae21bb79fea1d8666ebb78c1ae6403bbc1ad46ec968efb3795da3d5cd2e87aa02d28f33105abb3cf629e04051b84e763ddaea9c9ee18 SHA512 18a0cf1946155252fc84bce64a1789a2a497c8a870a8494e4b2caecde567121dc6404855c021900358659702a33f8c4f749e9cd0bb1eb761cd650e2c56347035 +EBUILD bar-1.11.1.ebuild 921 BLAKE2B a755cdb05274d03039d454a8807ade5956f2a5bba4880b6cf863990e854c463782bc2d090ef1fb8408cdaa000253d3394690545f471cc1403429ce2f0ddf2447 SHA512 369c42156dd03b284c4eaa4e91f85b37b0a4bcbbe2e3229a50e147bda5624293bbe599bb357ba1f9b1126f236ab7ff1858fa586d5803e0e6fd45d6af52b21c6e MISC metadata.xml 341 BLAKE2B 6008193c402387f8645fecb0192f981fb9288db8048468ab44f133e5264cf24e4e5094c82c0692c2297b85f46ab0b2281bc9705f941894af202c69682777b3b3 SHA512 fd71a4c90f9480d279e8a7198ca518856b379173f977a165a28782dced3f49110f869a87c8f5a9923f1b1486bbb064147ea69ded5ab2a4f458ebcfd450ac1c7e diff --git a/sys-apps/bar/bar-1.11.1.ebuild b/sys-apps/bar/bar-1.11.1.ebuild index ff678910027e..0d1aadd2a030 100644 --- a/sys-apps/bar/bar-1.11.1.ebuild +++ b/sys-apps/bar/bar-1.11.1.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=4 +EAPI=6 inherit autotools @@ -18,31 +18,30 @@ DEPEND="doc? ( >=app-doc/doxygen-1.3.5 )" RDEPEND="" src_prepare() { - sed -e '/^LDFLAGS/d' \ - -e '/cd $(WEB_DIR) && $(MAKE)/d' -i Makefile.am || die + default + sed '/cd $(WEB_DIR) && $(MAKE)/d' -i Makefile.am || die eautomake } src_configure() { - local myconf - - # Fix wrt #113392 - use sparc && myconf="${myconf} --disable-use-memalign" - econf ${myconf} + # Fix bug 113392 + econf $(use_enable !sparc use-memalign) } src_compile() { emake CFLAGS="${CFLAGS}" + if use doc; then - mkdir -p ../www/doxygen/${PV} + mkdir -p ../www/doxygen/${PV} || die emake update-www + HTML_DOCS=( ../www/doxygen/${PV}/html/. ) + + # remove doxygen working files + find ../www/doxygen/${PV}/html \( -iname '*.map' -o -iname '*.md5' \) -delete || die fi } src_install() { - emake DESTDIR="${D}" install - dodoc AUTHORS TODO TROUBLESHOOTING debian/changelog - if use doc ; then - dohtml -r ../www/doxygen/${PV}/html/* - fi + default + dodoc TROUBLESHOOTING debian/changelog } diff --git a/sys-apps/byld/Manifest b/sys-apps/byld/Manifest index 6a88251ab58f..188ca9cc45fc 100644 --- a/sys-apps/byld/Manifest +++ b/sys-apps/byld/Manifest @@ -1,3 +1,3 @@ -DIST byld-1_0_3.tgz 1128317 SHA256 f5206f6eb0d85f6b9435c24e554262b69dede6dd7d24acd9faea1dc77549cde3 SHA512 ec141b5c7f636e611fd43bbfa69c8a06ebbfb766e5f58086ce4c0fce1271b8a0cd76333b748322efb19e46aaf2ed150cb3a5fc09c91aef55e10f80b1d1551eb0 WHIRLPOOL f2d43ba2c8820f16dcf6beda530e0c4fe3887fa4039b90d920516b4cf9ef25b736ef14133b0ed2924db0328362896eb6583b0ef2fd5d2c0e84b614d8b120de98 -EBUILD byld-1.0.3.ebuild 688 BLAKE2B 664d1697f1654da971c79c2357a3da8bf7d49d253b51936668bdc6c64fd2d3c583a07a8850b1091a8a014e938a334a46f88898e6c7b53961d711d8361bc6e715 SHA512 587210add8869bfd8b41ac626b244d37ed647e000a90208e2185ddbf9b3d317404cfec054a478fe1f170d6412a3ca3b0972892688dce2eec4d9edd282b14ec53 +DIST byld-1_0_3.tgz 1128317 BLAKE2B c096cc3cfa4f467c9e5310a6f17d97d5f690fed20a03ce2d70b1d8476003df87815f4ba7c6262be7bfa2597e467c64e750eed8d5da386950d86c1413b62ff380 SHA512 ec141b5c7f636e611fd43bbfa69c8a06ebbfb766e5f58086ce4c0fce1271b8a0cd76333b748322efb19e46aaf2ed150cb3a5fc09c91aef55e10f80b1d1551eb0 +EBUILD byld-1.0.3.ebuild 681 BLAKE2B c0d28673e2e455541485b9d04794c96c5aa07c65370ff4b84b3a3413eca5c164e9050dfbf1d2539284c5b5d3b9824911b0787af0c102382a4f8f38e986ef2876 SHA512 289a995e44d01313ca68c803e771b2697adaceefaf2871357915aa5cb22e98ba55499641e125af4f345abc9a7f66514137e8d18244e84498046a1dd195210791 MISC metadata.xml 324 BLAKE2B 8b0f2c337f87797b823417bb4e81a8c6ed684acc8288cc4bf103a0d793d02003cd703f478ddad29877dfe3f88498adfa21c76dfdfe58a15291c3d44a68aa04d4 SHA512 51f62e5258feee75a0953d3f27dc8a990096d5289c7dbf2977fe0202e23b251bd635a29b00398a3dcc8c42c80d32fc58c566a90f0aefa971568c54bb7dfd1b91 diff --git a/sys-apps/byld/byld-1.0.3.ebuild b/sys-apps/byld/byld-1.0.3.ebuild index 2359a6e8dd48..2c9a65e33e97 100644 --- a/sys-apps/byld/byld-1.0.3.ebuild +++ b/sys-apps/byld/byld-1.0.3.ebuild @@ -1,6 +1,8 @@ -# Copyright 1999-2008 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 +EAPI=6 + DESCRIPTION="build a Linux distribution on a single floppy" HOMEPAGE="http://byld.sourceforge.net/" SRC_URI="mirror://sourceforge/byld/byld-${PV//./_}.tgz" @@ -16,8 +18,9 @@ RDEPEND="sys-apps/util-linux" src_install() { dodoc BYLDING CREDITS README INSTALL FHS PAKING rm MAKEDEV.8 BYLDING CREDITS README INSTALL FHS LICENSE PAKING - dodir /usr/lib/${PN} - cp -rf * ${D}/usr/lib/${PN}/ + + insinto /usr/lib/${PN} + doins -r . } pkg_postinst() { 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 diff --git a/sys-apps/fwupd/Manifest b/sys-apps/fwupd/Manifest index 6d4d52460442..809f116afe8f 100644 --- a/sys-apps/fwupd/Manifest +++ b/sys-apps/fwupd/Manifest @@ -1,10 +1,7 @@ -AUX fwupd-0.9-polkit_its_files.patch 2298 BLAKE2B 4ac967398d88f47640f6390dd6399c86958a42715628129d472353c2cddc382b44aa6f01d0853614fcf58fdb5d14208e495170b2c8bdca666ce423bd2b3c8e75 SHA512 032e081ef068834e131595a21481fd02b74dfb765ec2a4a080115b9c1f07914220cd197ba18c041def4b33a6784e168d7e77d45dc18700539d98a057e8fa1365 -DIST fwupd-0.9.5.tar.gz 1389768 SHA256 876bb4c1cc5b27bb5f30e1c5d81522c82554738bede9a811f9e352966e58453e SHA512 2a8ca8da2fffa71bdaa44b82aff1a4151441b8496793101d7d0b1ab984bfbb10a3a94c4ebae5cfc17241364ab7aed051252a70543ebe6a82dd8bdb5c6f52863d WHIRLPOOL b7d606acd35a58e25ee94045557899b1c9ea30941024cfb17bf3226f39dab7961c802abafc9ca6320e21ea1ca3792a0bd37fa942476dfd0b37c4ce3b4fe28b5b -DIST fwupd-0.9.6.tar.gz 1404749 SHA256 cf406eb11b284cd89228db53bff787cb8468d4e14a910acdea4c995f04df2435 SHA512 d2098d2f14319728f1f2078126f68ee5b5cb2f32687428f61db13b01ad3904ea6c641c3758044229a7d1f48a0b96c7984a119d48a8ef5efc65e29e90476f4017 WHIRLPOOL 7854fd62fb87980c2d89d8341c85f4ddbf860c3cfbd0a1e541caac28c36f4499db1b2e78a42b7d8351a519bbb6d7ce2e75b3fa13672b5ca7b7f8e2cc35ceaf34 DIST fwupd-1.0.0.tar.gz 1466486 SHA256 179ee1fb5c0099ba9bfb8c07178574cc7408297d2af80ddf483e9f147b30e31a SHA512 6bf5e691b2d958b28e6002bfbc06bd19440876aea8dc55f761e10e039141e12df14a6ec8c2f2479b82770feeee4a15296229dd662653841bb0b41d4ea61fa422 WHIRLPOOL 0db3183049921b8ac30b5855c3657d6c51a948bba2728178ed4932e18401f15f6af7178ac866a56347219b334385c826ce5cec0ac72ddcba799251b3f91468b9 -DIST fwupd-1.0.1.tar.gz 1498681 SHA256 9a4eeb37241f4b4e1eeade9d431e074f5324573e450ea9d2ef4af3fd8b59def3 SHA512 f89455563d8d587bee6c6f4a9a1ff75401d803a89087ddb73b9260e2578e581bdc315593b7bb3466318a52123383c9499cba2fe3ead0fe13efd40d907a753345 WHIRLPOOL 774ff9b64e6e37b12b48c987ed2515d958127883e84ae988a5b491a238fc6a486adf29d2b4d615ef2107eb87c915d1eed8deff8875c6cd749fb004b98f10f4c2 -EBUILD fwupd-0.9.5-r1.ebuild 2172 BLAKE2B e6c7408b2a2d894c8ea6e4cbc0587c2248dff253f0f4f9016ce1091411cefbac2cfd127703ca8eac78951867e61fc9e6f359c31442ecf29c2378c4ebd0648c60 SHA512 d4b49cb711efd77ef2835294a92e6c61d2f0d3d833758befe4c6dc264e879c60c20d2fc4463c7600b942ed73aad2b379e691008ab94cb31e9e8530b213c77ad3 -EBUILD fwupd-0.9.6.ebuild 2111 BLAKE2B 4c25db796be3495a27c13da311f5c7df8d9cec5af98ee2da4f281dce7deb9166e0768740ca260cb1cce994eddaff7b3ed0e8190dfa2414a8d344609c0924077e SHA512 8a62187f7aecdc16bda9d30751ac9f3767621ea6588f9c24e8b141f5e7a334f437a3eb473cb9f4929e9714d9bd9bd970abbbd2c224454580a3daf5570c2e46f0 -EBUILD fwupd-1.0.0.ebuild 2366 BLAKE2B 04386e98b68a2df831631b1b6a47dad18b0c709ede9ed8b8c3ea29bf505ffa2ac078a21cac51916599a5e760e0667b823c0fa2cbe6f45c708ddb2d2862087d62 SHA512 7a04646aefec3344873c3604ae7249538529817987361ffb47ac696c590c39a8e580414bc5a5e60f289ea8bc43a56c8f2c3a58243add2569f7fa4bd06b711b50 -EBUILD fwupd-1.0.1.ebuild 2366 BLAKE2B 04386e98b68a2df831631b1b6a47dad18b0c709ede9ed8b8c3ea29bf505ffa2ac078a21cac51916599a5e760e0667b823c0fa2cbe6f45c708ddb2d2862087d62 SHA512 7a04646aefec3344873c3604ae7249538529817987361ffb47ac696c590c39a8e580414bc5a5e60f289ea8bc43a56c8f2c3a58243add2569f7fa4bd06b711b50 -MISC metadata.xml 790 BLAKE2B acccebd5c400f0b0b47b79d18bb11f8a62f3558d145218afa95fafef7ac7e4e03ccabf9a7b0a199597e69e070e5acd808cac5a5ab7cedf14bf78f710c55e949e SHA512 5b0e4ce1e52ffc53059e995698820ad7f426a13e81bf9fb7f7e41f8c706839c5493bf72d3b75c55e8bf12be97dc6bde1a1a4eee473e8022e387b4256e6f67f49 +DIST fwupd-1.0.1.tar.gz 1498681 BLAKE2B 3320c540d5395c28ab778d40e5a9901f877a7606b5e5188a7bc8e1c17648916c52e752363f07e01e5381894feb9df7034064bebb62a9088fbaf8affd01685d34 SHA512 f89455563d8d587bee6c6f4a9a1ff75401d803a89087ddb73b9260e2578e581bdc315593b7bb3466318a52123383c9499cba2fe3ead0fe13efd40d907a753345 +DIST fwupd-1.0.2.tar.gz 1516078 BLAKE2B bdc0d54fa0058a329d409debd41c4f83f7036669b3356ca82d86a1233ca567841b1758adeb8f8abbfb7f9bda004934ba970747da413dc4862e459792a42745ec SHA512 52773590255b0a120c56f5f8b58243e88fcc322d8f2348b5f463db4107aebd4df2769103e003d095b1d0571c598c0274af0b7da4a248e4dd1786156697170e06 +EBUILD fwupd-1.0.0.ebuild 2466 BLAKE2B 150f5af501a5abd738a06f08b6e0b064062485df4cd5f256995c46ec9df5e4c41838627d8a6745c84df82dc432a488ebe4a2ab31b093271a9ba888b4c9e3ea23 SHA512 534111d6d6099592b10ba7b58cd6b7683bac7178abd0e43d3acf1403b3410461b1e7430c63a8254d2cb338d4c9e92422809601f1a1ecffc55c4db89e9b1464d9 +EBUILD fwupd-1.0.1.ebuild 2466 BLAKE2B 150f5af501a5abd738a06f08b6e0b064062485df4cd5f256995c46ec9df5e4c41838627d8a6745c84df82dc432a488ebe4a2ab31b093271a9ba888b4c9e3ea23 SHA512 534111d6d6099592b10ba7b58cd6b7683bac7178abd0e43d3acf1403b3410461b1e7430c63a8254d2cb338d4c9e92422809601f1a1ecffc55c4db89e9b1464d9 +EBUILD fwupd-1.0.2.ebuild 2468 BLAKE2B 3e2171512869cfb08ba0121dabcdeb527acd5da45248506a6c03558d622d1ec3d13a07da08d68bdb3a27b9228db8f82edf773510cafe7c21b13ed52f54200269 SHA512 2d640bf0f2e71955c75a99cbdf856a30f8d48cfcd027c9b2b6515edf0227d5baf4764fabf672bb4a3840f5a3cd19abf2a245b53c35e4e5043bb05b67a53a5d12 +MISC metadata.xml 838 BLAKE2B 94e61de164b7858afceebb163391c113e557d7d962c40650ac2e45a334e2347ad5ee42123ca5e878693a0768ca9819ce29e64650b0dae6d0e49c558d46550ba3 SHA512 22e958ed755f3d824fed8f164fb20943947ff1038382e8983104e15c4b0b57540f940da6933a2a121e4795ddafba817cecf0fde92e563d5b875574c268eb4f4c diff --git a/sys-apps/fwupd/files/fwupd-0.9-polkit_its_files.patch b/sys-apps/fwupd/files/fwupd-0.9-polkit_its_files.patch deleted file mode 100644 index 999df1cba252..000000000000 --- a/sys-apps/fwupd/files/fwupd-0.9-polkit_its_files.patch +++ /dev/null @@ -1,65 +0,0 @@ -From 797e5672e64acd4f90cd52afca3bb192b28b4636 Mon Sep 17 00:00:00 2001 -From: Julian Liu <liu.julian@gmail.com> -Date: Fri, 28 Apr 2017 18:09:20 +0800 -Subject: [PATCH] Add polkit's ITS files as Ubuntu doesn't not ship with it. - -Call msgfmt with custom_target for now as data_dir kargs for i18n.merge_file() not merged into master yet. -(https://github.com/mesonbuild/meson/issues/1565) ---- - its/polkit.its | 8 ++++++++ - its/polkit.loc | 6 ++++++ - policy/meson.build | 12 ++++++++---- - 3 files changed, 22 insertions(+), 4 deletions(-) - create mode 100644 its/polkit.its - create mode 100644 its/polkit.loc - -diff --git a/its/polkit.its b/its/polkit.its -new file mode 100644 -index 0000000..1c37e6b ---- /dev/null -+++ b/its/polkit.its -@@ -0,0 +1,8 @@ -+<?xml version="1.0"?> -+<its:rules xmlns:its="http://www.w3.org/2005/11/its" -+ version="2.0"> -+ <its:translateRule selector="//*" translate="no"/> -+ <its:translateRule selector="//action/description | -+ //action/message" -+ translate="yes"/> -+</its:rules> -diff --git a/its/polkit.loc b/its/polkit.loc -new file mode 100644 -index 0000000..c7427ec ---- /dev/null -+++ b/its/polkit.loc -@@ -0,0 +1,6 @@ -+<?xml version="1.0"?> -+<locatingRules> -+ <locatingRule name="polkit policy" pattern="*.policy"> -+ <documentRule localName="policyconfig" target="polkit.its"/> -+ </locatingRule> -+</locatingRules> -diff --git a/policy/meson.build b/policy/meson.build -index def8976..41da2db 100644 ---- a/policy/meson.build -+++ b/policy/meson.build -@@ -1,11 +1,15 @@ - install_data('org.freedesktop.fwupd.rules', - install_dir : 'share/polkit-1/rules.d') - --i18n.merge_file( -- input: 'org.freedesktop.fwupd.policy.in', -+envbin = find_program('env') -+gettext_data_dir = 'GETTEXTDATADIRS=' + meson.source_root() -+custom_target('org.freedesktop.fwupd.policy', - output: 'org.freedesktop.fwupd.policy', -- type: 'xml', -- po_dir: join_paths(meson.source_root(), 'po'), -+ input: 'org.freedesktop.fwupd.policy.in', -+ command: [envbin, gettext_data_dir, 'msgfmt', '--xml', -+ '--template', '@INPUT@', -+ '-d', join_paths(meson.source_root(), 'po'), -+ '-o', '@OUTPUT@'], - install: true, - install_dir: join_paths(get_option('datadir'), 'polkit-1', 'actions') - ) diff --git a/sys-apps/fwupd/fwupd-0.9.6.ebuild b/sys-apps/fwupd/fwupd-0.9.6.ebuild deleted file mode 100644 index 19962f03252f..000000000000 --- a/sys-apps/fwupd/fwupd-0.9.6.ebuild +++ /dev/null @@ -1,80 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python3_4 python3_5 python3_6 ) - -inherit meson python-single-r1 xdg-utils - -DESCRIPTION="Aims to make updating firmware on Linux automatic, safe and reliable" -HOMEPAGE="https://fwupd.org" -SRC_URI="https://github.com/hughsie/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2+" - -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="colorhug dell doc elf +man systemd uefi uefi_labels" -REQUIRED_USE="uefi_labels? ( ${PYTHON_REQUIRED_USE} )" - -RDEPEND=" - app-crypt/gpgme - dev-db/sqlite - >=dev-libs/appstream-glib-0.6.13[introspection] - >=dev-libs/glib-2.45.8:2 - dev-libs/libgpg-error - dev-libs/libgudev - >=dev-libs/libgusb-0.2.9[introspection] - >=net-libs/libsoup-2.51.92:2.4 - >=sys-auth/polkit-0.103 - colorhug? ( >=x11-misc/colord-1.2.12:0= ) - dell? ( - sys-libs/efivar - >=sys-libs/libsmbios-2.3.3 - ) - elf? ( virtual/libelf:0= ) - systemd? ( >=sys-apps/systemd-231 ) - !systemd? ( >=sys-auth/consolekit-1.0.0 ) - uefi? ( >=sys-apps/fwupdate-5 ) - uefi_labels? ( - ${PYTHON_DEPS} - dev-python/pycairo[${PYTHON_USEDEP}] - dev-python/pygobject:3[cairo,${PYTHON_USEDEP}] - dev-python/pillow[${PYTHON_USEDEP}] - x11-libs/pango - x11-libs/cairo - media-libs/freetype - media-libs/fontconfig - media-fonts/dejavu - media-fonts/source-han-sans - ) -" -DEPEND=" - ${RDEPEND} - app-arch/gcab - app-arch/libarchive - virtual/pkgconfig - doc? ( dev-util/gtk-doc ) - man? ( app-text/docbook-sgml-utils ) -" - -REQUIRED_USE="dell? ( uefi )" - -src_configure() { - xdg_environment_reset - local emesonargs=( - -Denable-colorhug="$(usex colorhug true false)" - -Denable-consolekit="$(usex systemd false true)" - -Denable-dell="$(usex dell true false)" - -Denable-doc="$(usex doc true false)" - -Denable-man="$(usex man true false)" - -Denable-libelf="$(usex elf true false)" - -Denable-systemd="$(usex systemd true false)" - # requires libtbtfwu which is not packaged yet - -Denable-thunderbolt=false - -Denable-uefi="$(usex uefi true false)" - -Denable-uefi-labels="$(usex uefi_labels true false)" - ) - meson_src_configure -} diff --git a/sys-apps/fwupd/fwupd-1.0.0.ebuild b/sys-apps/fwupd/fwupd-1.0.0.ebuild index 6d4d3f01c65e..c102d10d91b7 100644 --- a/sys-apps/fwupd/fwupd-1.0.0.ebuild +++ b/sys-apps/fwupd/fwupd-1.0.0.ebuild @@ -62,6 +62,9 @@ DEPEND=" test? ( net-libs/gnutls[tools] ) " +# tests require some ominous "certtool" which has not been packages for Gentoo yet +RESTRICT="test" + REQUIRED_USE="dell? ( uefi )" src_prepare() { diff --git a/sys-apps/fwupd/fwupd-1.0.1.ebuild b/sys-apps/fwupd/fwupd-1.0.1.ebuild index 6d4d3f01c65e..c102d10d91b7 100644 --- a/sys-apps/fwupd/fwupd-1.0.1.ebuild +++ b/sys-apps/fwupd/fwupd-1.0.1.ebuild @@ -62,6 +62,9 @@ DEPEND=" test? ( net-libs/gnutls[tools] ) " +# tests require some ominous "certtool" which has not been packages for Gentoo yet +RESTRICT="test" + REQUIRED_USE="dell? ( uefi )" src_prepare() { diff --git a/sys-apps/fwupd/fwupd-0.9.5-r1.ebuild b/sys-apps/fwupd/fwupd-1.0.2.ebuild index 1f4146f8c86e..c3bdbec6962f 100644 --- a/sys-apps/fwupd/fwupd-0.9.5-r1.ebuild +++ b/sys-apps/fwupd/fwupd-1.0.2.ebuild @@ -15,8 +15,10 @@ LICENSE="GPL-2+" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="colorhug dell doc elf +man systemd uefi uefi_labels" -REQUIRED_USE="uefi_labels? ( ${PYTHON_REQUIRED_USE} )" +IUSE="colorhug dell doc gpg +man systemd test uefi uefi_labels" +REQUIRED_USE=" + uefi_labels? ( ${PYTHON_REQUIRED_USE} ) +" RDEPEND=" app-crypt/gpgme @@ -28,12 +30,16 @@ RDEPEND=" >=dev-libs/libgusb-0.2.9[introspection] >=net-libs/libsoup-2.51.92:2.4 >=sys-auth/polkit-0.103 + virtual/libelf:0= colorhug? ( >=x11-misc/colord-1.2.12:0= ) dell? ( sys-libs/efivar >=sys-libs/libsmbios-2.3.3 ) - elf? ( virtual/libelf:0= ) + gpg? ( + app-crypt/gpgme + dev-libs/libgpg-error + ) systemd? ( >=sys-apps/systemd-231 ) !systemd? ( >=sys-auth/consolekit-1.0.0 ) uefi? ( >=sys-apps/fwupdate-5 ) @@ -57,28 +63,35 @@ DEPEND=" virtual/pkgconfig doc? ( dev-util/gtk-doc ) man? ( app-text/docbook-sgml-utils ) + test? ( net-libs/gnutls[tools] ) " +# tests require some ominous "certtool" which has not been packages for Gentoo yet +RESTRICT="test" + REQUIRED_USE="dell? ( uefi )" -PATCHES=( - "${FILESDIR}/${PN}-0.9-polkit_its_files.patch" -) +src_prepare() { + default + sed -i -e "s/'--create'/'--absolute-name', '--create'/" data/tests/builder/meson.build || die +} src_configure() { xdg_environment_reset local emesonargs=( - -Denable-colorhug="$(usex colorhug true false)" - -Denable-consolekit="$(usex systemd false true)" - -Denable-dell="$(usex dell true false)" - -Denable-doc="$(usex doc true false)" - -Denable-man="$(usex man true false)" - -Denable-libelf="$(usex elf true false)" - -Denable-systemd="$(usex systemd true false)" + -Dconsolekit="$(usex systemd false true)" + -Dgpg="$(usex gpg true false)" + -Dgtkdoc="$(usex doc true false)" + -Dman="$(usex man true false)" + -Dplugin_colorhug="$(usex colorhug true false)" + -Dplugin_dell="$(usex dell true false)" + -Dplugin_synaptics="$(usex dell true false)" # requires libtbtfwu which is not packaged yet - -Denable-thunderbolt=false - -Denable-uefi="$(usex uefi true false)" - -Denable-uefi-labels="$(usex uefi_labels true false)" + -Dplugin_thunderbolt=false + -Dplugin_uefi="$(usex uefi true false)" + -Dplugin_uefi-labels="$(usex uefi_labels true false)" + -Dsystemd="$(usex systemd true false)" + -Dtests="$(usex test true false)" ) meson_src_configure } diff --git a/sys-apps/fwupd/metadata.xml b/sys-apps/fwupd/metadata.xml index bad753d8cddc..a6f7b5108871 100644 --- a/sys-apps/fwupd/metadata.xml +++ b/sys-apps/fwupd/metadata.xml @@ -11,6 +11,7 @@ <flag name="dell">Enable Dell-specific support.</flag> <flag name="elf">Enable libelf support through <pkg>dev-libs/libelf</pkg> package.</flag> + <flag name="gpg">Enable GPG support.</flag> <flag name="man">Build and install man pages</flag> <flag name="uefi">Enable UEFI support</flag> <flag name="uefi_labels">Enable UEFI labels support</flag> diff --git a/sys-apps/lcdsplash/Manifest b/sys-apps/lcdsplash/Manifest index 1bdd0565b50a..c1322e49eacc 100644 --- a/sys-apps/lcdsplash/Manifest +++ b/sys-apps/lcdsplash/Manifest @@ -1,3 +1,3 @@ -DIST lcdsplash-0.3.tar.bz2 8121 SHA256 0d5db8b897fa6508bbebf7dcc12a5afdf3f48178d72a247d3d8b611c68645c9c SHA512 4d40200882260c31cfe20988cf64d27be0af7f1ab983e5a998dcaeafede074e882379508a775f54690105591e0802eb897559eb7437d81f0b24096dd8c363243 WHIRLPOOL f4d98cab8057080a643ec5f90d9ff878c4b6647190b256261328105614f9fef6a16a3214432aec44b9afb0eab42bc02973f2641ac6babcf4ef52496550a2d94c -EBUILD lcdsplash-0.3.ebuild 646 BLAKE2B 494aa3329786812d7b86a1d3250589fbd687b0c2e5be5602f83749fedb19ec261c190643c5d52a1542cd696bfe9b7bbebeffcf038c80d97778a45840359a3052 SHA512 0b9b0bfed65b7fb86af70f82f3ab8ae80e0d1c9fedc8d741d15c8484ed25a4d5de6bb3a9e55c288b2e7ed1ad5ad7078125ecb76c27a704fde5a0bf4d951e6a2a +DIST lcdsplash-0.3.tar.bz2 8121 BLAKE2B 52baebd47f6b72fd55c3afaa4a44803fd71b3674419a6fe43b8a642cdfbd14fd964e82db995707e48b23ccf0d323f9f6853f1a5558ae3ff64b6332cc9880ecf1 SHA512 4d40200882260c31cfe20988cf64d27be0af7f1ab983e5a998dcaeafede074e882379508a775f54690105591e0802eb897559eb7437d81f0b24096dd8c363243 +EBUILD lcdsplash-0.3.ebuild 591 BLAKE2B 710b35f5b9477749d8e8bb7ea6cc841ad1fbe6fb641808490ce44cb6ac14ca8120469b240ca28fc7c8f67c7d6c910053aa49d70e6b2c55f529197fcd0912712b SHA512 d47fe1dd7d4f1563b4367b5547801dfd87063dc6cf904f992ace4e53d7cf72d3367d90c3a8eec250e71ffab0ceed6e19795f8a5cad595752d634f353f86c9d97 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555 diff --git a/sys-apps/lcdsplash/lcdsplash-0.3.ebuild b/sys-apps/lcdsplash/lcdsplash-0.3.ebuild index 34046a4e316b..21435a81ead6 100644 --- a/sys-apps/lcdsplash/lcdsplash-0.3.ebuild +++ b/sys-apps/lcdsplash/lcdsplash-0.3.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2010 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -inherit multilib +EAPI=6 DESCRIPTION="splash Gentoo boot information on LCD's" HOMEPAGE="https://www.gentoo.org/" @@ -13,18 +13,19 @@ SLOT="0" KEYWORDS="hppa ~mips x86" IUSE="" -DEPEND="mips? ( sys-apps/lcdutils )" +RDEPEND="mips? ( sys-apps/lcdutils )" S=${WORKDIR}/${PN} src_install() { insinto /sbin - doins splash-functions.sh || die "splash" + doins splash-functions.sh + insinto /$(get_libdir)/rcscripts/lcdsplash - doins -r modules/* || die "modules" + doins -r modules/. insinto /etc - doins lcdsplash.conf || die "conf" + doins lcdsplash.conf - dodoc README + einstalldocs } diff --git a/sys-apps/pcsc-lite/Manifest b/sys-apps/pcsc-lite/Manifest index 7dc8db80601d..1571c7b06f1a 100644 --- a/sys-apps/pcsc-lite/Manifest +++ b/sys-apps/pcsc-lite/Manifest @@ -1,10 +1,10 @@ AUX 99-pcscd-hotplug.rules 358 BLAKE2B 6ff034ffd1a1942d5d0429f9ed35428853ff8daa06eeec753415df8b514894dbc925c9210df80fbdf2f723a476740e8d15785c2c98cca6733249c4643aa632aa SHA512 74421fe073cb55f665c4a0350931beae7c252300b4954f69f215334e3e4e6dda927f51837540d24d893ba8ae862e3c1370b694d153508c4186e94959d37f918a AUX pcsc-lite-1.8.11-polkit-pcscd.patch 744 BLAKE2B b9a846a989d1708a30bb62e93ab19fbf5cfe4c2c601d435b53a8933117d919a4fbac8835e68b895507840a25a9aab85e35f6b4c2e7461ec3c7893d483e12f759 SHA512 4f8b774ec888d51c0ad82431cb9d041be6b69af0bfa2a535c6b7e47afb0056147c08ab9265d7da2259a74347ceba9dba320ad0892d3a25797efc64b79113f4a5 AUX pcscd-init.7 408 BLAKE2B 15ba28f80cc0f44598a553bced62bf8972b698bf8c02a715531ffbb0724915004e47e2779fefa6349adccfdc7d32e8880f8d6d82ea98178e8556b9453c31019d SHA512 e4dac959dbea3d418a3e4012788a3cc7b8aeea295f56f1c3e2f0a599cf469d302f3eaadf05cd0b3c7929a583f8d0b6756177ebe2c497c404b70e9aed7fb7d003 -DIST pcsc-lite-1.8.20.tar.bz2 745049 SHA256 ec7d0114016c788c1c09859c84860f6cec6c4595436d23245105154b9c046bb2 SHA512 63fea660d71605ebced5600a59ab5b6a735c4ba3697faf7658d91b8e281a7fb2a2bca6831c8f8c8c87b87a54f7fd03ae818a4c496dcbac0afce523e3b6c606b8 WHIRLPOOL 1c758274a884cf5625d31ed4d56938ee147ba276613c701aee1465b70842a9a73daa92b889835decaaca55707da6be798e3b183aef16a64817d969734d19250a +DIST pcsc-lite-1.8.20.tar.bz2 745049 BLAKE2B 211b463c63b25f1dab629e8c32ccc6f19f28baf7b62029610dc9c2163ba2392f9ffa3d17671ae93c35e0ae3768a82ed5a5f245b8d3ea5f4c46013a07896a00b5 SHA512 63fea660d71605ebced5600a59ab5b6a735c4ba3697faf7658d91b8e281a7fb2a2bca6831c8f8c8c87b87a54f7fd03ae818a4c496dcbac0afce523e3b6c606b8 DIST pcsc-lite-1.8.21.tar.bz2 750879 SHA256 fe3365eb7d4ce0fe891e2b6d6248351c287435ca502103f1f1431b1710e513ad SHA512 bd3740f4444d2201efaa34a312d2a5f6b5808b0b7ff1d5696dce26df67ef198a63a96670d0acac97a6e693b33079afeeeaa6692746875b0ff72d69a2b0835990 WHIRLPOOL 7bc1040262974c94f9c15f48db5370f1ebd6d29f42267cbf73bcbe750974490dcc012f20a56213a17e26f1cb1dbbe2e9f8fbf0fb9c1db80841aa5863ffe4766c -DIST pcsc-lite-1.8.22.tar.bz2 751724 SHA256 6a358f61ed3b66a7f6e1f4e794a94c7be4c81b7a58ec360c33791e8d7d9bd405 SHA512 762eccf6a25040653f563b93bf11262ddc015323d06d759a3472ba80af0489804410ba17c7e5330ccd4b5accc8b7314c80b5e99da278561d3818d8c381e6a025 WHIRLPOOL 39c7b6217fe75da42d062a2618cdb749b78c6a1dd04f60a92c45e974d551782ffa621f78198c600b350da9c7c30666a7e92409b7248b3642bc922f8ab9014036 +DIST pcsc-lite-1.8.22.tar.bz2 751724 BLAKE2B d11ca9588449ea8508550b60aad2d2bb6a140c02a86287f6d972ced97fdc8a5db80d542624cbaebdda564192217186c79c30b046cb7d6f6c7a450d91c0f1c9fb SHA512 762eccf6a25040653f563b93bf11262ddc015323d06d759a3472ba80af0489804410ba17c7e5330ccd4b5accc8b7314c80b5e99da278561d3818d8c381e6a025 EBUILD pcsc-lite-1.8.20.ebuild 3193 BLAKE2B f161086df19a7db4f0a579ce56cef95b57c32b18691dbf3388b38caf9ee3f428060faa2c14a2e5240728c0657c58a64a395f1515d8a4bfd8f1f43a91dda68deb SHA512 172634822b9c74bdfc515135b15d883566692f1ecab16f0c93a0b8eccc254d9c38d87b8b7d3647d0d60085cf39952753a442d1993f08f7e72a8c5d83e30358ca EBUILD pcsc-lite-1.8.21.ebuild 3218 BLAKE2B 1b14333382b36968d0c30e95c0e320038824e40a104d0262077e737171bdfae55499709004d4f03a1cb8ba8521d9e1adf43522a0d066a008fccd45631b5e182e SHA512 e971f52ae70d2b66e237ab17e1cc5c8b6d9ec2ab1922a7ceb9b5cc125889eaa9dd4a3592feac0d02d43355d6954546cc8efaa567b3e22de908b044e73ec43476 -EBUILD pcsc-lite-1.8.22.ebuild 3219 BLAKE2B 4b5766245aa41820a54bb42e6f2ed2756b9b64a242e6f041379353a54220787e403ecbc14e1ee04ea98f0a542e722faf033c7d33198b176070e5d74f4e83a736 SHA512 f85a053a8f115302e45ae8764e1cf0af26cd37b3bd2f987a9e90bc4573caca2b60d3c5f10bd8c5d9c53fa99e41a9918a679e325dac38ef00f071363523dadd6c +EBUILD pcsc-lite-1.8.22.ebuild 3218 BLAKE2B 6c36cc80cd6547cfc641480d4db6fb62fc9ce3c5f9ff3c529fb6ca21eb13226bbf603b96f61202f7a03642000d707d2b3d093ac7fc89339a1faacc2b914d3a47 SHA512 683bb1ee27ab8b38eb14a9266cb01d52df29cfd7b1698c8141fd5515e5e9ed064cb3655aaca0df9546100f60e28d54afee1a79eaae85599430de76e576b941db MISC metadata.xml 1077 BLAKE2B d13414e4b691e3df98ce7fefb9939a2cfd224d7ce76b78a72c0585c22acf18939ccee85a5f19791ccdbb8e31e8ba93cb0c537dc86a8a8820435efbef07c7d941 SHA512 4abc19855a868236dfdcfa6d42fcb901fdf52796e08b589a1413c78b931aee74fd482121ff67da632c2cf2e1ba018ff02f1122f1dac5c2185046f98952efd838 diff --git a/sys-apps/pcsc-lite/pcsc-lite-1.8.22.ebuild b/sys-apps/pcsc-lite/pcsc-lite-1.8.22.ebuild index 9d136110c54b..a86d7bfce15b 100644 --- a/sys-apps/pcsc-lite/pcsc-lite-1.8.22.ebuild +++ b/sys-apps/pcsc-lite/pcsc-lite-1.8.22.ebuild @@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_P}" # upstream. LICENSE="BSD ISC MIT GPL-3+ GPL-2" SLOT="0" -KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" +KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" # This is called libusb so that it doesn't fool people in thinking that # it is _required_ for USB support. Otherwise they'll disable udev and diff --git a/sys-apps/salinfo/Manifest b/sys-apps/salinfo/Manifest index 47e866964504..c5f627fe7792 100644 --- a/sys-apps/salinfo/Manifest +++ b/sys-apps/salinfo/Manifest @@ -1,4 +1,4 @@ AUX salinfo-1.2-build.patch 1198 BLAKE2B 2f2ecac3141170e0efa253fc6e550d7de60162a7187b2cc4ac304c1ca62b052f14480ba281d74765cef03bbaa606f6a507f6717586f07ed5089c649b040683c9 SHA512 fd037371b22fe3d6038ad2555fd6af485d45688006b02a35bace25c7a98b9f5b9f13cff0a0be4c47f356952b24b9622328b465e8439cd7056f7b288866068bec -DIST salinfo-1.2.tar.gz 40511 SHA256 4c5b19a38d29b9e2883fc9f5ef3a5e9198c4a323b7cd1b35da21e86f392e1498 SHA512 6a92eb6ff38965a93ea61f034ba3607b871b7250cb640ced21b0eabaf94214ad2df78a3fb059fa0c61eb7aa90a6fc4e592ea852b89629b259c36d2b17fb7c4ca WHIRLPOOL d831aa5f773d51ff8170d6c102b211887e49bf24636f9f85dbc0154a393211fa3716f78b1b9e39013ce454336333ff184fbee28fbc047057dd31832fcb5eb236 -EBUILD salinfo-1.2.ebuild 555 BLAKE2B 588ef399687e6684ea5f4aa08c7781c77c0c05b2ba988c33627eff9a5542797ff501e2dae34a395309608b9a8a9e7f507d5303565f435dc8ad18d15cf4c62312 SHA512 774b876b0fde0f03b797f7aa6da5c4a00199c72e7c9a830ec90870e3b7761d270f804689e233a2c152f067e4056328f0849e4a79c5e931f35ba0e592cb864f06 +DIST salinfo-1.2.tar.gz 40511 BLAKE2B 6556593181a27bf6f608470c2ad42a76a65c3d07691357a1412bb8d1bd157309427dc43c0ceec8ecc1a11cb14cd92de22e83fefe0c09ff80c3040ab12ac3aa7a SHA512 6a92eb6ff38965a93ea61f034ba3607b871b7250cb640ced21b0eabaf94214ad2df78a3fb059fa0c61eb7aa90a6fc4e592ea852b89629b259c36d2b17fb7c4ca +EBUILD salinfo-1.2.ebuild 532 BLAKE2B 0f52dfc2a39eaa02b26b15188bfdaaa8ba3ae089944a39172d3f146e143e6678f619c5dc9a766a97cd38be7cadefff1edf65098b503f75f2cd1c5c602ae3977e SHA512 f01a6d4a852d255a9da1e78f6cd1a2490ecf97d2e8fe3ec5de315ec1bdf1ee2724d19215faf43c5237ec26ddf5cd0b9a11c8a709239a197cdd452a50ed9e7188 MISC metadata.xml 258 BLAKE2B ecb1fdb19c796780954401c2028e1c6e3eb0c20e0932cdd7386662f2fe654bf6bb29e447627b840fb34db165fb8d5eef0433a2eb56addd0b9799fb2ad92ab726 SHA512 0efa4eca2fddcb607098b6696ac01fc1d98cacfb3cab6e64821e306e8cc66d32bbeaa2a89960ccb9da74620d6ca3f85baf60891f5e70f647fae9e2a84781dd1a diff --git a/sys-apps/salinfo/salinfo-1.2.ebuild b/sys-apps/salinfo/salinfo-1.2.ebuild index 83bb8edf39c9..5237254bc974 100644 --- a/sys-apps/salinfo/salinfo-1.2.ebuild +++ b/sys-apps/salinfo/salinfo-1.2.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI="4" +EAPI=6 -inherit toolchain-funcs eutils +inherit toolchain-funcs DESCRIPTION="decode Itanium SAL records (e.g. various hardware errors)" HOMEPAGE="https://www.kernel.org/pub/linux/kernel/people/helgaas/" @@ -14,9 +14,7 @@ SLOT="0" KEYWORDS="~ia64" IUSE="" -src_prepare() { - epatch "${FILESDIR}"/${P}-build.patch -} +PATCHES=( "${FILESDIR}"/${P}-build.patch ) src_configure() { tc-export CC diff --git a/sys-apps/superiotool/Manifest b/sys-apps/superiotool/Manifest index 41698701df96..36dc0d078e55 100644 --- a/sys-apps/superiotool/Manifest +++ b/sys-apps/superiotool/Manifest @@ -1,5 +1,5 @@ AUX make-tarball.sh 671 BLAKE2B c293d0c6fff141bf6b82f15772b6dfe2faf15189ee95618c580a056cb9c7d062fbd5c8bcf5091311f56227c8306b457a0824af6ae44f79a28db5a4219abdb88a SHA512 7f3efac359f6da1521b26da4e57efbe7333f2841335ced85452c2a6a7575d0506c5fa3f3062b2e07b85db4c35194c3ea4dd3755d71b236f601776e4e3c471b5c -DIST superiotool-6637.tar.xz 27364 SHA256 e21e091c7679c2eeac66aa49499c02587d64a41b3b36449f4ec06dafc8f0ba21 SHA512 dafb732b33205d1bdd368c1f752c7ba78cfb9f6174fc72075b9e8dcae962ab9ef10eb0860052a5925167b91e5b056f6b8a4a316799661d3950a630020f4330fd WHIRLPOOL 70ee5da7946cd93d978db2094dee1466a91239db96f640e5e2b7aa6d9487ccc43229e570bd084dcd6ef27353752059dfaa6fdf5b414d4eadf657549d0998bf39 -EBUILD superiotool-6637.ebuild 945 BLAKE2B b73c7056554de3b1d220240646dd2497496c6d556f17db3c0a6305a8dc94d37b6aaad77f7ee398c65fdb73b5a002a1dd43c677409233c63ac45184e94c8d7155 SHA512 36377d290c33c7003e8ab961a2f51d40d35220a326728dab6cda0c91d51507ef60f50c88bcbd27ba2534b661cf4b8004debf47c7ac4edfe1bdc55ce2bdaf09ae -EBUILD superiotool-99999999.ebuild 945 BLAKE2B b73c7056554de3b1d220240646dd2497496c6d556f17db3c0a6305a8dc94d37b6aaad77f7ee398c65fdb73b5a002a1dd43c677409233c63ac45184e94c8d7155 SHA512 36377d290c33c7003e8ab961a2f51d40d35220a326728dab6cda0c91d51507ef60f50c88bcbd27ba2534b661cf4b8004debf47c7ac4edfe1bdc55ce2bdaf09ae +DIST superiotool-6637.tar.xz 27364 BLAKE2B be0fd054f1385c20ca1d3da04052f7155da77211c1a4253c58c0ee272944e4134b1df6213934ea0ab6c297da9ab09ceab1cc00dcd775633d7ba50f46cba8ffb8 SHA512 dafb732b33205d1bdd368c1f752c7ba78cfb9f6174fc72075b9e8dcae962ab9ef10eb0860052a5925167b91e5b056f6b8a4a316799661d3950a630020f4330fd +EBUILD superiotool-6637.ebuild 870 BLAKE2B 42c4c647cb2c5da453b5ea74aa0e07362e6fe88303f11ba5fa3a6bf425fc567c3d9e8767ede790f7e872693b1c3826109565713dcf2fa5fe5ce03684368b4d31 SHA512 d925d93c6022d78c9784fb8aa42abf8213cb1196d1fa044ee2949fb1abb5b0a6981ee63ef23cf2760202ed1272e1a55ae81f0bb6111d59139b34278e4664369e +EBUILD superiotool-99999999.ebuild 870 BLAKE2B 42c4c647cb2c5da453b5ea74aa0e07362e6fe88303f11ba5fa3a6bf425fc567c3d9e8767ede790f7e872693b1c3826109565713dcf2fa5fe5ce03684368b4d31 SHA512 d925d93c6022d78c9784fb8aa42abf8213cb1196d1fa044ee2949fb1abb5b0a6981ee63ef23cf2760202ed1272e1a55ae81f0bb6111d59139b34278e4664369e MISC metadata.xml 322 BLAKE2B 7db639cd43d36f1d29c872b19955ce7496eca2ceed7cd62525bb92b13e110b594d4906036830dec86ea4b3a74bb79b69f6a89177514a514114f5d698f41f3b69 SHA512 b10b11adf9b11f1a01a62a9968a99ced6a5b5744ca65967e0d0cea6d30ff0b84a8b84c720eb0362f4963d42daebc9fbe6e2540d9c972f48561a29f3efb27ca43 diff --git a/sys-apps/superiotool/superiotool-6637.ebuild b/sys-apps/superiotool/superiotool-6637.ebuild index 9cd57fadcfca..83db272b25ab 100644 --- a/sys-apps/superiotool/superiotool-6637.ebuild +++ b/sys-apps/superiotool/superiotool-6637.ebuild @@ -1,14 +1,13 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI="4" +EAPI=6 -inherit toolchain-funcs eutils +inherit toolchain-funcs -if [[ ${PV} == "99999999" ]] ; then +if [[ ${PV} == *99999999 ]] ; then ESVN_REPO_URI="svn://coreboot.org/coreboot/trunk/util/${PN}" inherit subversion - SRC_URI="" else SRC_URI="mirror://gentoo/${P}.tar.xz" KEYWORDS="~amd64 ~x86" @@ -26,6 +25,8 @@ DEPEND="${RDEPEND} app-arch/xz-utils" src_prepare() { + default + sed -i \ -e 's:-Werror ::' \ -e 's:-O2 ::' \ @@ -40,8 +41,3 @@ src_compile() { CC="$(tc-getCC)" \ SVNDEF="-D'SUPERIOTOOL_VERSION=\"${ESVN_WC_REVISION}\"'" } - -src_install() { - emake install DESTDIR="${D}" - dodoc README -} diff --git a/sys-apps/superiotool/superiotool-99999999.ebuild b/sys-apps/superiotool/superiotool-99999999.ebuild index 9cd57fadcfca..83db272b25ab 100644 --- a/sys-apps/superiotool/superiotool-99999999.ebuild +++ b/sys-apps/superiotool/superiotool-99999999.ebuild @@ -1,14 +1,13 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI="4" +EAPI=6 -inherit toolchain-funcs eutils +inherit toolchain-funcs -if [[ ${PV} == "99999999" ]] ; then +if [[ ${PV} == *99999999 ]] ; then ESVN_REPO_URI="svn://coreboot.org/coreboot/trunk/util/${PN}" inherit subversion - SRC_URI="" else SRC_URI="mirror://gentoo/${P}.tar.xz" KEYWORDS="~amd64 ~x86" @@ -26,6 +25,8 @@ DEPEND="${RDEPEND} app-arch/xz-utils" src_prepare() { + default + sed -i \ -e 's:-Werror ::' \ -e 's:-O2 ::' \ @@ -40,8 +41,3 @@ src_compile() { CC="$(tc-getCC)" \ SVNDEF="-D'SUPERIOTOOL_VERSION=\"${ESVN_WC_REVISION}\"'" } - -src_install() { - emake install DESTDIR="${D}" - dodoc README -} diff --git a/sys-apps/syscriptor/Manifest b/sys-apps/syscriptor/Manifest index 146304bf1755..95be397c81d0 100644 --- a/sys-apps/syscriptor/Manifest +++ b/sys-apps/syscriptor/Manifest @@ -1,3 +1,3 @@ -DIST syscriptor-1.5.15.tar.bz2 58732 SHA256 74c8bedc473e3b55171b6e2fdc4ed694983fdfa36a213c1356f6ad49872b62ef SHA512 12fadc8bee58b8001f805383f0bab5ca4999f5d463eb69ec15486aeb2eb407671d2a4007f017e35df450f3616c4e1096bc86b34413485bae4ca6a9460e9056bd WHIRLPOOL 43af7a5c4a92065407dae68827be261f97c21e70b2daba69729d5f299f55bb94bfebd8d597c5761cb12d434183529cdcad07a6f662376770beafdff4056909f0 -EBUILD syscriptor-1.5.15.ebuild 464 BLAKE2B ea384b4e5b84999e13bb08b99c4ce6f121b1fc9cb114682536e6ceda76dc9a2ef3829257672d9f9a3ee801ede08825bdac545663e0864921822326ad35b696f7 SHA512 8cd3b54c5adc05ec58c9958e4087d866a6598efecd49cc3bfd1451afa0d1629e3057011c1d0a72329c57ab8e3b51f3b46141246fe803bb49f234d230d135b742 +DIST syscriptor-1.5.15.tar.bz2 58732 BLAKE2B 1527d9baf18d51543f2be07e55fe5e3557fcbf616a0770a1d17920361af41e45c7a0191246c6e833674c073bb06dd5b05eb54fbe882f9700fd928284277a232d SHA512 12fadc8bee58b8001f805383f0bab5ca4999f5d463eb69ec15486aeb2eb407671d2a4007f017e35df450f3616c4e1096bc86b34413485bae4ca6a9460e9056bd +EBUILD syscriptor-1.5.15.ebuild 357 BLAKE2B bdad021921fcd14442a1f5fe5e649e554c6c6855dc0b96aa418bb0b959a4cf529c749379ad8699894a0b61a8b0c93c42d29279c7622c5c425024f33e1e86df55 SHA512 f2efe1a57c7a50b00b35e97f0b3c0920ba05282eb46c6d1a6c63cd4bd582402519e5f170cbc3250ef3033a4a33c9ae3e05a5b30b0a8a47d15ae35942b0f657f9 MISC metadata.xml 330 BLAKE2B 76b31db3b847c70f18388d67b3ed93acba1a8fa2571459ba917b92afcc8f3288185dd4133af7b35539d8a5b29069ed8536844fb1190a98ebde82b9134648d56d SHA512 746cc86310142135f45c241de444d7fe4c47e0d36d08c52bbe7bd6c60d391c28b3f299cbd58f0fc65751aff6bdb3077d7d2880e9e2380b7cf2142a2ba91abbe6 diff --git a/sys-apps/syscriptor/syscriptor-1.5.15.ebuild b/sys-apps/syscriptor/syscriptor-1.5.15.ebuild index eeba6012f3e6..adef11296006 100644 --- a/sys-apps/syscriptor/syscriptor-1.5.15.ebuild +++ b/sys-apps/syscriptor/syscriptor-1.5.15.ebuild @@ -1,6 +1,8 @@ -# Copyright 1999-2008 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 +EAPI=6 + DESCRIPTION="display misc information about your hardware" HOMEPAGE="http://syscriptor.sourceforge.net/" SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2" @@ -11,8 +13,3 @@ KEYWORDS="~alpha amd64 ppc x86" IUSE="" S=${WORKDIR}/${PN} - -src_install () { - emake DESTDIR="${D}" install || die - dodoc AUTHORS CREDITS ChangeLog HISTORY NEWS README TODO -} diff --git a/sys-apps/ultracopier/Manifest b/sys-apps/ultracopier/Manifest index 936d55ce4061..e6ea37e6543e 100644 --- a/sys-apps/ultracopier/Manifest +++ b/sys-apps/ultracopier/Manifest @@ -1,3 +1,3 @@ -DIST ultracopier-src-0.2.0.16.tar.bz2 430736 SHA256 3c965899c491ddaa7381de805a62557d224a70c3379f68bb2a24f4bf07d36f30 SHA512 7ca0698bca73c9fa696b48d5aee09a5159c7a1bb6c8d8194476ed13d189c4b16b42c8aff0013fe1107889c95d9a048cc86953698f90b731b48d8ededac350693 WHIRLPOOL 8c901099bedeca8edd89c60fa05e4fbf164d8c28bb9bdeae9ec5d16d1c257549f8bc343d780bfb79d46060403e1c62ffbf24ad4cc05f2ad02b13911f1b292c47 -EBUILD ultracopier-0.2.0.16.ebuild 830 BLAKE2B 8a156ed68903439f4e531a2cbcf6bc4ff7588d186aaebe077d63591fefff0f5fa90fe80b4d695ebded0e7bac89272cd885d8c71de4e87440bbcf326adf620014 SHA512 02779e06e9453b359016b4bb17dd9743fd4bd53f0ab0ff613738d7e7192dc2afad21304d4d955b6f7aa573954271de666ed24796ba3f0b3139343f14f7adeaf2 +DIST ultracopier-src-0.2.0.16.tar.bz2 430736 BLAKE2B 2af470ca2fb0671732e9fe528c12ba4c1957028cc0f7df512668670f011f5b34e6e73e91033b60bdb5a91a4520791e06fd0a606222637929b12a620ee252901a SHA512 7ca0698bca73c9fa696b48d5aee09a5159c7a1bb6c8d8194476ed13d189c4b16b42c8aff0013fe1107889c95d9a048cc86953698f90b731b48d8ededac350693 +EBUILD ultracopier-0.2.0.16.ebuild 799 BLAKE2B 5f1cfba22086f9838394484da6ea6ba5405217e9c3502c3ae482438f7661b888adde6a999da55019871541bcd05f9f69fdd8f5257a382186b3bb00bee8b8c75f SHA512 b98b46e5592a28e5c33657cf6a6cdd938ff6ebb95a1bf2d49c8ff0ecf7fd6d8606fd4bb2ea9d27c9fffc0f2b246542840ad7906c56a68bcb1281e7a734e052fb MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 diff --git a/sys-apps/ultracopier/ultracopier-0.2.0.16.ebuild b/sys-apps/ultracopier/ultracopier-0.2.0.16.ebuild index ba8896b647cd..d29381801355 100644 --- a/sys-apps/ultracopier/ultracopier-0.2.0.16.ebuild +++ b/sys-apps/ultracopier/ultracopier-0.2.0.16.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=2 +EAPI=6 -inherit eutils qt4-r2 +inherit desktop qmake-utils DESCRIPTION="Advanced file copying tool" HOMEPAGE="http://ultracopier.first-world.info/" @@ -18,22 +18,25 @@ RDEPEND="dev-qt/qtgui:4" DEPEND="${RDEPEND}" src_prepare() { - local debugl=0 - use debug && debugl=100 - sed -i -e "s/\(DEBUG_ULTRACOPIER\) 0/\1 ${debugl}/" src/var.h || die + default + sed -i -e "s/\(DEBUG_ULTRACOPIER\) 0/\1 $(usex debug 100 0)/" src/var.h || die +} + +src_configure() { + eqmake4 } src_install() { - dodoc CHANGELOG README || die + einstalldocs cd src || die rm -f lang/en* lang/*.ts || die rm -Rf styles/kde3 || die - dobin ${PN} || die - newicon other/${PN}-128x128.png ${PN}.png || die - domenu other/${PN}.desktop || die + dobin ${PN} + newicon other/${PN}-128x128.png ${PN}.png + domenu other/${PN}.desktop insinto /usr/share/${PN} - doins -r lang styles || die + doins -r lang styles } diff --git a/sys-apps/utempter/Manifest b/sys-apps/utempter/Manifest index 3ba34ee8d8bc..651ad70e6b7f 100644 --- a/sys-apps/utempter/Manifest +++ b/sys-apps/utempter/Manifest @@ -1,6 +1,5 @@ -AUX utempter-0.5.5.6-build.patch 310 BLAKE2B 79f5ac19186faa7d64941971873160d7a5292bb396efb451d3639b601bc5b2e5a3ba5ef539ae64668d595c1471e0f8815d2f90bcea3616eaf370c55e0e833515 SHA512 3dc62d5e7ce326524bf4373334d474f09fb48b65b6bd1e03fd08f4dcf88a0397194fcb0b04b7a67de5c960607c53b5cf0e456f74133e6d6fc4c208943c45ce22 -AUX utempter-0.5.5.6-no_utmpx.patch 768 BLAKE2B 7432ccd5b0f00eb2b8e734c3b00fd60efcebcd23a0c9c5d9eded505084f7d795ae0a2c7d6bd2ed5df0a0461cdf47c4b6753429a86830a33222b05c23453418b4 SHA512 c6201252c8712578a5668346502f1143fabc717cb5be922a92f2af8787a1e757fa5d70aa447f5a2d6347d49edb6fce2106d21993cc6a0e85c111bd049efa3bf3 -AUX utempter-0.5.5.6-soname-makefile-fix.patch 839 BLAKE2B aba35c6d69ba55d782b689ea4462b42b14d59b81ff32925c909991625797d437f178128ce2554c0d26c6fbf0e93133c47172572782c4acb481f5645fd0fe091c SHA512 a7bf938bd0cd9e486255f43dfa4436bfba63e1d21d14abf611128e41f9e8ce87b412f7ac15ad3c78c2c307e7c8ca45fe6c3ffd41a33bb4ae7f35b93547fff79b -DIST utempter-0.5.5-6.src.rpm 21099 SHA256 617c28d579fa54349b8a706e8346c2442f2ef39523db7e0501701a0919651f3c SHA512 81eeac830631922f2d1b2099a559b60bfd21818b38a524d3c5f61aec143b3e70e95a9ccc300f649dd81f515837fe3befaba6b93bb2e22767e71eee7acb711655 WHIRLPOOL 3ae0a32eae886f2ac14dcf36b4e96e4bb8c25966389c6608a83673149a3045b580b35832e5c69836a18a4f88b55e8c20d254470f84424e30f758a820a87ce13a -EBUILD utempter-0.5.5.6.ebuild 1239 BLAKE2B d2696331207b2acc4665ae09aa35bcce1cc87e6e009af8db24a0661f1f323dd8fb8979c7b3eed317556e2282f874b2895b5968e250a6ee37460d0961b5df5dfa SHA512 c4f621242f77152536e4137e1f13aa9aaf362ad4f620021a076008102284cce9246300c029e5dd0cfcfaf7624978fb8b3de1a0bd52a484f8f88244d06d07ea39 +AUX utempter-0.5.5.6-fix-build-system.patch 1168 BLAKE2B c513d18115a7a78e2c4d381f7ae650aa56de4d0833fa7c610948da072c4a1e85ae6832517012dd0c04ca91f4c3cb51d8b3b332c58b66b0716c63e3576917fe77 SHA512 a2febc07a01e0f9f95c8c846616d8f46e74e3db2ea66af720539f6825019dd05ab5472507210945c5caf84566584ab01824ebf0f16e51e7012f1334fc5a920b4 +AUX utempter-0.5.5.6-no_utmpx.patch 666 BLAKE2B 9ee0c3634b87ddd50d50f81811f749f615e4fad8dc27b9fc97cc1b61ffdd64eb5045910457547b2cbc245c593490ab354e3a7f5a5965a8aeebf330c6b32d4889 SHA512 4cdc7616f1b886b74fa39272f502fb9eb303047c93be57122ba32517f49a0274e4f7e02b25ead9dd9b60584610a576cb2d78c6350350b3d8364ccd903c3dafcf +DIST utempter-0.5.5-6.src.rpm 21099 BLAKE2B a4a8c53ab31d53ec56d60a16e5c1d3a0a2ec6c73c3c3025c15dfc389da75f969545392b46976017cfcde1d9f9ca974b14786bbf39709aebdda890df13a7866ed SHA512 81eeac830631922f2d1b2099a559b60bfd21818b38a524d3c5f61aec143b3e70e95a9ccc300f649dd81f515837fe3befaba6b93bb2e22767e71eee7acb711655 +EBUILD utempter-0.5.5.6.ebuild 1178 BLAKE2B 180449c6cdfad5122e9a73538a5eabdc2c1d720fc66d97e926d1f3c720cb7ca2ae387123f10b1ed3acf4b9ab1b73132fcaa4e83715610355e3f387816ae28a45 SHA512 4d575c5df427cfc522934c23464154c40af12c54d1e7baed46c52e3d34ae252d1305c6408a990d40dab8bac1338865d5f243d7bce8e6ead232b8fad0aa7d0778 MISC metadata.xml 344 BLAKE2B 090f0e14a3a7fec427cbffa3abc85b6caf242a4f471358ba0614a23682a183a2ac93fd4d6695ab0059b0c7e5573d8429ea4600506050753e2ceca3c1217c394a SHA512 77307533cb1ddb71561957493f7062330c1748f62ab1381f369c5fb864f0e2a6608cfa5c86005b816c2a9a2523bb9a2264c807f1d6c31a5e2bb6177876b94ed9 diff --git a/sys-apps/utempter/files/utempter-0.5.5.6-build.patch b/sys-apps/utempter/files/utempter-0.5.5.6-build.patch deleted file mode 100644 index 8fbfb111196f..000000000000 --- a/sys-apps/utempter/files/utempter-0.5.5.6-build.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- Makefile -+++ Makefile -@@ -37,7 +37,7 @@ - ln -sf $(SHAREDLIB).$(VERSION) $(RPM_BUILD_ROOT)/$(LIBDIR)/$(SHAREDLIB).$(SOMAJOR) - - $(SHAREDLIB): utmpintf.os -- $(CC) -o $@ -shared -Wl,-soname,$(SONAME) $^ -lc -+ $(CC) $(LDFLAGS) -o $@ -shared -Wl,-soname,$(SONAME) $^ -lc - - utmpintf.o: utmpintf.c utempter.h - diff --git a/sys-apps/utempter/files/utempter-0.5.5.6-soname-makefile-fix.patch b/sys-apps/utempter/files/utempter-0.5.5.6-fix-build-system.patch index 123c77eb357c..83b41a04b25f 100644 --- a/sys-apps/utempter/files/utempter-0.5.5.6-soname-makefile-fix.patch +++ b/sys-apps/utempter/files/utempter-0.5.5.6-fix-build-system.patch @@ -1,6 +1,6 @@ ---- Makefile.orig 2005-04-15 08:54:32.000000000 -0400 -+++ Makefile 2005-04-15 08:56:17.000000000 -0400 -@@ -5,6 +5,10 @@ +--- a/Makefile ++++ b/Makefile +@@ -5,12 +5,14 @@ CVSROOT=$(shell cat CVS/Root) # major number of the .so lib SOMAJOR = 0 @@ -11,7 +11,22 @@ SHAREDLIB = lib$(NAME).so SONAME = $(SHAREDLIB).$(SOMAJOR) -@@ -29,6 +33,8 @@ + +-CFLAGS = -Wall $(RPM_OPT_FLAGS) +- + TARGETS = $(NAME) utmp $(SHAREDLIB) + + all: $(TARGETS) +@@ -19,7 +21,7 @@ + rm -f *.so utempter utmp *.os + + %.os : %.c +- $(CC) -c $(CFLAGS) -fPIC $< -o $@ ++ $(CC) -c $(CFLAGS) $(CPPFLAGS) -fPIC $< -o $@ + + install: + mkdir -p $(RPM_BUILD_ROOT)/usr/sbin +@@ -29,9 +31,11 @@ install -m 644 utempter.h $(RPM_BUILD_ROOT)/usr/include install -m 644 $(SHAREDLIB) $(RPM_BUILD_ROOT)/$(LIBDIR)/$(SHAREDLIB).$(VERSION) ln -sf $(SHAREDLIB).$(VERSION) $(RPM_BUILD_ROOT)/$(LIBDIR)/$(SHAREDLIB) @@ -19,4 +34,8 @@ + ln -sf $(SHAREDLIB).$(VERSION) $(RPM_BUILD_ROOT)/$(LIBDIR)/$(SHAREDLIB).$(SOMAJOR) $(SHAREDLIB): utmpintf.os - $(CC) -o $@ -shared -Wl,-soname,$(SONAME) $^ -lc +- $(CC) -o $@ -shared -Wl,-soname,$(SONAME) $^ -lc ++ $(CC) $(LDFLAGS) -o $@ -shared -Wl,-soname,$(SONAME) $^ -lc $(LIBS) + + utmpintf.o: utmpintf.c utempter.h + diff --git a/sys-apps/utempter/files/utempter-0.5.5.6-no_utmpx.patch b/sys-apps/utempter/files/utempter-0.5.5.6-no_utmpx.patch index 8644db837f4a..b6fc7ea7d27e 100644 --- a/sys-apps/utempter/files/utempter-0.5.5.6-no_utmpx.patch +++ b/sys-apps/utempter/files/utempter-0.5.5.6-no_utmpx.patch @@ -1,5 +1,5 @@ ---- utempter-0.5.5/utempter.c.mps 2004-12-11 14:54:06.000000000 +0100 -+++ utempter-0.5.5/utempter.c 2004-12-11 14:57:46.000000000 +0100 +--- a/utempter.c ++++ b/utempter.c @@ -11,7 +11,9 @@ #include <sys/stat.h> #include <sys/sysmacros.h> diff --git a/sys-apps/utempter/utempter-0.5.5.6.ebuild b/sys-apps/utempter/utempter-0.5.5.6.ebuild index 4866160d3cd1..6fd2931dcb40 100644 --- a/sys-apps/utempter/utempter-0.5.5.6.ebuild +++ b/sys-apps/utempter/utempter-0.5.5.6.ebuild @@ -1,10 +1,12 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -inherit rpm eutils user +EAPI=6 + +inherit flag-o-matic rpm toolchain-funcs user MY_P=${P%.*}-${PV##*.} -S=${WORKDIR}/${P%.*} + DESCRIPTION="App that allows non-privileged apps to write utmp (login) info" HOMEPAGE="https://www.redhat.com/" SRC_URI="mirror://gentoo/${MY_P}.src.rpm" @@ -14,43 +16,43 @@ SLOT="0" KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86" IUSE="" -RDEPEND="!sys-libs/libutempter +RDEPEND=" + !sys-libs/libutempter !dev-python/utmp" +S=${WORKDIR}/${P%.*} +PATCHES=( + "${FILESDIR}"/${P}-no_utmpx.patch + "${FILESDIR}"/${P}-fix-build-system.patch +) + pkg_setup() { enewgroup utmp 406 } -src_unpack() { - rpm_src_unpack - cd "${S}" - epatch "${FILESDIR}"/${P}-soname-makefile-fix.patch - epatch "${FILESDIR}"/${P}-no_utmpx.patch - epatch "${FILESDIR}"/${P}-build.patch -} - -src_compile() { - emake RPM_OPT_FLAGS="${CFLAGS} ${CPPFLAGS}" || die +src_configure() { + tc-export CC + append-cflags -Wall } src_install() { emake \ - RPM_BUILD_ROOT="${D}" \ + RPM_BUILD_ROOT="${ED}" \ LIBDIR=/usr/$(get_libdir) \ - install || die - dobin utmp || die + install + dobin utmp fowners root:utmp /usr/sbin/utempter fperms 2755 /usr/sbin/utempter } pkg_postinst() { - if [ -f "${ROOT}"/var/log/wtmp ] ; then - chown root:utmp "${ROOT}"/var/log/wtmp - chmod 664 "${ROOT}"/var/log/wtmp + if [[ -f "${EROOT%/}"/var/log/wtmp ]] ; then + chown root:utmp "${EROOT%/}"/var/log/wtmp + chmod 664 "${EROOT%/}"/var/log/wtmp fi - if [ -f "${ROOT}"/var/run/utmp ] ; then - chown root:utmp "${ROOT}"/var/run/utmp - chmod 664 "${ROOT}"/var/run/utmp + if [[ -f "${EROOT%/}"/var/run/utmp ]] ; then + chown root:utmp "${EROOT%/}"/var/run/utmp + chmod 664 "${EROOT%/}"/var/run/utmp fi } diff --git a/sys-apps/vbetool/Manifest b/sys-apps/vbetool/Manifest index 360c4d34c0ef..fe66dcaaea5e 100644 --- a/sys-apps/vbetool/Manifest +++ b/sys-apps/vbetool/Manifest @@ -1,4 +1,4 @@ AUX vbetool-1.0-build.patch 537 BLAKE2B e22826304e84fe21f577c3c7db754194103ca97a9b2647063469241f5c213182f4c80007823ef1caa6d79af1d313d560b1e06ebfaf757ec876a618117f2fbb3e SHA512 1b9b1b7471f09ec6dac8f535df1ea6bf09f8824f58c025b92e3e5d3e451a56e750e93836d03ee37e20f14868a9b75e97c548add36256412dfc154530c7a4be12 -DIST vbetool-1.1.tar.gz 182826 SHA256 4d26ddc43144593742349e69481e3536ce3482faaa9ad4494fdc7c8b7662f954 SHA512 09d8713516f074fe8e901ab3e24aba7e8b9ddf459b3ee3394b7604e4489a70a27c6dc3604cf1284c49233dba908f00da746c583562af2bc93b6df8ff413efd96 WHIRLPOOL 9b6d6b616c0b074e49c80291e48e2c951e83a2981780cf942ca535f2909e7e83a0d7cf1f9efdc6cea779a5db688635bb7a3740c3bd77a80a268776dea9b1d147 -EBUILD vbetool-1.1.ebuild 660 BLAKE2B a6570349d22aee9e6e59682658cbd68f56bb1c26f253a11fe90aab1df6674ea414d216f9ffeca4d41bc19da27c71845ea427e471682dce8dd6e3a763ff3239c3 SHA512 d45fe17ff11f433c53357bc34b0709805a9f1d3eb129fce761f450ca0a3fc0654afda8cf19a8434f7a51fe03e71c5d24a4ab8fc9b1e2aa1f41c25bb6b9a83d37 +DIST vbetool-1.1.tar.gz 182826 BLAKE2B 6b30eb468e55bedd766161e373e042b5fdf38fd2926bfc8aeb94404350864e835d41642f19be155fcf9a8fbfdc8b4e237e742cabd00626db5e8d17e7c7c5cf6f SHA512 09d8713516f074fe8e901ab3e24aba7e8b9ddf459b3ee3394b7604e4489a70a27c6dc3604cf1284c49233dba908f00da746c583562af2bc93b6df8ff413efd96 +EBUILD vbetool-1.1.ebuild 669 BLAKE2B 5c355f84b0e499c3d6335904d5f279cd30811db5c40b36f8f776801f48b5cf4cc19c719bdd4d6d17bffbcfd256675da4e1546f9cba38cdc2eb2da7736a0c6b34 SHA512 b382bb9a2bc2d795d6a4b33d8fe27c80251794ab7eaf0c72d82447aebb8b167762cea520e68ed7ea88e6fe81e24e3b5cdf85fc7d17b98df9f304776c181994f4 MISC metadata.xml 309 BLAKE2B 9eebaf0a2c9bddec7b166ccc276008e70956fdcfbbfbb4c996f23cb09fde3047048e609b9a3c412d3bac383aeab874f505166be8b7362ed3d40387108cc4f604 SHA512 9068ab08a41974b1d807c0beb90e289c9fe22e70299c164d65d0a3e051a46964b91d77b5045df9f0dfdc7f23e1ee6d918819456f27b878890e343c86280b422c diff --git a/sys-apps/vbetool/vbetool-1.1.ebuild b/sys-apps/vbetool/vbetool-1.1.ebuild index 60ec4a9872c8..fd6c4d5d9ce2 100644 --- a/sys-apps/vbetool/vbetool-1.1.ebuild +++ b/sys-apps/vbetool/vbetool-1.1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI="4" +EAPI=6 -inherit eutils autotools +inherit autotools DESCRIPTION="Run real-mode video BIOS code to alter hw state (i.e. reinitialize video card)" HOMEPAGE="http://www.codon.org.uk/~mjg59/vbetool/" @@ -14,13 +14,17 @@ SLOT="0" KEYWORDS="amd64 x86" IUSE="" -DEPEND="sys-libs/zlib +RDEPEND=" + sys-libs/zlib sys-apps/pciutils >=dev-libs/libx86-1.1-r1" -RDEPEND="${DEPEND}" +DEPEND="${RDEPEND}" + +PATCHES=( "${FILESDIR}"/${PN}-1.0-build.patch ) src_prepare() { - epatch "${FILESDIR}"/${PN}-1.0-build.patch + default + eaclocal # temp fix for #439614 eautoreconf } diff --git a/sys-apps/watchdog/Manifest b/sys-apps/watchdog/Manifest index e452a45a139f..ffc9c1d0915d 100644 --- a/sys-apps/watchdog/Manifest +++ b/sys-apps/watchdog/Manifest @@ -5,7 +5,7 @@ AUX watchdog-init.d 861 BLAKE2B 5fbda896379eb22d6beb50c7839f9c10c463cea5491b7447 AUX watchdog-init.d-r1 773 BLAKE2B 7d5bdf4e349f558f12e8250de5abf39278e3d7bfa5344225ce717cd3575573853f11feef8cdc3aa526280f717f9ae43bd42191789ddf81bb4beb32afc8f38bc5 SHA512 c07f0e3f026a86ecbcaa839c5711420fe00433a9ce84c3a7e3f4de4a1d90bc5ad6646561acaa1d1df2d1adb638dd6817497c4c538574ac894deb6c7451b2964a AUX watchdog.service 146 BLAKE2B 9a0a28cbc4509590c98850bf31355e991fd298e52a1fce0a7b6925554f24b80c76adf76bee20790e0d100c8372e4e35a3b0826d6192267f5addf7155d414cf4c SHA512 5eb489e72351db8a881d84fc15730a91ca2a108641031196ad5374aec5e01fa5b859872fa27c3382b4637482a5c8dab7efa61057f4663ae6c49c4ed01e9d8abd DIST watchdog-5.14.tar.gz 216384 SHA256 620b2f49e9879f2e85c73d4c1f422f9101e6b38e824fea2414befd8bb6866ad1 SHA512 ccfaca7a68a47cff42dbeae047dfa691e1cfc23851f9ca0634ea6315ff55a13cdbb0020bde7df38b702c82c0535ad41f520617dd639037e171701a6b0f8991aa WHIRLPOOL 5520e0a4970a20c25780d507260380acf2056828bad8702de98039876526c39a40f884eb1b684cf39386479e6d40c08f3134b138cc6caf51b4150289a364239c -DIST watchdog-5.15.tar.gz 228132 SHA256 ffdc865137ad5d8e53664bd22bad4de6ca136d1b4636720320cb52af0c18947c SHA512 a675cfadf3296d583b9163193297038fb19459daf7c6681289392d613e775e75b7afd42a3e01b136a955f25b2f45818033b56e10de9050075d7dc015535a6e75 WHIRLPOOL ebd7ee604ddbad856760949b16615693b1665289d57312f7dee10cea1d358dbd20f2beb2656e549a80c81ad08e5e6de8621cda3ad4eb696e9af7b63b8b4045b9 +DIST watchdog-5.15.tar.gz 228132 BLAKE2B 040badcf66f048e2873c335a4dd1b5dad6716c61534322c0c92dad2238049555af40e92612a260507fddd4c284d7ccb5d362dc1660084fd0a7db2c522b1ea323 SHA512 a675cfadf3296d583b9163193297038fb19459daf7c6681289392d613e775e75b7afd42a3e01b136a955f25b2f45818033b56e10de9050075d7dc015535a6e75 EBUILD watchdog-5.14.ebuild 869 BLAKE2B 0d159a185ac60a8f911547e42d13f594d9c54e54f0bd49b375b975c9321eeb6ef13e89f748dea0947a01e7d48d4783e11838ae26c856372aed4d06b627260cd5 SHA512 7223acbd16f44a78cab8af57d283453f1e72fe49bab38100a2f3dfdfcdc9cc02caf3c07f75b77b06bdae6d14cd7c31069709d1f4374dcb852fa059cd4e57089a -EBUILD watchdog-5.15.ebuild 989 BLAKE2B 4315585e1d24c5578897d02a8abf5636455a1243258c3c6588b518c00a43323cd55e6ca05d91572989060c6cc782c88b960186e3f034121a3166687fa0d84ab5 SHA512 6172c8dcbb3f7b5b60d2ad8eb3bd781b266aeb4f0326ece639b4b802096519287ca49dd64192ed3727ee6b9714533ad006634e93644fe10cd3619cba5146eead +EBUILD watchdog-5.15.ebuild 980 BLAKE2B e836902710b06fb0a60ccbeef277111c24cd36f92b003710cd4f491916236b11d123ab08cb6a343aebc4a2a5787d474843bf269b9db3014f8a4a526fd94e4b01 SHA512 ecc4b12592b375d3e1ecc40d46a552285d9e678ff7edf760f844f9f90b4216cfcc8385e15936518a4f4e6d312b3816775703bb3a26d37b847a32c77f9127064d MISC metadata.xml 405 BLAKE2B 47880df93bf397e1a7d905a0ade7c385eb7f97ca4e99fd5687f15147adb093da1312f518b6179d7ab9095a355d73147091787a0d3dc90200cef3e8cf7320a8c8 SHA512 36da0e0199b41608190b0e39de2b82bea5516890208c57744b93e527904501de01b1bfd4e20fc74450bd7b9ac4d152e0d57e31a35deca0b1edddc9ce60846d0b diff --git a/sys-apps/watchdog/watchdog-5.15.ebuild b/sys-apps/watchdog/watchdog-5.15.ebuild index 887cff300800..1c38ff5e0028 100644 --- a/sys-apps/watchdog/watchdog-5.15.ebuild +++ b/sys-apps/watchdog/watchdog-5.15.ebuild @@ -3,7 +3,7 @@ EAPI=6 -inherit toolchain-funcs flag-o-matic systemd +inherit flag-o-matic systemd toolchain-funcs DESCRIPTION="A software watchdog and /dev/watchdog daemon" HOMEPAGE="https://sourceforge.net/projects/watchdog/" @@ -14,8 +14,9 @@ SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" IUSE="nfs" -DEPEND="nfs? ( net-libs/libtirpc )" -RDEPEND="${DEPEND}" +RDEPEND="nfs? ( net-libs/libtirpc )" +DEPEND="${RDEPEND} + virtual/pkgconfig" PATCHES=( "${FILESDIR}"/${P}-musl.patch @@ -23,18 +24,16 @@ PATCHES=( ) src_configure() { - if use nfs ; then - tc-export PKG_CONFIG - append-cppflags $(${PKG_CONFIG} libtirpc --cflags) - export LIBS+=" $(${PKG_CONFIG} libtirpc --libs)" + if use nfs; then + append-cppflags "$($(tc-getPKG_CONFIG) libtirpc --cflags)" + append-libs "$($(tc-getPKG_CONFIG) libtirpc --libs)" fi econf $(use_enable nfs) } src_install() { default - docinto examples - dodoc examples/* + dodoc -r examples newconfd "${FILESDIR}"/${PN}-conf.d ${PN} newinitd "${FILESDIR}"/${PN}-init.d-r1 ${PN} diff --git a/sys-apps/which/Manifest b/sys-apps/which/Manifest index 6dd28c1d88ef..02584c2494bb 100644 --- a/sys-apps/which/Manifest +++ b/sys-apps/which/Manifest @@ -1,3 +1,3 @@ -DIST which-2.21.tar.gz 149305 SHA256 f4a245b94124b377d8b49646bf421f9155d36aa7614b6ebf83705d3ffc76eaad SHA512 d2f04a5c5291f2d7d1226982da7cf999d36cfe24d3f7bda145508efcfb359511251d3c68b860c0ddcedd66b15a0587b648a35ab6d1f173707565305c506dfc61 WHIRLPOOL e1712d2f2b48467300f5947d0a72c0cf759bc33001661ba41cd57cefe21cb9974cc318748d76ff73c71fb869c4d7a445973ad95777ab380f673c85095360fd57 -EBUILD which-2.21.ebuild 694 BLAKE2B 11ec8ad7898a779d330939b2a3f6cab6e8cb76cc809cf2ff932a1caf3a78cb8b73da1a7280a93143dd9e45d262dacb0d1a05adf1ec205585037fed14d8182df9 SHA512 0ab7b75309345083377b4e13ff91a3896479e19d22fc26cfc49dc90b6697851404c6dc2720b0e39f91e69c569ffd484491ba8c930e3025e246a113491ebacb46 +DIST which-2.21.tar.gz 149305 BLAKE2B 355888b0dfe3e4e1679a8a9e1255a935fa48be220408abc441fae69fe0b26bd39e0544ed20e75497ed5bccaa75e788d9aec17007c668f15eaf6b1599faa131a0 SHA512 d2f04a5c5291f2d7d1226982da7cf999d36cfe24d3f7bda145508efcfb359511251d3c68b860c0ddcedd66b15a0587b648a35ab6d1f173707565305c506dfc61 +EBUILD which-2.21.ebuild 673 BLAKE2B d681f3859e04138afec5d34cd74591217630e65ebd4620345fdd19ebaadfea217be8ced8012cd22b37ba6bd9105be7a8e21b4eef36563d7d59832f88199879d1 SHA512 a15d06bff94a64d770489f66d2683f6d6eeaf08e30c3275b8f4d1a18b40cfeb2aea68be2738ff52e15e4e4084443000fecb5bb78771526df3ed3d83da7a7ead1 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555 diff --git a/sys-apps/which/which-2.21.ebuild b/sys-apps/which/which-2.21.ebuild index 8afa8dab5298..4b01ed6b5168 100644 --- a/sys-apps/which/which-2.21.ebuild +++ b/sys-apps/which/which-2.21.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI="4" +EAPI=6 inherit flag-o-matic toolchain-funcs @@ -14,11 +14,8 @@ SLOT="0" KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="" -src_prepare() { - append-lfs-flags -} - src_configure() { + append-lfs-flags tc-export AR default } diff --git a/sys-apps/x86info/Manifest b/sys-apps/x86info/Manifest index f1fd2a43dcf0..10d1e74d447b 100644 --- a/sys-apps/x86info/Manifest +++ b/sys-apps/x86info/Manifest @@ -1,7 +1,8 @@ -AUX 1.21-pic.patch 717 BLAKE2B f99c086338e1639e181eb1533b7fe222df8afa8463fa13ee44b20e1bf5d7df5f227631347e3f165f0377eabf816878c1055709179f913e1ec49e5314de743086 SHA512 bbb1cceaba649a23629b25f7cd6c18248ec3ed9d9072071aaf69ab7e50362b9698d734ad4a2d473d989d3a2cc75a01e8cb96ca7b764725c9d2c424adff406faf -AUX x86info-1.24-pic.patch 573 BLAKE2B 6c4294abd04da33cfb1750fd3c49a782a1c09af12bdf62f273950ddd0340ba63c21216dc9d672a6dfcb82ef538054cadf687f593f22078724a32b2019edc69e0 SHA512 9844411268f15a94fdd202c5f6f74deff22b6bd7a5a4f2e12aca8f86dae4d642055d7abc01dca4467b20000df9d1966cfa3055bdc4c6fad790b7894aebba0a76 -AUX x86info-1.29-parallel-make-cleanup.patch 486 BLAKE2B c38b7569220044f26d13f3699a3933fd04cafb806e6c65f3ff61aef4c52ad2f6a8bb1fb80f73bb9b9ba7fb091268f892e685bca332d872f95db3a4b14b5457a6 SHA512 ff0ab367a0ed4b14dd0e705463ad63e8a6c4ee026bcfe4509413d8147397332aeac1c41a44684cc09eefe1d09842cf0ab1c27a7c9ea4c7fa8de5b7f04561792b +AUX 1.21-pic.patch 538 BLAKE2B 98869b7f97ef786a6a8c72277416722d815ffeb562f756f730886dd5dd07f9c03b7d53626be507d23854ecdc5a4d89391effe0084265dd0bfb78b80b11dc86bc SHA512 cee450649d775b682cbed101036f58b6c277417533202919c93df2802e06eaf7337399bf0ef68806f1b5c282589772c63ae46a65dd8d1f754d4691cd4062bd5c +AUX x86info-1.24-pic.patch 577 BLAKE2B c552b1e35109107b8b368929240deb0acb84c09f12d60acb67646a947386a1b7cd532da79c2e7ff97104526327d625f917f2ee51275977de41b2743f1d386bcf SHA512 72d476c4fdc0eef30dfaa585ab4344081da1c441289d917cd01612bc0d7f1b31f8c26510c86c89fbb9d79d4526ae6a1ad413f98fb8aa005d9fc729f80fb99e2a +AUX x86info-1.29-parallel-make-cleanup.patch 330 BLAKE2B 77d0b528bd5a5dae91442ae6e2ee5e5c6d397ae82e0b35f89e5f441319907e3ca9e83c79fcdcf2964cf7b0b96cd2c5cfa94536e4d5002665771876c158b0943f SHA512 c13035a4487d36c5949fab22aed6b61db70c4ff304849ac5345656ec56e7d90c8636ea25180db7ec5b73881d3602acae3bc0936148a3bc25f8d64f4c1d97d454 +AUX x86info-1.30-fix-build-system.patch 268 BLAKE2B a1f57d38ea3836b51eef4ed6b6516ac8a3e1350496e5550a2070d8b7f1a8e6b15c5af664d2c45062ea347168edf882ee2ddafa976beaa8688b19c33ae4ac3b0c SHA512 80f7b0773737b83c35a8dc59aa1f844edf73c93ee89d8fceeed3eb69cf757b79d42e9e0acfea061c1e7f7f4c38b953dbc0943dda874c62db7b63102394f8f6ea AUX x86info-modules.conf-rc 204 BLAKE2B 1077f0a793ca7eedef6c996d2ec9075872d7df862d24885a8152ee22ef3e0ee1667f142a690b44c019c7d75093038ad5a9eb9be7b34e7bc08abf498aa91a7591 SHA512 54557bb1ee77749b7207ac886a31278ae003b52f5c4e76709c3a367e59ab0086872e8b39d30f018ad9d8b07d037a54b4817815880b5c9ebde106cad73421af6b -DIST x86info-1.30.tgz 95727 SHA256 fe3009850e93a9c5fa38ed6bf74d72686043329fead8f1b2be4b5943d4fc9428 SHA512 0b4c9f1be83a737aa26ec14d239d09465608fcf542766ef5b8634d2fe08f75857c0d2bd1969d971ab4b0d55cd3aa3e4e5f58b3b2865865aa68fd751377672e5f WHIRLPOOL 112b91421b8ff3ce8c01f7f22c5b26cad09a9d222fe4259b6644d8f28887a909f94947f1cd94325ae3acab7d440338bbea5693d2ed014f7464c8279a6079a336 -EBUILD x86info-1.30.ebuild 1688 BLAKE2B d2311f6173c397221f29152909716fcdd8ac931624a3aa7cd8aad14b6e2daea88866d2b5d3a6b4df051f51d6f4de0681b7ed15a1ab19dc14419824ef996bed93 SHA512 e0d8ff51be23dc2ad706192ebf677aa41a559a2703fc273b1b4b13c6d93fb619c03ae7ad5522bdaf3fbbfea8e3a346693a8d889167625df52f532e5ea2cd3654 +DIST x86info-1.30.tgz 95727 BLAKE2B 6e9e345c6b4d05d4a137b898f1cc8a31e901b25b8a3822c06c103298e2ee60c6fada8e1fc314a5fcec04618b9a8a9ce05a4e631dbf9f03a24c5349f13d1e2301 SHA512 0b4c9f1be83a737aa26ec14d239d09465608fcf542766ef5b8634d2fe08f75857c0d2bd1969d971ab4b0d55cd3aa3e4e5f58b3b2865865aa68fd751377672e5f +EBUILD x86info-1.30.ebuild 1733 BLAKE2B b3f271e8d4617c828069e438b201fa7ba8d2c84984dac8bf214cd6bf96a4c15c7033934b878c791d078bdb09ff61ff1871dbc3b749ce649d5ca9a8f797ff376b SHA512 ce72adfb475678dfee2f45c00d0ef89231ae81df793d88ff2f0879c17755c7cdfc23af79d12bbc65a24d178698d77c72775c91c010ebf42cf66c3fbdaa1fb87f MISC metadata.xml 329 BLAKE2B d3b79b0a53a4a98cf288ff1ee8ae8cb477b90dad4529cedf04a52b25a3fc359121851c2cea28d703b2d2a42c5813bfe9b84398786e9045521eaff01b94f543c4 SHA512 3baca06564c2219ea6175ea39cea467ada4e7bf21a4341fcdc9d5b885ae387f4ca4f93605464b900a2524d64badfae641c5459d0acd0569de1ce848528a46ee4 diff --git a/sys-apps/x86info/files/1.21-pic.patch b/sys-apps/x86info/files/1.21-pic.patch index ddf24b293e14..7bf89240c2c0 100644 --- a/sys-apps/x86info/files/1.21-pic.patch +++ b/sys-apps/x86info/files/1.21-pic.patch @@ -1,6 +1,5 @@ -diff -Nuar x86info-1.21.orig/bench/benchmarks.c x86info-1.21/bench/benchmarks.c ---- x86info-1.21.orig/bench/benchmarks.c 2007-11-26 17:53:58.278467889 -0800 -+++ x86info-1.21/bench/benchmarks.c 2007-11-26 17:54:32.014318066 -0800 +--- a/bench/benchmarks.c ++++ b/bench/benchmarks.c @@ -19,7 +19,10 @@ #ifdef __linux__ TIME(asm volatile("int $0x80" :"=a" (tmp) :"0" (__NR_getppid)), "int 0x80"); diff --git a/sys-apps/x86info/files/x86info-1.24-pic.patch b/sys-apps/x86info/files/x86info-1.24-pic.patch index 5cbd3a586f8e..b4098c5c68c2 100644 --- a/sys-apps/x86info/files/x86info-1.24-pic.patch +++ b/sys-apps/x86info/files/x86info-1.24-pic.patch @@ -1,7 +1,7 @@ http://bugs.gentoo.org/270388 ---- cpuid.c -+++ cpuid.c +--- a/cpuid.c ++++ b/cpuid.c @@ -62,12 +62,28 @@ sched_setaffinity(getpid(), sizeof(set), &set); } diff --git a/sys-apps/x86info/files/x86info-1.29-parallel-make-cleanup.patch b/sys-apps/x86info/files/x86info-1.29-parallel-make-cleanup.patch index 54208cab0843..a9cec0397fac 100644 --- a/sys-apps/x86info/files/x86info-1.29-parallel-make-cleanup.patch +++ b/sys-apps/x86info/files/x86info-1.29-parallel-make-cleanup.patch @@ -1,12 +1,11 @@ -diff -Nuar x86info-1.29.orig/Makefile x86info-1.29/Makefile ---- x86info-1.29.orig/Makefile 2011-04-05 22:54:04.000000000 +0000 -+++ x86info-1.29/Makefile 2011-05-15 18:19:42.204228978 +0000 +--- a/Makefile ++++ b/Makefile @@ -12,7 +12,8 @@ LSMSR_TMP_HEADERS=AMD/k8.h AMD/fam10h.h AMD/fam11h.h generic_msr.h %.h: %.regs scripts/createheader.py - python scripts/createheader.py $< `basename $< .regs` >$@ -+ python scripts/createheader.py $< `basename $< .regs` >$@.tmp ; \ ++ $(PYTHON) scripts/createheader.py $< `basename $< .regs` >$@.tmp ; \ + mv $@.tmp $@ LSMSR_SRC = \ diff --git a/sys-apps/x86info/files/x86info-1.30-fix-build-system.patch b/sys-apps/x86info/files/x86info-1.30-fix-build-system.patch new file mode 100644 index 000000000000..21034d99edc5 --- /dev/null +++ b/sys-apps/x86info/files/x86info-1.30-fix-build-system.patch @@ -0,0 +1,12 @@ +--- a/Makefile ++++ b/Makefile +@@ -1,9 +1,5 @@ + VERSION=1.30 + +-CFLAGS = -g -O2 -Werror -Wall -Wshadow -Wextra -Wmissing-declarations -Wdeclaration-after-statement -Wredundant-decls +-LDFLAGS = -Wl,-z,relro,-z,now +-CC = gcc +- + SHELL = /bin/sh + + all: x86info test lsmsr diff --git a/sys-apps/x86info/x86info-1.30.ebuild b/sys-apps/x86info/x86info-1.30.ebuild index 7ef0bfa3f20b..358f453ebbbe 100644 --- a/sys-apps/x86info/x86info-1.30.ebuild +++ b/sys-apps/x86info/x86info-1.30.ebuild @@ -1,9 +1,11 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=2 +EAPI=6 -inherit eutils flag-o-matic linux-info toolchain-funcs +PYTHON_COMPAT=( python2_7 ) + +inherit flag-o-matic linux-info python-any-r1 toolchain-funcs DESCRIPTION="Dave Jones' handy, informative x86 CPU diagnostic utility" HOMEPAGE="http://www.codemonkey.org.uk/projects/x86info/" @@ -14,48 +16,57 @@ SLOT="0" KEYWORDS="-* amd64 x86" IUSE="" -RDEPEND="sys-apps/pciutils" -DEPEND="${RDEPEND}" +RDEPEND="sys-apps/pciutils:=" +DEPEND=" + ${PYTHON_DEPS} + ${RDEPEND}" CONFIG_CHECK="~MTRR ~X86_CPUID" -src_prepare() { - epatch "${FILESDIR}"/1.21-pic.patch - epatch "${FILESDIR}"/${PN}-1.24-pic.patch #270388 - epatch "${FILESDIR}"/${PN}-1.29-parallel-make-cleanup.patch +PATCHES=( + "${FILESDIR}"/1.21-pic.patch + "${FILESDIR}"/${PN}-1.24-pic.patch #270388 + "${FILESDIR}"/${PN}-1.29-parallel-make-cleanup.patch + "${FILESDIR}"/${PN}-1.30-fix-build-system.patch +) + +pkg_setup() { + linux-info_pkg_setup + python-any-r1_pkg_setup } -src_compile() { +src_configure() { # These flags taken from the 1.29 ebuild - append-flags -Wall -Wshadow -Wextra -Wmissing-declarations -Wdeclaration-after-statement -Wredundant-decls + append-flags -Wall -Wshadow -Wextra -Wmissing-declarations \ + -Wdeclaration-after-statement -Wredundant-decls append-ldflags -Wl,-z,relro,-z,now - emake x86info lsmsr \ - CC="$(tc-getCC)" \ - CFLAGS="${CFLAGS} ${CPPFLAGS}" \ - LDFLAGS="${LDFLAGS}" \ - || die "emake failed" + + tc-export CC +} + +src_compile() { + emake x86info lsmsr } src_install() { - dobin x86info lsmsr || die + dobin x86info lsmsr insinto /etc/modprobe.d newins "${FILESDIR}"/x86info-modules.conf-rc x86info.conf - dodoc TODO README + einstalldocs doman x86info.1 lsmsr.8 - insinto /usr/share/doc/${PF} - doins -r results - prepalldocs + + dodoc -r results } pkg_preinst() { - if [ -a "${ROOT}"/etc/modules.d/x86info ] && [ ! -a "${ROOT}"/etc/modprobe.d/x86info ] ; then + if [[ -a "${EROOT%/}"/etc/modules.d/x86info ]] && [[ ! -a "${EROOT%/}"/etc/modprobe.d/x86info ]]; then elog "Moving x86info from /etc/modules.d/ to /etc/modprobe.d/" - mv "${ROOT}"/etc/{modules,modprobe}.d/x86info + mv "${EROOT%/}"/etc/{modules,modprobe}.d/x86info fi - if [ -a "${ROOT}"/etc/modprobe.d/x86info ] && [ ! -a "${ROOT}"/etc/modprobe.d/x86info.conf ] ; then + if [[ -a "${EROOT%/}"/etc/modprobe.d/x86info ]] && [[ ! -a "${EROOT%/}"/etc/modprobe.d/x86info.conf ]]; then elog "Adding .conf suffix to x86info in /etc/modprobe.d/" - mv "${ROOT}"/etc/modprobe.d/x86info{,.conf} + mv "${EROOT%/}"/etc/modprobe.d/x86info{,.conf} fi } diff --git a/sys-apps/xmbmon/Manifest b/sys-apps/xmbmon/Manifest index 19ce5281de1a..91b656ce2a47 100644 --- a/sys-apps/xmbmon/Manifest +++ b/sys-apps/xmbmon/Manifest @@ -1,9 +1,9 @@ AUX mbmon.confd 172 BLAKE2B a4ee3d22ca45541534693b64002c849ba3e1ea43c9f73815b30e01c2544dd005787c06250c45334244d76ec82d4fbd55653557519a556ab3dd95ef94bc70843f SHA512 6d48cecc4b2e9f80866a5f1a6a908c91d7ee36b60673ed9ea9e935d26805099ee30c5e205e35f00928b79d9e0fa4d21fe7314ec8b7b8705b508f941460a779f4 AUX mbmon.rc 385 BLAKE2B 7206f97c43f5fad60c46809800f2af7908f68d62b36fb107f341fdc14caa5496b108799b06ab59880f7e7aa8a7ca3378d0a8e0bc2371ad1634331a5721a36aed SHA512 d3c358c176b18d0314d4bca2c89ed0a0c07f38fb604d6eb450c9c2928a24febf5b871fb29150f6c2567638a5ee66c2ac07b1b0a0130ab0c352e74d4a681d5c7c -AUX xmbmon-2.0.5-amd64.patch 674 BLAKE2B 91a04c2228cd2b87cdfc6b1600c3f0b9010bd9f9bef1f50e285ff4f824021f4f5e7d6b630e1fdc9f27743a92219d14b02580b03d9c7feff101c40338cfb863a5 SHA512 a024b87f841fcb8813b241c3ce9fcaba06bd42ce69241fd9f080feb92402b413200d6adbb644ae46b9e8fde76b2fcaec46dcb4be736bde3c8386ca34e55a7f83 -AUX xmbmon-2.0.5-loopback.patch 1181 BLAKE2B 2c9c6183adced2f16f46168bfbe22de935edda8150f2dadda23b62ffb7c03e7cf1ac7a5512dc2e931e7579154776c6fd476a3af12d8c005c2ebafeda09bbb68d SHA512 11104d1c46da9f3a01d4e49a010294feb94696d9a262340ebec3a7acd661089f70d5af3c0d93a8fa89c022275bfdf4becd4c24f6a0544ec2261fdc62d65fce5a -AUX xmbmon-2.0.5-pid.patch 505 BLAKE2B 389b189a2fd0baa7d3b94c6b8c10d23485064644fdf259e9951d5cc923fca979ba180c278532c305d9a45515136639f12344808c530ae9ed9a829cf30a02c0eb SHA512 9c6a569b0d1350715597cf582a558fe311e3eac00f088eb29890741ba814eb18cb934a49ad02532d4d0836ce147b07671f3cbdd45afb9842fc4bfbb8a3a229dc -DIST xmbmon205.tar.gz 142987 SHA256 65b10ebfe53585ac22d6a31d8ef3fea552cb266cf2c124c00421dec1df5a4a4f SHA512 0ee2f3616976af6edc3777391f657d12670be1557f726f67f51edc23866d96d5cd4cfa9ac8aaad52cce2bdd2b9c616efd6edba1a019e4360a0fcaae0aef99a9c WHIRLPOOL f4a77e88315cb86fb6aa61566804cb22b382a6a18d56c96a09dd991033be005ec638361a03cfde21a95e6ef316ed65bbf15d72d03b10810e4dee59e1790e3d7b -DIST xmbmon205_fflush.patch 242 SHA256 f837f465861ce46e4a90d1d3c7a680c1904f7fb91e14efcbad22313c90e2cdc7 SHA512 4ebd6f3870f3b35aafe9424da9e007b269bbdd6944a012e45a6bb18871a1df649245a0992862a2346dd92026e36430130b2061d8308286b93e13571e028684b5 WHIRLPOOL 3bb1a83e9e753642fe6a9bf0deea8743829fe3e27759786f049e03b3fb862adb5c7ed2d69a045d682e1e7afbb207d5f496dbff9d938625d1292583271a804b69 -EBUILD xmbmon-2.0.5-r1.ebuild 1851 BLAKE2B 0ba986fe77dd9bbec00e039cb755812c16c7a4471b2b659bd98d1aba131b0903cd737fafab9396cac2c8735cee4d8e2db0c16630933068df078d08739da95fad SHA512 39508420cec49fa5a724312431188639094cf75aa94ec683b6176d0d2ebb5853ef2031197d659615387bc26bbf9bc4a403e5d68740718db8777d8810d6e6ecdc +AUX xmbmon-2.0.5-amd64.patch 370 BLAKE2B ba44981a10c63298d0b7338bfc03cfd8f0a3cd9eb7aa1f5121f685226c6a1dbbb0d4bf67aabd45b3c37e475e322712f366e482f2f971e5cd4c312402a866d14e SHA512 498f8771cf6d902cfd28da1229f3c73d55e69f44c93aa5904b7e3c2646e0735690723bedd251dff10c4efe614822a28127e7376f9dd19f4b6d6298d3412a7e5c +AUX xmbmon-2.0.5-fflush.patch 191 BLAKE2B 38c8a858a89c5c915252be88e81bdf549f47276e7e121f2d0b90d01497728fb061272d16bdd79c7381b8685dd7894869bdb8a02b24b6f3765bff67a876eaf826 SHA512 9b6c9c6c2ab0a389aa6e200341ee9053c8da307f1863020fa7efe1696ef8d65816bbef3096fd4376ceced5ab3b8ae867ee07810715fa76197cc585192117d8a8 +AUX xmbmon-2.0.5-loopback.patch 1185 BLAKE2B 6f5378afac536131daf02173b2330ed29de2003d467d2d55ce6b2908dd8a828fa1355d43a9f4a1a88c3e08c02770920643f8cfa50ff0e7c41ede6741374bb196 SHA512 9f19fa6ea36f12a7d6dcf9a2c87167b612d8cb5d3d81cba7158e92173feb146fff3b2cb02ff30aef328ffb83a6998842a5ded4e1297482d26862e629fec5b37e +AUX xmbmon-2.0.5-pid.patch 508 BLAKE2B e52468a3a92f051efc6574af4ff124f3f04ba817248b6564bfa633ccb64eb597b3be28f6404185927288119a3d75609e0cfc62317b7faa6a435f652f53eada90 SHA512 caa1a23cd21c33546acbcb703bec778367abde739eed03ab30ffa7051cb2455a9a2fcf776dcbc29109e28a58d2aa2d588b04464d114c083738be45124056515d +DIST xmbmon205.tar.gz 142987 BLAKE2B 7c39c78068106c828273c077a2a375bfd4dbfa686a4f6b592a986b6cebec6b3e2ae7c9318ecd1b1d91c0757fe7ebb023ac135aa8167b5c86c3e42c1c173cdb72 SHA512 0ee2f3616976af6edc3777391f657d12670be1557f726f67f51edc23866d96d5cd4cfa9ac8aaad52cce2bdd2b9c616efd6edba1a019e4360a0fcaae0aef99a9c +EBUILD xmbmon-2.0.5-r1.ebuild 1597 BLAKE2B 70352f472e49439334fc59aeab8391d9957c09ec393fa1cba5dea8534ed5f0c54ab17c165bcb682e100e87799e1118e7594eeb9a5ea3b3ec37911379937082a5 SHA512 e9f3e4957a1fd81f495d11b9dcf3c549c945fe68a873fb682d8101f91595c7a21bdd3e3edc5f470732d1c270f4ed63723db08a81cda7a54d7156b675f09a489e MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555 diff --git a/sys-apps/xmbmon/files/xmbmon-2.0.5-amd64.patch b/sys-apps/xmbmon/files/xmbmon-2.0.5-amd64.patch index 27b150e9b0ba..bac206905107 100644 --- a/sys-apps/xmbmon/files/xmbmon-2.0.5-amd64.patch +++ b/sys-apps/xmbmon/files/xmbmon-2.0.5-amd64.patch @@ -1,6 +1,5 @@ -diff -Naur xmbmon205.orig/configure xmbmon205/configure ---- xmbmon205.orig/configure 2004-08-13 16:22:18.000000000 +0900 -+++ xmbmon205/configure 2005-02-05 11:02:02.496163477 +0900 +--- a/configure ++++ b/configure @@ -3489,7 +3489,7 @@ i?86-*-freebsd*) CC=cc @@ -10,9 +9,8 @@ diff -Naur xmbmon205.orig/configure xmbmon205/configure CC=gcc HOSTDEF="-DLINUX" ;; -diff -Naur xmbmon205.orig/configure.in xmbmon205/configure.in ---- xmbmon205.orig/configure.in 2004-08-13 16:06:31.000000000 +0900 -+++ xmbmon205/configure.in 2005-02-05 11:01:35.414957216 +0900 +--- a/configure.in ++++ b/configure.in @@ -19,7 +19,7 @@ i?86-*-freebsd*) CC=cc diff --git a/sys-apps/xmbmon/files/xmbmon-2.0.5-fflush.patch b/sys-apps/xmbmon/files/xmbmon-2.0.5-fflush.patch new file mode 100644 index 000000000000..655b30f75517 --- /dev/null +++ b/sys-apps/xmbmon/files/xmbmon-2.0.5-fflush.patch @@ -0,0 +1,10 @@ +--- a/mbmon.c ++++ b/mbmon.c +@@ -640,6 +640,7 @@ + else if (fanspeed == 7) + fprintf(out, "%4d\n%4d\n%4d\n", rot1, rot2, rot3); + } ++ fflush(out); + if (port) { + #ifdef LOGGING + if (nfd) diff --git a/sys-apps/xmbmon/files/xmbmon-2.0.5-loopback.patch b/sys-apps/xmbmon/files/xmbmon-2.0.5-loopback.patch index 5a28b52f9ea2..e501f448dcfa 100644 --- a/sys-apps/xmbmon/files/xmbmon-2.0.5-loopback.patch +++ b/sys-apps/xmbmon/files/xmbmon-2.0.5-loopback.patch @@ -2,8 +2,8 @@ Listen on loopback only with the -l option patch by Mike Frysinger ---- mbmon.c -+++ mbmon.c +--- a/mbmon.c ++++ b/mbmon.c @@ -41,4 +41,5 @@ static const char *MyName = "mbmon"; int port = 0; diff --git a/sys-apps/xmbmon/files/xmbmon-2.0.5-pid.patch b/sys-apps/xmbmon/files/xmbmon-2.0.5-pid.patch index aecb5e7a9b7c..1ca30657c230 100644 --- a/sys-apps/xmbmon/files/xmbmon-2.0.5-pid.patch +++ b/sys-apps/xmbmon/files/xmbmon-2.0.5-pid.patch @@ -2,8 +2,8 @@ Write a pid when we daemonize patch by Mike Frysinger ---- mbmon.c -+++ mbmon.c +--- a/bmon.c ++++ b/mbmon.c @@ -229,4 +229,5 @@ static void daemonize() { diff --git a/sys-apps/xmbmon/xmbmon-2.0.5-r1.ebuild b/sys-apps/xmbmon/xmbmon-2.0.5-r1.ebuild index da5cef958ffd..2b128239d11e 100644 --- a/sys-apps/xmbmon/xmbmon-2.0.5-r1.ebuild +++ b/sys-apps/xmbmon/xmbmon-2.0.5-r1.ebuild @@ -1,13 +1,13 @@ -# Copyright 1999-2008 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -inherit eutils +EAPI=6 MY_P=${PN}${PV//.} + DESCRIPTION="Mother Board Monitor Program for X Window System" HOMEPAGE="http://www.nt.phys.kyushu-u.ac.jp/shimizu/download/download.html" -SRC_URI="http://www.nt.phys.kyushu-u.ac.jp/shimizu/download/xmbmon/${MY_P}.tar.gz - http://www.nt.phys.kyushu-u.ac.jp/shimizu/download/xmbmon/${MY_P}_fflush.patch" +SRC_URI="http://www.nt.phys.kyushu-u.ac.jp/shimizu/download/xmbmon/${MY_P}.tar.gz" # http://www.nt.phys.kyushu-u.ac.jp/shimizu/download/xmbmon/${MY_P}_A7N8X-VM.patch LICENSE="BSD" @@ -15,21 +15,27 @@ SLOT="0" KEYWORDS="amd64 x86 ~x86-fbsd" IUSE="X" -DEPEND="X? ( x11-libs/libXt - x11-libs/libSM - x11-libs/libX11 - x11-libs/libICE )" +RDEPEND=" + X? ( + x11-libs/libXt + x11-libs/libSM + x11-libs/libX11 + x11-libs/libICE + )" +DEPEND="${RDEPEND}" S=${WORKDIR}/${MY_P} +PATCHES=( + # "${DISTDIR}"/${MY_P}_A7N8X-VM.patch + "${FILESDIR}"/${P}-fflush.patch + "${FILESDIR}"/${P}-amd64.patch + "${FILESDIR}"/${P}-pid.patch + "${FILESDIR}"/${P}-loopback.patch +) + +src_prepare() { + default -src_unpack() { - unpack ${A} - cd "${S}" - # epatch "${DISTDIR}"/${MY_P}_A7N8X-VM.patch - epatch "${DISTDIR}"/${MY_P}_fflush.patch - epatch "${FILESDIR}"/${P}-amd64.patch - epatch "${FILESDIR}"/${P}-pid.patch - epatch "${FILESDIR}"/${P}-loopback.patch sed -i \ -e "/^CFLAGS=/s/-O3/${CFLAGS}/" \ -e '/^LDFLAGS=-s$/d' \ @@ -40,21 +46,19 @@ src_unpack() { } src_compile() { - econf || die "Configure failed" - emake mbmon || die "Make mbmon failed" - if use X ; then - emake xmbmon || die "Make xmbmon failed" - fi + emake mbmon + use X && emake xmbmon } src_install() { - dosbin mbmon || die "mbmon failed" + dosbin mbmon doman mbmon.1 dodoc ChangeLog* ReadMe* mbmon-rrd.pl - if use X ; then - dosbin xmbmon || die "xmbmon failed" + if use X; then + dosbin xmbmon doman xmbmon.1x + insinto /etc/X11/app-defaults/ newins xmbmon.resources XMBmon fi @@ -64,10 +68,8 @@ src_install() { } pkg_postinst() { - echo einfo "These programs access SMBus/ISA-IO ports without any kind" einfo "of checking. It is, therefore, very dangerous and may cause" einfo "a system-crash. Make sure you read ReadMe," einfo "section 4, 'How to use!'" - echo } diff --git a/sys-apps/zorroutils/Manifest b/sys-apps/zorroutils/Manifest index 1981a1527f21..d66a7a840b5c 100644 --- a/sys-apps/zorroutils/Manifest +++ b/sys-apps/zorroutils/Manifest @@ -1,5 +1,6 @@ -AUX zorroutils-0.04-20021014.diff 2181 BLAKE2B feea4843c87ff8e44e53bfbbfb4a3ff647609244196e692bf8af6ac53421650fd6ca8282f1144bf157580595ef7b545a30c099c3e80823dcf53e71326d6357de SHA512 f517be553f9be801dbdd21fa886df63fb1a10c151e8687d48c4efe66a202daf2cd3714f3d18167a6ced33fa7a9ae6c6e75fe0f7ee0e804f4ed1683bccc443599 -AUX zorroutils-gentoo.diff 327 BLAKE2B 0af58b11528b079562b7dfe29ca36e8083b5324e87217c981aa239a1ffd24b4ae70ce3f45dd62f95988cf36a45c0e25c50493ed2a634fae394ebc1f6f718b61c SHA512 c8ef49ae4438140c1336e0cbf9381a5e42b39f310eeda9be5101b85a19c595a1bfb97fac451c4757596cd49d5b2410c9d999bbff0d36b6ada9828ae278d57497 -DIST zorroutils-0.04.tar.gz 12205 SHA256 5aca30dec4f29b918d6b899d0467c95e4b9d0016dd7c647e9022bd7d4864676c SHA512 e00a621cc64f3c50ae940809eb79ee145dab7d042e5a2b7fafe14bc7f9f85ff2e1b592d8922e628c5dbcecab95e6bd634d0cbbc1cc84f72136a5235480e6274f WHIRLPOOL ca81347f5fca3ad595b6f50556fe295f680ca160b72dd2b05b7d13ee90c502a369d31a5741ad30e81c902d1ac385ee3c39b4f7ef2d81cbc751b995d42c86c3ef -EBUILD zorroutils-0.04.ebuild 686 BLAKE2B c53426b6dbacfb6cc4a1db7422080df31fa0598ea2cf7602f914e6c4331f3596aebc35a74c2be3a79d96961d3e695a9e135f3bdd4b2ed901411341214d69c803 SHA512 5c715f1f987fdec565743c59ee5e7518c4fc9214b7112d9f19182c467922292aa24b06d16ac24034c5487001c084a9fac26757c83b124309925ff25633ce4b18 +AUX zorroutils-0.04-20021014.diff 1791 BLAKE2B c2b3f27d3f7b1fd54ca53fe2e32df05e59a6b7d2e1b925fd4e1b50e35b2ff172bedb705608489c8cf805b83cb338f159e73633ad7e242107432891881c376529 SHA512 b64ac785ddada0b48b11f824b4a0e68a1d2e3113dcff160f53c8031fa6abe202562d84ba43a8ef9201531071cbb127a0b2d015bfeffd4cde36def3541036a13e +AUX zorroutils-0.04-fix-build-system.patch 265 BLAKE2B ed4e654654f1e589fbdc9800811d0fcbabc482a5ef9f2612325ad008ed482e33c2143c9024bafdf979ba2cf43949a2b0351c40022a54516facd790a57d828174 SHA512 60c1d4d30cc2715be3cb749640df4a30445fbc2e25fd10c474bed59a30fc5c7fce6cdffe613304685693c1ea7c3765c3e66b640c92facfbdc43ed9831ed9452f +AUX zorroutils-gentoo.diff 149 BLAKE2B 362923537fe56671c793bebbd82962362af13a97caace6bc37b7b99a07cdb6bfbaa6a0570e245c7c8e8ec688d5cf188f07d1bdc6f3447b935beeb8fe8ca1249a SHA512 fb6262cf297ad57a423bc9f7b160bc25f5fa2134694c8adaf38d3c6ed17c652ab79473f9d0139bb29692d0ec5a24ad80b94f1b6d03a21329697d0e4d996633d7 +DIST zorroutils-0.04.tar.gz 12205 BLAKE2B b5818073551b39d715c8e8fbaaba2b827a7a4f4442bac76876037721d1202cf5893779cd22fba0451d2a0e7eb15266b08af242a1fa1c6be3eff2e65949523803 SHA512 e00a621cc64f3c50ae940809eb79ee145dab7d042e5a2b7fafe14bc7f9f85ff2e1b592d8922e628c5dbcecab95e6bd634d0cbbc1cc84f72136a5235480e6274f +EBUILD zorroutils-0.04.ebuild 688 BLAKE2B 2452a8f3bf3006825208d24007da5cbcdd6c861dfb9740e6f63c8b75446fcd27cb8cc1306cd54f89a7c4f504491f2192c8c213dd05a53e33f38ca6634ad2d766 SHA512 8269199e9badc67052b86aa8eedaaf1c6de4ba6b80645303867dfce5740396ea71088e7edf098dfb533e117d5139b58f541f0ac1fd75b19862f9eb4e9c1a7031 MISC metadata.xml 430 BLAKE2B 6394dd99f4248b05a48e72b7f5b499f6e403f38ff6f43236bccaea69ccbfd352f094b9a5e9a09db8f5741d46104ba44243784570bd4fc654a77a4e96ca8d6bb6 SHA512 8e8419f4e429758c2d1d42405505da55f47fc3ea7e30c69c994d825aeb6e45d8639533f8cf276d44e1d272062d6d8058f27651c8b38eae7f7ac8c5844523318b diff --git a/sys-apps/zorroutils/files/zorroutils-0.04-20021014.diff b/sys-apps/zorroutils/files/zorroutils-0.04-20021014.diff index 70edf2fce1d7..9475390ff4ce 100644 --- a/sys-apps/zorroutils/files/zorroutils-0.04-20021014.diff +++ b/sys-apps/zorroutils/files/zorroutils-0.04-20021014.diff @@ -1,15 +1,5 @@ -diff -Nru zorroutils-0.04.orig/zorro.ids zorroutils-0.04/zorro.ids ---- zorroutils-0.04.orig/zorro.ids 2000-09-28 20:45:47.000000000 +0200 -+++ zorroutils-0.04/zorro.ids 2002-10-14 15:08:58.000000000 +0200 -@@ -4,7 +4,7 @@ - # Maintained by Geert Uytterhoeven <zorro@linux-m68k.org> - # If you have any new entries, please send them to the maintainer. - # --# $Id$ -+# $Id$ - # - - # Manufacturers and Products. Please keep sorted. +--- a/zorro.ids ++++ b/zorro.ids @@ -42,7 +42,7 @@ 5000 A2620 68020 [Accelerator and RAM Expansion] 5100 A2630 68030 [Accelerator and RAM Expansion] diff --git a/sys-apps/zorroutils/files/zorroutils-0.04-fix-build-system.patch b/sys-apps/zorroutils/files/zorroutils-0.04-fix-build-system.patch new file mode 100644 index 000000000000..6e05cab86d81 --- /dev/null +++ b/sys-apps/zorroutils/files/zorroutils-0.04-fix-build-system.patch @@ -0,0 +1,15 @@ +Respect user variables + +--- a/Makefile ++++ b/Makefile +@@ -2,10 +2,6 @@ + # Makefile for Linux Zorro Utilities + # Copyright (C) 1998--2000 Geert Uytterhoeven <geert@linux-m68k.org> + +-CC=gcc +-OPT=-O3 -fomit-frame-pointer +-CFLAGS=$(OPT) -Wall +- + ROOT=/ + PREFIX=/usr + diff --git a/sys-apps/zorroutils/files/zorroutils-gentoo.diff b/sys-apps/zorroutils/files/zorroutils-gentoo.diff index a0a7e44872bc..97c545e0ed5d 100644 --- a/sys-apps/zorroutils/files/zorroutils-gentoo.diff +++ b/sys-apps/zorroutils/files/zorroutils-gentoo.diff @@ -1,6 +1,5 @@ -diff -Nru zorroutils-0.04.orig/zorroutils.h zorroutils-0.04/zorroutils.h ---- zorroutils-0.04.orig/zorroutils.h 2000-09-28 20:46:14.000000000 +0200 -+++ zorroutils-0.04/zorroutils.h 2006-09-16 18:08:17.000000000 +0200 +--- a/zorroutils.h ++++ b/zorroutils.h @@ -16,1 +16,1 @@ -#define ZORRO_ID_DB "/usr/share/zorro.ids" +#define ZORRO_ID_DB "/usr/share/misc/zorro.ids" diff --git a/sys-apps/zorroutils/zorroutils-0.04.ebuild b/sys-apps/zorroutils/zorroutils-0.04.ebuild index 59c90eecef3d..e6f9de0d1603 100644 --- a/sys-apps/zorroutils/zorroutils-0.04.ebuild +++ b/sys-apps/zorroutils/zorroutils-0.04.ebuild @@ -1,32 +1,32 @@ -# Copyright 1999-2009 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -inherit eutils toolchain-funcs +EAPI=6 + +inherit flag-o-matic toolchain-funcs DESCRIPTION="Zorro bus utility for Amigas running 2.1 and later kernels" HOMEPAGE="http://users.telenet.be/geertu/Download/#zorro" SRC_URI="http://users.telenet.be/geertu/Download/${P}.tar.gz" -IUSE="" LICENSE="GPL-2" SLOT="0" KEYWORDS="m68k ~ppc" -DEPEND="" -RDEPEND="" - -src_unpack() { - unpack ${A} - epatch "${FILESDIR}"/${PN}-0.04-20021014.diff - epatch "${FILESDIR}"/${PN}-gentoo.diff -} +PATCHES=( + "${FILESDIR}"/${PN}-0.04-20021014.diff + "${FILESDIR}"/${PN}-gentoo.diff + "${FILESDIR}"/${PN}-0.04-fix-build-system.patch +) -src_compile() { - emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" || die +src_configure() { + tc-export CC + append-cflags -Wall } src_install() { dosbin lszorro + einstalldocs doman *.8 insinto /usr/share/misc |