From b284a3168fa91a038925d2ecf5e4791011ea5e7d Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 18 Nov 2019 10:15:03 +0000 Subject: gentoo resync : 18.11.2019 --- net-wireless/blueman/Manifest | 4 +- net-wireless/blueman/blueman-2.1.1-r1.ebuild | 129 +++++++++++++++++++++++++++ net-wireless/blueman/blueman-2.1.1.ebuild | 124 ------------------------- net-wireless/blueman/blueman-9999.ebuild | 7 +- 4 files changed, 137 insertions(+), 127 deletions(-) create mode 100644 net-wireless/blueman/blueman-2.1.1-r1.ebuild delete mode 100644 net-wireless/blueman/blueman-2.1.1.ebuild (limited to 'net-wireless/blueman') diff --git a/net-wireless/blueman/Manifest b/net-wireless/blueman/Manifest index 78a0627f2e9b..bf6c2c04ee09 100644 --- a/net-wireless/blueman/Manifest +++ b/net-wireless/blueman/Manifest @@ -1,5 +1,5 @@ AUX 01-org.blueman.rules 432 BLAKE2B c81ec47bc68be911b44056e4f0f4dd4e2939d8d5db78fbca9f4ddceb7c8ed0108bff1bc12d83ebfa9ed67f8939fdd0aea712aec4ae964f10d84a4a6077479a37 SHA512 5cea5f5e9f43e9778dd671ecfdf59e79d740abf278cd9a7250efcf790f632d9ff6b08bf82dff96292c45c3424be9dc290bb39c3bf329c853e02e0ae3f7bb213b DIST blueman-2.1.1.tar.xz 950296 BLAKE2B 10113bf9bd6744d6aaa5e4d0912d87ba11ace36027acfb10802988ad7c7458dbe2c092095148277f437a8dac68f93c017da53a0925a2c3e8c24e0400db567c87 SHA512 bde7dffc369a7204e2c0e05005f3c1cb97760b3d8625342fe69a5b5c729d6b90eabeca37c679c56f73499f1dbc17ccc15800b4e6e48e717f0e306083525981e9 -EBUILD blueman-2.1.1.ebuild 2826 BLAKE2B 38500885fb7dfaf750539b65cf95c7e026ac299333afa19e69b5b8654aca8b5d5704802a29f79724d2624792f8c1ec2741a1d93214e03a5f3e99691f6420d43e SHA512 1eaf03b851010782da3e605ed7483ac5dcd12b622ad2da7decf07e8790dfc309f46bba28378010a4d8db5e92f817f683ee1b81bd30845e0cb15df356dbb64c84 -EBUILD blueman-9999.ebuild 2803 BLAKE2B ea725ce4274ab2492c619cf0635d5bd23ccba7779d95270f5b30d339985fbc4f8ddc1a98293afcfae81163bef4b96d5af7b65a18a7545b16b86114adc624c6da SHA512 17992351025084a18b019e9709057c0123a6f6c49beb26bcc78d54955fd843c4f34bd6fb086701218f59da48fe01d02cee4b0f1ad74f4d2dc464a09c1eae4c40 +EBUILD blueman-2.1.1-r1.ebuild 2878 BLAKE2B 309baeb29898253dc126575a5c85dab436e349f29fb2148221b67c7bfd085fb424f8c5ef922ed5b2bd148fc45094a2983b4dd305dced31d95c628baf965d7fb1 SHA512 cfdf6087681518433b7fd9004aa0c09b5a269566222e20dfdbc09391ebaa23f875318254fd719882679f597768003c9fd90d327a2d2b2bbdb5d82567973afb62 +EBUILD blueman-9999.ebuild 2855 BLAKE2B 0c9c2adfbc0131ac1fd0357180646f0c5db82bfa15800814caeefb94ed0f38564433d7b7b48527f8382568f7462c791c60bb720e49f759a1d627405b11ac7fd0 SHA512 a2b5872da84d145b23b54af2163f1c22fe644ba8324d905fd093baafe95a8329d44856c07b368c8dfc677479b312bd0a00b664a12895d9611362f28465bee5c0 MISC metadata.xml 688 BLAKE2B 60db2d7f9a0b7a9cb49845de2720dd1ef20fe18b3c85a0b95387aa8b3e801aa9edc2ab0e66b69c2d27ca148d1358ae347ceb81cc5a94def15fe7b7966424f35b SHA512 372797b89a2f56312d68bd0719af15c273fdb15a90172d2752ea22f5404d3e054075fd5d1edb08b280d842dcee6b52e2cdf5b18b296b230b6e4a76d4c6fe0bad diff --git a/net-wireless/blueman/blueman-2.1.1-r1.ebuild b/net-wireless/blueman/blueman-2.1.1-r1.ebuild new file mode 100644 index 000000000000..4249d4afac6f --- /dev/null +++ b/net-wireless/blueman/blueman-2.1.1-r1.ebuild @@ -0,0 +1,129 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" + +PYTHON_COMPAT=( python3_{5,6,7} ) +inherit autotools gnome2-utils linux-info python-single-r1 systemd xdg-utils + +DESCRIPTION="Simple and intuitive GTK+ Bluetooth Manager" +HOMEPAGE="https://github.com/blueman-project/blueman" + +if [[ ${PV} == "9999" ]] ; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/blueman-project/blueman.git" + KEYWORDS="" +else + SRC_URI="https://github.com/blueman-project/${PN}/releases/download/${PV/_/.}/${P/_/.}.tar.xz" + KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" +fi + +# icons are GPL-2 +# source files are mixed GPL-3+ and GPL-2+ +LICENSE="GPL-3+ GPL-2" +SLOT="0" +IUSE="appindicator network nls policykit pulseaudio" + +DEPEND=" + dev-python/pygobject:3[${PYTHON_USEDEP}] + >=net-wireless/bluez-5:= + ${PYTHON_DEPS}" +BDEPEND=" + dev-python/cython[${PYTHON_USEDEP}] + virtual/pkgconfig + nls? ( dev-util/intltool sys-devel/gettext )" +RDEPEND="${DEPEND} + dev-python/pycairo[${PYTHON_USEDEP}] + sys-apps/dbus + x11-libs/gtk+:3[introspection] + x11-libs/libnotify[introspection] + || ( + x11-themes/adwaita-icon-theme + x11-themes/faenza-icon-theme + x11-themes/mate-icon-theme + ) + appindicator? ( dev-libs/libappindicator:3[introspection] ) + network? ( + net-firewall/iptables + || ( + sys-apps/net-tools + sys-apps/iproute2 + ) + || ( + net-dns/dnsmasq + net-misc/dhcp + >=net-misc/networkmanager-0.8 + ) + ) + policykit? ( sys-auth/polkit ) + pulseaudio? ( + || ( + media-sound/pulseaudio[bluetooth] + media-sound/pulseaudio-modules-bt + ) + ) + !net-wireless/gnome-bluetooth +" + +S=${WORKDIR}/${P/_/.} + +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +pkg_pretend() { + if use network; then + local CONFIG_CHECK="~BRIDGE ~IP_NF_IPTABLES + ~IP_NF_NAT ~IP_NF_TARGET_MASQUERADE" + check_extra_config + fi +} + +pkg_setup() { + python-single-r1_pkg_setup +} + +src_prepare() { + default + # replace py-compile to fix py3 + [[ ${PV} == 9999 ]] && eautoreconf || eautomake +} + +src_configure() { + local myconf=( + --docdir=/usr/share/doc/${PF} + --disable-runtime-deps-check + --disable-static + --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" + --with-systemduserunitdir="$(systemd_get_userunitdir)" + --with-dhcp-config="/etc/dhcp/dhcpd.conf" + $(use_enable appindicator) + $(use_enable policykit polkit) + $(use_enable nls) + $(use_enable pulseaudio) + # thunar integration is a single data file with no extra deps + # so install it unconditionally + --enable-thunar-sendto + ) + econf "${myconf[@]}" +} + +src_install() { + default + + if use policykit; then + # Allow users in plugdev group to modify connections + insinto /usr/share/polkit-1/rules.d + doins "${FILESDIR}/01-org.blueman.rules" + fi + + rm "${D}"/$(python_get_sitedir)/*.la || die +} + +pkg_postinst() { + xdg_icon_cache_update + gnome2_schemas_update +} + +pkg_postrm() { + xdg_icon_cache_update + gnome2_schemas_update +} diff --git a/net-wireless/blueman/blueman-2.1.1.ebuild b/net-wireless/blueman/blueman-2.1.1.ebuild deleted file mode 100644 index afa7dd91ce10..000000000000 --- a/net-wireless/blueman/blueman-2.1.1.ebuild +++ /dev/null @@ -1,124 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -PYTHON_COMPAT=( python3_{5,6,7} ) -inherit autotools gnome2-utils linux-info python-single-r1 systemd xdg-utils - -DESCRIPTION="Simple and intuitive GTK+ Bluetooth Manager" -HOMEPAGE="https://github.com/blueman-project/blueman" - -if [[ ${PV} == "9999" ]] ; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/blueman-project/blueman.git" - KEYWORDS="" -else - SRC_URI="https://github.com/blueman-project/${PN}/releases/download/${PV/_/.}/${P/_/.}.tar.xz" - KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" -fi - -# icons are GPL-2 -# source files are mixed GPL-3+ and GPL-2+ -LICENSE="GPL-3+ GPL-2" -SLOT="0" -IUSE="appindicator network nls policykit pulseaudio" - -DEPEND=" - dev-python/pygobject:3[${PYTHON_USEDEP}] - >=net-wireless/bluez-5:= - ${PYTHON_DEPS}" -BDEPEND=" - dev-python/cython[${PYTHON_USEDEP}] - virtual/pkgconfig - nls? ( dev-util/intltool sys-devel/gettext )" -RDEPEND="${DEPEND} - dev-python/pycairo[${PYTHON_USEDEP}] - sys-apps/dbus - x11-libs/gtk+:3[introspection] - x11-libs/libnotify[introspection] - || ( - x11-themes/adwaita-icon-theme - x11-themes/faenza-icon-theme - x11-themes/mate-icon-theme - ) - appindicator? ( dev-libs/libappindicator:3[introspection] ) - network? ( - net-firewall/iptables - || ( - sys-apps/net-tools - sys-apps/iproute2 - ) - || ( - net-dns/dnsmasq - net-misc/dhcp - >=net-misc/networkmanager-0.8 - ) - ) - policykit? ( sys-auth/polkit ) - pulseaudio? ( media-sound/pulseaudio[bluetooth] ) - !net-wireless/gnome-bluetooth -" - -S=${WORKDIR}/${P/_/.} - -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -pkg_pretend() { - if use network; then - local CONFIG_CHECK="~BRIDGE ~IP_NF_IPTABLES - ~IP_NF_NAT ~IP_NF_TARGET_MASQUERADE" - check_extra_config - fi -} - -pkg_setup() { - python-single-r1_pkg_setup -} - -src_prepare() { - default - # replace py-compile to fix py3 - [[ ${PV} == 9999 ]] && eautoreconf || eautomake -} - -src_configure() { - local myconf=( - --docdir=/usr/share/doc/${PF} - --disable-runtime-deps-check - --disable-static - --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" - --with-systemduserunitdir="$(systemd_get_userunitdir)" - --with-dhcp-config="/etc/dhcp/dhcpd.conf" - $(use_enable appindicator) - $(use_enable policykit polkit) - $(use_enable nls) - $(use_enable pulseaudio) - # thunar integration is a single data file with no extra deps - # so install it unconditionally - --enable-thunar-sendto - ) - econf "${myconf[@]}" -} - -src_install() { - default - - if use policykit; then - # Allow users in plugdev group to modify connections - insinto /usr/share/polkit-1/rules.d - doins "${FILESDIR}/01-org.blueman.rules" - fi - - rm "${D}"/$(python_get_sitedir)/*.la || die -} - -pkg_postinst() { - xdg_icon_cache_update - gnome2_schemas_update -} - -pkg_postrm() { - xdg_icon_cache_update - gnome2_schemas_update -} diff --git a/net-wireless/blueman/blueman-9999.ebuild b/net-wireless/blueman/blueman-9999.ebuild index 4e3c0edd40da..c04d0676bc9c 100644 --- a/net-wireless/blueman/blueman-9999.ebuild +++ b/net-wireless/blueman/blueman-9999.ebuild @@ -56,7 +56,12 @@ RDEPEND="${DEPEND} ) ) policykit? ( sys-auth/polkit ) - pulseaudio? ( media-sound/pulseaudio[bluetooth] ) + pulseaudio? ( + || ( + media-sound/pulseaudio[bluetooth] + media-sound/pulseaudio-modules-bt + ) + ) !net-wireless/gnome-bluetooth " -- cgit v1.2.3