From 83bebc90c0368e697557e78df9bb6d1017e3b15f Mon Sep 17 00:00:00 2001 From: "Volkmar W. Pogatzki" Date: Sat, 6 Jun 2020 16:48:57 +0200 Subject: [PATCH 1/4] net-wireless/eiwd: 20200416 (Version 1.7) Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: Volkmar W. Pogatzki --- net-wireless/eiwd/eiwd-20200416.ebuild | 56 ++++++++++++++++++++++++++ net-wireless/eiwd/eiwd-9999.ebuild | 1 + net-wireless/eiwd/files/20200416.patch | 15 +++++++ 3 files changed, 72 insertions(+) create mode 100644 net-wireless/eiwd/eiwd-20200416.ebuild create mode 100644 net-wireless/eiwd/files/20200416.patch diff --git a/net-wireless/eiwd/eiwd-20200416.ebuild b/net-wireless/eiwd/eiwd-20200416.ebuild new file mode 100644 index 0000000000..1453d6a051 --- /dev/null +++ b/net-wireless/eiwd/eiwd-20200416.ebuild @@ -0,0 +1,56 @@ +# Copyright 2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools flag-o-matic git-r3 + +MY_PV="$(ver_rs 2 '-')" +MY_P="${PN}-${MY_PV}" + +DESCRIPTION="iwd without dbus" +HOMEPAGE="https://github.com/dylanaraps/eiwd" +EGIT_REPO_URI="https://github.com/dylanaraps/eiwd.git" +# Version 1.7 Apr 16, 2020 +EGIT_COMMIT="7b5545a" + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="" +IUSE="+resolvconf +system-ell" + +DEPEND="system-ell? ( >=dev-libs/ell-0.31 )" +RDEPEND="${DEPEND} + resolvconf? ( || ( net-dns/openresolv net-misc/dhcpcd ) ) + !net-wireless/iwd + net-wireless/wireless-regdb" +BDEPEND="virtual/pkgconfig" + +S="${WORKDIR}/${MY_P}" + +PATCHES=( "${FILESDIR}"/20200416.patch ) + +src_prepare() { + default + eautoreconf +} + +src_configure() { + append-cflags "-fsigned-char" + local myeconfargs=( + --sysconfdir="${EPREFIX}"/etc/iwd --localstatedir="${EPREFIX}"/var + --disable-dbus + $(use_enable system-ell external-ell) + ) + econf "${myeconfargs[@]}" +} + +src_install() { + default + keepdir /var/lib/iwd + newinitd "${FILESDIR}"/iwd.initd iwd + if use resolvconf ; then + insinto /etc/iwd/ + doins "${FILESDIR}"/main.conf + fi +} diff --git a/net-wireless/eiwd/eiwd-9999.ebuild b/net-wireless/eiwd/eiwd-9999.ebuild index 78157c427b..af4ac27505 100644 --- a/net-wireless/eiwd/eiwd-9999.ebuild +++ b/net-wireless/eiwd/eiwd-9999.ebuild @@ -11,6 +11,7 @@ MY_P="${PN}-${MY_PV}" DESCRIPTION="iwd without dbus" HOMEPAGE="https://github.com/dylanaraps/eiwd" EGIT_REPO_URI="https://github.com/dylanaraps/eiwd.git" +EGIT_COMMIT="7b5545a" LICENSE="LGPL-2.1" SLOT="0" diff --git a/net-wireless/eiwd/files/20200416.patch b/net-wireless/eiwd/files/20200416.patch new file mode 100644 index 0000000000..e559a21c27 --- /dev/null +++ b/net-wireless/eiwd/files/20200416.patch @@ -0,0 +1,15 @@ +# Good for EGIT_COMMIT="7b5545a" which is Release 1.7 +# https://github.com/dylanaraps/eiwd/commit/39ef23ea037fe97c060fafbcbd25af684ae0c55e + +diff --git a/src/main.c b/src/main.c +index 549f1bae..2ab44355 100644 +--- a/src/main.c ++++ b/src/main.c +@@ -49,6 +49,7 @@ + #include "src/backtrace.h" + + static struct l_genl *genl; ++static struct l_netlink *rtnl; + static struct l_settings *iwd_config; + static struct l_timeout *timeout; + static const char *interfaces; From 170c23b4e1f711bfcaa9104a373926ab169f797a Mon Sep 17 00:00:00 2001 From: "Volkmar W. Pogatzki" Date: Sat, 6 Jun 2020 18:55:11 +0200 Subject: [PATCH 2/4] net-wireless/eiwd: iwmon.1 patch When upstream then remove it Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: Volkmar W. Pogatzki --- net-wireless/eiwd/eiwd-20200416.ebuild | 4 +- net-wireless/eiwd/files/iwmon.patch | 62 ++++++++++++++++++++++++++ 2 files changed, 65 insertions(+), 1 deletion(-) create mode 100644 net-wireless/eiwd/files/iwmon.patch diff --git a/net-wireless/eiwd/eiwd-20200416.ebuild b/net-wireless/eiwd/eiwd-20200416.ebuild index 1453d6a051..96457f79f7 100644 --- a/net-wireless/eiwd/eiwd-20200416.ebuild +++ b/net-wireless/eiwd/eiwd-20200416.ebuild @@ -28,7 +28,9 @@ BDEPEND="virtual/pkgconfig" S="${WORKDIR}/${MY_P}" -PATCHES=( "${FILESDIR}"/20200416.patch ) +PATCHES=( + "${FILESDIR}"/20200416.patch + "${FILESDIR}"/iwmon.patch ) src_prepare() { default diff --git a/net-wireless/eiwd/files/iwmon.patch b/net-wireless/eiwd/files/iwmon.patch new file mode 100644 index 0000000000..5be901e057 --- /dev/null +++ b/net-wireless/eiwd/files/iwmon.patch @@ -0,0 +1,62 @@ +diff --git a/monitor/iwmon.1 b/monitor/iwmon.1 +new file mode 100644 +index 00000000..433ce18b +--- /dev/null ++++ b/monitor/iwmon.1 +@@ -0,0 +1,56 @@ ++.\" Man page generated from reStructuredText. ++. ++.TH IWMON 1 "22 September 2019" "iwmon" "Linux Connectivity" ++.SH NAME ++iwmon \- Internet wireless monitor utility ++. ++.nr rst2man-indent-level 0 ++. ++.de1 rstReportMargin ++\\$1 \\n[an-margin] ++level \\n[rst2man-indent-level] ++level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] ++- ++\\n[rst2man-indent0] ++\\n[rst2man-indent1] ++\\n[rst2man-indent2] ++.. ++.de1 INDENT ++.\" .rstReportMargin pre: ++. RS \\$1 ++. nr rst2man-indent\\n[rst2man-indent-level] \\n[an-margin] ++. nr rst2man-indent-level +1 ++.\" .rstReportMargin post: ++.. ++.de UNINDENT ++. RE ++.\" indent \\n[an-margin] ++.\" old: \\n[rst2man-indent\\n[rst2man-indent-level]] ++.nr rst2man-indent-level -1 ++.\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] ++.in \\n[rst2man-indent\\n[rst2man-indent-level]]u ++.. ++.SH SYNOPSIS ++.sp ++\fBiwmon\fP [\fIoptions\fP ...] ++.SH DESCRIPTION ++.sp ++Tool for monitoring and logging of Wireless control messages from nl80211. ++.SH OPTIONS ++.INDENT 0.0 ++.TP ++.B \-\-version\fP,\fB \-v ++Show version number and exit. ++.TP ++.B \-\-help\fP,\fB \-h ++Show help message and exit. ++.UNINDENT ++.SH SEE ALSO ++.sp ++iwd(8) ++.SH AUTHOR ++Marcel Holtmann ++.SH COPYRIGHT ++2013-2019 Intel Corporation ++.\" Generated by docutils manpage writer. ++. From 1092d460e710305277a7a62a8a9f78ad9b97039a Mon Sep 17 00:00:00 2001 From: Oliver Freyermuth Date: Sat, 6 Jun 2020 21:59:51 +0200 Subject: [PATCH 3/4] x11-misc/gromit-mpx: New package. Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: Oliver Freyermuth --- x11-misc/gromit-mpx/Manifest | 1 + x11-misc/gromit-mpx/gromit-mpx-1.3.ebuild | 37 ++++++++++++++++++++++ x11-misc/gromit-mpx/gromit-mpx-9999.ebuild | 37 ++++++++++++++++++++++ x11-misc/gromit-mpx/metadata.xml | 12 +++++++ 4 files changed, 87 insertions(+) create mode 100644 x11-misc/gromit-mpx/Manifest create mode 100644 x11-misc/gromit-mpx/gromit-mpx-1.3.ebuild create mode 100644 x11-misc/gromit-mpx/gromit-mpx-9999.ebuild create mode 100644 x11-misc/gromit-mpx/metadata.xml diff --git a/x11-misc/gromit-mpx/Manifest b/x11-misc/gromit-mpx/Manifest new file mode 100644 index 0000000000..f5ab9d460e --- /dev/null +++ b/x11-misc/gromit-mpx/Manifest @@ -0,0 +1 @@ +DIST gromit-mpx-1.3.tar.gz 56835 BLAKE2B 900df398b22f0c818045b905eff3e2c63ad8fea3a3a03fab3cefea0f4a956a5633a5653cbe56a1f9a7f1fd2b5f9eebecfe8ce4a801c565d958cc372cfae22708 SHA512 7819c0d7684b05c812a476504df221edf005cc854c9184218cffda5c3692d865d358610d8541eb8ebd257e3d471e41d959afbca2aa118329826cfce99a13384f diff --git a/x11-misc/gromit-mpx/gromit-mpx-1.3.ebuild b/x11-misc/gromit-mpx/gromit-mpx-1.3.ebuild new file mode 100644 index 0000000000..8f419cba90 --- /dev/null +++ b/x11-misc/gromit-mpx/gromit-mpx-1.3.ebuild @@ -0,0 +1,37 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake-utils + +DESCRIPTION="Gromit-MPX is a multi-pointer GTK3 port of the Gromit desktop annotation tool." +HOMEPAGE="https://github.com/bk138/${PN}" + +if [[ ${PV} == *9999* ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/bk138/${PN}.git" + KEYWORDS="" +else + SRC_URI="https://github.com/bk138/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~x86" +fi + +SLOT="0" +LICENSE="GPL-2" + +RDEPEND=" + x11-libs/gtk+:3 + dev-libs/libappindicator:3 + x11-libs/libX11 + >=x11-apps/xinput-1.3 +" +DEPEND="${RDEPEND}" + +src_configure() { + local mycmakeargs=( + -DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}"/etc + ) + + cmake-utils_src_configure +} diff --git a/x11-misc/gromit-mpx/gromit-mpx-9999.ebuild b/x11-misc/gromit-mpx/gromit-mpx-9999.ebuild new file mode 100644 index 0000000000..8f419cba90 --- /dev/null +++ b/x11-misc/gromit-mpx/gromit-mpx-9999.ebuild @@ -0,0 +1,37 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake-utils + +DESCRIPTION="Gromit-MPX is a multi-pointer GTK3 port of the Gromit desktop annotation tool." +HOMEPAGE="https://github.com/bk138/${PN}" + +if [[ ${PV} == *9999* ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/bk138/${PN}.git" + KEYWORDS="" +else + SRC_URI="https://github.com/bk138/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~x86" +fi + +SLOT="0" +LICENSE="GPL-2" + +RDEPEND=" + x11-libs/gtk+:3 + dev-libs/libappindicator:3 + x11-libs/libX11 + >=x11-apps/xinput-1.3 +" +DEPEND="${RDEPEND}" + +src_configure() { + local mycmakeargs=( + -DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}"/etc + ) + + cmake-utils_src_configure +} diff --git a/x11-misc/gromit-mpx/metadata.xml b/x11-misc/gromit-mpx/metadata.xml new file mode 100644 index 0000000000..95c9cae28b --- /dev/null +++ b/x11-misc/gromit-mpx/metadata.xml @@ -0,0 +1,12 @@ + + + + + o.freyermuth@googlemail.com + Oliver Freyermuth + + + https://github.com/bk138/gromit-mpx/issues + bk138/gromit-mpx + + From fb500663ef46406157292cc73009edf7d92d2035 Mon Sep 17 00:00:00 2001 From: Andrew Ammerlaan Date: Sun, 7 Jun 2020 09:56:44 +0200 Subject: [PATCH 4/4] x11-misc/gromit-mpx: minor changes cmake-utils will be deprecated in favor of cmake eclass in the future Package-Manager: Portage-2.3.100, Repoman-2.3.22 Signed-off-by: Andrew Ammerlaan --- x11-misc/gromit-mpx/gromit-mpx-1.3.ebuild | 6 +++--- x11-misc/gromit-mpx/gromit-mpx-9999.ebuild | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/x11-misc/gromit-mpx/gromit-mpx-1.3.ebuild b/x11-misc/gromit-mpx/gromit-mpx-1.3.ebuild index 8f419cba90..5c18ed6ec3 100644 --- a/x11-misc/gromit-mpx/gromit-mpx-1.3.ebuild +++ b/x11-misc/gromit-mpx/gromit-mpx-1.3.ebuild @@ -3,9 +3,9 @@ EAPI=7 -inherit cmake-utils +inherit cmake -DESCRIPTION="Gromit-MPX is a multi-pointer GTK3 port of the Gromit desktop annotation tool." +DESCRIPTION="Gromit-MPX is a multi-pointer GTK3 port of the Gromit desktop annotation tool" HOMEPAGE="https://github.com/bk138/${PN}" if [[ ${PV} == *9999* ]]; then @@ -33,5 +33,5 @@ src_configure() { -DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}"/etc ) - cmake-utils_src_configure + cmake_src_configure } diff --git a/x11-misc/gromit-mpx/gromit-mpx-9999.ebuild b/x11-misc/gromit-mpx/gromit-mpx-9999.ebuild index 8f419cba90..5c18ed6ec3 100644 --- a/x11-misc/gromit-mpx/gromit-mpx-9999.ebuild +++ b/x11-misc/gromit-mpx/gromit-mpx-9999.ebuild @@ -3,9 +3,9 @@ EAPI=7 -inherit cmake-utils +inherit cmake -DESCRIPTION="Gromit-MPX is a multi-pointer GTK3 port of the Gromit desktop annotation tool." +DESCRIPTION="Gromit-MPX is a multi-pointer GTK3 port of the Gromit desktop annotation tool" HOMEPAGE="https://github.com/bk138/${PN}" if [[ ${PV} == *9999* ]]; then @@ -33,5 +33,5 @@ src_configure() { -DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}"/etc ) - cmake-utils_src_configure + cmake_src_configure }