diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2021-04-28 20:21:43 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2021-04-28 20:21:43 +0100 |
| commit | 40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 (patch) | |
| tree | 758c221bad35c9288d0bd6df9c7dfc226728e52c /app-misc/dvorak7min | |
| parent | 8d5dbd847cbc704a6a06405856e94b461011afe3 (diff) | |
gentoo resync : 28.04.2021
Diffstat (limited to 'app-misc/dvorak7min')
| -rw-r--r-- | app-misc/dvorak7min/Manifest | 4 | ||||
| -rw-r--r-- | app-misc/dvorak7min/dvorak7min-1.6.1-r1.ebuild | 9 | ||||
| -rw-r--r-- | app-misc/dvorak7min/files/dvorak7min-1.6.1-ncurses-pkg-config.patch | 4 |
3 files changed, 8 insertions, 9 deletions
diff --git a/app-misc/dvorak7min/Manifest b/app-misc/dvorak7min/Manifest index 58419b4e58e8..7266b3c102c5 100644 --- a/app-misc/dvorak7min/Manifest +++ b/app-misc/dvorak7min/Manifest @@ -1,6 +1,6 @@ AUX dvorak7min-1.6.1-debian-changes.patch 7956 BLAKE2B 77396f83105259f53556e6e47bc15291be00d7a822c5eecb52e95e525e10ee24f3a7cc6c731954de3b9a4228980bedc45b84f90c139c915766a53804a376f763 SHA512 274d9a33b59e18de206431b2fb4f1f37342b27dd4accb37dc16ee5470f4c6163f55c82d8b3466894ac20f3470d65ba05e8f332b0b489dc27814bcfe4270d4115 AUX dvorak7min-1.6.1-makefile-flags.patch 684 BLAKE2B 94d9a24871d88f3d18e8804b3f09f5435dd1e5c4f084322dff2bb40213dfafd1ced7c931adc439b0ab8e089f080254bdff7dc58a7efc77b42da037ed10c9cfb3 SHA512 173858e4daaba8f6f764f4c9cb4aa8e7c6d513d1dff8bc3e2753a969bad15fd4d1a9e91a7da3b9a9353c67c40209b3f316d7f4394042329205d0d80dc9e1454c -AUX dvorak7min-1.6.1-ncurses-pkg-config.patch 668 BLAKE2B 48dd6d4efe50ad7648c2caf3ebd333f212692d4c14c5be83e7d674fb133095a09860115974e2275674e798d81d03d89f943e210497637ace7f22803402d75577 SHA512 8a39fe1b1715d2b953f1e13e9548e4864324b78bfa7a0ca6165b787163807615dfc472e7a0c6a39aaff8257fc2008851e5768c42dbd3fca5e991bb8d1453e2ec +AUX dvorak7min-1.6.1-ncurses-pkg-config.patch 608 BLAKE2B 0541105aba889a65ed74dcca7696a5bc0fb983778cd81cb7225317b25e17d7bac856ea325f4eed0e1724588d7d7d2fc1a271b7a2ccbc2263d565eb63b24aa7cc SHA512 85e2a05b6ec78be488c3f5bc1a29286a4fbea08bae69f0cbd1901c5f3c03de9d5340900bb898316da61277f66b6ff0a209cae66b029ff5b57166af6ddc320542 DIST dvorak7min-1.6.1.tar.gz 53115 BLAKE2B f884f1900a7de0422f076e3701f7b982d5c5cba70ae1805bd3540ebd109e9bbaaa9e439272ac530862eac9dca2c0ba67b1d0040aa58294b5cabba2fa126d04ae SHA512 17ed601f298673a51d73b2efeb1555d91337f34cfbcc099a71c11de38fecdb29747de9533abec9028c3abc9f04dc9090e4452bba1c53cdac8d65e86a760e8a7a -EBUILD dvorak7min-1.6.1-r1.ebuild 800 BLAKE2B a635043a5c9af9c5eadef748162e2b153038eb318f64e3c79f683e980a2e5ff9812a2e7ae87eaadb039a8db56eccb298ccab03c9211c017722d6c21cf2dbb0b5 SHA512 e22e35e8980266effade00b1ebab9765edf70da4ad142dfa6bb5b5fc158f39542399119d747130d506dd0c4dd06683a3ed1346911bd0f43b3c86a44ddd00eea1 +EBUILD dvorak7min-1.6.1-r1.ebuild 822 BLAKE2B 0c6f7136df13e84db9661e73fb0b7cc89b4a46bb6118939606a0ea2a358e0e508cf29158fe5a3754a1111c1bcd40d371913fddd08d920b51a3cee4fdcb8bbaf1 SHA512 819ba083b42db6751cf69f32e48a074e6b74b5e283ee2edc73ff7ee0d989e381543bd674d910799787d6642719a747a211a83753cf83edd199036c3cb714976b MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 diff --git a/app-misc/dvorak7min/dvorak7min-1.6.1-r1.ebuild b/app-misc/dvorak7min/dvorak7min-1.6.1-r1.ebuild index 38f74d2fc070..cb6545c1f3ce 100644 --- a/app-misc/dvorak7min/dvorak7min-1.6.1-r1.ebuild +++ b/app-misc/dvorak7min/dvorak7min-1.6.1-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -18,12 +18,13 @@ DEPEND="sys-libs/ncurses:=" RDEPEND="${DEPEND}" PATCHES=( - "${FILESDIR}/${PN}-1.6.1-debian-changes.patch" - "${FILESDIR}/${PN}-1.6.1-makefile-flags.patch" - "${FILESDIR}/${PN}-1.6.1-ncurses-pkg-config.patch" + "${FILESDIR}"/${PN}-1.6.1-debian-changes.patch + "${FILESDIR}"/${PN}-1.6.1-makefile-flags.patch + "${FILESDIR}"/${PN}-1.6.1-ncurses-pkg-config.patch ) src_compile() { + tc-export PKG_CONFIG emake \ CC="$(tc-getCC)" \ PROF="${CFLAGS}" \ diff --git a/app-misc/dvorak7min/files/dvorak7min-1.6.1-ncurses-pkg-config.patch b/app-misc/dvorak7min/files/dvorak7min-1.6.1-ncurses-pkg-config.patch index 2f62112ceb48..045278ef4e06 100644 --- a/app-misc/dvorak7min/files/dvorak7min-1.6.1-ncurses-pkg-config.patch +++ b/app-misc/dvorak7min/files/dvorak7min-1.6.1-ncurses-pkg-config.patch @@ -2,8 +2,6 @@ https://bugs.gentoo.org/show_bug.cgi?id=722336 https://bugs.gentoo.org/show_bug.cgi?id=689986 https://bugs.gentoo.org/show_bug.cgi?id=698082 https://bugs.gentoo.org/show_bug.cgi?id=702372 -diff --git a/Makefile b/Makefile -index e0e7645..6aee6ab 100644 --- a/Makefile +++ b/Makefile @@ -15,12 +15,13 @@ LIMIT_LENGTH = -DLIMIT_LENGTH=1024 @@ -18,7 +16,7 @@ index e0e7645..6aee6ab 100644 $(LIMIT_LENGTH) $(PROF) LDFLAGS += $(PROF) -LIBS = -lncurses -+LIBS = $(shell pkg-config --libs ncurses) ++LIBS = $(shell ${PKG_CONFIG} --libs ncurses) OBJECTS = dvorak7min.o lessons.o HEADERS = lessons.h |