gentoo resync : 27.03.2021

3 files changed, 57 insertions, 5 deletions

diff --git a/dev-cpp/libmcpp/Manifest b/dev-cpp/libmcpp/Manifest
index 15e9e10579da..849540acf6db 100644
--- a/dev-cpp/libmcpp/Manifest
+++ b/dev-cpp/libmcpp/Manifest
@@ -2,5 +2,7 @@ AUX libmcpp-2.7.2-fix-build-system.patch 1008 BLAKE2B d9a87af2faada430c9bd09bb6d
 AUX libmcpp-2.7.2-gniibe.patch 1039 BLAKE2B 2d69c087602432013c86cfe3a54f67e113842b0ae1cb9d293862f9ab1956c0b38a86a93c294936eb9e43c9fc6f7c8726bcfe198d0cdd9ede68bb05acec340e46 SHA512 a31a0f2e7430381e5e62ea4257a35891ce9d2f3beed60c6caad3b6d298a58557e9c850223840ef8c6f6c2e8139cf4a4edf29ac93b2532680feafba503fcfaf6d
 AUX libmcpp-2.7.2-zeroc.patch 2342 BLAKE2B d33a7539044a084ce42d5655db298c92b288574ae677621ccbde252abbc46ea7f5c071c500431e2e761c6158944beb2efd7fa95ec8cebd4e5ea1ce3a6ddf4af9 SHA512 86b2e851490e180dfe3028a5a37019ea423924c921ab053a642fb78d4533a87f913ede2928daf9da4daf60e67795a24521186b40c76961ae99ebeb75f8aa95ad
 DIST mcpp-2.7.2.tar.gz 1533457 BLAKE2B 4368fd1c667923ab3b60ce79f8421c549a9d9105957ca87b9ba49be513cb1be7f220a3ddbaf306e860014d5211af480d07170d912d3d4a80345d8eab45fd6c00 SHA512 1ca885cb13fdb684de9d0595a9215b52f48a93a69077d82cdcacafe40d9a61fb77b00a3ff2b8890e7bc0a0fcc0c8d70d4093c00c280351cd4459aba67c573235
-EBUILD libmcpp-2.7.2-r3.ebuild 771 BLAKE2B 306444121f6c963ae823a42ad8d1adc58e54f3d196385f0a6f95443421896779d5b821108bbdc4da0e4de6de332f73335a6f4c9e4727bc341f7d749fd60207c1 SHA512 2017ba16c121bc09393b7a1df4ff586d90034c8b568076fbfd824864f45a296306ad99ef66104caf9bf99264997469dca9579891db44b7ac873aab51c2100492
+DIST mcpp_2.7.2-5.debian.tar.xz 7528 BLAKE2B 92f455809cfb49d97ca4e62c7087ebe2ebe0ce835e8f12d6e93b1df2ec1e15472f242637f320be2b6bada85b193545fcf3608e8c9a935805a5f052909d3c6f0b SHA512 08509945048ccc4525ecd61d3f901a4d81fe73c1db84c26b76664d5127970af45662a168b99836b58467afc7202a1a20e0dfe8954a87e4cd1368f2136d7955be
+EBUILD libmcpp-2.7.2-r3.ebuild 843 BLAKE2B a2e1db534a44b4a030c750e38c9e948cca083ec61006a2da7494b0f5d07d3e70b86851f90d0ed6a67762c5422de3ce27383a9bb0016a19815ac59283447fc76e SHA512 e92af5e7f009dd942a204088466e7812a5c6bbae9e36a2a56e544f148daeb31c79b1415542ea0bc8a59c4e1fe0ec12a9aba04cf2976b3e642118651d32fbe4ff
+EBUILD libmcpp-2.7.2_p5.ebuild 893 BLAKE2B d4746ed659e1390fb35d515f8e201c55f1b1fccdf6562ceeddc333ea9320bd185ae2f64e1cc74e194b015f87dc293bf2447e5a0536ddc461362d52287fa151a7 SHA512 d6eb6671dfb4206caa08d88af5b7deb08c98f3b78b234791aab2ad50938768c2cc51970d10bfb01cecf04d0ec08d8f2bdfcfaf83b028518674014d3ef4a68112
 MISC metadata.xml 241 BLAKE2B 243a081993d2297570d94667e0858f3a05bc5a214321a6d5a132f0b7a20a4cdfd9fdd1ccfd9e4753e6ea74e26907b167c484e504671e68458664d0fee31e1a2b SHA512 d242d2c5f6c5b13d0380745c59f6d4672fefcf85b888df7bc88f4501853f262eb1f615b25787ad4bce10fb8b5aad23de076feff3350f214be3d3793a3d249444
diff --git a/dev-cpp/libmcpp/libmcpp-2.7.2-r3.ebuild b/dev-cpp/libmcpp/libmcpp-2.7.2-r3.ebuild
index d22a2e028a4e..b2aa110f1885 100644
--- a/dev-cpp/libmcpp/libmcpp-2.7.2-r3.ebuild
+++ b/dev-cpp/libmcpp/libmcpp-2.7.2-r3.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit autotools
 
@@ -10,14 +10,13 @@ MY_P=${P/lib/}
 DESCRIPTION="A portable C++ preprocessor"
 HOMEPAGE="http://mcpp.sourceforge.net"
 SRC_URI="mirror://sourceforge/mcpp/${MY_P}.tar.gz"
+S="${WORKDIR}"/${MY_P}
 
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="amd64 ~arm ~ia64 x86 ~x86-linux ~x64-macos"
 IUSE="static-libs"
 
-S=${WORKDIR}/${MY_P}
-
 PATCHES=(
 	"${FILESDIR}"/${PN}-2.7.2-fix-build-system.patch
 	"${FILESDIR}"/${PN}-2.7.2-zeroc.patch
@@ -26,6 +25,10 @@ PATCHES=(
 
 src_prepare() {
 	default
+
+	# bug #778461
+	sed -i 's/-lmcpp/libmcpp.la/' src/Makefile.am || die
+
 	eautoreconf
 }
 
diff --git a/dev-cpp/libmcpp/libmcpp-2.7.2_p5.ebuild b/dev-cpp/libmcpp/libmcpp-2.7.2_p5.ebuild
new file mode 100644
index 000000000000..ca5877298ab4
--- /dev/null
+++ b/dev-cpp/libmcpp/libmcpp-2.7.2_p5.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+MY_PN=${PN/lib/}
+MY_P=$(ver_cut 1-4 ${MY_PN}-${PV})
+
+DESCRIPTION="A portable C++ preprocessor"
+HOMEPAGE="http://mcpp.sourceforge.net"
+SRC_URI="mirror://sourceforge/mcpp/${MY_P}.tar.gz"
+SRC_URI+=" https://deb.debian.org/debian/pool/main/m/${MY_PN}/${MY_PN}_${PV/_p/-}.debian.tar.xz"
+S="${WORKDIR}"/${MY_P}
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~x86 ~x86-linux ~x64-macos"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.7.2-fix-build-system.patch
+)
+
+src_prepare() {
+	default
+
+	# bug #718808
+	eapply "${WORKDIR}"/debian/patches/*.patch
+
+	# bug #778461
+	sed -i 's/-lmcpp/libmcpp.la/' src/Makefile.am || die
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--enable-mcpplib \
+		--disable-static
+}
+
+src_install() {
+	default
+
+	find "${ED}" -name '*.la' -delete || die
+}