mgorny 15/08/08 16:16:09 Modified: blueman-9999.ebuild blueman-2.0.ebuild ChangeLog Log: Add additional deps and kernel checks for USE=network. Bug #487378. (Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!)
Revision Changes Path 1.12 net-wireless/blueman/blueman-9999.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-wireless/blueman/blueman-9999.ebuild?rev=1.12&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-wireless/blueman/blueman-9999.ebuild?rev=1.12&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-wireless/blueman/blueman-9999.ebuild?r1=1.11&r2=1.12 Index: blueman-9999.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/net-wireless/blueman/blueman-9999.ebuild,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- blueman-9999.ebuild 8 Aug 2015 15:35:02 -0000 1.11 +++ blueman-9999.ebuild 8 Aug 2015 16:16:09 -0000 1.12 @@ -1,17 +1,17 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-wireless/blueman/blueman-9999.ebuild,v 1.11 2015/08/08 15:35:02 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-wireless/blueman/blueman-9999.ebuild,v 1.12 2015/08/08 16:16:09 mgorny Exp $ EAPI="5" PYTHON_COMPAT=( python{2_7,3_4} ) -inherit eutils python-single-r1 gnome2-utils autotools +inherit eutils gnome2-utils linux-info python-single-r1 DESCRIPTION="GTK+ Bluetooth Manager, designed to be simple and intuitive for everyday bluetooth tasks" HOMEPAGE="https://github.com/blueman-project/blueman"; if [[ ${PV} == "9999" ]] ; then - inherit git-r3 + inherit autotools git-r3 EGIT_REPO_URI="https://github.com/blueman-project/blueman.git"; KEYWORDS="" else @@ -43,9 +43,16 @@ x11-themes/mate-icon-theme ) appindicator? ( dev-libs/libappindicator:3[introspection] ) - network? ( || ( net-dns/dnsmasq - net-misc/dhcp - >=net-misc/networkmanager-0.8 ) ) + network? ( + net-dns/avahi[autoipd] + net-firewall/iptables + sys-apps/net-tools + || ( + net-dns/dnsmasq + net-misc/dhcp + >=net-misc/networkmanager-0.8 + ) + ) policykit? ( sys-auth/polkit ) pulseaudio? ( media-sound/pulseaudio[bluetooth] ) thunar? ( xfce-base/thunar ) @@ -54,6 +61,19 @@ 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" + linux-info_pkg_setup + fi +} + +pkg_setup() { + pkg_pretend + python-single-r1_pkg_setup +} + src_prepare() { epatch \ "${FILESDIR}/${PN}-9999-set-codeset-for-gettext-to-UTF-8-always.patch" 1.2 net-wireless/blueman/blueman-2.0.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-wireless/blueman/blueman-2.0.ebuild?rev=1.2&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-wireless/blueman/blueman-2.0.ebuild?rev=1.2&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-wireless/blueman/blueman-2.0.ebuild?r1=1.1&r2=1.2 Index: blueman-2.0.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/net-wireless/blueman/blueman-2.0.ebuild,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- blueman-2.0.ebuild 8 Aug 2015 15:35:02 -0000 1.1 +++ blueman-2.0.ebuild 8 Aug 2015 16:16:09 -0000 1.2 @@ -1,17 +1,17 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-wireless/blueman/blueman-2.0.ebuild,v 1.1 2015/08/08 15:35:02 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-wireless/blueman/blueman-2.0.ebuild,v 1.2 2015/08/08 16:16:09 mgorny Exp $ EAPI="5" PYTHON_COMPAT=( python2_7 ) -inherit eutils python-single-r1 gnome2-utils autotools +inherit eutils gnome2-utils linux-info python-single-r1 DESCRIPTION="GTK+ Bluetooth Manager, designed to be simple and intuitive for everyday bluetooth tasks" HOMEPAGE="https://github.com/blueman-project/blueman"; if [[ ${PV} == "9999" ]] ; then - inherit git-r3 + inherit autotools git-r3 EGIT_REPO_URI="https://github.com/blueman-project/blueman.git"; KEYWORDS="" else @@ -43,9 +43,16 @@ x11-themes/mate-icon-theme ) appindicator? ( dev-libs/libappindicator:3[introspection] ) - network? ( || ( net-dns/dnsmasq - net-misc/dhcp - >=net-misc/networkmanager-0.8 ) ) + network? ( + net-dns/avahi[autoipd] + net-firewall/iptables + sys-apps/net-tools + || ( + net-dns/dnsmasq + net-misc/dhcp + >=net-misc/networkmanager-0.8 + ) + ) policykit? ( sys-auth/polkit ) pulseaudio? ( media-sound/pulseaudio[bluetooth] ) thunar? ( xfce-base/thunar ) @@ -54,6 +61,19 @@ 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" + linux-info_pkg_setup + fi +} + +pkg_setup() { + pkg_pretend + python-single-r1_pkg_setup +} + src_prepare() { epatch \ "${FILESDIR}/${P}-set-codeset-for-gettext-to-UTF-8-always.patch" 1.39 net-wireless/blueman/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-wireless/blueman/ChangeLog?rev=1.39&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-wireless/blueman/ChangeLog?rev=1.39&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-wireless/blueman/ChangeLog?r1=1.38&r2=1.39 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/net-wireless/blueman/ChangeLog,v retrieving revision 1.38 retrieving revision 1.39 diff -u -r1.38 -r1.39 --- ChangeLog 8 Aug 2015 15:42:23 -0000 1.38 +++ ChangeLog 8 Aug 2015 16:16:09 -0000 1.39 @@ -1,6 +1,10 @@ # ChangeLog for net-wireless/blueman # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-wireless/blueman/ChangeLog,v 1.38 2015/08/08 15:42:23 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-wireless/blueman/ChangeLog,v 1.39 2015/08/08 16:16:09 mgorny Exp $ + + 08 Aug 2015; Michał Górny <[email protected]> blueman-2.0.ebuild, + blueman-9999.ebuild: + Add additional deps and kernel checks for USE=network. Bug #487378. 08 Aug 2015; Michał Górny <[email protected]> -blueman-1.23-r1.ebuild, -blueman-1.23.ebuild, -blueman-1.23_p20140717-r1.ebuild,
