1 |
commit: 1abaa6b42ce8926c0901058affe6952ac3493bdc |
2 |
Author: Conrad Kostecki <conikost <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Sep 18 09:19:16 2020 +0000 |
4 |
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Sep 18 09:20:43 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1abaa6b4 |
7 |
|
8 |
dev-libs/libhid: drop old version |
9 |
|
10 |
Package-Manager: Portage-3.0.6, Repoman-3.0.1 |
11 |
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org> |
12 |
|
13 |
dev-libs/libhid/Manifest | 1 - |
14 |
dev-libs/libhid/files/libhid-0.2.16-gentoo.patch | 21 --------- |
15 |
dev-libs/libhid/files/libhid-0.2.16-libusb.patch | 25 ---------- |
16 |
dev-libs/libhid/files/libhid-0.2.16-swig.patch | 45 ------------------ |
17 |
dev-libs/libhid/libhid-0.2.16-r4.ebuild | 58 ------------------------ |
18 |
5 files changed, 150 deletions(-) |
19 |
|
20 |
diff --git a/dev-libs/libhid/Manifest b/dev-libs/libhid/Manifest |
21 |
index 74d879346aa..2b87fe1a61f 100644 |
22 |
--- a/dev-libs/libhid/Manifest |
23 |
+++ b/dev-libs/libhid/Manifest |
24 |
@@ -1,2 +1 @@ |
25 |
-DIST libhid-0.2.16.tar.gz 435245 BLAKE2B 9bd06b226e42ed0dbbf4395824636dbfaa796ce9c0170ad7af561741ec3f494b92ec09c548f3bc7c698a32aa78d82d4da4094231fbb810de5a67d3066947fd97 SHA512 3c9348f9d63e0e1577e983c65ff8e6acbaee0d5f43ecb29b7004654a7e9d14a94176aa029f259e0b8576fc30e8a9af6d1df34912dd582bfadc2b29f9b87eb52b |
26 |
DIST libhid-0.2.17.tar.gz 218501 BLAKE2B d7110dc1854829023531f1fd58fd6668f5d15dc3b98f9a6c799b3bc4725ded907de645921d17161a37cde8d9759ec371f96caf4fbb8d6f7bd480dfe2a352b399 SHA512 d82ef95871460e22e26f4fddb88edb83c262a8d0cd70beb7e65cacb443bfc21e12f868d50b8b4ea0ee00acce7c2d0f5bd06437b69cf89ef39dd118c21c73b977 |
27 |
|
28 |
diff --git a/dev-libs/libhid/files/libhid-0.2.16-gentoo.patch b/dev-libs/libhid/files/libhid-0.2.16-gentoo.patch |
29 |
deleted file mode 100644 |
30 |
index b5960af5d7d..00000000000 |
31 |
--- a/dev-libs/libhid/files/libhid-0.2.16-gentoo.patch |
32 |
+++ /dev/null |
33 |
@@ -1,21 +0,0 @@ |
34 |
---- a/configure.ac |
35 |
-+++ b/configure.ac |
36 |
-@@ -78,7 +78,6 @@ |
37 |
- AC_C_BIGENDIAN |
38 |
- AC_C_STRINGIZE |
39 |
- |
40 |
--MD_CONF_DEBUGGING |
41 |
- MD_CONF_COMPILER |
42 |
- AM_CONDITIONAL(OS_LINUX, test "$MD_OS" = "linux") |
43 |
- AM_CONDITIONAL(OS_BSD, test "$MD_OS" = "bsd") |
44 |
---- a/m4/md_check_gcc3.m4 |
45 |
-+++ b/m4/md_check_gcc3.m4 |
46 |
-@@ -1,7 +1,7 @@ |
47 |
- AC_DEFUN([MD_CHECK_GCC3], |
48 |
- [ |
49 |
- if [[ "$GCC" = "yes" ]]; then |
50 |
-- ver=$(gcc -dD -E - < /dev/null | sed -ne 's,.*__GNUC__ ,,p') |
51 |
-+ ver=$(${CC} -dD -E - < /dev/null | sed -ne 's,.*__GNUC__ ,,p') |
52 |
- case $ver in |
53 |
- *[[^[:digit:]]]*) |
54 |
- AC_MSG_WARN([Could not determine compiler version. Trying our luck...]) |
55 |
|
56 |
diff --git a/dev-libs/libhid/files/libhid-0.2.16-libusb.patch b/dev-libs/libhid/files/libhid-0.2.16-libusb.patch |
57 |
deleted file mode 100644 |
58 |
index aa49205ec75..00000000000 |
59 |
--- a/dev-libs/libhid/files/libhid-0.2.16-libusb.patch |
60 |
+++ /dev/null |
61 |
@@ -1,25 +0,0 @@ |
62 |
---- a/configure.ac |
63 |
-+++ b/configure.ac |
64 |
-@@ -59,6 +59,8 @@ |
65 |
- MD_CHECK_OS |
66 |
- |
67 |
- MD_CHECK_LIBUSB018B |
68 |
-+LIBS="$LIBS $LIBUSB_LIBS" |
69 |
-+INCLUDES="$INCLUDES $LIBUSB_CFLAGS" |
70 |
- |
71 |
- AC_PROG_CC |
72 |
- MD_CHECK_GCC3 |
73 |
-@@ -97,13 +99,6 @@ |
74 |
- |
75 |
- MD_CHECK_DOXYGEN |
76 |
- |
77 |
--MD_CONF_FLAGS( |
78 |
-- [], |
79 |
-- [$OS_CFLAGS $LIBUSB_CFLAGS], |
80 |
-- [], |
81 |
-- [$OS_LDFLAGS $LIBUSB_LIBS] |
82 |
--) |
83 |
-- |
84 |
- MD_CONF_DB2MAN |
85 |
- |
86 |
- ##### OUTPUT ################################################################# |
87 |
|
88 |
diff --git a/dev-libs/libhid/files/libhid-0.2.16-swig.patch b/dev-libs/libhid/files/libhid-0.2.16-swig.patch |
89 |
deleted file mode 100644 |
90 |
index ce5dae7481b..00000000000 |
91 |
--- a/dev-libs/libhid/files/libhid-0.2.16-swig.patch |
92 |
+++ /dev/null |
93 |
@@ -1,45 +0,0 @@ |
94 |
---- a/configure.ac |
95 |
-+++ b/configure.ac |
96 |
-@@ -88,8 +87,8 @@ |
97 |
- if test "${ac_cv_enable_swig}" = "no" ; then |
98 |
- AM_CONDITIONAL(HAVE_SWIG, false) |
99 |
- else |
100 |
-- AC_PROG_SWIG(1.3) |
101 |
-- AM_CONDITIONAL(HAVE_SWIG, "$SWIG" -version) |
102 |
-+ AC_CHECK_PROG(SWIG,swig,swig,false) |
103 |
-+ AM_CONDITIONAL(HAVE_SWIG, "$ac_cv_prog_SWIG" -version) |
104 |
- if test -z "${HAVE_SWIG_TRUE}" ; then |
105 |
- AM_PATH_PYTHON |
106 |
- SWIG_PYTHON |
107 |
---- a/swig/Makefile.am |
108 |
-+++ b/swig/Makefile.am |
109 |
-@@ -1,7 +1,7 @@ |
110 |
- # AM_MAKEFLAGS = @MAKEFLAGS@ |
111 |
- ACLOCAL_AMFLAGS = -I m4 |
112 |
- |
113 |
--AM_CPPFLAGS = $(SWIG_PYTHON_CPPFLAGS) -I$(top_srcdir)/include -I$(top_srcdir)/hidparser -DHID_INTERNAL -DSWIG |
114 |
-+AM_CPPFLAGS = $(SWIG_PYTHON_CPPFLAGS) -iquote$(top_srcdir)/include -I$(top_srcdir)/hidparser -DHID_INTERNAL -DSWIG |
115 |
- AM_CFLAGS = -fPIC -fno-strict-aliasing |
116 |
- AM_LDFLAGS = -shared ../src/libhid.la -lusb |
117 |
- |
118 |
-@@ -29,7 +29,7 @@ __init__.py: hid.py |
119 |
- |
120 |
- %_wrap.c %.py: %.i $(top_srcdir)/include/hid.h |
121 |
- $(SWIG) $(SWIG_PYTHON_OPT) $(SWIG_INC) -o $@ $< |
122 |
-- echo '#include <compiler.h>' > tmp.c |
123 |
-+ echo '#include "compiler.h"' > tmp.c |
124 |
- sed -e 's/PyObject \*self/& UNUSED/' \ |
125 |
- -e 's/int flags)/int flags UNUSED)/' < $@ >> tmp.c \ |
126 |
- && mv tmp.c $@ |
127 |
---- a/swig/hid.i |
128 |
-+++ b/swig/hid.i |
129 |
-@@ -1,7 +1,7 @@ |
130 |
- %module(docstring="libhid is a user-space USB HID access library built on libusb.", "threads"=1) hid |
131 |
- %{ |
132 |
--#include <compiler.h> |
133 |
--#include <hid.h> |
134 |
-+#include "compiler.h" |
135 |
-+#include "hid.h" |
136 |
- %} |
137 |
- |
138 |
- %feature("autodoc","0"); |
139 |
|
140 |
diff --git a/dev-libs/libhid/libhid-0.2.16-r4.ebuild b/dev-libs/libhid/libhid-0.2.16-r4.ebuild |
141 |
deleted file mode 100644 |
142 |
index 4f67990368a..00000000000 |
143 |
--- a/dev-libs/libhid/libhid-0.2.16-r4.ebuild |
144 |
+++ /dev/null |
145 |
@@ -1,58 +0,0 @@ |
146 |
-# Copyright 1999-2020 Gentoo Authors |
147 |
-# Distributed under the terms of the GNU General Public License v2 |
148 |
- |
149 |
-EAPI=5 |
150 |
-PYTHON_COMPAT=( python2_7 ) |
151 |
-inherit autotools eutils ltprune python-single-r1 |
152 |
- |
153 |
-DESCRIPTION="Provides a generic and flexible way to access and interact with USB HID devices" |
154 |
-HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage" |
155 |
-SRC_URI="https://alioth-archive.debian.org/releases/${PN}/${PN}/${PV}/${P}.tar.gz" |
156 |
- |
157 |
-LICENSE="GPL-2" |
158 |
-SLOT="0" |
159 |
-KEYWORDS="amd64 ppc ppc64 x86" |
160 |
-IUSE="doc python static-libs" |
161 |
- |
162 |
-RDEPEND=" |
163 |
- python? ( ${PYTHON_DEPS} ) |
164 |
- virtual/libusb:0 |
165 |
-" |
166 |
- |
167 |
-DEPEND=" |
168 |
- ${RDEPEND} |
169 |
- doc? ( app-doc/doxygen ) |
170 |
- python? ( dev-lang/swig ) |
171 |
-" |
172 |
- |
173 |
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" |
174 |
- |
175 |
-src_prepare() { |
176 |
- epatch "${FILESDIR}"/${P}-gentoo.patch |
177 |
- epatch "${FILESDIR}"/${P}-swig.patch |
178 |
- epatch "${FILESDIR}"/${P}-libusb.patch |
179 |
- |
180 |
- eautoreconf |
181 |
-} |
182 |
- |
183 |
-src_configure() { |
184 |
- export OS_LDFLAGS="${LDFLAGS}" |
185 |
- use python && export PYTHON_LDFLAGS=$(${EPYTHON}-config --ldflags) |
186 |
- |
187 |
- econf \ |
188 |
- $(use_enable python swig) \ |
189 |
- $(use_enable static-libs static) \ |
190 |
- $(use_with doc doxygen) \ |
191 |
- --disable-debug \ |
192 |
- --disable-werror |
193 |
-} |
194 |
- |
195 |
-DOCS=( AUTHORS ChangeLog NEWS README README.licence TODO ) |
196 |
- |
197 |
-src_install() { |
198 |
- default |
199 |
- |
200 |
- use doc && dohtml -r doc/html/* |
201 |
- |
202 |
- prune_libtool_files |
203 |
-} |