Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-wireless/blueman/
Date: Tue, 02 Aug 2022 04:08:55
Message-Id: 1659413230.694d9d319c313b160fbb3fea155f9c7d5bd706ea.mgorny@gentoo
1 commit: 694d9d319c313b160fbb3fea155f9c7d5bd706ea
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Wed Jul 27 08:32:26 2022 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Tue Aug 2 04:07:10 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=694d9d31
7
8 net-wireless/blueman: Invoke eautomake to fix py-compile script
9
10 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
11
12 net-wireless/blueman/blueman-2.3.1.ebuild | 2 +-
13 net-wireless/blueman/blueman-2.3.2.ebuild | 11 ++++++++---
14 net-wireless/blueman/blueman-9999.ebuild | 11 ++++++++---
15 3 files changed, 17 insertions(+), 7 deletions(-)
16
17 diff --git a/net-wireless/blueman/blueman-2.3.1.ebuild b/net-wireless/blueman/blueman-2.3.1.ebuild
18 index dbedcfc7eae6..997963609ec2 100644
19 --- a/net-wireless/blueman/blueman-2.3.1.ebuild
20 +++ b/net-wireless/blueman/blueman-2.3.1.ebuild
21 @@ -97,7 +97,7 @@ pkg_setup() {
22 }
23
24 src_prepare() {
25 - [[ ${PV} == 9999 ]] && eautoreconf
26 + [[ ${PV} == 9999 ]] && eautoreconf || eautomake
27 distutils-r1_src_prepare
28 }
29
30
31 diff --git a/net-wireless/blueman/blueman-2.3.2.ebuild b/net-wireless/blueman/blueman-2.3.2.ebuild
32 index 453fb6b604da..c34ce0ed1161 100644
33 --- a/net-wireless/blueman/blueman-2.3.2.ebuild
34 +++ b/net-wireless/blueman/blueman-2.3.2.ebuild
35 @@ -7,13 +7,13 @@ DISTUTILS_SINGLE_IMPL=1
36 DISTUTILS_USE_PEP517=no
37 PYTHON_COMPAT=( python3_{8..11} )
38
39 -inherit distutils-r1 gnome2-utils linux-info systemd xdg-utils
40 +inherit autotools distutils-r1 gnome2-utils linux-info systemd xdg-utils
41
42 DESCRIPTION="Simple and intuitive GTK+ Bluetooth Manager"
43 HOMEPAGE="https://github.com/blueman-project/blueman/"
44
45 if [[ ${PV} == "9999" ]] ; then
46 - inherit autotools git-r3
47 + inherit git-r3
48 EGIT_REPO_URI="https://github.com/blueman-project/blueman.git"
49 else
50 SRC_URI="
51 @@ -97,7 +97,12 @@ pkg_setup() {
52 }
53
54 src_prepare() {
55 - [[ ${PV} == 9999 ]] && eautoreconf
56 + if [[ ${PV} == 9999 ]]; then
57 + eautoreconf
58 + else
59 + # remove this when upstream switches to automake with .pyc fix
60 + eautomake
61 + fi
62 distutils-r1_src_prepare
63 }
64
65
66 diff --git a/net-wireless/blueman/blueman-9999.ebuild b/net-wireless/blueman/blueman-9999.ebuild
67 index 453fb6b604da..c34ce0ed1161 100644
68 --- a/net-wireless/blueman/blueman-9999.ebuild
69 +++ b/net-wireless/blueman/blueman-9999.ebuild
70 @@ -7,13 +7,13 @@ DISTUTILS_SINGLE_IMPL=1
71 DISTUTILS_USE_PEP517=no
72 PYTHON_COMPAT=( python3_{8..11} )
73
74 -inherit distutils-r1 gnome2-utils linux-info systemd xdg-utils
75 +inherit autotools distutils-r1 gnome2-utils linux-info systemd xdg-utils
76
77 DESCRIPTION="Simple and intuitive GTK+ Bluetooth Manager"
78 HOMEPAGE="https://github.com/blueman-project/blueman/"
79
80 if [[ ${PV} == "9999" ]] ; then
81 - inherit autotools git-r3
82 + inherit git-r3
83 EGIT_REPO_URI="https://github.com/blueman-project/blueman.git"
84 else
85 SRC_URI="
86 @@ -97,7 +97,12 @@ pkg_setup() {
87 }
88
89 src_prepare() {
90 - [[ ${PV} == 9999 ]] && eautoreconf
91 + if [[ ${PV} == 9999 ]]; then
92 + eautoreconf
93 + else
94 + # remove this when upstream switches to automake with .pyc fix
95 + eautomake
96 + fi
97 distutils-r1_src_prepare
98 }