diff options
author | 2022-11-29 00:01:56 +0000 | |
---|---|---|
committer | 2022-11-29 00:01:56 +0000 | |
commit | 362e9c08b4471e839f56cf99a3c5888527927764 (patch) | |
tree | 8eae86d6ea03840ebae2b0391be89a919ef6bfce | |
parent | 2022-11-28 23:31:51 UTC (diff) | |
parent | x11-misc/xbattbar: EAPI7->8, fix w/ upcoming clang16 (diff) | |
download | gentoo-362e9c08b4471e839f56cf99a3c5888527927764.tar.gz gentoo-362e9c08b4471e839f56cf99a3c5888527927764.tar.bz2 gentoo-362e9c08b4471e839f56cf99a3c5888527927764.zip |
Merge updates from master
-rw-r--r-- | net-analyzer/synscan/files/synscan-5.02-lld.patch | 9 | ||||
-rw-r--r-- | net-analyzer/synscan/synscan-5.02.ebuild | 10 | ||||
-rw-r--r-- | net-misc/minidlna/minidlna-1.3.2-r1.ebuild | 2 | ||||
-rw-r--r-- | www-client/vivaldi-snapshot/Manifest | 6 | ||||
-rw-r--r-- | www-client/vivaldi-snapshot/vivaldi-snapshot-5.6.2865.3.ebuild (renamed from www-client/vivaldi-snapshot/vivaldi-snapshot-5.6.2839.3.ebuild) | 0 | ||||
-rw-r--r-- | x11-misc/xbattbar/files/xbattbar-1.4.9-implicit-int.patch | 8 | ||||
-rw-r--r-- | x11-misc/xbattbar/xbattbar-1.4.9.ebuild | 15 |
7 files changed, 33 insertions, 17 deletions
diff --git a/net-analyzer/synscan/files/synscan-5.02-lld.patch b/net-analyzer/synscan/files/synscan-5.02-lld.patch new file mode 100644 index 000000000000..612e91599984 --- /dev/null +++ b/net-analyzer/synscan/files/synscan-5.02-lld.patch @@ -0,0 +1,9 @@ +lld does not ignore erroneous libdirs (ideally should use pkg-config) +https://bugs.gentoo.org/875017 +--- a/configure.in ++++ b/configure.in +@@ -60,3 +60,3 @@ + CFLAGS="$CFLAGS -I${prefix}/include" +- LIBS="$LIBS -L${prefix}/lib -lpcap" ++ LIBS="$LIBS -lpcap" + elif test -f /usr/include/pcap/pcap.h; then diff --git a/net-analyzer/synscan/synscan-5.02.ebuild b/net-analyzer/synscan/synscan-5.02.ebuild index d8b2dba2efc9..5d38f8710526 100644 --- a/net-analyzer/synscan/synscan-5.02.ebuild +++ b/net-analyzer/synscan/synscan-5.02.ebuild @@ -1,15 +1,15 @@ # Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit autotools -DESCRIPTION="A fast asynchronous half-open TCP portscanner" +DESCRIPTION="Fast asynchronous half-open TCP portscanner" HOMEPAGE="http://www.digit-labs.org/files/tools/synscan/" -SRC_URI="http://www.digit-labs.org/files/tools/${PN}/releases/${P}.tar.gz" +SRC_URI="http://www.digit-labs.org/files/tools/synscan/releases/${P}.tar.gz" -LICENSE="GPL-2" +LICENSE="GPL-2+" SLOT="0" KEYWORDS="amd64 x86 ~x64-macos" @@ -18,12 +18,12 @@ DEPEND="${RDEPEND}" PATCHES=( "${FILESDIR}"/${P}-destdir.patch + "${FILESDIR}"/${P}-lld.patch ) src_prepare() { default - mv configure.{in,ac} || die eautoreconf } diff --git a/net-misc/minidlna/minidlna-1.3.2-r1.ebuild b/net-misc/minidlna/minidlna-1.3.2-r1.ebuild index 562f0f8ec84a..8f4526c40645 100644 --- a/net-misc/minidlna/minidlna-1.3.2-r1.ebuild +++ b/net-misc/minidlna/minidlna-1.3.2-r1.ebuild @@ -14,7 +14,7 @@ SRC_URI=" LICENSE="BSD GPL-2" SLOT="0" -KEYWORDS="~amd64 ~arm ~x86" +KEYWORDS="~amd64 ~arm ~arm64 ~x86" IUSE="netgear readynas zeroconf" DEPEND=" diff --git a/www-client/vivaldi-snapshot/Manifest b/www-client/vivaldi-snapshot/Manifest index 956562f02ad5..108464399897 100644 --- a/www-client/vivaldi-snapshot/Manifest +++ b/www-client/vivaldi-snapshot/Manifest @@ -1,6 +1,6 @@ -DIST vivaldi-snapshot_5.6.2839.3-1_amd64.deb 101051284 BLAKE2B 908a5f05abfc072cfcbe7c59a31d8a8c4b877118e2b9ec303da6e8e4f15347399ff525a690ee7fc9fc5804aa5bb8bf8739440b753ec04df34a9b6ad639ce4ed6 SHA512 aff58bba17cf62f63ce991c032a87a3b3f5bd92095c8c5c8991f20f3667cc81759cbf23173d7414731a40b1e6f742c3c6994b6fd678676a1145fa29e1a6a93d4 -DIST vivaldi-snapshot_5.6.2839.3-1_arm64.deb 90954576 BLAKE2B 5799cf85c059a59978bfb50f1abbc36020f84d1388de3691e049cd6e2c59680675c2514986ed79c5a2fd1e4a41ded30de6cbc02ccec7c6a56195e6439dc9c5b9 SHA512 1751c374bb5a26375cfddd994235aca73461b87b0be25687722789b83676c8ed427481cae22d318210a0f4a7cea95c3083cf8b9a9c9d67eb95b37d031c041a58 -DIST vivaldi-snapshot_5.6.2839.3-1_armhf.deb 90294052 BLAKE2B 5c3d0b42c1a7c245403a3ae689e430c3b7c36d04e770faf1d4b3aab4107cdbfbd20d673d1236211f9b37406f9e366b69e339572af4ad420e7c674355481f3460 SHA512 0f581741de6c2398eab5dbb672f46a51f847f9d41d2045ea67daa86d376f5540a93c6996d2277f98ddbf4ac739b35e076ed9819e8a7c05e86127b5f7ad8a1fb5 DIST vivaldi-snapshot_5.6.2861.3-1_amd64.deb 101214436 BLAKE2B b4b67d7124490bf7775bf14386505c02c7a090f81df57071a07c45da1e45488fe871733fe976824ef728012d390d3c00bb71022d3fa9892f59da507682ed1f09 SHA512 c8a352f4e74adf52c94be8bb2461bfcaef56d0c63f8f6119790862b4036ac0f1270af612046e808421e84aec6863b2722b455531b873b7d4addf95804ccb3d43 DIST vivaldi-snapshot_5.6.2861.3-1_arm64.deb 90873664 BLAKE2B 190b2892e77e7d09d4b15b228e2dabe2cda35fdbbb91b681e0aa6b981816bee7d0866c248500e5d6b0ab8ec01bba83922cc5b1ace6c51cbe4df863f2be275fa2 SHA512 34b03df5c48e1d9448ce348e30e8d864c6c21b17fd13d12b537ef1ed5faf15d4c5e02325ae3a509803387ef7da06eca6034fe9867ee98b13fad7e4640953b047 DIST vivaldi-snapshot_5.6.2861.3-1_armhf.deb 90991428 BLAKE2B 75d00e28532dddb5b2fff1c7d8b7f43ec0fe3804e695b27505796bba071c56f3d379f121f9936f683a15792e58cf59c3e22a119340eb8e27fcf4d8ebb1aaf742 SHA512 0fb10bce051a4808f793a5ff4c26e1803f77d93deaf9dc6f3386583e18be5b4069cdcd8e6e615e76b08a682871b0da81e004065636e8067801df1da46a485af5 +DIST vivaldi-snapshot_5.6.2865.3-1_amd64.deb 101232472 BLAKE2B 7c23dda06e4f799c6adfd599fde56a86dc9dd13b8a54884bf63d363f624642e1282379add8c5116abb90c510895909e51b1c815e3c6de887dcc32d9c7a66c357 SHA512 0a5bfb3abae0e23b337b6d146922ab40d2c790f1e6877420c43edf8fb132d26d5a351e08cf22bc46be91db79cf3c53a644febe5ec3ebdf5f417abf2021c51d97 +DIST vivaldi-snapshot_5.6.2865.3-1_arm64.deb 90873684 BLAKE2B e2d6a8db2accd5c322f643b78c329f1db5c586f02401fc365cdc8898856a48245f92a41f82e95def4f4c7959418d2ea806b92514078420ce2bcf29b9ac8eb305 SHA512 e0fce932c50b8a91efbc9b1417375eec1dbbe8acbf97e80c1fb297e6ef5d9491175abd31f9749c1df2700ee5ec958c2f7f65ebde4f4710dcb15d78d6633e43ec +DIST vivaldi-snapshot_5.6.2865.3-1_armhf.deb 90168840 BLAKE2B 0c18d86cd28b18bae909004b3367b38a8b7a5749b8492d8a60b18cc518f45248b9ccdc5f101991e289c8caeb0bc3d60e2d586b48d33818df49cae707fce65445 SHA512 759f6a7333a5e0285a68340c4b7d67897f9e83ac1d7051965e5516bf776c5e5410852e062a8097c936362b45fa803aa3c55383db3b62cc59c6ae27a5345c75d5 diff --git a/www-client/vivaldi-snapshot/vivaldi-snapshot-5.6.2839.3.ebuild b/www-client/vivaldi-snapshot/vivaldi-snapshot-5.6.2865.3.ebuild index 82e87d9746ea..82e87d9746ea 100644 --- a/www-client/vivaldi-snapshot/vivaldi-snapshot-5.6.2839.3.ebuild +++ b/www-client/vivaldi-snapshot/vivaldi-snapshot-5.6.2865.3.ebuild diff --git a/x11-misc/xbattbar/files/xbattbar-1.4.9-implicit-int.patch b/x11-misc/xbattbar/files/xbattbar-1.4.9-implicit-int.patch new file mode 100644 index 000000000000..8ee0b80ecb3b --- /dev/null +++ b/x11-misc/xbattbar/files/xbattbar-1.4.9-implicit-int.patch @@ -0,0 +1,8 @@ +https://bugs.gentoo.org/875059 +--- a/xbattbar.c ++++ b/xbattbar.c +@@ -234,3 +234,3 @@ + +-main(int argc, char **argv) ++int main(int argc, char **argv) + { diff --git a/x11-misc/xbattbar/xbattbar-1.4.9.ebuild b/x11-misc/xbattbar/xbattbar-1.4.9.ebuild index 660160d40073..ff02fcb15ecb 100644 --- a/x11-misc/xbattbar/xbattbar-1.4.9.ebuild +++ b/x11-misc/xbattbar/xbattbar-1.4.9.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit flag-o-matic toolchain-funcs @@ -9,7 +9,7 @@ DESCRIPTION="Advanced Power Management battery status display for X" HOMEPAGE="https://packages.qa.debian.org/x/xbattbar.html" SRC_URI="mirror://debian/pool/main/x/${PN}/${PN}_${PV}.orig.tar.gz" -LICENSE="GPL-2" +LICENSE="GPL-2+" SLOT="0" KEYWORDS="amd64 ppc x86" @@ -24,14 +24,13 @@ BDEPEND="virtual/pkgconfig" PATCHES=( "${FILESDIR}"/${PN}-1.4.5-Makefile.patch "${FILESDIR}"/${PN}-1.4.8-const.patch + "${FILESDIR}"/${PN}-1.4.9-implicit-int.patch ) src_prepare() { default - sed -i \ - -e "s:usr/lib:usr/$(get_libdir):" \ - xbattbar.c || die + sed -i "s|/usr/lib|${EPREFIX}/usr/$(get_libdir)|" xbattbar.c || die } src_configure() { @@ -40,6 +39,6 @@ src_configure() { } src_install() { - emake DESTDIR="${D}" LIBDIR="$(get_libdir)" install - dodoc README + emake DESTDIR="${ED}" LIBDIR="$(get_libdir)" install + einstalldocs } |