gentoo auto-resync : 31:07:2022 - 15:12:39

4 files changed, 30 insertions, 59 deletions

diff --git a/app-editors/moe/Manifest b/app-editors/moe/Manifest
index 49e90f1f2935..5bf618ede737 100644
--- a/app-editors/moe/Manifest
+++ b/app-editors/moe/Manifest
@@ -1,8 +1,7 @@
+AUX moe-1.12-respect-user-flags.patch 473 BLAKE2B 36857c2387ac28dba72e88e990800be2aa5ee34765a06c5d62097768495139d9dd6a1e26546797d87c6b20e82bcf653e2f67f3a03fee21cf7d8ca042a07d08b3 SHA512 8ecceaa1662c6434c63e49a36831dff7f790462b354302f06243dcb6021ce96b2e9a28c2a512a455fc160d39e5e9a63137fe32e726be31470d12f46015f8ecad
 AUX moe-1.6-tinfo.patch 379 BLAKE2B 4b2b0b895181d98b742c5abe5bab3690a9f37d987e0b63123d2b0288ec0f0980df3bb9cc654e5cfcabcaeee69714aec7e3e99974bab4a8fbc36105c071b2a988 SHA512 8fa0661bce445d585aa37d845a4b41a0d1ed08aeab4117f6f1c6bdac346d7d774dfe38253dc11f0be7bd68c136eaac5aa889e174e0556f036fbdaf2e8b06373f
 DIST moe-1.10.tar.lz 84050 BLAKE2B 2e49aba27cdd603fbc9a4eb0fef5e086a527087d72f30f68beb4e3389de0ccdd85fec5bf753b3187d64cd6549ac5738c89e94c543c141f88896c580e7c33ad42 SHA512 3908d7906aa7dcb8bd4a5d340fe94b06fc91814098c20e8939906c2b0e03e1a8a3c95847b5f8111a5d9f37636a2fafa52f9105e0e8fa0ad8b16c2f9e9dede748
-DIST moe-1.11.tar.lz 89532 BLAKE2B 8479c8bb0504e614b4ad87e47ae89d1f0eb23141ff71ef3e46eb316424dfe87150f2d9474e1dbd3510fa9b1da517bd6afe47b2cd36f1aa70630b371f0f6bec3a SHA512 147f3500909739371290fc2f703ef5fab286d2ca385f6808ee3e0cb1cbae2ed58a0b5046d30ad5d24215dc28d77f0bba4efacb144c116209d89d023e731e8a39
-DIST moe-1.9.tar.lz 82046 BLAKE2B 9144dfc4ce17bc04f3ad9aa9ec271f173df6c581705e5d922a346f94c086a97af9429478c016d7081c1fd38787055666504f04d25a8b9f5c1020dc147aaafdb0 SHA512 277700e4a796e1a7aee42de55ba4599a350a612f95a1a2eca5078d85f6f9a7db190fb5611eb2f286c98580af847a2934bf38a4bce10176db4c5cddc2d257f929
+DIST moe-1.12.tar.lz 87917 BLAKE2B b036b24193045cd5c64812af13e6cf542700e649e78f3ba416501d0915c0ac2eef09bebdb333d145e0428dfacdccef431588ce93b1f407a41a7bd7e0acbc163c SHA512 f0d5daba70d0018ce82d6673749b8f688c0bac58de7684cc24f5badffd6868d425c9f771404186ab5cec12ab94c3e20af870bd920bfef0432a622925838ebed7
 EBUILD moe-1.10.ebuild 698 BLAKE2B 181da72a9e3b4af805e8682b3fe6ecdf4eba42fb6ed0bc6bcf381dafda7624ccf0d86c1ac67d509470dedc25c6d2e9b9d348721fb34e8f0417e651faad70ee8f SHA512 5f53a824ce1e7e26e937327ae07182d820ba32817d5c3d1681aaf3ae65d03f0ae93fa117a5b41c7de6a27de5b295a337f096a8765a38d6e716580af1ef1a6df9
