From b17a3ef12038de50228bade1f05502c74e135321 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Wed, 2 Sep 2020 14:09:07 +0100
Subject: gentoo resync : 02.09.2020

---
 dev-util/editorconfig-geany/Manifest               |  4 +--
 .../editorconfig-geany-0.1_p20160725.ebuild        | 35 ----------------------
 .../editorconfig-geany-0.2.ebuild                  |  3 +-
 3 files changed, 3 insertions(+), 39 deletions(-)
 delete mode 100644 dev-util/editorconfig-geany/editorconfig-geany-0.1_p20160725.ebuild

(limited to 'dev-util/editorconfig-geany')

diff --git a/dev-util/editorconfig-geany/Manifest b/dev-util/editorconfig-geany/Manifest
index ed3c2f57f5ee..b5500b4467b7 100644
--- a/dev-util/editorconfig-geany/Manifest
+++ b/dev-util/editorconfig-geany/Manifest
@@ -1,5 +1,3 @@
-DIST editorconfig-geany-0.1_p20160725.tar.gz 10336 BLAKE2B 0794a7c90c46eb107822a2ceba92ae5dbcafcbe11aac519d8cd2102d92b93c578f3f49e31f7e281df2c3a90facaf29df5fdfa0b2970dd75894356066f4c40a0a SHA512 ac8c4d46c17a5592c8f75a4100cfa1eaa55cb5333a1a6330ae84249d6df3b9ae4b454ee9c68b88ad777f5bea22ad1f3ce0a63bf89a1dd41d13abcfbd2a585734
 DIST editorconfig-geany-0.2.tar.gz 12322 BLAKE2B 2d203d3df6c6a7bb18a0b80cd33c041606b9732a83c5210fe3a66db587dedd81e1a1c2102e827980f6d85404cceed3b097f85e6c33aea81f21e9725fa7dd49e8 SHA512 cda2fd6c8ff5b7a2088840e5f2ceebb2f00f48281ff2943c4ffada30a7e70ce18ae9a84e5ac946e3affb3e5238512f829e545d31b59383722820b89c0309702d
-EBUILD editorconfig-geany-0.1_p20160725.ebuild 952 BLAKE2B f53dd862c4c27b6c061fc5e9f7bb97760b5ffd301e1f50b74695e9b4888ba0b6459dc1d7d5a818cf916083b78d1d39a85c016d6005a36e674c6fbd781a01412f SHA512 1bfbb0bc98b7bf9adaca636eea5a06481b0f645731ce5967711e7d68ca596cd0296f62b23bb6f8b2805fa220be60d88a112a44c6363ed1e6056a8ee6037cd24f
-EBUILD editorconfig-geany-0.2.ebuild 963 BLAKE2B ea286eb12c0b99f568d6062d659598cff680131e0db4f6f74c633accd084ccd4c5c12138dc535996a6f42c7f18fbe077625f7cb031b6c9c71aab35414823e47a SHA512 a064dffe54200e637b5e6cfc083c285915e19d1ae51b99692bcdf5f9197586680a2880e552503e8cb542a5668111d5e16855147d467d0c6ba21a55441dbc9128
+EBUILD editorconfig-geany-0.2.ebuild 996 BLAKE2B 6443273427ece4fa4e2d7504f91cf5a88b8ff5945b5b640ed5a8979abcfce4ad0a010fbf0c6691681c9c316ea887199399e379a2158c47e8bcfe40a79d1909c9 SHA512 c5af88b6429d0fa1497ff87d0dfe8d001022b990625bc3f402554a9b7fc4f5a0b6ed03c5df745c54c65a0c4d2015bc5030ac8b43ec64306ba48ce53a2aa353ea
 MISC metadata.xml 314 BLAKE2B 0689cfb21238bdd9c4c59ab9c9809bf9e99a29d5f18afcdc1c278a623bc10bdb631f1883e729ea0ce3eab0da320054a8c7da2ca707b471167f4c4f74db3d052f SHA512 c6fe2f783aaacb434eca03948af5b32f1b3cd96d701c5f237ff8b0d4ff068ec4ec67daf1715801087b3e54df5451140680caeccac53cc5aae6c0c4a6ea872124
diff --git a/dev-util/editorconfig-geany/editorconfig-geany-0.1_p20160725.ebuild b/dev-util/editorconfig-geany/editorconfig-geany-0.1_p20160725.ebuild
deleted file mode 100644
index de7614d662ba..000000000000
--- a/dev-util/editorconfig-geany/editorconfig-geany-0.1_p20160725.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="EditorConfig plugin for Geany"
-HOMEPAGE="https://github.com/editorconfig/editorconfig-geany/"
-EGIT_COMMIT="9dce3bb476728a8f4124aefe12e0a4ffc8567dff"
-SRC_URI="https://github.com/editorconfig/${PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-CDEPEND="app-text/editorconfig-core-c:="
-DEPEND="${CDEPEND}
-	dev-util/geany"
-RDEPEND="${CDEPEND}"
-S=${WORKDIR}/${PN}-${EGIT_COMMIT}
-
-src_prepare() {
-	eapply_user
-	sed -e "s|^\\(EDITORCONFIG_PREFIX =\\).*|\\1 ${EPREFIX}/usr|" \
-		-e "s|^\\(CFLAGS =\\).*|\\1 -fPIC $("$(tc-getPKG_CONFIG)" --cflags geany geany) ${CFLAGS}|" \
-		-e "s|\`pkg-config[^\`]*\`||" \
-		-i Makefile || die
-}
-
-src_install() {
-	exeinto "$("$(tc-getPKG_CONFIG)" --variable=libdir geany)/geany"
-	doexe ${PN}.so
-	dodoc README.md
-}
diff --git a/dev-util/editorconfig-geany/editorconfig-geany-0.2.ebuild b/dev-util/editorconfig-geany/editorconfig-geany-0.2.ebuild
index 3e1268e041e6..cc715d422e3c 100644
--- a/dev-util/editorconfig-geany/editorconfig-geany-0.2.ebuild
+++ b/dev-util/editorconfig-geany/editorconfig-geany-0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -23,6 +23,7 @@ S=${WORKDIR}/${PN}-${EGIT_COMMIT#v}
 src_prepare() {
 	eapply_user
 	sed -e "s|^\\(EDITORCONFIG_PREFIX =\\).*|\\1 ${EPREFIX}/usr|" \
+		-e "s|\\bcc\\b|$(tc-getCC)|" \
 		-e "s|^\\(CFLAGS =\\).*|\\1 -fPIC $("$(tc-getPKG_CONFIG)" --cflags geany geany) ${CFLAGS}|" \
 		-e "s|^\\(LDFLAGS =.*\\)|\\1 ${LDFLAGS}|" \
 		-e "s|\`pkg-config[^\`]*\`||" \
-- 
cgit v1.2.3