1 |
commit: 65f3ccbd519bdf422e621daea9425fd309a09a7c |
2 |
Author: Craig Andrews <candrews <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Jan 7 17:36:42 2021 +0000 |
4 |
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Jan 8 02:33:45 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=65f3ccbd |
7 |
|
8 |
net-libs/libqmi: 1.26.6 version bump |
9 |
|
10 |
Closes: https://bugs.gentoo.org/710788 |
11 |
Closes: https://bugs.gentoo.org/762032 |
12 |
Signed-off-by: Craig Andrews <candrews <AT> gentoo.org> |
13 |
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> |
14 |
|
15 |
net-libs/libqmi/Manifest | 1 + |
16 |
net-libs/libqmi/libqmi-1.26.6.ebuild | 47 ++++++++++++++++++++++++++++++++++++ |
17 |
net-libs/libqmi/libqmi-9999.ebuild | 37 ++++++++++++++-------------- |
18 |
3 files changed, 67 insertions(+), 18 deletions(-) |
19 |
|
20 |
diff --git a/net-libs/libqmi/Manifest b/net-libs/libqmi/Manifest |
21 |
index 073fbca7bb3..9b7652c8348 100644 |
22 |
--- a/net-libs/libqmi/Manifest |
23 |
+++ b/net-libs/libqmi/Manifest |
24 |
@@ -8,3 +8,4 @@ DIST libqmi-1.18.2.tar.xz 845560 BLAKE2B 732c7385d149073a9cf89a58f0e2977fff593b0 |
25 |
DIST libqmi-1.20.0.tar.xz 859464 BLAKE2B 146b07b47aa5d40d93ce381aca107ec554918a909aef85b28751228fdcb3a518ffa9479a88b1f17a94f9251a1cff1cb606c4cfd4689e8d5e813a6467f078e5cb SHA512 fceec9aff22942fa64f7a568527033354dc379f347b96c9b37844bbdfb7bfa0936f554402b855c4b191fd63ca488776b94ee69e84502a460e941caddbd648b63 |
26 |
DIST libqmi-1.20.2.tar.xz 860408 BLAKE2B d6f757c7eb7d93101763714f32dee1bfc4de1f4b58fe2b6f457b938e42175da12ba6070395f06542f4edb9c6b3264ad74a718f7fc58ac25de4f4d5f2692ee123 SHA512 2d1ceda25ad995b27dc20d9b5d85ee23a841c43f33aa68b3543df10cc1da72062e648c1136a2706740659ae2cf8c17373d7c6c6f5f8d075864f47e4fb89d7b50 |
27 |
DIST libqmi-1.22.2.tar.xz 947124 BLAKE2B 662cf58cb3fe48b5bbe167ac552b12ecff2944d1098e47b5a8c216a65c42c5e5c462f16625c4572e0e27e69a55cdfad76777468a42f8887f5b3984313c70747b SHA512 5785b56a60db8fb2566b6a712a18ec2ae74ce1da257473ab6b7cdea3163298ebee6c60a3158a7041aa759bd717eee4b16d9eeaa6b15d9b6e911bc8c8c44bd3d8 |
28 |
+DIST libqmi-1.26.6.tar.xz 1127552 BLAKE2B 1dba56c867c688c991fde7bb019234a05d77092f0725498d677a7ff620c56e58e17c873c773d96ee2131bfeac8cdbec86dadacd8fcc2f751f4e9a8d2c75efe5b SHA512 6c5e05fc158a085e1f652ff31cef65762c026cb09eb630153fddccb15e19187141e74c79818ebe00a058c5624891981cfce4d56545d4150ebb3b6e8d7bddb5ba |
29 |
|
30 |
diff --git a/net-libs/libqmi/libqmi-1.26.6.ebuild b/net-libs/libqmi/libqmi-1.26.6.ebuild |
31 |
new file mode 100644 |
32 |
index 00000000000..51ac0339e07 |
33 |
--- /dev/null |
34 |
+++ b/net-libs/libqmi/libqmi-1.26.6.ebuild |
35 |
@@ -0,0 +1,47 @@ |
36 |
+# Copyright 1999-2021 Gentoo Authors |
37 |
+# Distributed under the terms of the GNU General Public License v2 |
38 |
+ |
39 |
+EAPI=7 |
40 |
+ |
41 |
+inherit multilib |
42 |
+if [[ ${PV} == "9999" ]] ; then |
43 |
+ inherit git-r3 autotools |
44 |
+ EGIT_REPO_URI="https://gitlab.freedesktop.org/mobile-broadband/libqmi.git" |
45 |
+else |
46 |
+ KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86" |
47 |
+ SRC_URI="https://www.freedesktop.org/software/libqmi/${P}.tar.xz" |
48 |
+fi |
49 |
+ |
50 |
+DESCRIPTION="Qualcomm MSM (Mobile Station Modem) Interface (QMI) modem protocol library" |
51 |
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/libqmi/ https://gitlab.freedesktop.org/mobile-broadband/libqmi" |
52 |
+ |
53 |
+LICENSE="LGPL-2" |
54 |
+SLOT="0/5.7" # soname of libqmi-glib.so |
55 |
+IUSE="doc +mbim" |
56 |
+ |
57 |
+RDEPEND=">=dev-libs/glib-2.48 |
58 |
+ dev-libs/libgudev |
59 |
+ mbim? ( >=net-libs/libmbim-1.18.0 )" |
60 |
+DEPEND="${RDEPEND}" |
61 |
+BDEPEND=" |
62 |
+ virtual/pkgconfig |
63 |
+ doc? ( dev-util/gtk-doc )" |
64 |
+[[ ${PV} == "9999" ]] && BDEPEND+=" dev-util/gtk-doc" #469214 |
65 |
+ |
66 |
+src_prepare() { |
67 |
+ default |
68 |
+ [[ ${PV} == "9999" ]] && eautoreconf |
69 |
+} |
70 |
+ |
71 |
+src_configure() { |
72 |
+ econf \ |
73 |
+ --disable-Werror \ |
74 |
+ --disable-static \ |
75 |
+ $(use_enable mbim mbim-qmux) \ |
76 |
+ $(use_enable {,gtk-}doc) |
77 |
+} |
78 |
+ |
79 |
+src_install() { |
80 |
+ default |
81 |
+ find "${ED}" -name '*.la' -delete || die |
82 |
+} |
83 |
|
84 |
diff --git a/net-libs/libqmi/libqmi-9999.ebuild b/net-libs/libqmi/libqmi-9999.ebuild |
85 |
index 9ae85656240..51ac0339e07 100644 |
86 |
--- a/net-libs/libqmi/libqmi-9999.ebuild |
87 |
+++ b/net-libs/libqmi/libqmi-9999.ebuild |
88 |
@@ -1,46 +1,47 @@ |
89 |
-# Copyright 1999-2019 Gentoo Authors |
90 |
+# Copyright 1999-2021 Gentoo Authors |
91 |
# Distributed under the terms of the GNU General Public License v2 |
92 |
|
93 |
-EAPI="6" |
94 |
+EAPI=7 |
95 |
|
96 |
inherit multilib |
97 |
if [[ ${PV} == "9999" ]] ; then |
98 |
inherit git-r3 autotools |
99 |
- EGIT_REPO_URI="https://anongit.freedesktop.org/git/libqmi.git" |
100 |
+ EGIT_REPO_URI="https://gitlab.freedesktop.org/mobile-broadband/libqmi.git" |
101 |
else |
102 |
- KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" |
103 |
+ KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86" |
104 |
SRC_URI="https://www.freedesktop.org/software/libqmi/${P}.tar.xz" |
105 |
fi |
106 |
|
107 |
-DESCRIPTION="Qualcomm MSM (Mobile Station Modem) Interface (QMI) modem protocol helper library" |
108 |
-HOMEPAGE="https://cgit.freedesktop.org/libqmi/" |
109 |
+DESCRIPTION="Qualcomm MSM (Mobile Station Modem) Interface (QMI) modem protocol library" |
110 |
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/libqmi/ https://gitlab.freedesktop.org/mobile-broadband/libqmi" |
111 |
|
112 |
LICENSE="LGPL-2" |
113 |
-SLOT="0/5.1" # soname of libqmi-glib.so |
114 |
-IUSE="doc +mbim static-libs" |
115 |
+SLOT="0/5.7" # soname of libqmi-glib.so |
116 |
+IUSE="doc +mbim" |
117 |
|
118 |
-RDEPEND=">=dev-libs/glib-2.36 |
119 |
+RDEPEND=">=dev-libs/glib-2.48 |
120 |
dev-libs/libgudev |
121 |
- mbim? ( >=net-libs/libmbim-1.14.0 )" |
122 |
-DEPEND="${RDEPEND} |
123 |
- doc? ( dev-util/gtk-doc ) |
124 |
- virtual/pkgconfig" |
125 |
-[[ ${PV} == "9999" ]] && DEPEND+=" dev-util/gtk-doc" #469214 |
126 |
+ mbim? ( >=net-libs/libmbim-1.18.0 )" |
127 |
+DEPEND="${RDEPEND}" |
128 |
+BDEPEND=" |
129 |
+ virtual/pkgconfig |
130 |
+ doc? ( dev-util/gtk-doc )" |
131 |
+[[ ${PV} == "9999" ]] && BDEPEND+=" dev-util/gtk-doc" #469214 |
132 |
|
133 |
src_prepare() { |
134 |
default |
135 |
- [[ -e configure ]] || eautoreconf |
136 |
+ [[ ${PV} == "9999" ]] && eautoreconf |
137 |
} |
138 |
|
139 |
src_configure() { |
140 |
econf \ |
141 |
- --disable-more-warnings \ |
142 |
+ --disable-Werror \ |
143 |
+ --disable-static \ |
144 |
$(use_enable mbim mbim-qmux) \ |
145 |
- $(use_enable static{-libs,}) \ |
146 |
$(use_enable {,gtk-}doc) |
147 |
} |
148 |
|
149 |
src_install() { |
150 |
default |
151 |
- use static-libs || rm -f "${ED}/usr/$(get_libdir)/${PN}-glib.la" |
152 |
+ find "${ED}" -name '*.la' -delete || die |
153 |
} |