[gentoo-commits] repo/gentoo:master commit in: app-misc/tek/, profiles/, app-misc/tek/files/
commit: dd9bd6023ed09cdc583820eb987a4836f2459348
Author: Arthur Zamarin gentoo org>
AuthorDate: Sat Apr 27 14:57:55 2024 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Sat Apr 27 14:57:55 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dd9bd602
app-misc/tek: treeclean
Closes: https://bugs.gentoo.org/895222
Bug: https://bugs.gentoo.org/854774
Signed-off-by: Arthur Zamarin gentoo.org>
app-misc/tek/Manifest | 1 -
app-misc/tek/files/tek-1.3.0-makefile.patch | 25 --
app-misc/tek/metadata.xml | 8 --
app-misc/tek/tek-1.3.0.ebuild | 40 -
profiles/package.mask | 6 -
5 files changed, 80 deletions(-)
diff --git a/app-misc/tek/Manifest b/app-misc/tek/Manifest
deleted file mode 100644
index d75eaf0b8ea5..
--- a/app-misc/tek/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST tek-1.3.0.tar.gz 99399 BLAKE2B
191fec7992ea4b79aed5833012cb22ac3ad399eced53e74467139aa05e2dfda08af220b35cb191f5f1bf706186a8460f3d80196599f43654d5de05e36b5df84b
SHA512
20e3e704db71a7c0fb7a7791c8ebbdb348d370b06bea39f2ee77cae72ac4b71873884c6ec58712c9bf85d7d0785310f33189ce977a77b970951e39c8803d28fd
diff --git a/app-misc/tek/files/tek-1.3.0-makefile.patch
b/app-misc/tek/files/tek-1.3.0-makefile.patch
deleted file mode 100644
index b04985235e49..
--- a/app-misc/tek/files/tek-1.3.0-makefile.patch
+++ /dev/null
@@ -1,25 +0,0 @@
a/Makefile
-+++ b/Makefile
-@@ -15,11 +15,10 @@
-
- SOURCES=gui.cpp ihex.cpp usb.cpp
-
--CXXFLAGS=-O2 -std=c++11
-+CXXFLAGS+=-std=c++11
-
- tek.lin: $(patsubst %.cpp,%-lin.o,$(SOURCES))
-- $(LIN_CXX) $(CXXFLAGS) $^ `$(LIN_WXCONFIG) --libs` -lusb-1.0 -o $@
-- $(LIN_STRIP) -s $@
-+ $(CXX) $(LDFLAGS) $^ `$(WX_CONFIG) --libs` -lusb-1.0 -o $@ $(LIBS)
-
- tek.mac: $(patsubst %.cpp,%-mac.o,$(SOURCES))
- $(OSX_CXX) $(CXXFLAGS) $^ `$(OSX_WXCONFIG) --libs --static` -lusb-1.0
-o $@ -v
-@@ -30,7 +29,7 @@
- $(WIN_STRIP) -s $@
-
- %-lin.o: %.cpp
-- $(LIN_CXX) -c $(CXXFLAGS) `$(LIN_WXCONFIG) --cxxflags` $(filter
%.cpp,$^) -o $@
-+ $(CXX) -c $(CXXFLAGS) $(CPPFLAGS) `$(WX_CONFIG) --cxxflags` $(filter
%.cpp,$^) -o $@
-
- %-win.o: %.cpp
- $(WIN_CXX) -c $(CXXFLAGS) `$(WIN_WXCONFIG) --cxxflags` $(filter
%.cpp,$^) -o $@
diff --git a/app-misc/tek/metadata.xml b/app-misc/tek/metadata.xml
deleted file mode 100644
index cdb8a3505d92..
--- a/app-misc/tek/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-https://www.gentoo.org/dtd/metadata.dtd;>
-
-
-
- m-ou-se/tek
-
-
diff --git a/app-misc/tek/tek-1.3.0.ebuild b/app-misc/tek/tek-1.3.0.ebuild
deleted file mode 100644
index 644b9e272307..
--- a/app-misc/tek/tek-1.3.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-WX_GTK_VER="3.0"
-inherit toolchain-funcs udev wxwidgets
-
-DESCRIPTION="GUI tool for upgrading the firmware of a Truly Ergonomic Keyboard"
-HOMEPAGE="https://trulyergonomic.com/ https://github.com/m-ou-se/tek;
-SRC_URI="https://github.com/m-ou-se/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="all-rights-reserved GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-RESTRICT="mirror"
-
-RDEPEND="
- x11-libs/wxGTK:${WX_GTK_VER}=[X]
- virtual/libusb:1
- virtual/udev"
-DEPEND="${RDEPEND}"
-BDEPEND="app-editors/vim-core"
-
-PATCHES=( "${FILESDIR}"/${P}-makefile.patch )
-
-src_configure() {
- tc-export CXX
- setup-wxwidgets
-}
-
-src_install() {
- newbin tek.lin tek
- udev_newrules linux-udev-rules 40-tek.rules
- einstalldocs
-}
-
-pkg_postinst() {
- udev_reload
-}
diff --git a/profiles/package.mask b/profiles/package.mask
index efac407b9ffc..4316edbc5c4f 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -376,12 +376,6 @@ media-video/openshot
# Removal on 2024-04-25. Bug #892031.
sys-auth/pam_ssh
-# Michał Górny (2024-03-26)
-# Fails to compile. Unmaintained. Last activity in 2016.
-# Depends on an old wxGTK slot.
-# Removal on 2024-04-25. Bug #895222.
-app-misc/tek
-
# Rahil Bhimjiani (2024-03-17)
# buildah-1.34.0 isn't getting security fixes from upstream
# https://github.com/containers/buildah/issues/5320
[gentoo-commits] repo/gentoo:master commit in: app-misc/tek/, app-misc/tek/files/
commit: 0eae9ea80ef4b1b9dd6088892cb40357abf4b4a0
Author: David Seifert gentoo org>
AuthorDate: Sun Apr 4 22:28:41 2021 +
Commit: David Seifert gentoo org>
CommitDate: Sun Apr 4 22:28:41 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0eae9ea8
app-misc/tek: Port to EAPI 7
Closes: https://bugs.gentoo.org/734252
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: David Seifert gentoo.org>
app-misc/tek/files/tek-1.3.0-makefile.patch | 25 +
app-misc/tek/tek-1.3.0.ebuild | 28
2 files changed, 37 insertions(+), 16 deletions(-)
diff --git a/app-misc/tek/files/tek-1.3.0-makefile.patch
b/app-misc/tek/files/tek-1.3.0-makefile.patch
new file mode 100644
index 000..b04985235e4
--- /dev/null
+++ b/app-misc/tek/files/tek-1.3.0-makefile.patch
@@ -0,0 +1,25 @@
+--- a/Makefile
b/Makefile
+@@ -15,11 +15,10 @@
+
+ SOURCES=gui.cpp ihex.cpp usb.cpp
+
+-CXXFLAGS=-O2 -std=c++11
++CXXFLAGS+=-std=c++11
+
+ tek.lin: $(patsubst %.cpp,%-lin.o,$(SOURCES))
+- $(LIN_CXX) $(CXXFLAGS) $^ `$(LIN_WXCONFIG) --libs` -lusb-1.0 -o $@
+- $(LIN_STRIP) -s $@
++ $(CXX) $(LDFLAGS) $^ `$(WX_CONFIG) --libs` -lusb-1.0 -o $@ $(LIBS)
+
+ tek.mac: $(patsubst %.cpp,%-mac.o,$(SOURCES))
+ $(OSX_CXX) $(CXXFLAGS) $^ `$(OSX_WXCONFIG) --libs --static` -lusb-1.0
-o $@ -v
+@@ -30,7 +29,7 @@
+ $(WIN_STRIP) -s $@
+
+ %-lin.o: %.cpp
+- $(LIN_CXX) -c $(CXXFLAGS) `$(LIN_WXCONFIG) --cxxflags` $(filter
%.cpp,$^) -o $@
++ $(CXX) -c $(CXXFLAGS) $(CPPFLAGS) `$(WX_CONFIG) --cxxflags` $(filter
%.cpp,$^) -o $@
+
+ %-win.o: %.cpp
+ $(WIN_CXX) -c $(CXXFLAGS) `$(WIN_WXCONFIG) --cxxflags` $(filter
%.cpp,$^) -o $@
diff --git a/app-misc/tek/tek-1.3.0.ebuild b/app-misc/tek/tek-1.3.0.ebuild
index 69421b1eaec..644b9e27230 100644
--- a/app-misc/tek/tek-1.3.0.ebuild
+++ b/app-misc/tek/tek-1.3.0.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
-WX_GTK_VER=3.0
+EAPI=7
-inherit udev wxwidgets
+WX_GTK_VER="3.0"
+inherit toolchain-funcs udev wxwidgets
DESCRIPTION="GUI tool for upgrading the firmware of a Truly Ergonomic Keyboard"
HOMEPAGE="https://trulyergonomic.com/ https://github.com/m-ou-se/tek;
@@ -13,24 +13,20 @@
SRC_URI="https://github.com/m-ou-se/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="all-rights-reserved GPL-3+"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE=""
RESTRICT="mirror"
-RDEPEND="x11-libs/wxGTK:${WX_GTK_VER}=[X]
+RDEPEND="
+ x11-libs/wxGTK:${WX_GTK_VER}=[X]
virtual/libusb:1
virtual/udev"
-DEPEND="${RDEPEND}
- app-editors/vim-core"
+DEPEND="${RDEPEND}"
+BDEPEND="app-editors/vim-core"
-src_prepare() {
- default
+PATCHES=( "${FILESDIR}"/${P}-makefile.patch )
+
+src_configure() {
+ tc-export CXX
setup-wxwidgets
- sed -r \
- -e '/LIN_STRIP/d' \
- -e 's/LIN_CXX/CXX/g' \
- -e 's/CXX=/CXX\?=/' \
- -e 's/CXXFLAGS=(.*)/CXXFLAGS:=\1 $(CXXFLAGS)/' \
- -i "${S}"/Makefile || die
}
src_install() {
[gentoo-commits] repo/gentoo:master commit in: app-misc/tek/
commit: 578aaf7bdd69641d019ef2be76ee040d9de09033
Author: Michael Mair-Keimberger gmail com>
AuthorDate: Thu Mar 22 18:24:16 2018 +
Commit: Amadeusz Piotr Żołnowski gentoo org>
CommitDate: Thu Mar 22 21:32:00 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=578aaf7b
app-misc/tek: use HTTPS
app-misc/tek/tek-1.3.0.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/app-misc/tek/tek-1.3.0.ebuild b/app-misc/tek/tek-1.3.0.ebuild
index a999ca161f5..69421b1eaec 100644
--- a/app-misc/tek/tek-1.3.0.ebuild
+++ b/app-misc/tek/tek-1.3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -7,7 +7,7 @@ WX_GTK_VER=3.0
inherit udev wxwidgets
DESCRIPTION="GUI tool for upgrading the firmware of a Truly Ergonomic Keyboard"
-HOMEPAGE="http://trulyergonomic.com/ https://github.com/m-ou-se/tek;
+HOMEPAGE="https://trulyergonomic.com/ https://github.com/m-ou-se/tek;
SRC_URI="https://github.com/m-ou-se/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="all-rights-reserved GPL-3+"
[gentoo-commits] repo/gentoo:master commit in: app-misc/tek/
commit: 972f5331e4f4b8b1b3ef3d811ec1014f1d9b7108
Author: Amadeusz Żołnowski gentoo org>
AuthorDate: Sun Mar 12 11:18:59 2017 +
Commit: Amadeusz Piotr Żołnowski gentoo org>
CommitDate: Sun Mar 12 11:19:42 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=972f5331
app-misc/tek: Add missing libusb dependency
Gentoo-Bug: 612332
Package-Manager: Portage-2.3.4, Repoman-2.3.2
app-misc/tek/tek-1.3.0.ebuild | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/app-misc/tek/tek-1.3.0.ebuild b/app-misc/tek/tek-1.3.0.ebuild
index 2e36719949e..a999ca161f5 100644
--- a/app-misc/tek/tek-1.3.0.ebuild
+++ b/app-misc/tek/tek-1.3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -17,6 +17,7 @@ IUSE=""
RESTRICT="mirror"
RDEPEND="x11-libs/wxGTK:${WX_GTK_VER}=[X]
+ virtual/libusb:1
virtual/udev"
DEPEND="${RDEPEND}
app-editors/vim-core"
[gentoo-commits] repo/gentoo:master commit in: app-misc/tek/
commit: 4676a34e27a13a8416b1cb4cbbcffedac7b1284d
Author: Amadeusz Żołnowski gentoo org>
AuthorDate: Sat Jul 23 17:34:47 2016 +
Commit: Amadeusz Piotr Żołnowski gentoo org>
CommitDate: Sat Jul 23 17:36:18 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4676a34e
app-misc/tek: Correct license (later versions of GPL are allowed)
Package-Manager: portage-2.3.0
app-misc/tek/tek-1.3.0.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-misc/tek/tek-1.3.0.ebuild b/app-misc/tek/tek-1.3.0.ebuild
index 692a584..4cfeba4 100644
--- a/app-misc/tek/tek-1.3.0.ebuild
+++ b/app-misc/tek/tek-1.3.0.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="GUI tool for upgrading the firmware of a Truly
Ergonomic Keyboard"
HOMEPAGE="http://trulyergonomic.com/ https://github.com/m-ou-se/tek;
SRC_URI="https://github.com/m-ou-se/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="all-rights-reserved GPL-3"
+LICENSE="all-rights-reserved GPL-3+"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE=""
[gentoo-commits] repo/gentoo:master commit in: app-misc/tek/
commit: 8f079e5a55493424277efe239ba1aa7d7dbc8c35
Author: Amadeusz Żołnowski gentoo org>
AuthorDate: Sat Jul 23 08:11:43 2016 +
Commit: Amadeusz Piotr Żołnowski gentoo org>
CommitDate: Sat Jul 23 16:18:56 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f079e5a
app-misc/tek: Add new package
Package-Manager: portage-2.3.0
app-misc/tek/Manifest | 1 +
app-misc/tek/metadata.xml | 8
app-misc/tek/tek-1.3.0.ebuild | 44 +++
3 files changed, 53 insertions(+)
diff --git a/app-misc/tek/Manifest b/app-misc/tek/Manifest
new file mode 100644
index 000..24f7a37
--- /dev/null
+++ b/app-misc/tek/Manifest
@@ -0,0 +1 @@
+DIST tek-1.3.0.tar.gz 99399 SHA256
730e43749bf83fe1f717a64754262fe0577d25b3b47896838d4936fd8f76ffe6 SHA512
20e3e704db71a7c0fb7a7791c8ebbdb348d370b06bea39f2ee77cae72ac4b71873884c6ec58712c9bf85d7d0785310f33189ce977a77b970951e39c8803d28fd
WHIRLPOOL
2736f63121b2a743234ddd972a88562f1e8094c45fc6aec79dbda1c5d2a4c8df776db6f6f997c88afd6155e5fdaffa44859b6ba987a987bb09c36556764b4e5f
diff --git a/app-misc/tek/metadata.xml b/app-misc/tek/metadata.xml
new file mode 100644
index 000..674f5ad
--- /dev/null
+++ b/app-misc/tek/metadata.xml
@@ -0,0 +1,8 @@
+
+http://www.gentoo.org/dtd/metadata.dtd;>
+
+
+ aide...@gentoo.org
+ Amadeusz Żołnowski
+
+
diff --git a/app-misc/tek/tek-1.3.0.ebuild b/app-misc/tek/tek-1.3.0.ebuild
new file mode 100644
index 000..692a584
--- /dev/null
+++ b/app-misc/tek/tek-1.3.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+WX_GTK_VER=3.0
+
+inherit udev wxwidgets
+
+DESCRIPTION="GUI tool for upgrading the firmware of a Truly Ergonomic Keyboard"
+HOMEPAGE="http://trulyergonomic.com/ https://github.com/m-ou-se/tek;
+SRC_URI="https://github.com/m-ou-se/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="all-rights-reserved GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+RESTRICT="mirror"
+
+RDEPEND="x11-libs/wxGTK:${WX_GTK_VER}=[X]
+ virtual/udev"
+DEPEND="${RDEPEND}
+ app-editors/vim-core"
+
+src_prepare() {
+ default
+ setup-wxwidgets
+ sed -r \
+ -e '/LIN_STRIP/d' \
+ -e 's/LIN_CXX/CXX/g' \
+ -e 's/CXX=/CXX\?=/' \
+ -e 's/CXXFLAGS=(.*)/CXXFLAGS:=\1 $(CXXFLAGS)/' \
+ -i "${S}"/Makefile || die
+}
+
+src_install() {
+ newbin tek.lin tek
+ udev_newrules linux-udev-rules 40-tek.rules
+ einstalldocs
+}
+
+pkg_postinst() {
+ udev_reload
+}
