Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--app-emulation/virtualbox/Manifest1
-rw-r--r--app-emulation/virtualbox/virtualbox-9999.ebuild6
-rw-r--r--dev-build/kbuild/Manifest2
-rw-r--r--dev-build/kbuild/files/kbuild-0.1.9998.3660-gcc-15.patch19
-rw-r--r--dev-build/kbuild/files/kbuild-0.1.9998.3660-int-conversion.patch17
-rw-r--r--dev-build/kbuild/kbuild-0.1.9998.3660.ebuild75
-rw-r--r--dev-build/kbuild/kbuild-9999.ebuild21
-rw-r--r--net-dns/dnstop/dnstop-20140915-r3.ebuild7
-rw-r--r--net-wireless/nanovna-saver/Manifest1
-rw-r--r--net-wireless/nanovna-saver/nanovna-saver-0.6.5.ebuild47
10 files changed, 176 insertions, 20 deletions
diff --git a/app-emulation/virtualbox/Manifest b/app-emulation/virtualbox/Manifest
index 698ddabaa107..3d637fd4ada8 100644
--- a/app-emulation/virtualbox/Manifest
+++ b/app-emulation/virtualbox/Manifest
@@ -11,3 +11,4 @@ DIST virtualbox-help-7.1.4.tar.xz 1586108 BLAKE2B e8219ed67b1db9a5e4d0271e25980f
DIST virtualbox-patches-6.1.36.tar.bz2 2733 BLAKE2B dcfebfeca4873d382441515d48b4dfee9343bc7c83ea3cbb5002dbf7975143a79fae9a701b67dc35505e9ca03ff1b6293cb7c3279c4fdfda8ad21ba5fb9b7e87 SHA512 1bed5cdefbf8e7c4b0d9092ba4961ecf2262f27f35c71a91ef6f2e8fe8a1d92ed74f06bafbf58d70ba7165d933997f58073f4d4f4051e3ba5c0339b729066f57
DIST virtualbox-patches-7.0.16.tar.bz2 6808 BLAKE2B d15fa2ca306375142c3e25d4759d2790b2bb9eb69e333a8773ad500b29dd127b401943abf59ca59d01858a3ed5551fb3a6c93c4c893c8de971a714ce5306d577 SHA512 a488cbc6660fe8637c44cd79d87156609af089988239a7e76fea8a3c7e6319512c574bef2e942b354b14ce671a8e75ab8b2160abf7c40963795ee8a545ecd992
DIST virtualbox-patches-7.1.0.tar.bz2 5952 BLAKE2B cb024f36249d7d312c9d0f9231c22a9609d45de1d4c82ca36672fea703765d437d7a414d810adb5eb5f2db92018b669c3b5d0c32372c5ced90f5e13f82344ffa SHA512 c6ef54b7d60f01f5f2b89c6fd7f8b7b509bc62bca0502114cedcbaaf9643445ea413bba481dcf43fb96b5b4d94d64395965682c1ee160d889213615c9272184c
+DIST virtualbox-patches-7.2.0_pre20241128.tar.bz2 5982 BLAKE2B b502d73edd9faa527b4cb88f7ff7d44604120fa1acae5223752361c3e2251a1f37562b82a250d6e4169171b8bbff890b726b7ce8068e76178319d899c58fe0db SHA512 299be2d5bccab9db6a6246bf75acaccb745c4bac64deef1ceb45e3a5182fa6a5d960d0f55494a1ffc924bfe76ef16b6932b2562d7d27aac5c862faa96db0c0ab
diff --git a/app-emulation/virtualbox/virtualbox-9999.ebuild b/app-emulation/virtualbox/virtualbox-9999.ebuild
index ad3e2aba25bb..1306d563b1c4 100644
--- a/app-emulation/virtualbox/virtualbox-9999.ebuild
+++ b/app-emulation/virtualbox/virtualbox-9999.ebuild
@@ -36,7 +36,7 @@ DESCRIPTION="Family of powerful x86 virtualization products for enterprise and h
HOMEPAGE="https://www.virtualbox.org/"
ESVN_REPO_URI="https://www.virtualbox.org/svn/vbox/trunk"
SRC_URI="
- https://gitweb.gentoo.org/proj/virtualbox-patches.git/snapshot/virtualbox-patches-7.1.0.tar.bz2
+ https://gitweb.gentoo.org/proj/virtualbox-patches.git/snapshot/virtualbox-patches-7.2.0_pre20241128.tar.bz2
gui? ( !doc? ( https://dev.gentoo.org/~ceamac/${CATEGORY}/${PN}/${PN}-help-${BASE_PV}.tar.xz ) )
"
S="${WORKDIR}/trunk"
@@ -135,7 +135,7 @@ BDEPEND="
>=dev-lang/yasm-0.6.2
dev-libs/libIDL
dev-util/glslang
- >=dev-build/kbuild-0.1.9998.3592
+ >=dev-build/kbuild-0.1.9998.3660
sys-apps/which
sys-devel/bin86
sys-libs/libcap
@@ -198,7 +198,7 @@ REQUIRED_USE="
PATCHES=(
# Downloaded patchset
- "${WORKDIR}"/virtualbox-patches-7.1.0/patches
+ "${WORKDIR}"/virtualbox-patches-7.2.0_pre20241128/patches
)
DOCS=() # Don't install the default README file during einstalldocs
diff --git a/dev-build/kbuild/Manifest b/dev-build/kbuild/Manifest
index 13279a1ec0d1..095b7cae2350 100644
--- a/dev-build/kbuild/Manifest
+++ b/dev-build/kbuild/Manifest
@@ -1,3 +1,5 @@
DIST kbuild-0.1.9998.3499-fix-clang-16.patch.bz2 10271 BLAKE2B fe40a3a0afafefa10da6fe675eec72392fe6bcc318d1d8728363b9e855d10e11d0b7189f875cd2d496bf4871f87b96ed2ad6775e6968e044cc107dad23f5fcab SHA512 8f11355f0bfdda431dba4cb4dcd73c5bf0b10d2380495fe91292846b57fb7f80711d711b0b229fb4a865512d90010a181d1e1ab7d2b57d1a1751ce79440b02dc
DIST kbuild-0.1.9998.3499-src.tar.xz 2371580 BLAKE2B 847c5c67ded37ca87228ff7164d6c7f2f670a57f2fd94d6d0bf4f8896266e7fe5442666c03dbda016564a52dc91d10be83f0d4b0ef5093db0f5210ac8d5f3aaa SHA512 eebdcd1d2fa71313edd764d45a4aa3580078af22d7c5fed32d3d139a4f41c4e028282fdfdda0ee9b617ed0e8e63b8f5d065b3cf6647f08fe446560938b7577fc
DIST kbuild-0.1.9998.3592-src.tar.xz 3975348 BLAKE2B 4b1862238f6f6c35ba1b586e11e17baca3b66c4ba3a97b17168ced902d7fcc9f1baa9a4b8669489902346b9bab67095f4ff4d008187c36cd2ef4b7841d4134be SHA512 b9ca1723b426db81571b048db5afe4b7c3d2d8a881003812e9a5f9df44c5109b628d77af415cf56eb44a8775c590a6f0e343efccf562ef83213c5525e081e59b
+DIST kbuild-0.1.9998.3660-fix-clang-16.patch.bz2 11762 BLAKE2B 48c083a8c008da3cac4e0e175b65d487f4c2ed49bd46baa7fca8d847f8894b52bb5e21d5c99bab8d06141a2de0924e69b61930e63fb8061d54d291469d28afb7 SHA512 cc45721a69b970062a24c95e1426865c097df190c63bfe9cc86ebb76ba66a7f892c30e76d33298ec0d9e0a24ba81ac22e99de3eb5f0b6da3d53b95f4334b5820
+DIST kbuild-0.1.9998.3660-src.tar.xz 5281800 BLAKE2B 6c8ca902efddbbdce4588a046edc243ad76bd56cc319c94b4ffb7c25dad7c3ad9e5f816c960c6d80a13374995469d6f1d4c91a20860321a2d12b2456c21ba26f SHA512 d993de9a481a30aef7f4db2bbd6c19ffbeba6e5e505ae2ea63e7479007198d3eb89308860b90a5df8728997fb239ff5e553e6050c136468522c780a2a1e593e2
diff --git a/dev-build/kbuild/files/kbuild-0.1.9998.3660-gcc-15.patch b/dev-build/kbuild/files/kbuild-0.1.9998.3660-gcc-15.patch
new file mode 100644
index 000000000000..0ab71235a982
--- /dev/null
+++ b/dev-build/kbuild/files/kbuild-0.1.9998.3660-gcc-15.patch
@@ -0,0 +1,19 @@
+diff --git a/src/kmk/glob/fnmatch.c b/src/kmk/glob/fnmatch.c
+index b346e10..008a4a7 100644
+--- a/src/kmk/glob/fnmatch.c
++++ b/src/kmk/glob/fnmatch.c
+@@ -120,14 +120,6 @@ USA. */
+ /* Avoid depending on library functions or files
+ whose names are inconsistent. */
+
+-# if !defined _LIBC && !defined getenv && !defined _MSC_VER
+-extern char *getenv ();
+-# endif
+-
+-# ifndef errno
+-extern int errno;
+-# endif
+-
+ /* This function doesn't exist on most systems. */
+
+ # if !defined HAVE___STRCHRNUL && !defined _LIBC
diff --git a/dev-build/kbuild/files/kbuild-0.1.9998.3660-int-conversion.patch b/dev-build/kbuild/files/kbuild-0.1.9998.3660-int-conversion.patch
new file mode 100644
index 000000000000..9e472abbfdd6
--- /dev/null
+++ b/dev-build/kbuild/files/kbuild-0.1.9998.3660-int-conversion.patch
@@ -0,0 +1,17 @@
+Fix int to pointer conversion for clang
+
+Note - this parameter was not actually used inside eval_buffer because of a define.
+
+Bug: https://bugs.gentoo.org/875449
+
+--- a/src/kmk/loadapi.c
++++ b/src/kmk/loadapi.c
+@@ -20,6 +20,8 @@
+ #include "variable.h"
+ #include "dep.h"
+
++#include <string.h>
++
+ /* Allocate a buffer in our context, so we can free it. */
+ char *
+ gmk_alloc (unsigned int len)
diff --git a/dev-build/kbuild/kbuild-0.1.9998.3660.ebuild b/dev-build/kbuild/kbuild-0.1.9998.3660.ebuild
new file mode 100644
index 000000000000..36fda5b3b52b
--- /dev/null
+++ b/dev-build/kbuild/kbuild-0.1.9998.3660.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools toolchain-funcs
+
+DESCRIPTION="A makefile framework for writing simple makefiles for complex tasks"
+HOMEPAGE="https://trac.netlabs.org/kbuild/wiki"
+SRC_URI="
+ https://dev.gentoo.org/~ceamac/${CATEGORY}/${PN}/${P}-src.tar.xz
+ https://dev.gentoo.org/~ceamac/${CATEGORY}/${PN}/${PN}-0.1.9998.3660-fix-clang-16.patch.bz2
+"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="
+ sys-apps/texinfo
+ app-alternatives/lex
+ sys-devel/gettext
+ virtual/pkgconfig
+ app-alternatives/yacc
+"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-0.1.9998.3407-unknown_configure_opt.patch"
+ "${FILESDIR}/${PN}-0.1.5-gentoo-docdir.patch"
+ "${FILESDIR}/${PN}-0.1.9998_pre20110817-kash-link-pthread.patch"
+ "${FILESDIR}/${PN}-0.1.9998.3572-fix-bison.patch"
+ "${FILESDIR}/${PN}-0.1.9998.3572-fix-lto.patch"
+ "${FILESDIR}/${PN}-0.1.9998.3660-int-conversion.patch"
+ "${FILESDIR}/${PN}-0.1.9998.3499-fix-CC.patch"
+ "${FILESDIR}/${PN}-0.1.9998.3660-gcc-15.patch"
+
+ "${WORKDIR}/${PN}-0.1.9998.3660-fix-clang-16.patch"
+)
+
+pkg_setup() {
+ # Package fails with distcc (bug #255371)
+ export DISTCC_DISABLE=1
+}
+
+src_prepare() {
+ default
+
+ # 905419 - build fails if /bin/sh is something other than bash
+ sed 's:ln -s /bin/sh:ln -s /bin/bash:' -i bootstrap.gmk || die
+
+ # Add a file with the svn revision this package was pulled from
+ printf '%s\n' "KBUILD_SVN_REV := $(ver_cut 4)" \
+ > SvnInfo.kmk || die
+
+ cd "${S}/src/kmk" || die
+ eautoreconf
+ cd "${S}/src/sed" || die
+ eautoreconf
+
+ sed -e "s@_LDFLAGS\.$(tc-arch)*.*=@& ${LDFLAGS}@g" \
+ -e "s@_CFLAGS\.$(tc-arch)*.*=@& ${CFLAGS}@g" \
+ -e "s@_CXXFLAGS\.$(tc-arch)*.*=@& ${CXXFLAGS}@g" \
+ -i "${S}"/Config.kmk || die #332225
+ tc-export CC PKG_CONFIG RANLIB AR # bug #923130: AR must be both here and below
+}
+
+src_compile() {
+ kBuild/env.sh --full emake -f bootstrap.gmk AUTORECONF=true AR="$(tc-getAR)" \
+ || die "bootstrap failed"
+}
+
+src_install() {
+ kBuild/env.sh kmk NIX_INSTALL_DIR=/usr PATH_INS="${D}" install \
+ || die "install failed"
+}
diff --git a/dev-build/kbuild/kbuild-9999.ebuild b/dev-build/kbuild/kbuild-9999.ebuild
index bef735b7059a..308b44b81180 100644
--- a/dev-build/kbuild/kbuild-9999.ebuild
+++ b/dev-build/kbuild/kbuild-9999.ebuild
@@ -3,19 +3,12 @@
EAPI=8
-inherit autotools toolchain-funcs
+inherit autotools subversion toolchain-funcs
DESCRIPTION="A makefile framework for writing simple makefiles for complex tasks"
HOMEPAGE="https://trac.netlabs.org/kbuild/wiki"
-if [[ "${PV}" == *9999 ]] ; then
- inherit subversion
- ESVN_REPO_URI="http://svn.netlabs.org/repos/kbuild/trunk"
-else
- MY_P="${P}-src"
- #SRC_URI="ftp://ftp.netlabs.org/pub/${PN}/${MY_P}.tar.gz"
- SRC_URI="https://dev.gentoo.org/~polynomial-c/${MY_P}.tar.xz"
- KEYWORDS="~amd64 ~x86"
-fi
+ESVN_REPO_URI="http://svn.netlabs.org/repos/kbuild/trunk"
+
LICENSE="GPL-3+"
SLOT="0"
@@ -30,14 +23,12 @@ BDEPEND="
PATCHES=(
"${FILESDIR}/${PN}-0.1.9998.3407-unknown_configure_opt.patch"
"${FILESDIR}/${PN}-0.1.5-gentoo-docdir.patch"
- "${FILESDIR}/${PN}-0.1.9998_pre20120806-qa.patch"
"${FILESDIR}/${PN}-0.1.9998_pre20110817-kash-link-pthread.patch"
- "${FILESDIR}/${PN}-0.1.9998.3499-gold.patch"
"${FILESDIR}/${PN}-0.1.9998.3572-fix-bison.patch"
"${FILESDIR}/${PN}-0.1.9998.3572-fix-lto.patch"
- "${FILESDIR}/${PN}-0.1.9998.3499-implicit-function-declaration.patch"
- "${FILESDIR}/${PN}-0.1.9998.3499-int-conversion.patch"
+ "${FILESDIR}/${PN}-0.1.9998.3660-int-conversion.patch"
"${FILESDIR}/${PN}-0.1.9998.3499-fix-CC.patch"
+ "${FILESDIR}/${PN}-0.1.9998.3660-gcc-15.patch"
)
pkg_setup() {
@@ -63,7 +54,7 @@ src_prepare() {
-e "s@_CFLAGS\.$(tc-arch)*.*=@& ${CFLAGS}@g" \
-e "s@_CXXFLAGS\.$(tc-arch)*.*=@& ${CXXFLAGS}@g" \
-i "${S}"/Config.kmk || die #332225
- tc-export CC PKG_CONFIG RANLIB #AR does not work here
+ tc-export CC PKG_CONFIG RANLIB AR # bug #923130: AR must be both here and below
}
src_compile() {
diff --git a/net-dns/dnstop/dnstop-20140915-r3.ebuild b/net-dns/dnstop/dnstop-20140915-r3.ebuild
index 30758ba27b51..a211bf87616b 100644
--- a/net-dns/dnstop/dnstop-20140915-r3.ebuild
+++ b/net-dns/dnstop/dnstop-20140915-r3.ebuild
@@ -13,9 +13,12 @@ LICENSE="BSD"
SLOT="0"
KEYWORDS="amd64 arm ~hppa ppc x86"
-RDEPEND="sys-libs/ncurses:0
- net-libs/libpcap"
+RDEPEND="
+ sys-libs/ncurses:0
+ net-libs/libpcap
+"
DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
PATCHES=(
"${FILESDIR}/${P}"-pkg-config.patch
diff --git a/net-wireless/nanovna-saver/Manifest b/net-wireless/nanovna-saver/Manifest
index 1d834c258f80..b75e75c1f676 100644
--- a/net-wireless/nanovna-saver/Manifest
+++ b/net-wireless/nanovna-saver/Manifest
@@ -1,3 +1,4 @@
DIST nanovna-saver-0.5.4.tar.gz 494010 BLAKE2B 71e4292e33dbb5b055e7ddd3a29222a67e05b1af431eaee64b613e50648b0b91ad5446cc2d3af868ae624826caf871bff9062275239298c29de261d741bad1f4 SHA512 6600b3c83fc1dcaf81a85b1d14087d2067327098c486011c8bfbaba83e06ca1081c6f7045730a58f097bab332072139707ea23c037924624d2f8100a7b61acb7
DIST nanovna-saver-0.6.3.tar.gz 580073 BLAKE2B be8482bf60a3abfff8a58c14cb34e81cf7b5733efa4d4da02e8d1cae0884fc4030f14a21bd66a6e5fb38f05938a446de8a5919cf3d13d902568c8c76f43381f1 SHA512 96cedb567f01f90ff07fef385d7ab6130213ab35674668d50962795e527414ca772583991db7bab73375a2651cb23876f1047d914579d5bec7758173f70bce71
DIST nanovna-saver-0.6.4.tar.gz 580141 BLAKE2B f46914f60ef845cb65343c336ad905f6fb00206b5f0888ded45193b988a495127a4a944ef8fb24aa25cf5025d522291c062178ee55e460d3a54889b7a36d02c7 SHA512 ec85495cc2a72fc7f97c6336abec3cc20d1829d878d8ee1692103d00dc5482a14a5407309a585d39e938d8f77b6b336b6a12aa80c986ff01ff75b3daed6581c0
+DIST nanovna-saver-0.6.5.tar.gz 580669 BLAKE2B c1ab76f8cce42a764623a1ecc97186a5e42da2bcd12cf157a08591f8549400c5a7179a9c5c2844eb2aea7cd426f5111fae427ab5ab464c13b07d9e3a454f3c4b SHA512 21ad70534a265ac04b01d311aae05e74fb9a8d0525eb2f30cfa7cc4d8c3ad7d337d6888d9bbf3e1372d682ef63f044d959579bb36caa0fdc29531493c751a855
diff --git a/net-wireless/nanovna-saver/nanovna-saver-0.6.5.ebuild b/net-wireless/nanovna-saver/nanovna-saver-0.6.5.ebuild
new file mode 100644
index 000000000000..66984a384d51
--- /dev/null
+++ b/net-wireless/nanovna-saver/nanovna-saver-0.6.5.ebuild
@@ -0,0 +1,47 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..12} )
+inherit distutils-r1 xdg-utils
+
+DESCRIPTION="tool for reading, displaying and saving data from the NanoVNA"
+HOMEPAGE="https://github.com/mihtjel/nanovna-saver"
+
+LICENSE="GPL-3+"
+SLOT="0"
+if [ "${PV}" = "9999" ]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/mihtjel/nanovna-saver.git"
+else
+ SRC_URI="https://github.com/mihtjel/nanovna-saver/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~x86"
+ export SETUPTOOLS_SCM_PRETEND_VERSION="${PV}"
+fi
+
+RDEPEND="${DEPEND}
+ dev-python/cython[${PYTHON_USEDEP}]
+ dev-python/pyserial[${PYTHON_USEDEP}]
+ dev-python/pyqt6[${PYTHON_USEDEP},gui,widgets]
+ dev-python/pyqt6-sip[${PYTHON_USEDEP}]
+ dev-python/sip[${PYTHON_USEDEP}]
+ dev-python/numpy[${PYTHON_USEDEP}]
+ dev-python/scipy[${PYTHON_USEDEP}]"
+BDEPEND="dev-python/setuptools-scm[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
+
+python_install() {
+ distutils-r1_python_install
+}
+
+pkg_postinst() {
+ xdg_desktop_database_update
+ xdg_icon_cache_update
+}
+
+pkg_postrm() {
+ xdg_desktop_database_update
+ xdg_icon_cache_update
+}