* [gentoo-commits] repo/gentoo:master commit in: dev-libs/libhid/files/, dev-libs/libhid/
@ 2020-08-12 22:54 Conrad Kostecki
0 siblings, 0 replies; 2+ messages in thread
From: Conrad Kostecki @ 2020-08-12 22:54 UTC (permalink / raw
To: gentoo-commits
commit: 3dc25d8aa576b305202ed8b1bc572250ac566c7c
Author: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 12 22:52:23 2020 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Wed Aug 12 22:53:27 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3dc25d8a
dev-libs/libhid: bump to version 0.2.17
As the python bindings are python2 only, they have been disabled.
The packages, which are using libhid don't need it anyway.
Closes: https://bugs.gentoo.org/718704
Closes: https://bugs.gentoo.org/735292
Package-Manager: Portage-3.0.1, Repoman-2.3.23
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
dev-libs/libhid/Manifest | 1 +
.../libhid/files/libhid-0.2.17-configure.patch | 36 +++++++++++++
dev-libs/libhid/files/libhid-0.2.17-man.patch | 11 ++++
dev-libs/libhid/libhid-0.2.17.ebuild | 61 ++++++++++++++++++++++
dev-libs/libhid/metadata.xml | 17 +++---
5 files changed, 119 insertions(+), 7 deletions(-)
diff --git a/dev-libs/libhid/Manifest b/dev-libs/libhid/Manifest
index 007ca6de453..74d879346aa 100644
--- a/dev-libs/libhid/Manifest
+++ b/dev-libs/libhid/Manifest
@@ -1 +1,2 @@
DIST libhid-0.2.16.tar.gz 435245 BLAKE2B 9bd06b226e42ed0dbbf4395824636dbfaa796ce9c0170ad7af561741ec3f494b92ec09c548f3bc7c698a32aa78d82d4da4094231fbb810de5a67d3066947fd97 SHA512 3c9348f9d63e0e1577e983c65ff8e6acbaee0d5f43ecb29b7004654a7e9d14a94176aa029f259e0b8576fc30e8a9af6d1df34912dd582bfadc2b29f9b87eb52b
+DIST libhid-0.2.17.tar.gz 218501 BLAKE2B d7110dc1854829023531f1fd58fd6668f5d15dc3b98f9a6c799b3bc4725ded907de645921d17161a37cde8d9759ec371f96caf4fbb8d6f7bd480dfe2a352b399 SHA512 d82ef95871460e22e26f4fddb88edb83c262a8d0cd70beb7e65cacb443bfc21e12f868d50b8b4ea0ee00acce7c2d0f5bd06437b69cf89ef39dd118c21c73b977
diff --git a/dev-libs/libhid/files/libhid-0.2.17-configure.patch b/dev-libs/libhid/files/libhid-0.2.17-configure.patch
new file mode 100644
index 00000000000..5318aa2d89f
--- /dev/null
+++ b/dev-libs/libhid/files/libhid-0.2.17-configure.patch
@@ -0,0 +1,36 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -59,9 +59,10 @@
+ MD_CHECK_OS
+
+ MD_CHECK_LIBUSB018B
++LIBS="$LIBS $LIBUSB_LIBS"
++INCLUDES="$INCLUDES $LIBUSB_CFLAGS"
+
+ AC_PROG_CC
+-MD_CHECK_GCC3
+
+ dnl MD_CONF_DISTCC
+ dnl MD_CONF_CCACHE
+@@ -78,7 +79,6 @@
+ AC_C_BIGENDIAN
+ AC_C_STRINGIZE
+
+-MD_CONF_DEBUGGING
+ MD_CONF_COMPILER
+ AM_CONDITIONAL(OS_LINUX, test "$MD_OS" = "linux")
+ AM_CONDITIONAL(OS_BSD, test "$MD_OS" = "bsd")
+@@ -98,13 +98,6 @@
+
+ MD_CHECK_DOXYGEN
+
+-MD_CONF_FLAGS(
+- [],
+- [$OS_CFLAGS $LIBUSB_CFLAGS],
+- [],
+- [$OS_LDFLAGS $LIBUSB_LIBS]
+-)
+-
+ MD_CONF_DB2MAN
+
+ ##### OUTPUT #################################################################
diff --git a/dev-libs/libhid/files/libhid-0.2.17-man.patch b/dev-libs/libhid/files/libhid-0.2.17-man.patch
new file mode 100644
index 00000000000..4fe5677c107
--- /dev/null
+++ b/dev-libs/libhid/files/libhid-0.2.17-man.patch
@@ -0,0 +1,11 @@
+--- a/m4/md_conf_db2man.m4
++++ b/m4/md_conf_db2man.m4
+@@ -3,7 +3,7 @@
+ for file in \
+ /usr/share/sgml/docbook/stylesheet/xsl/nwalsh/manpages/docbook.xsl \
+ /usr/share/sgml/docbook/stylesheet/xsl/nwalsh/*/manpages/docbook.xsl \
+- /usr/share/{x,sg}ml/docbook/xsl-stylesheets-*/manpages/docbook.xsl \
++ /usr/share/{x,sg}ml/docbook/xsl-stylesheets*/manpages/docbook.xsl \
+ /sw/share/xml/xsl/docbook-xsl/manpages/docbook.xsl; do
+
+ test -r $file && db2man_file=$file
diff --git a/dev-libs/libhid/libhid-0.2.17.ebuild b/dev-libs/libhid/libhid-0.2.17.ebuild
new file mode 100644
index 00000000000..bfc00287f46
--- /dev/null
+++ b/dev-libs/libhid/libhid-0.2.17.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="Provides a generic and flexible way to access and interact with USB HID devices"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
+SRC_URI="https://dev.gentoo.org/~conikost/files/${P}.tar.gz"
+
+LICENSE="GPL-2 GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="doc"
+
+RDEPEND="virtual/libusb:0="
+
+DEPEND="${RDEPEND}"
+
+BDEPEND="
+ app-text/docbook-xsl-stylesheets
+ dev-libs/libxslt
+ doc? ( app-doc/doxygen )
+"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-configure.patch
+ "${FILESDIR}"/${P}-man.patch
+)
+
+src_prepare() {
+ default
+
+ eautoreconf
+}
+
+src_configure() {
+ export OS_LDFLAGS="${LDFLAGS}"
+
+ myeconfargs=(
+ "--disable-static"
+ "--disable-swig"
+ "--disable-warnings"
+ "--disable-werror"
+ "$(use_with doc doxygen)"
+ )
+
+ econf ${myeconfargs[@]}
+}
+
+src_install() {
+ default
+
+ if use doc; then
+ docinto html
+ dodoc -r doc/html/.
+ fi
+
+ find "${D}" -name '*.la' -type f -delete || die
+}
diff --git a/dev-libs/libhid/metadata.xml b/dev-libs/libhid/metadata.xml
index 8ab79897699..8e5545cdf11 100644
--- a/dev-libs/libhid/metadata.xml
+++ b/dev-libs/libhid/metadata.xml
@@ -1,11 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<!-- maintainer-needed -->
-<longdescription lang="en">
-libhid provides a generic and flexible way to access and interact with USB
-HID devices, much like libusb does for plain USB devices. It is based on
-libusb, thus it requires no HID support in the kernel and provides means to
-take control over a device even if the kernel governs it.
-</longdescription>
+ <maintainer type="person">
+ <email>conikost@gentoo.org</email>
+ <name>Conrad Kostecki</name>
+ </maintainer>
+ <longdescription>
+ Libhid provides a generic and flexible way to access and interact with
+ USB HID devices, much like libusb does for plain USB devices.
+ It is based on libusb, thus it requires no HID support in the kernel
+ and provides means to take control over a device even if the kernel governs it.
+ </longdescription>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/libhid/files/, dev-libs/libhid/
@ 2020-09-18 9:20 Conrad Kostecki
0 siblings, 0 replies; 2+ messages in thread
From: Conrad Kostecki @ 2020-09-18 9:20 UTC (permalink / raw
To: gentoo-commits
commit: 1abaa6b42ce8926c0901058affe6952ac3493bdc
Author: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 18 09:19:16 2020 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Fri Sep 18 09:20:43 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1abaa6b4
dev-libs/libhid: drop old version
Package-Manager: Portage-3.0.6, Repoman-3.0.1
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
dev-libs/libhid/Manifest | 1 -
dev-libs/libhid/files/libhid-0.2.16-gentoo.patch | 21 ---------
dev-libs/libhid/files/libhid-0.2.16-libusb.patch | 25 ----------
dev-libs/libhid/files/libhid-0.2.16-swig.patch | 45 ------------------
dev-libs/libhid/libhid-0.2.16-r4.ebuild | 58 ------------------------
5 files changed, 150 deletions(-)
diff --git a/dev-libs/libhid/Manifest b/dev-libs/libhid/Manifest
index 74d879346aa..2b87fe1a61f 100644
--- a/dev-libs/libhid/Manifest
+++ b/dev-libs/libhid/Manifest
@@ -1,2 +1 @@
-DIST libhid-0.2.16.tar.gz 435245 BLAKE2B 9bd06b226e42ed0dbbf4395824636dbfaa796ce9c0170ad7af561741ec3f494b92ec09c548f3bc7c698a32aa78d82d4da4094231fbb810de5a67d3066947fd97 SHA512 3c9348f9d63e0e1577e983c65ff8e6acbaee0d5f43ecb29b7004654a7e9d14a94176aa029f259e0b8576fc30e8a9af6d1df34912dd582bfadc2b29f9b87eb52b
DIST libhid-0.2.17.tar.gz 218501 BLAKE2B d7110dc1854829023531f1fd58fd6668f5d15dc3b98f9a6c799b3bc4725ded907de645921d17161a37cde8d9759ec371f96caf4fbb8d6f7bd480dfe2a352b399 SHA512 d82ef95871460e22e26f4fddb88edb83c262a8d0cd70beb7e65cacb443bfc21e12f868d50b8b4ea0ee00acce7c2d0f5bd06437b69cf89ef39dd118c21c73b977
diff --git a/dev-libs/libhid/files/libhid-0.2.16-gentoo.patch b/dev-libs/libhid/files/libhid-0.2.16-gentoo.patch
deleted file mode 100644
index b5960af5d7d..00000000000
--- a/dev-libs/libhid/files/libhid-0.2.16-gentoo.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -78,7 +78,6 @@
- AC_C_BIGENDIAN
- AC_C_STRINGIZE
-
--MD_CONF_DEBUGGING
- MD_CONF_COMPILER
- AM_CONDITIONAL(OS_LINUX, test "$MD_OS" = "linux")
- AM_CONDITIONAL(OS_BSD, test "$MD_OS" = "bsd")
---- a/m4/md_check_gcc3.m4
-+++ b/m4/md_check_gcc3.m4
-@@ -1,7 +1,7 @@
- AC_DEFUN([MD_CHECK_GCC3],
- [
- if [[ "$GCC" = "yes" ]]; then
-- ver=$(gcc -dD -E - < /dev/null | sed -ne 's,.*__GNUC__ ,,p')
-+ ver=$(${CC} -dD -E - < /dev/null | sed -ne 's,.*__GNUC__ ,,p')
- case $ver in
- *[[^[:digit:]]]*)
- AC_MSG_WARN([Could not determine compiler version. Trying our luck...])
diff --git a/dev-libs/libhid/files/libhid-0.2.16-libusb.patch b/dev-libs/libhid/files/libhid-0.2.16-libusb.patch
deleted file mode 100644
index aa49205ec75..00000000000
--- a/dev-libs/libhid/files/libhid-0.2.16-libusb.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -59,6 +59,8 @@
- MD_CHECK_OS
-
- MD_CHECK_LIBUSB018B
-+LIBS="$LIBS $LIBUSB_LIBS"
-+INCLUDES="$INCLUDES $LIBUSB_CFLAGS"
-
- AC_PROG_CC
- MD_CHECK_GCC3
-@@ -97,13 +99,6 @@
-
- MD_CHECK_DOXYGEN
-
--MD_CONF_FLAGS(
-- [],
-- [$OS_CFLAGS $LIBUSB_CFLAGS],
-- [],
-- [$OS_LDFLAGS $LIBUSB_LIBS]
--)
--
- MD_CONF_DB2MAN
-
- ##### OUTPUT #################################################################
diff --git a/dev-libs/libhid/files/libhid-0.2.16-swig.patch b/dev-libs/libhid/files/libhid-0.2.16-swig.patch
deleted file mode 100644
index ce5dae7481b..00000000000
--- a/dev-libs/libhid/files/libhid-0.2.16-swig.patch
+++ /dev/null
@@ -1,45 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -88,8 +87,8 @@
- if test "${ac_cv_enable_swig}" = "no" ; then
- AM_CONDITIONAL(HAVE_SWIG, false)
- else
-- AC_PROG_SWIG(1.3)
-- AM_CONDITIONAL(HAVE_SWIG, "$SWIG" -version)
-+ AC_CHECK_PROG(SWIG,swig,swig,false)
-+ AM_CONDITIONAL(HAVE_SWIG, "$ac_cv_prog_SWIG" -version)
- if test -z "${HAVE_SWIG_TRUE}" ; then
- AM_PATH_PYTHON
- SWIG_PYTHON
---- a/swig/Makefile.am
-+++ b/swig/Makefile.am
-@@ -1,7 +1,7 @@
- # AM_MAKEFLAGS = @MAKEFLAGS@
- ACLOCAL_AMFLAGS = -I m4
-
--AM_CPPFLAGS = $(SWIG_PYTHON_CPPFLAGS) -I$(top_srcdir)/include -I$(top_srcdir)/hidparser -DHID_INTERNAL -DSWIG
-+AM_CPPFLAGS = $(SWIG_PYTHON_CPPFLAGS) -iquote$(top_srcdir)/include -I$(top_srcdir)/hidparser -DHID_INTERNAL -DSWIG
- AM_CFLAGS = -fPIC -fno-strict-aliasing
- AM_LDFLAGS = -shared ../src/libhid.la -lusb
-
-@@ -29,7 +29,7 @@ __init__.py: hid.py
-
- %_wrap.c %.py: %.i $(top_srcdir)/include/hid.h
- $(SWIG) $(SWIG_PYTHON_OPT) $(SWIG_INC) -o $@ $<
-- echo '#include <compiler.h>' > tmp.c
-+ echo '#include "compiler.h"' > tmp.c
- sed -e 's/PyObject \*self/& UNUSED/' \
- -e 's/int flags)/int flags UNUSED)/' < $@ >> tmp.c \
- && mv tmp.c $@
---- a/swig/hid.i
-+++ b/swig/hid.i
-@@ -1,7 +1,7 @@
- %module(docstring="libhid is a user-space USB HID access library built on libusb.", "threads"=1) hid
- %{
--#include <compiler.h>
--#include <hid.h>
-+#include "compiler.h"
-+#include "hid.h"
- %}
-
- %feature("autodoc","0");
diff --git a/dev-libs/libhid/libhid-0.2.16-r4.ebuild b/dev-libs/libhid/libhid-0.2.16-r4.ebuild
deleted file mode 100644
index 4f67990368a..00000000000
--- a/dev-libs/libhid/libhid-0.2.16-r4.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-inherit autotools eutils ltprune python-single-r1
-
-DESCRIPTION="Provides a generic and flexible way to access and interact with USB HID devices"
-HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
-SRC_URI="https://alioth-archive.debian.org/releases/${PN}/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE="doc python static-libs"
-
-RDEPEND="
- python? ( ${PYTHON_DEPS} )
- virtual/libusb:0
-"
-
-DEPEND="
- ${RDEPEND}
- doc? ( app-doc/doxygen )
- python? ( dev-lang/swig )
-"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-gentoo.patch
- epatch "${FILESDIR}"/${P}-swig.patch
- epatch "${FILESDIR}"/${P}-libusb.patch
-
- eautoreconf
-}
-
-src_configure() {
- export OS_LDFLAGS="${LDFLAGS}"
- use python && export PYTHON_LDFLAGS=$(${EPYTHON}-config --ldflags)
-
- econf \
- $(use_enable python swig) \
- $(use_enable static-libs static) \
- $(use_with doc doxygen) \
- --disable-debug \
- --disable-werror
-}
-
-DOCS=( AUTHORS ChangeLog NEWS README README.licence TODO )
-
-src_install() {
- default
-
- use doc && dohtml -r doc/html/*
-
- prune_libtool_files
-}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-09-18 9:20 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-08-12 22:54 [gentoo-commits] repo/gentoo:master commit in: dev-libs/libhid/files/, dev-libs/libhid/ Conrad Kostecki
-- strict thread matches above, loose matches on Subject: below --
2020-09-18 9:20 Conrad Kostecki
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox