From 74e526c590f52d24a213e25f77858ae0b34ec2c8 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 17 Jun 2024 00:09:46 +0100 Subject: gentoo auto-resync : 17:06:2024 - 00:09:46 --- net-wireless/bluez/Manifest | 8 - net-wireless/bluez/bluez-5.72.ebuild | 288 --------------------- net-wireless/bluez/bluez-5.73-r1.ebuild | 278 -------------------- net-wireless/bluez/bluez-5.75.ebuild | 278 -------------------- ...xd-without-systemd-in-the-user-session-r2.patch | 58 ----- .../bluez-5.66-power-state-adapter-property.patch | 28 -- 6 files changed, 938 deletions(-) delete mode 100644 net-wireless/bluez/bluez-5.72.ebuild delete mode 100644 net-wireless/bluez/bluez-5.73-r1.ebuild delete mode 100644 net-wireless/bluez/bluez-5.75.ebuild delete mode 100644 net-wireless/bluez/files/0001-Allow-using-obexd-without-systemd-in-the-user-session-r2.patch delete mode 100644 net-wireless/bluez/files/bluez-5.66-power-state-adapter-property.patch (limited to 'net-wireless/bluez') diff --git a/net-wireless/bluez/Manifest b/net-wireless/bluez/Manifest index 4191ae46cf02..28c93d2b3033 100644 --- a/net-wireless/bluez/Manifest +++ b/net-wireless/bluez/Manifest @@ -1,16 +1,8 @@ -AUX 0001-Allow-using-obexd-without-systemd-in-the-user-session-r2.patch 1912 BLAKE2B c7226ccbf1b794b5f3d6504dcb6950bc7e7bd69995243d0e4cf30dfb161f95e15c18c96724f82916e8c83cac6ff255ed957b60c9ee9ad53e108c69eb509074d5 SHA512 65a970fa82ded9f6e97ef2f0d856010f96468cbd375447e1c47d6073be5a364f747b7b5ea93a0bc3b7dba0470dc8dccd9b5d1f6567f18b38042e424d3e06171b AUX 0001-Allow-using-obexd-without-systemd-in-the-user-session-r3.patch 698 BLAKE2B 41f16a7227518616160aecd016f462f2e636166ddc546aa4fe099e3c6146648b2e0985b97b97eeb3941ebb8666a9ba83803dc773e3d752adc1177c50e7073390 SHA512 144cfa6b1608c59cd49f23871d3fb63fd4b4d08bd0a5fe51ce775218d8d46ef22bd11e2ae3b571d42b7571bbbfe1d5b5e7e49864f1e147242ecddb1c3976b611 AUX bluetooth-conf.d 21 BLAKE2B 7c94e499438f441fc18f0b50178e707982ac91871a74b2e7a35c9930d32441a89f742993e993e3003f9bcb5e3ee9adde2ab1cbe33b27245b1b1e91e7c3dc1a0b SHA512 45befd3fb42ea3462fa6e1ee9f3ee9591e197d4925a4c9df6733bacfe44cf44f54ed3aad6fd7a6a2953da54b93460a1cf0ea1cadf0d7e47f811e4c3182af74d5 AUX bluetooth-init.d-r5 313 BLAKE2B 6bad1b9a75de5927ab22a229d6ce18247b32a79b994078338eff33df7f74a7dc4a5266212f6d0150101600e3a864a9b64ce6a576208218750bfbe88bc5911baa SHA512 95aff192be6207047fc01b42754bcd34d5cd7f82c16486fdd81bb1d14be040e4f3e9bafd8dc2f4e8b87bf1eb50f6634f526feaf2b38c0c6807f40784d84dac96 -AUX bluez-5.66-power-state-adapter-property.patch 1085 BLAKE2B 9d76822b8ab649eb322e9511b86d85b912d8a073f15c563b689ad57b12e1c1eb043ed1741b62364dfae3b4a100ad4fdce36e723103f231dd77bf070c4ae0be73 SHA512 df52b4d260e0de6de9ad4bc1201740b2bc37a537c96e2a22d4f8b698caf6fcea81eba1e8d7b152ad6a1237a51e06212e7cfdc429b9b7f7ff66d23a294cbc55e5 AUX bluez-5.73-configure-cups.patch 1245 BLAKE2B f9ce853b68e85b671fd9531700e0556273dcb2f3b16468ba1182f7746d467cced106b47c920be102cb3a1383e7dda8e49fba26e818f098b455d022fd00b9cd71 SHA512 35559f4d67befaa86e149d46e95bc473bc970beb38fab837cb40b5ca6f9de9bbff3fb437138cb165394fd27e48e0869d6f42af07d1eb1f0da3663c4a8f4e74c2 AUX bluez-udevadm-path-r1.patch 564 BLAKE2B 0b4dc12f55ab60d254aa3365baf35186a5913026dbfcbc3da41c113b3c423c81189b87016dabcb2c505b684cad376d10d10df9aa17558b8fd022928995931e0e SHA512 d9b0dd452258e425802cf5ad4980a77796be79e94bf6ce641927c5ab7ea1117ce6589063f3a0b96bf25e81303234279a09d58484fec49cfc6aa1db46f245f9c6 -DIST bluez-5.72.tar.xz 2390792 BLAKE2B b5d1bc290c9bad5aa32de16433c34d0ac5aed7164077ef941a0bf90eddc5e22a6cf19f972bcae33061b41e3c344f7abeb65a11b6013c13fd53059ac93d83240a SHA512 1c6560f60ac0654d7c25ed8ab2f0f3a3a9ca8688ee28e1c476ffc7ae38737e739d27bbb88789c86b03fc600a8a68496d90a7b395ec393dd2bbf69be62357991a -DIST bluez-5.73.tar.xz 2408088 BLAKE2B 69c5b8c23039108403631da86c29d62869f2311bb34eeb471779fae094bbf8738193389fb8792b779b10eaeca5b02723c86f2b98c435bbd2c23a3d317df76070 SHA512 20090da036d3d614706b14a757b02acf138859d8f0476aa7f68d57635dfb3632ce7d8bb3456320904d72333d1314a5fe14dcb8ece307e6d31ce6d2d516de25e8 -DIST bluez-5.75.tar.xz 2414552 BLAKE2B 5100995421114d850c1b1bd19188f7ee193c262dd79b45788de5d9ba0f260c3c096c724b1077f7cf6e846d13fd2f0a8a7c7a5014457c2928e5acbaa73ba40853 SHA512 f5fdad3824ed094d944d33f3d116c045e69d593a2b4dae5e57feeb5625a13e024e2433a3178921d2f8e1bd8261794ecdfc25ff3e52672e6e8d42e85b33a735a4 DIST bluez-5.76.tar.xz 2418848 BLAKE2B 658e67ec3ac568fd4d8bdc434eabfc63fd8cddd287f7cf6a8967771673e79fe95c509be654ae2495d1b3aedb1e23ca710d545f5ded281a64fd44058b0cdf7afe SHA512 30dc3faef74a2225fd6027178376dca4166082d1ed5188021e13d13582db5846aef60b753f173d525bfd0c040f26c3e7dab0283ecafbd34c4a06855d13abb389 -EBUILD bluez-5.72.ebuild 9105 BLAKE2B 11cdfa69a8c3d61284c7424ed85ea91b3e7ad543393d1918ed8dc4defd505a60795bba78d6dc154e77f1769407a71dd3b9761b7e1417e846b7482ddb7e4deea7 SHA512 8f28c066bfd16079fc8a25bac990d0aefbfecfa1f9fe5b276ac42fca87716e926735ce4d2066e99c1b7f5f86613f487d0be5d015f8f77cc643cdb1f04b028772 -EBUILD bluez-5.73-r1.ebuild 8739 BLAKE2B f9cf85e143cb0840fa32ac66eff4f588009aa2472b5104a28288b05db28aac4c39800edd3c85d267ccb0a64e1fe8c0c285c1fdb803abf68c836dfb767c8791cd SHA512 57d8689e6a0becb4e9b5fa51e9cfe45334bf502db5c9350e6a95c6fdcea959d5212facdb089220436ecf46d00608c09800adc5c3b1b998b1688cfeaffc5af864 -EBUILD bluez-5.75.ebuild 8739 BLAKE2B d729b6306f373b24e87acbe8ac12bb7dc2b98af68159cd02e6b14374e33b5980b6c7fee66db6afcf07694851a7b84e9edc93deb9704ed71a1a46711fbcb258b0 SHA512 ce4399c430250e537a4eca561c57f81ccfc086a72a2c013a69ade33c06a98aabf74479d869494240810b0c53b4602d5b52656d27b2f9417efaa38e6c7b3bad9e EBUILD bluez-5.76-r1.ebuild 8716 BLAKE2B 3e60db8c15d28986482467668d73be83934caa2f2d433b17977b95755868ca32a5774ac8f8bc17171139ecea54d9d194cc02b981ebabfc08121c66a79ca2299f SHA512 586ad637ca9951c34c7f3c8d5ca460455a6e0456b491eac1c394f38618c08b8fd692f46aa58431c9bd3d597eb0dac3a3abe733e05861cfcf9ef04d13f367d2b2 MISC metadata.xml 1150 BLAKE2B 830a8e0c89fcc18af92e063ceb3632c97eed9f7424ac5214dd4c853b142d03bba6d629b86fc41ecc28a450a9b7989a21faaae1b95654cb8f16ce2ceb3a97e025 SHA512 44e4489f48634d1b1ff300ccba0f7caa74b76ac7325d38d395ee53763906743f7b622b028a01d32e963952a23da560c16b8cd6771a9001ba90845b59293a6101 diff --git a/net-wireless/bluez/bluez-5.72.ebuild b/net-wireless/bluez/bluez-5.72.ebuild deleted file mode 100644 index 06b68087328b..000000000000 --- a/net-wireless/bluez/bluez-5.72.ebuild +++ /dev/null @@ -1,288 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 -PYTHON_COMPAT=( python3_{9..12} ) - -inherit autotools flag-o-matic linux-info python-single-r1 systemd udev multilib-minimal #readme.gentoo-r1 - -DESCRIPTION="Bluetooth Tools and System Daemons for Linux" -HOMEPAGE="http://www.bluez.org https://github.com/bluez/bluez" -SRC_URI="https://www.kernel.org/pub/linux/bluetooth/${P}.tar.xz" - -LICENSE="GPL-2+ LGPL-2.1+" -SLOT="0/3" -KEYWORDS="amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv x86" -IUSE="btpclient cups doc debug deprecated extra-tools experimental +mesh midi +obex +readline selinux systemd test test-programs +udev" - -# Since this release all remaining extra-tools need readline support, but this could -# change in the future, hence, this REQUIRED_USE constraint could be dropped -# again in the future. -# btpclient needs mesh, bug #790587 -REQUIRED_USE=" - btpclient? ( mesh ) - extra-tools? ( deprecated readline ) - test? ( ${PYTHON_REQUIRED_USE} ) - test-programs? ( ${PYTHON_REQUIRED_USE} ) -" - -TEST_DEPS="${PYTHON_DEPS} - $(python_gen_cond_dep ' - >=dev-python/dbus-python-1[${PYTHON_USEDEP}] - dev-python/pygobject:3[${PYTHON_USEDEP}] - ') -" -BDEPEND=" - dev-python/docutils - virtual/pkgconfig - test? ( ${TEST_DEPS} ) -" -DEPEND=" - >=dev-libs/glib-2.28:2[${MULTILIB_USEDEP}] - btpclient? ( >=dev-libs/ell-0.39 ) - cups? ( net-print/cups:= ) - mesh? ( - >=dev-libs/ell-0.39 - >=dev-libs/json-c-0.13:= - sys-libs/readline:0= - ) - midi? ( media-libs/alsa-lib ) - obex? ( dev-libs/libical:= ) - readline? ( sys-libs/readline:0= ) - systemd? ( sys-apps/systemd ) - >=sys-apps/dbus-1.6:= - udev? ( >=virtual/udev-172 ) -" -RDEPEND="${DEPEND} - selinux? ( sec-policy/selinux-bluetooth ) - test-programs? ( ${TEST_DEPS} ) -" - -RESTRICT="!test? ( test )" - -PATCHES=( - # Try both udevadm paths to cover udev/systemd vs. eudev locations (#539844) - # http://www.spinics.net/lists/linux-bluetooth/msg58739.html - # https://bugs.gentoo.org/539844 - # https://github.com/bluez/bluez/issues/268 - "${FILESDIR}"/${PN}-udevadm-path-r1.patch - - # Fedora patches - # https://lore.kernel.org/linux-bluetooth/20220901110719.176944-1-hadess@hadess.net/T/#m9c08d004cd5422783ee1d93154f42303bba9169f - "${FILESDIR}"/${PN}-5.66-power-state-adapter-property.patch -) - -pkg_setup() { - # From http://www.linuxfromscratch.org/blfs/view/svn/general/bluez.html - # to prevent bugs like: - # https://bugzilla.kernel.org/show_bug.cgi?id=196621 - CONFIG_CHECK="~NET ~BT ~BT_RFCOMM ~BT_RFCOMM_TTY ~BT_BNEP ~BT_BNEP_MC_FILTER - ~BT_BNEP_PROTO_FILTER ~BT_HIDP ~CRYPTO_USER_API_HASH ~CRYPTO_USER_API_SKCIPHER - ~UHID ~RFKILL" - # https://bugzilla.kernel.org/show_bug.cgi?id=196621 - # https://bugzilla.kernel.org/show_bug.cgi?id=206815 - if use mesh || use test; then - CONFIG_CHECK="${CONFIG_CHECK} ~CRYPTO_USER - ~CRYPTO_USER_API ~CRYPTO_USER_API_AEAD ~CRYPTO_AES ~CRYPTO_CCM ~CRYPTO_AEAD ~CRYPTO_CMAC - ~CRYPTO_MD5 ~CRYPTO_SHA1 ~KEY_DH_OPERATIONS" - fi - linux-info_pkg_setup - - if use test || use test-programs; then - python-single-r1_pkg_setup - fi - - if ! use udev; then - ewarn - ewarn "You are installing ${PN} with USE=-udev. This means various bluetooth" - ewarn "devices and adapters from Apple, Dell, Logitech etc. will not work," - ewarn "and hid2hci will not be available." - ewarn - fi -} - -src_prepare() { - default - - # http://www.spinics.net/lists/linux-bluetooth/msg38490.html - if ! use systemd; then - eapply "${FILESDIR}"/0001-Allow-using-obexd-without-systemd-in-the-user-session-r2.patch - fi - - eautoreconf - - if use cups; then - # Only not .am to not need to run eautoreconf only because of this - sed -i \ - -e "s:cupsdir = \$(libdir)/cups:cupsdir = $(cups-config --serverbin):" \ - Makefile.{in,tools} || die - fi - - multilib_copy_sources -} - -multilib_src_configure() { - # unit/test-vcp test fails with LTO (bug #925745) - filter-lto - - local myconf=( - # readline is automagic when client is enabled - # --enable-client always needs readline, bug #504038 - # --enable-mesh is handled in the same way - ac_cv_header_readline_readline_h=$(multilib_native_usex readline) - ac_cv_header_readline_readline_h=$(multilib_native_usex mesh) - ) - - if ! multilib_is_native_abi; then - myconf+=( - # deps not used for the library - {DBUS,GLIB}_{CFLAGS,LIBS}=' ' - ) - fi - - econf \ - --localstatedir=/var \ - --disable-android \ - --enable-datafiles \ - --enable-optimization \ - $(use_enable debug) \ - --enable-pie \ - --enable-threads \ - --enable-library \ - --enable-tools \ - --enable-manpages \ - --enable-monitor \ - --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \ - --with-systemduserunitdir="$(systemd_get_userunitdir)" \ - $(multilib_native_use_enable btpclient) \ - $(multilib_native_use_enable btpclient external-ell) \ - $(multilib_native_use_enable cups) \ - $(multilib_native_use_enable deprecated) \ - $(multilib_native_use_enable experimental) \ - $(multilib_native_use_enable mesh) \ - $(multilib_native_use_enable mesh external-ell) \ - $(multilib_native_use_enable midi) \ - $(multilib_native_use_enable obex) \ - $(multilib_native_use_enable readline client) \ - $(multilib_native_use_enable systemd) \ - $(multilib_native_use_enable test-programs test) \ - $(multilib_native_use_enable udev) \ - $(multilib_native_use_enable udev hid2hci) \ - $(multilib_native_use_enable udev sixaxis) -} - -multilib_src_compile() { - if multilib_is_native_abi; then - default - else - emake -f Makefile -f - libs \ - <<<'libs: $(lib_LTLIBRARIES)' - fi -} - -multilib_src_test() { - multilib_is_native_abi && default -} - -multilib_src_install() { - if multilib_is_native_abi; then - emake DESTDIR="${D}" install - - # Only install extra-tools when relevant USE flag is enabled - if use extra-tools; then - ewarn "Upstream doesn't support using this tools and their bugs are" - ewarn "likely to be ignored forever, also they can break without" - ewarn "previous announcement." - ewarn "Upstream also states all this tools are not really needed," - ewarn "then, if you still need to rely on them, you must ask them" - ewarn "to either install that tool by default or add the needed" - ewarn "functionality to the existing 'official' tools." - ewarn "Please report this issues to:" - ewarn "http://www.bluez.org/development/lists/" - - # Upstream doesn't install this, bug #524640 - # http://permalink.gmane.org/gmane.linux.bluez.kernel/53115 - # http://comments.gmane.org/gmane.linux.bluez.kernel/54564 - dobin tools/btmgmt - # gatttool is only built with readline, bug #530776 - # https://bugzilla.redhat.com/show_bug.cgi?id=1141909 - # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=720486 - # https://bugs.archlinux.org/task/37686 - dobin attrib/gatttool - # https://bugzilla.redhat.com/show_bug.cgi?id=1699680 - dobin tools/avinfo - fi - - # Not installed by default after being built, bug #666756 - use btpclient && dobin tools/btpclient - - # Unittests are not that useful once installed, so make them optional - if use test-programs; then - # Drop python2 only test tools - # https://bugzilla.kernel.org/show_bug.cgi?id=206819 - rm "${ED}"/usr/$(get_libdir)/bluez/test/simple-player || die - # https://bugzilla.kernel.org/show_bug.cgi?id=206821 - rm "${ED}"/usr/$(get_libdir)/bluez/test/test-hfp || die - # https://bugzilla.kernel.org/show_bug.cgi?id=206823 - rm "${ED}"/usr/$(get_libdir)/bluez/test/test-sap-server || die - - python_fix_shebang "${ED}"/usr/$(get_libdir)/bluez/test - - for i in $(find "${ED}"/usr/$(get_libdir)/bluez/test -maxdepth 1 -type f ! -name "*.*"); do - dosym "${i}" /usr/bin/bluez-"${i##*/}" - done - fi - else - emake DESTDIR="${D}" \ - install-pkgincludeHEADERS \ - install-libLTLIBRARIES \ - install-pkgconfigDATA - fi -} - -multilib_src_install_all() { - # We need to ensure obexd can be spawned automatically by systemd - # when user-session is enabled: - # http://marc.info/?l=linux-bluetooth&m=148096094716386&w=2 - # https://bugs.gentoo.org/show_bug.cgi?id=577842 - # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=804908 - # https://bugs.archlinux.org/task/45816 - # https://bugzilla.redhat.com/show_bug.cgi?id=1318441 - # https://bugzilla.redhat.com/show_bug.cgi?id=1389347 - if use systemd; then - dosym obex.service /usr/lib/systemd/user/dbus-org.bluez.obex.service - fi - - find "${D}" -name '*.la' -type f -delete || die - - keepdir /var/lib/bluetooth - - # Upstream don't want people to play with them - # But we keep installing them due to 'historical' reasons - insinto /etc/bluetooth - local d - for d in input network; do - doins profiles/${d}/${d}.conf - done - # Setup auto enable as Fedora does for allowing to use - # keyboards/mouse as soon as possible - sed -i 's/#\[Policy\]$/\[Policy\]/; s/#AutoEnable=false/AutoEnable=true/' src/main.conf || die - doins src/main.conf - - newinitd "${FILESDIR}"/bluetooth-init.d-r5 bluetooth - newconfd "${FILESDIR}"/bluetooth-conf.d bluetooth - - einstalldocs - use doc && dodoc doc/*.txt -} - -pkg_postinst() { - use udev && udev_reload - systemd_reenable bluetooth.service - - has_version net-dialup/ppp || elog "To use dial up networking you must install net-dialup/ppp" -} - -pkg_postrm() { - use udev && udev_reload -} diff --git a/net-wireless/bluez/bluez-5.73-r1.ebuild b/net-wireless/bluez/bluez-5.73-r1.ebuild deleted file mode 100644 index d67e578fb3ef..000000000000 --- a/net-wireless/bluez/bluez-5.73-r1.ebuild +++ /dev/null @@ -1,278 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 -PYTHON_COMPAT=( python3_{9..12} ) - -inherit autotools flag-o-matic linux-info python-single-r1 systemd udev multilib-minimal #readme.gentoo-r1 - -DESCRIPTION="Bluetooth Tools and System Daemons for Linux" -HOMEPAGE="http://www.bluez.org https://github.com/bluez/bluez" -SRC_URI="https://www.kernel.org/pub/linux/bluetooth/${P}.tar.xz" - -LICENSE="GPL-2+ LGPL-2.1+" -SLOT="0/3" -KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~x86" -IUSE="btpclient cups doc debug deprecated extra-tools experimental +mesh midi +obex +readline selinux systemd test test-programs +udev" - -# Since this release all remaining extra-tools need readline support, but this could -# change in the future, hence, this REQUIRED_USE constraint could be dropped -# again in the future. -# btpclient needs mesh, bug #790587 -REQUIRED_USE=" - btpclient? ( mesh ) - extra-tools? ( deprecated readline ) - test? ( ${PYTHON_REQUIRED_USE} ) - test-programs? ( ${PYTHON_REQUIRED_USE} ) -" - -TEST_DEPS="${PYTHON_DEPS} - $(python_gen_cond_dep ' - >=dev-python/dbus-python-1[${PYTHON_USEDEP}] - dev-python/pygobject:3[${PYTHON_USEDEP}] - ') -" -BDEPEND=" - dev-python/docutils - virtual/pkgconfig - test? ( ${TEST_DEPS} ) -" -DEPEND=" - >=dev-libs/glib-2.28:2[${MULTILIB_USEDEP}] - btpclient? ( >=dev-libs/ell-0.39 ) - cups? ( net-print/cups:= ) - mesh? ( - >=dev-libs/ell-0.39 - >=dev-libs/json-c-0.13:= - sys-libs/readline:0= - ) - midi? ( media-libs/alsa-lib ) - obex? ( dev-libs/libical:= ) - readline? ( sys-libs/readline:0= ) - systemd? ( sys-apps/systemd ) - >=sys-apps/dbus-1.6:= - udev? ( >=virtual/udev-196 ) -" -RDEPEND="${DEPEND} - selinux? ( sec-policy/selinux-bluetooth ) - test-programs? ( ${TEST_DEPS} ) -" - -RESTRICT="!test? ( test )" - -PATCHES=( - # Try both udevadm paths to cover udev/systemd vs. eudev locations (#539844) - # http://www.spinics.net/lists/linux-bluetooth/msg58739.html - # https://bugs.gentoo.org/539844 - # https://github.com/bluez/bluez/issues/268 - "${FILESDIR}"/${PN}-udevadm-path-r1.patch -) - -pkg_setup() { - # From http://www.linuxfromscratch.org/blfs/view/svn/general/bluez.html - # to prevent bugs like: - # https://bugzilla.kernel.org/show_bug.cgi?id=196621 - CONFIG_CHECK="~NET ~BT ~BT_RFCOMM ~BT_RFCOMM_TTY ~BT_BNEP ~BT_BNEP_MC_FILTER - ~BT_BNEP_PROTO_FILTER ~BT_HIDP ~CRYPTO_USER_API_HASH ~CRYPTO_USER_API_SKCIPHER - ~UHID ~RFKILL" - # https://bugzilla.kernel.org/show_bug.cgi?id=196621 - # https://bugzilla.kernel.org/show_bug.cgi?id=206815 - if use mesh || use test; then - CONFIG_CHECK="${CONFIG_CHECK} ~CRYPTO_USER - ~CRYPTO_USER_API ~CRYPTO_USER_API_AEAD ~CRYPTO_AES ~CRYPTO_CCM ~CRYPTO_AEAD ~CRYPTO_CMAC - ~CRYPTO_MD5 ~CRYPTO_SHA1 ~KEY_DH_OPERATIONS" - fi - linux-info_pkg_setup - - if use test || use test-programs; then - python-single-r1_pkg_setup - fi - - if ! use udev; then - ewarn - ewarn "You are installing ${PN} with USE=-udev. This means various bluetooth" - ewarn "devices and adapters from Apple, Dell, Logitech etc. will not work," - ewarn "and hid2hci will not be available." - ewarn - fi -} - -src_prepare() { - default - - # https://github.com/bluez/bluez/issues/773 - eapply "${FILESDIR}"/${P}-configure-cups.patch - - # https://github.com/bluez/bluez/issues/806 - eapply "${FILESDIR}"/0001-Allow-using-obexd-without-systemd-in-the-user-session-r3.patch - - eautoreconf - - multilib_copy_sources -} - -multilib_src_configure() { - # unit/test-vcp test fails with LTO (bug #925745) - filter-lto - - local myconf=( - # readline is automagic when client is enabled - # --enable-client always needs readline, bug #504038 - # --enable-mesh is handled in the same way - ac_cv_header_readline_readline_h=$(multilib_native_usex readline) - ac_cv_header_readline_readline_h=$(multilib_native_usex mesh) - ) - - if ! multilib_is_native_abi; then - myconf+=( - # deps not used for the library - {DBUS,GLIB}_{CFLAGS,LIBS}=' ' - ) - fi - - econf \ - --localstatedir=/var \ - --disable-android \ - --enable-datafiles \ - --enable-optimization \ - $(use_enable debug) \ - --enable-pie \ - --enable-threads \ - --enable-library \ - --enable-tools \ - --enable-manpages \ - --enable-monitor \ - --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \ - --with-systemduserunitdir="$(systemd_get_userunitdir)" \ - $(multilib_native_use_enable btpclient) \ - $(multilib_native_use_enable btpclient external-ell) \ - $(multilib_native_use_enable cups) \ - $(multilib_native_use_enable deprecated) \ - $(multilib_native_use_enable experimental) \ - $(multilib_native_use_enable mesh) \ - $(multilib_native_use_enable mesh external-ell) \ - $(multilib_native_use_enable midi) \ - $(multilib_native_use_enable obex) \ - $(multilib_native_use_enable readline client) \ - $(multilib_native_use_enable systemd) \ - $(multilib_native_use_enable test-programs test) \ - $(multilib_native_use_enable udev) \ - $(multilib_native_use_enable udev hid2hci) \ - $(multilib_native_use_enable udev sixaxis) -} - -multilib_src_compile() { - if multilib_is_native_abi; then - default - else - emake -f Makefile -f - libs \ - <<<'libs: $(lib_LTLIBRARIES)' - fi -} - -multilib_src_test() { - multilib_is_native_abi && default -} - -multilib_src_install() { - if multilib_is_native_abi; then - emake DESTDIR="${D}" install - - # Only install extra-tools when relevant USE flag is enabled - if use extra-tools; then - ewarn "Upstream doesn't support using this tools and their bugs are" - ewarn "likely to be ignored forever, also they can break without" - ewarn "previous announcement." - ewarn "Upstream also states all this tools are not really needed," - ewarn "then, if you still need to rely on them, you must ask them" - ewarn "to either install that tool by default or add the needed" - ewarn "functionality to the existing 'official' tools." - ewarn "Please report this issues to:" - ewarn "http://www.bluez.org/development/lists/" - - # Upstream doesn't install this, bug #524640 - # http://permalink.gmane.org/gmane.linux.bluez.kernel/53115 - # http://comments.gmane.org/gmane.linux.bluez.kernel/54564 - dobin tools/btmgmt - # gatttool is only built with readline, bug #530776 - # https://bugzilla.redhat.com/show_bug.cgi?id=1141909 - # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=720486 - # https://bugs.archlinux.org/task/37686 - dobin attrib/gatttool - # https://bugzilla.redhat.com/show_bug.cgi?id=1699680 - dobin tools/avinfo - fi - - # Not installed by default after being built, bug #666756 - use btpclient && dobin tools/btpclient - - # Unittests are not that useful once installed, so make them optional - if use test-programs; then - # Drop python2 only test tools - # https://bugzilla.kernel.org/show_bug.cgi?id=206819 - rm "${ED}"/usr/$(get_libdir)/bluez/test/simple-player || die - # https://bugzilla.kernel.org/show_bug.cgi?id=206821 - rm "${ED}"/usr/$(get_libdir)/bluez/test/test-hfp || die - # https://bugzilla.kernel.org/show_bug.cgi?id=206823 - rm "${ED}"/usr/$(get_libdir)/bluez/test/test-sap-server || die - - python_fix_shebang "${ED}"/usr/$(get_libdir)/bluez/test - - for i in $(find "${ED}"/usr/$(get_libdir)/bluez/test -maxdepth 1 -type f ! -name "*.*"); do - dosym "${i}" /usr/bin/bluez-"${i##*/}" - done - fi - else - emake DESTDIR="${D}" \ - install-pkgincludeHEADERS \ - install-libLTLIBRARIES \ - install-pkgconfigDATA - fi -} - -multilib_src_install_all() { - # We need to ensure obexd can be spawned automatically by systemd - # when user-session is enabled: - # http://marc.info/?l=linux-bluetooth&m=148096094716386&w=2 - # https://bugs.gentoo.org/show_bug.cgi?id=577842 - # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=804908 - # https://bugs.archlinux.org/task/45816 - # https://bugzilla.redhat.com/show_bug.cgi?id=1318441 - # https://bugzilla.redhat.com/show_bug.cgi?id=1389347 - if use systemd; then - dosym obex.service /usr/lib/systemd/user/dbus-org.bluez.obex.service - fi - - find "${D}" -name '*.la' -type f -delete || die - - keepdir /var/lib/bluetooth - - # Upstream don't want people to play with them - # But we keep installing them due to 'historical' reasons - insinto /etc/bluetooth - local d - for d in input network; do - doins profiles/${d}/${d}.conf - done - # Setup auto enable as Fedora does for allowing to use - # keyboards/mouse as soon as possible - sed -i 's/#\[Policy\]$/\[Policy\]/; s/#AutoEnable=false/AutoEnable=true/' src/main.conf || die - doins src/main.conf - - newinitd "${FILESDIR}"/bluetooth-init.d-r5 bluetooth - newconfd "${FILESDIR}"/bluetooth-conf.d bluetooth - - einstalldocs - use doc && dodoc doc/*.txt -} - -pkg_postinst() { - use udev && udev_reload - systemd_reenable bluetooth.service - - has_version net-dialup/ppp || elog "To use dial up networking you must install net-dialup/ppp" -} - -pkg_postrm() { - use udev && udev_reload -} diff --git a/net-wireless/bluez/bluez-5.75.ebuild b/net-wireless/bluez/bluez-5.75.ebuild deleted file mode 100644 index 5903ae635e78..000000000000 --- a/net-wireless/bluez/bluez-5.75.ebuild +++ /dev/null @@ -1,278 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 -PYTHON_COMPAT=( python3_{9..12} ) - -inherit autotools flag-o-matic linux-info python-single-r1 systemd udev multilib-minimal #readme.gentoo-r1 - -DESCRIPTION="Bluetooth Tools and System Daemons for Linux" -HOMEPAGE="http://www.bluez.org https://github.com/bluez/bluez" -SRC_URI="https://www.kernel.org/pub/linux/bluetooth/${P}.tar.xz" - -LICENSE="GPL-2+ LGPL-2.1+" -SLOT="0/3" -KEYWORDS="amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv x86" -IUSE="btpclient cups doc debug deprecated extra-tools experimental +mesh midi +obex +readline selinux systemd test test-programs +udev" - -# Since this release all remaining extra-tools need readline support, but this could -# change in the future, hence, this REQUIRED_USE constraint could be dropped -# again in the future. -# btpclient needs mesh, bug #790587 -REQUIRED_USE=" - btpclient? ( mesh ) - extra-tools? ( deprecated readline ) - test? ( ${PYTHON_REQUIRED_USE} ) - test-programs? ( ${PYTHON_REQUIRED_USE} ) -" - -TEST_DEPS="${PYTHON_DEPS} - $(python_gen_cond_dep ' - >=dev-python/dbus-python-1[${PYTHON_USEDEP}] - dev-python/pygobject:3[${PYTHON_USEDEP}] - ') -" -BDEPEND=" - dev-python/docutils - virtual/pkgconfig - test? ( ${TEST_DEPS} ) -" -DEPEND=" - >=dev-libs/glib-2.28:2[${MULTILIB_USEDEP}] - btpclient? ( >=dev-libs/ell-0.39 ) - cups? ( net-print/cups:= ) - mesh? ( - >=dev-libs/ell-0.39 - >=dev-libs/json-c-0.13:= - sys-libs/readline:0= - ) - midi? ( media-libs/alsa-lib ) - obex? ( dev-libs/libical:= ) - readline? ( sys-libs/readline:0= ) - systemd? ( sys-apps/systemd ) - >=sys-apps/dbus-1.6:= - udev? ( >=virtual/udev-196 ) -" -RDEPEND="${DEPEND} - selinux? ( sec-policy/selinux-bluetooth ) - test-programs? ( ${TEST_DEPS} ) -" - -RESTRICT="!test? ( test )" - -PATCHES=( - # Try both udevadm paths to cover udev/systemd vs. eudev locations (#539844) - # http://www.spinics.net/lists/linux-bluetooth/msg58739.html - # https://bugs.gentoo.org/539844 - # https://github.com/bluez/bluez/issues/268 - "${FILESDIR}"/${PN}-udevadm-path-r1.patch -) - -pkg_setup() { - # From http://www.linuxfromscratch.org/blfs/view/svn/general/bluez.html - # to prevent bugs like: - # https://bugzilla.kernel.org/show_bug.cgi?id=196621 - CONFIG_CHECK="~NET ~BT ~BT_RFCOMM ~BT_RFCOMM_TTY ~BT_BNEP ~BT_BNEP_MC_FILTER - ~BT_BNEP_PROTO_FILTER ~BT_HIDP ~CRYPTO_USER_API_HASH ~CRYPTO_USER_API_SKCIPHER - ~UHID ~RFKILL" - # https://bugzilla.kernel.org/show_bug.cgi?id=196621 - # https://bugzilla.kernel.org/show_bug.cgi?id=206815 - if use mesh || use test; then - CONFIG_CHECK="${CONFIG_CHECK} ~CRYPTO_USER - ~CRYPTO_USER_API ~CRYPTO_USER_API_AEAD ~CRYPTO_AES ~CRYPTO_CCM ~CRYPTO_AEAD ~CRYPTO_CMAC - ~CRYPTO_MD5 ~CRYPTO_SHA1 ~KEY_DH_OPERATIONS" - fi - linux-info_pkg_setup - - if use test || use test-programs; then - python-single-r1_pkg_setup - fi - - if ! use udev; then - ewarn - ewarn "You are installing ${PN} with USE=-udev. This means various bluetooth" - ewarn "devices and adapters from Apple, Dell, Logitech etc. will not work," - ewarn "and hid2hci will not be available." - ewarn - fi -} - -src_prepare() { - default - - # https://github.com/bluez/bluez/issues/773 - eapply "${FILESDIR}"/${PN}-5.73-configure-cups.patch - - # https://github.com/bluez/bluez/issues/806 - eapply "${FILESDIR}"/0001-Allow-using-obexd-without-systemd-in-the-user-session-r3.patch - - eautoreconf - - multilib_copy_sources -} - -multilib_src_configure() { - # unit/test-vcp test fails with LTO (bug #925745) - filter-lto - - local myconf=( - # readline is automagic when client is enabled - # --enable-client always needs readline, bug #504038 - # --enable-mesh is handled in the same way - ac_cv_header_readline_readline_h=$(multilib_native_usex readline) - ac_cv_header_readline_readline_h=$(multilib_native_usex mesh) - ) - - if ! multilib_is_native_abi; then - myconf+=( - # deps not used for the library - {DBUS,GLIB}_{CFLAGS,LIBS}=' ' - ) - fi - - econf \ - --localstatedir=/var \ - --disable-android \ - --enable-datafiles \ - --enable-optimization \ - $(use_enable debug) \ - --enable-pie \ - --enable-threads \ - --enable-library \ - --enable-tools \ - --enable-manpages \ - --enable-monitor \ - --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \ - --with-systemduserunitdir="$(systemd_get_userunitdir)" \ - $(multilib_native_use_enable btpclient) \ - $(multilib_native_use_enable btpclient external-ell) \ - $(multilib_native_use_enable cups) \ - $(multilib_native_use_enable deprecated) \ - $(multilib_native_use_enable experimental) \ - $(multilib_native_use_enable mesh) \ - $(multilib_native_use_enable mesh external-ell) \ - $(multilib_native_use_enable midi) \ - $(multilib_native_use_enable obex) \ - $(multilib_native_use_enable readline client) \ - $(multilib_native_use_enable systemd) \ - $(multilib_native_use_enable test-programs test) \ - $(multilib_native_use_enable udev) \ - $(multilib_native_use_enable udev hid2hci) \ - $(multilib_native_use_enable udev sixaxis) -} - -multilib_src_compile() { - if multilib_is_native_abi; then - default - else - emake -f Makefile -f - libs \ - <<<'libs: $(lib_LTLIBRARIES)' - fi -} - -multilib_src_test() { - multilib_is_native_abi && default -} - -multilib_src_install() { - if multilib_is_native_abi; then - emake DESTDIR="${D}" install - - # Only install extra-tools when relevant USE flag is enabled - if use extra-tools; then - ewarn "Upstream doesn't support using this tools and their bugs are" - ewarn "likely to be ignored forever, also they can break without" - ewarn "previous announcement." - ewarn "Upstream also states all this tools are not really needed," - ewarn "then, if you still need to rely on them, you must ask them" - ewarn "to either install that tool by default or add the needed" - ewarn "functionality to the existing 'official' tools." - ewarn "Please report this issues to:" - ewarn "http://www.bluez.org/development/lists/" - - # Upstream doesn't install this, bug #524640 - # http://permalink.gmane.org/gmane.linux.bluez.kernel/53115 - # http://comments.gmane.org/gmane.linux.bluez.kernel/54564 - dobin tools/btmgmt - # gatttool is only built with readline, bug #530776 - # https://bugzilla.redhat.com/show_bug.cgi?id=1141909 - # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=720486 - # https://bugs.archlinux.org/task/37686 - dobin attrib/gatttool - # https://bugzilla.redhat.com/show_bug.cgi?id=1699680 - dobin tools/avinfo - fi - - # Not installed by default after being built, bug #666756 - use btpclient && dobin tools/btpclient - - # Unittests are not that useful once installed, so make them optional - if use test-programs; then - # Drop python2 only test tools - # https://bugzilla.kernel.org/show_bug.cgi?id=206819 - rm "${ED}"/usr/$(get_libdir)/bluez/test/simple-player || die - # https://bugzilla.kernel.org/show_bug.cgi?id=206821 - rm "${ED}"/usr/$(get_libdir)/bluez/test/test-hfp || die - # https://bugzilla.kernel.org/show_bug.cgi?id=206823 - rm "${ED}"/usr/$(get_libdir)/bluez/test/test-sap-server || die - - python_fix_shebang "${ED}"/usr/$(get_libdir)/bluez/test - - for i in $(find "${ED}"/usr/$(get_libdir)/bluez/test -maxdepth 1 -type f ! -name "*.*"); do - dosym "${i}" /usr/bin/bluez-"${i##*/}" - done - fi - else - emake DESTDIR="${D}" \ - install-pkgincludeHEADERS \ - install-libLTLIBRARIES \ - install-pkgconfigDATA - fi -} - -multilib_src_install_all() { - # We need to ensure obexd can be spawned automatically by systemd - # when user-session is enabled: - # http://marc.info/?l=linux-bluetooth&m=148096094716386&w=2 - # https://bugs.gentoo.org/show_bug.cgi?id=577842 - # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=804908 - # https://bugs.archlinux.org/task/45816 - # https://bugzilla.redhat.com/show_bug.cgi?id=1318441 - # https://bugzilla.redhat.com/show_bug.cgi?id=1389347 - if use systemd; then - dosym obex.service /usr/lib/systemd/user/dbus-org.bluez.obex.service - fi - - find "${D}" -name '*.la' -type f -delete || die - - keepdir /var/lib/bluetooth - - # Upstream don't want people to play with them - # But we keep installing them due to 'historical' reasons - insinto /etc/bluetooth - local d - for d in input network; do - doins profiles/${d}/${d}.conf - done - # Setup auto enable as Fedora does for allowing to use - # keyboards/mouse as soon as possible - sed -i 's/#\[Policy\]$/\[Policy\]/; s/#AutoEnable=false/AutoEnable=true/' src/main.conf || die - doins src/main.conf - - newinitd "${FILESDIR}"/bluetooth-init.d-r5 bluetooth - newconfd "${FILESDIR}"/bluetooth-conf.d bluetooth - - einstalldocs - use doc && dodoc doc/*.txt -} - -pkg_postinst() { - use udev && udev_reload - systemd_reenable bluetooth.service - - has_version net-dialup/ppp || elog "To use dial up networking you must install net-dialup/ppp" -} - -pkg_postrm() { - use udev && udev_reload -} diff --git a/net-wireless/bluez/files/0001-Allow-using-obexd-without-systemd-in-the-user-session-r2.patch b/net-wireless/bluez/files/0001-Allow-using-obexd-without-systemd-in-the-user-session-r2.patch deleted file mode 100644 index dcebaa007bc1..000000000000 --- a/net-wireless/bluez/files/0001-Allow-using-obexd-without-systemd-in-the-user-session-r2.patch +++ /dev/null @@ -1,58 +0,0 @@ -From 3027cb7141fb65cf3eeda69c688db8c4045e2d3f Mon Sep 17 00:00:00 2001 -From: Giovanni Campagna -Date: Sat, 12 Oct 2013 17:45:25 +0200 -Subject: [PATCH] Allow using obexd without systemd in the user session - -Not all sessions run systemd --user (actually, the majority -doesn't), so the dbus daemon must be able to spawn obexd -directly, and to do so it needs the full path of the daemon. ---- - Makefile.obexd | 4 ++-- - obexd/src/org.bluez.obex.service | 4 ---- - obexd/src/org.bluez.obex.service.in | 4 ++++ - 3 files changed, 6 insertions(+), 6 deletions(-) - delete mode 100644 obexd/src/org.bluez.obex.service - create mode 100644 obexd/src/org.bluez.obex.service.in - -diff --git a/Makefile.obexd b/Makefile.obexd -index 3760867..142e7c3 100644 ---- a/Makefile.obexd -+++ b/Makefile.obexd -@@ -2,12 +2,12 @@ - if SYSTEMD - systemduserunitdir = $(SYSTEMD_USERUNITDIR) - systemduserunit_DATA = obexd/src/obex.service -+endif - - dbussessionbusdir = $(DBUS_SESSIONBUSDIR) - dbussessionbus_DATA = obexd/src/org.bluez.obex.service --endif - --EXTRA_DIST += obexd/src/obex.service.in obexd/src/org.bluez.obex.service -+EXTRA_DIST += obexd/src/obex.service.in obexd/src/org.bluez.obex.service.in - - obex_plugindir = $(libdir)/obex/plugins - -diff --git a/obexd/src/org.bluez.obex.service b/obexd/src/org.bluez.obex.service -deleted file mode 100644 -index a538088..0000000 ---- a/obexd/src/org.bluez.obex.service -+++ /dev/null -@@ -1,4 +0,0 @@ --[D-BUS Service] --Name=org.bluez.obex --Exec=/bin/false --SystemdService=dbus-org.bluez.obex.service -diff --git a/obexd/src/org.bluez.obex.service.in b/obexd/src/org.bluez.obex.service.in -new file mode 100644 -index 0000000..9c815f2 ---- /dev/null -+++ b/obexd/src/org.bluez.obex.service.in -@@ -0,0 +1,4 @@ -+[D-BUS Service] -+Name=org.bluez.obex -+Exec=@pkglibexecdir@/obexd -+SystemdService=dbus-org.bluez.obex.service --- -1.8.3.1 - diff --git a/net-wireless/bluez/files/bluez-5.66-power-state-adapter-property.patch b/net-wireless/bluez/files/bluez-5.66-power-state-adapter-property.patch deleted file mode 100644 index 566d7c08b591..000000000000 --- a/net-wireless/bluez/files/bluez-5.66-power-state-adapter-property.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 70309219acd4c81e3a9e2b3652d2d93eb08b0aee Mon Sep 17 00:00:00 2001 -From: Bastien Nocera -Date: Wed, 31 Aug 2022 11:16:34 +0200 -Subject: [PATCH 6/6] adapter: Remove experimental flag for PowerState - -Now that the feature has been tested, that the API is deemed adequate -and the reliability sufficient. ---- - src/adapter.c | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/src/adapter.c b/src/adapter.c -index 8fb2acdc8..841096d7f 100644 ---- a/src/adapter.c -+++ b/src/adapter.c -@@ -3864,8 +3864,7 @@ static const GDBusPropertyTable adapter_properties[] = { - { "Alias", "s", property_get_alias, property_set_alias }, - { "Class", "u", property_get_class }, - { "Powered", "b", property_get_powered, property_set_powered }, -- { "PowerState", "s", property_get_power_state, NULL, NULL, -- G_DBUS_PROPERTY_FLAG_EXPERIMENTAL }, -+ { "PowerState", "s", property_get_power_state }, - { "Discoverable", "b", property_get_discoverable, - property_set_discoverable }, - { "DiscoverableTimeout", "u", property_get_discoverable_timeout, --- -2.37.2 - -- cgit v1.2.3