diff options
Diffstat (limited to 'app-misc/tek')
| -rw-r--r-- | app-misc/tek/Manifest | 3 | ||||
| -rw-r--r-- | app-misc/tek/files/tek-1.3.0-makefile.patch | 25 | ||||
| -rw-r--r-- | app-misc/tek/tek-1.3.0.ebuild | 28 |
3 files changed, 39 insertions, 17 deletions
diff --git a/app-misc/tek/Manifest b/app-misc/tek/Manifest index 06950c7b3314..11ee6f100e60 100644 --- a/app-misc/tek/Manifest +++ b/app-misc/tek/Manifest @@ -1,3 +1,4 @@ +AUX tek-1.3.0-makefile.patch 799 BLAKE2B 6b9ee90e2974c2b0e7c54a353e7bf3e81a3c7f3cd6b0e66a69351679eeb9e6bda610bd09b66ed5614de6695d3358dbdc653f3e7ed36f53484b4a9e83b2477731 SHA512 e018f2148fc6c250c42682ff20adb0c40e0d60f3402279e912b39df5060e6a9fba88ec64d8301477636771ad2546286bb298e2c9dcb76a21767409246ae6ce03 DIST tek-1.3.0.tar.gz 99399 BLAKE2B 191fec7992ea4b79aed5833012cb22ac3ad399eced53e74467139aa05e2dfda08af220b35cb191f5f1bf706186a8460f3d80196599f43654d5de05e36b5df84b SHA512 20e3e704db71a7c0fb7a7791c8ebbdb348d370b06bea39f2ee77cae72ac4b71873884c6ec58712c9bf85d7d0785310f33189ce977a77b970951e39c8803d28fd -EBUILD tek-1.3.0.ebuild 935 BLAKE2B f3e3402447b1b3fb451389018fd16497bfe2eb52be781eace5bf5fe907fb86370283e23fd16572b56fa1eb8798ac46172c7c8de7f359901bf3a3f12b8864af1d SHA512 24f9cc5e5b8a8859a9f9a1de0fbd10c7deab048b40e2723fe65e0279f0c3eea345621a3bd386ceee482b5d9a5fc41dd293da5ba12378a73b903ea31c0d0ea13e +EBUILD tek-1.3.0.ebuild 848 BLAKE2B 7d97437a8644ae69c956db7e041653100eee8d7ac6c7b75c084b68c9f7a59ef08fde129b5c33fe597a55cfe0c9ecdd9115ef3ed88ec333ab7c403b0b2bd15577 SHA512 0496f8b802c9d0dd2bf91ddf6764a3742824915685d9205e39f2af13d1a12a7b251f0c71550fc21c0b0e98822f6f84b340a3465e2dc8dbf43104b3c823ec35c5 MISC metadata.xml 243 BLAKE2B 32baf4172680828d109bd212048ca921186236135d4ae1dc76411ea32307f919cf0b8c89ced23b4df6e446dbb3c2b1b1553a3588b3e61a2309405de3070fc313 SHA512 37178ea2c1bbaa0f40a3a2895aff57acfedb9846873e52248235023252cd3d3621457927ae54cadc797f3cedd71866a620e2c2ef627831a29512038b84c43012 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 000000000000..b04985235e49 --- /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 69421b1eaec1..644b9e272307 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() { |