-EBUILD moe-1.11.ebuild 709 BLAKE2B a758a2ce28cdefa10cf1fb575f3b2fb3eb088bb581918ccfac404cb12b75f287051844e68c0f0634413784604df970a3bc7d018f3fe47cebb87276bb4b2041ff SHA512 b4dbb93e20d125db3a3df6f7648253c2b74147cdbb3bdd3161f9fa71ffdc5a70d1791cdff7fc8de79041dc22700948253d5b8cf17cfe763d0223ac1de198fac5
-EBUILD moe-1.9.ebuild 702 BLAKE2B f8afc91d99ae88a4bf8c5b02393d10124466cddb6179eaf9c12300076d791a28ac0f3ad6dca5162cf58cfc5157cad7ede7af7c37cd201d216922d8fe44740aa8 SHA512 9e0153471f02bb31d039e6ec986352bb20bb0386296b5c1fd610c9b6140d32fe996765a5e85b362d310f64ebc7827f069519d6fee73a69f11df4c01d5cb5d10d
+EBUILD moe-1.12.ebuild 609 BLAKE2B c45bfb5b5c83d9bb9d0b1f09b17df59b7a52f5e17464ab3487d571ab581773e5d9831e6fa525047bff4837ce18881fdc368e64054af38b910e5cccb5d089dea1 SHA512 5c2c0abcf56e37e6a6a5c844e2b57f2e4dba5027bb2b1e6a8268e9a0d7817225a24cfb94e106123af90f9af781cfcd3b27e1e93fe3937dfd28db077c70fe320a
 MISC metadata.xml 248 BLAKE2B dba7ab19012197ff483b3c5febb6e1eae41d23999686b287a45c38e89ff7565454473fac44579b1e367345933bd749897f8e737f50eaf024190c42069a3d4d16 SHA512 abd659f01838c035f4dfeb2c13e95a0e8e249b41d093af54ff31b4d87bfe03ae472e911a20ff0ad3ea6bb9718dbab822c8b7553ac0a7a59c1d09db7b4d910ea9
diff --git a/app-editors/moe/files/moe-1.12-respect-user-flags.patch b/app-editors/moe/files/moe-1.12-respect-user-flags.patch
new file mode 100644
index 000000000000..2a83cb7d4c2f
--- /dev/null
+++ b/app-editors/moe/files/moe-1.12-respect-user-flags.patch
@@ -0,0 +1,17 @@
+--- a/configure
++++ b/configure
+@@ -21,11 +21,9 @@
+ infodir='$(datarootdir)/info'
+ mandir='$(datarootdir)/man'
+ sysconfdir='$(prefix)/etc'
+-CXX=g++
+-CPPFLAGS=
+-CXXFLAGS='-Wall -W -O2'
+-LDFLAGS=
+-LIBS=-lncurses
++CPPFLAGS="$(${PKG_CONFIG} --cflags ncurses) ${CPPFLAGS}"
++CXXFLAGS="-Wall -W ${CXXFLAGS}"
++LIBS="$(${PKG_CONFIG} --libs ncurses) ${LIBS}"
+ 
+ # checking whether we are using GNU C++.
+ /bin/sh -c "${CXX} --version" > /dev/null 2>&1 || { CXX=c++ ; CXXFLAGS=-O2 ; }
diff --git a/app-editors/moe/moe-1.11.ebuild b/app-editors/moe/moe-1.12.ebuild
index 18bd0460ec98..5b893619380a 100644
--- a/app-editors/moe/moe-1.11.ebuild
+++ b/app-editors/moe/moe-1.12.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 inherit toolchain-funcs unpacker
 
@@ -13,24 +13,15 @@ LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~riscv ~x86 ~amd64-linux ~x86-linux"
 
-RDEPEND="
-	sys-libs/ncurses:0=
-"
-DEPEND="
+RDEPEND="sys-libs/ncurses:="
+DEPEND="${RDEPEND}"
+BDEPEND="
 	$(unpacker_src_uri_depends)
-	${RDEPEND}
-	virtual/pkgconfig
-"
+	virtual/pkgconfig"
 
-src_prepare() {
-	tc-export CXX PKG_CONFIG
-	sed -i \
-		-e "/^CXXFLAGS=/d" \
-		-e "/^LDFLAGS=/d" \
-		-e  "/^CXX=/d" \
-		configure || die "sed on configure failed"
-
-	eapply_user
+PATCHES=( "${FILESDIR}"/${PN}-1.12-respect-user-flags.patch )
 
-	eapply "${FILESDIR}/${PN}-1.6-tinfo.patch"
+src_configure() {
+	tc-export CXX PKG_CONFIG
+	default
 }
diff --git a/app-editors/moe/moe-1.9.ebuild b/app-editors/moe/moe-1.9.ebuild
deleted file mode 100644
index 0e627addb662..000000000000
--- a/app-editors/moe/moe-1.9.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs unpacker
-
-DESCRIPTION="A powerful and user-friendly console text editor"
-HOMEPAGE="https://www.gnu.org/software/moe/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.lz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 arm x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	sys-libs/ncurses:0=
-"
-DEPEND="
-	$(unpacker_src_uri_depends)
-	${RDEPEND}
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	tc-export CXX PKG_CONFIG
-	sed -i \
-		-e "/^CXXFLAGS=/d" \
-		-e "/^LDFLAGS=/d" \
-		-e  "/^CXX=/d" \
-		configure || die "sed on configure failed"
-
-	eapply_user
-
-	eapply "${FILESDIR}/${PN}-1.6-tinfo.patch"
-}