From 3cf7c3ef441822c889356fd1812ebf2944a59851 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Tue, 25 Aug 2020 10:45:55 +0100
Subject: gentoo resync : 25.08.2020

---
 app-i18n/canfep/Manifest             |  3 +--
 app-i18n/canfep/canfep-1.0-r1.ebuild | 11 +++++-----
 app-i18n/canfep/canfep-1.0.ebuild    | 39 ------------------------------------
 3 files changed, 7 insertions(+), 46 deletions(-)
 delete mode 100644 app-i18n/canfep/canfep-1.0.ebuild

(limited to 'app-i18n/canfep')

diff --git a/app-i18n/canfep/Manifest b/app-i18n/canfep/Manifest
index 603f156e17f9..60402fad68aa 100644
--- a/app-i18n/canfep/Manifest
+++ b/app-i18n/canfep/Manifest
@@ -2,6 +2,5 @@ AUX canfep-posix-pty.patch 1674 BLAKE2B dfeda6e249501ed6b5a8bd185dbd9df735bd9f08
 AUX canfep-termcap.patch 6533 BLAKE2B c8e9ffa84390bac88e6ad1fc30e47d237a6fc10d3f8b727a730358faa69d76a24ddb9b1467d695eed691ceb9e1b5558baf12d45178e44b642fb3fc7ff0f9d36d SHA512 7ebaf5745bdc8b1aa1bd07879fe51c3c6410c1475f9e44535bf863f9ab0b7ee6ac0f3dca852c22036ae2ecfababfd976a0c3027ad9d33e3aae7e289c00bd60bc
 DIST canfep-1.0.tar.gz 8067 BLAKE2B 1a6e8af357d2b7aaccf442b0f8bab577ed05a5a0fdf2fb4c189105c2c41f739c2e559e740584bf393fcc52d3f3bd0bb6216e06e2b685f62f7dded9d576e95bed SHA512 0fd7c8ca56282fa537b76fe33f46e03d4f0f4727528ccad95cd4726888372da9158fc8bed2cdc67d645defb479040cd4a4d0999f69d38fd8b4080f7ece4e67d6
 DIST canfep_utf8.diff 7152 BLAKE2B e3848d5119b01d3296c93b5ed8495c6f93ecb1ef39f168d6e1685636055295b8f7277c6b680cadb648fe6847c92e3b038a9b5a9a58f23fe3490dcbe675bcc96f SHA512 32d946b8b78efd3b95736738497fe46a7d0e2383f2b665c8af79270d7b0d1404ca051e63fc67375f0b953b8f604475c8d6b2d683089bc97b098fa9524b89208c
-EBUILD canfep-1.0-r1.ebuild 997 BLAKE2B 494ff7ddc0a3e51c36c2bc766df0ebe2a1b4856478f9011057ebe11b27cb664985ec5ce9b8f2d8ebb9db5d04a26bc401d60a5776677524baebe6860f243846a9 SHA512 fc44c3107247a3de09705a45875e4bdeb3d4010f212b474cd4d7f54d42d37158bbc043327e222a8ec232fe7d291dae650534b9e9ac1e91c015fac064f5838878
-EBUILD canfep-1.0.ebuild 893 BLAKE2B ad7563343f58d9e831d31ad9f3cec03f833aaa0d09a15cbb5a3ab2a57b809435ad153858f003a0d2947d3e06d2248af93b79b5575d0483501700de4adc3504b6 SHA512 7970b0c9ce1fdd16e933c5f3c5b82216f9ab212433881ff51d0020e13fb05d4d96dd150ba0c305701e9c9029575aa5c52875bb61049962a47c5cb3c45f68b939
+EBUILD canfep-1.0-r1.ebuild 1030 BLAKE2B 9b7c52e4f3c81cb16b202d4af35dcb18ca074df89f4fd8b8fbc82f3bbd10fb9f3d6b678bd8d08fb20010064dc5a827928c9e4975f8f57b3f2d8c6a7e3543568b SHA512 4ab9f1dae9fcf24bf1f1727c61e82f86d7332165ae3df89d4f160262f95cff748976e268c19c32ec58c6acbcd778143e66ec3b1a9eb72153ca92846639829d99
 MISC metadata.xml 240 BLAKE2B 3e01f599fdbafa5c02b594007c673bcfcccb41559bd2f42d7ea60a1f13932335cecf353c1216e8feba4bb091385b57f05c4c8b3c62eed6c7bea41e308fc6115c SHA512 12aaa73d9b690de68a5c7b20e214ceb099efa87884b784eafd994f26032b44dcb66e7feac8a5b1df7f349ac05c5a198a7593dff2cc686de158cb21e4c54f38dd
diff --git a/app-i18n/canfep/canfep-1.0-r1.ebuild b/app-i18n/canfep/canfep-1.0-r1.ebuild
index c78e54ada07f..4b2531818834 100644
--- a/app-i18n/canfep/canfep-1.0-r1.ebuild
+++ b/app-i18n/canfep/canfep-1.0-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI="7"
 
 inherit toolchain-funcs
 
@@ -13,13 +13,13 @@ SRC_URI="mirror://gentoo/${P}.tar.gz
 
 LICENSE="canfep"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~ppc ~sparc x86"
+KEYWORDS="~alpha amd64 ppc ~sparc x86"
 IUSE="unicode"
 
 RDEPEND="app-i18n/canna
 	sys-libs/ncurses:="
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-posix-pty.patch
@@ -36,6 +36,7 @@ src_prepare() {
 src_compile() {
 	emake \
 		CC="$(tc-getCXX)" \
+		CFLAGS="${CXXFLAGS}" \
 		LIBS="-lcanna $($(tc-getPKG_CONFIG) --libs ncurses)"
 }
 
diff --git a/app-i18n/canfep/canfep-1.0.ebuild b/app-i18n/canfep/canfep-1.0.ebuild
deleted file mode 100644
index a290748825da..000000000000
--- a/app-i18n/canfep/canfep-1.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit toolchain-funcs
-
-DESCRIPTION="Canna Japanese kana-kanji frontend processor on console"
-HOMEPAGE="http://www.geocities.co.jp/SiliconValley-Bay/7584/canfep/"
-SRC_URI="http://www.geocities.co.jp/SiliconValley-Bay/7584/${PN}/${P}.tar.gz
-	unicode? ( http://hp.vector.co.jp/authors/VA020411/patches/${PN}_utf8.diff )"
-
-LICENSE="canfep"
-SLOT="0"
-KEYWORDS="-alpha ~amd64 ppc ~sparc x86"
-IUSE="unicode"
-
-RDEPEND="app-i18n/canna
-	sys-libs/ncurses:="
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	use unicode && eapply "${DISTDIR}"/${PN}_utf8.diff
-	sed -i 's/$(CFLAGS)/$(CFLAGS) $(LDFLAGS)/' Makefile
-
-	default
-}
-
-src_compile() {
-	emake \
-		CC="$(tc-getCXX)" \
-		LIBS="-lcanna $(pkg-config --libs ncurses)"
-}
-
-src_install() {
-	dobin ${PN}
-	dodoc 00{changes,readme}
-}
-- 
cgit v1.2.3