From e9d044d4b9b71200a96adfa280848858c0f468c9 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 13 Nov 2021 13:10:00 +0000 Subject: gentoo resync : 13.11.2021 --- app-i18n/zinnia/Manifest | 8 ++--- app-i18n/zinnia/files/zinnia-0.06-c++-2011.patch | 11 ------ app-i18n/zinnia/files/zinnia-0.06-c++11.patch | 11 ++++++ app-i18n/zinnia/files/zinnia-0.06-flags.patch | 4 +-- app-i18n/zinnia/files/zinnia-0.06-perl.patch | 11 ++++++ app-i18n/zinnia/files/zinnia-0.06-perl_build.patch | 11 ------ app-i18n/zinnia/zinnia-0.06-r3.ebuild | 39 ++++++++-------------- 7 files changed, 42 insertions(+), 53 deletions(-) delete mode 100644 app-i18n/zinnia/files/zinnia-0.06-c++-2011.patch create mode 100644 app-i18n/zinnia/files/zinnia-0.06-c++11.patch create mode 100644 app-i18n/zinnia/files/zinnia-0.06-perl.patch delete mode 100644 app-i18n/zinnia/files/zinnia-0.06-perl_build.patch (limited to 'app-i18n/zinnia') diff --git a/app-i18n/zinnia/Manifest b/app-i18n/zinnia/Manifest index 9c40b0836aa6..c2a9daa1fa5f 100644 --- a/app-i18n/zinnia/Manifest +++ b/app-i18n/zinnia/Manifest @@ -1,6 +1,6 @@ -AUX zinnia-0.06-c++-2011.patch 235 BLAKE2B 5a2dfa58d70b76198c8101e7a2f7b925e26dd8b5b29242990e84bc239dd5d7d7e62c554eba7b7f47c96273b5126d59bb8908518dacafe8b991528d43f9732e94 SHA512 23d856c2d14b28d4a2863767f1888701eba2693f5b7dda20bdb7959311d7ce875bb2df2776c576979d7f5dfb8106086a472af7a5e37b3972f8e16e2cc4ed1d6f -AUX zinnia-0.06-flags.patch 367 BLAKE2B 8f43fefa0822909054eaae843d98f51e0c0b007f95b546b768b2024bcce348139d0b8f738d8e3f64640267e8c2a5de600e034fd0f480bdd87f2c8855550b0d42 SHA512 f43f238cc037293a7914a00bf364068f977f5e4451e6a23959b7a6346f20d1cf5ae20d61c9e031dae0897f582ae62e3a8fb8cd77de72fe474b010ebbcc2d10b4 -AUX zinnia-0.06-perl_build.patch 336 BLAKE2B f8eb4d1ac570bad3a0cbb9fe2c09ac5e826f895741a7bf4b1e82ac439e03153936a915f4e24980d066905d9621c00a4892a65bd394e02423dee2995e319213aa SHA512 f3eeea5a6d23c07e50dc99d66b5799c5a03ff42d16afa43b97c8ff1ee9f63efe45864ba4eddb3c1bf69c38a632a4469a5f823ce13d1f57299ae027a1f698c9d0 +AUX zinnia-0.06-c++11.patch 237 BLAKE2B d6a0713e714d209f460169de1ba2b4157fc292415eaffc529c9303cf1b98fd48ef128330be3427beca8f4ec9a7b2d5212362a35b69297c635530a094f08dfbd1 SHA512 51f690d9a9d73d4f4739fa4c30b1fa145e8fae8e89f833e9c29e26451f0cbb4e0074bde088fa6109cdb730aac226b9f1a524d0c330e36ab4dbc7504a8cd14ad4 +AUX zinnia-0.06-flags.patch 369 BLAKE2B bbbb76ae8123fad5e8f5fc8853f748d8a1a1e09f5a155e79f6f6b38de28dd92a8182fd10f241987cf40f328b39650dc3a72014d107f48c00957e0b5b7eff7590 SHA512 6a40374cf473c4a196770417f63ad0a65aa6dd9151fe8b2c967ec6a618ae2b55097380784d61b4f4374963099f27463401e2be73ed8345402a66e04ebccec4f5 +AUX zinnia-0.06-perl.patch 338 BLAKE2B 500246d5415ab86329b434a27e5445599ddd510af2db43a21cf8700b8882f313b5b929a514daefac0e1b77846511e580d5c7237f04658d7a201c223e6c70f2dc SHA512 4154e4f3c0cb6a8bcce926cdc3845d4fd59fcb41e2078fe619c5b4faa52b09020d62594103b473382f504c73862f1215c96f7b678b4745a1fdb1695bc87fce2e DIST zinnia-0.06.tar.gz 457415 BLAKE2B 3c401735fec424030dd9f8d6d14f90a83cd6ad5eb8e0ec1b0d2d15285cecf14c793043fb9ad0982d6614e48bdbe913360d2f3933bb2e1a623c7920536cb3bd14 SHA512 b9a44dc3664302269c4d8481225964a3188c1921f5af7f136fdccdc452917f6ff934884e266436a0f1e0a32af19d3bea5f5e4416e694a653983039a513277b53 -EBUILD zinnia-0.06-r3.ebuild 1692 BLAKE2B c62874df0f5364ca243190204e3545707a51501f89b53864cb62cb92dd3b3efcae628ccc367028585b2bcac21116fea64d11a1f13205435b19493f4464a585dd SHA512 a383d157c6f7501b7dab47daebb39e6be7b889eca2a8f570771e32e2cfeed7f5287e58b8206ba2a329c431ede53e90228ad1ced0af559703bff09d6bc7a052ec +EBUILD zinnia-0.06-r3.ebuild 1574 BLAKE2B e1abc28a5b1050726f46d07e9d61449ff5d4382457248aa88b72d1f73eabb58655ae69c2cf7d2f9d668823c193a7df6320619fea4fca4a1c2972254422e7c4c1 SHA512 a3267fea9be4a881409e5c43ba6e8f7e9a46f24da3171dc9d1cade3f5f8413751f18b2046ffd20420869fa0e1a0bce9fa135a2014a2330c9ea217587292db68e MISC metadata.xml 365 BLAKE2B afee91a0ba5206261ec19c78e18b7c8f139d6732d169f6d38d16120c4b51eabaf635766e1f4b5881e3af2a09d58353f5bc1d3779bf43623d7c4e175331a0d328 SHA512 968bf10405fd2d4864bad421f37bd88c24412132e4e996bf9dd44a672f61753a79a0175485237c8b27c55fed076856f6000beaf070b83dba27bec7f474fd1445 diff --git a/app-i18n/zinnia/files/zinnia-0.06-c++-2011.patch b/app-i18n/zinnia/files/zinnia-0.06-c++-2011.patch deleted file mode 100644 index 0ef6ae40e434..000000000000 --- a/app-i18n/zinnia/files/zinnia-0.06-c++-2011.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- /trainer.cpp -+++ /trainer.cpp -@@ -103,7 +103,7 @@ - if (!fn) { - return false; - } -- x_.push_back(std::make_pair(y, fn)); -+ x_.push_back(std::make_pair(y, fn)); - return true; - } - diff --git a/app-i18n/zinnia/files/zinnia-0.06-c++11.patch b/app-i18n/zinnia/files/zinnia-0.06-c++11.patch new file mode 100644 index 000000000000..66a78a5a6997 --- /dev/null +++ b/app-i18n/zinnia/files/zinnia-0.06-c++11.patch @@ -0,0 +1,11 @@ +--- a/trainer.cpp ++++ b/trainer.cpp +@@ -103,7 +103,7 @@ + if (!fn) { + return false; + } +- x_.push_back(std::make_pair(y, fn)); ++ x_.push_back(std::make_pair(y, fn)); + return true; + } + diff --git a/app-i18n/zinnia/files/zinnia-0.06-flags.patch b/app-i18n/zinnia/files/zinnia-0.06-flags.patch index 80442ee4880f..5c26415f6018 100644 --- a/app-i18n/zinnia/files/zinnia-0.06-flags.patch +++ b/app-i18n/zinnia/files/zinnia-0.06-flags.patch @@ -1,5 +1,5 @@ ---- /configure.in -+++ /configure.in +--- a/configure.in ++++ b/configure.in @@ -59,15 +59,6 @@ AC_SUBST([pkgconfigdir]) AC_MSG_NOTICE([pkgconfig directory is ${pkgconfigdir}]) diff --git a/app-i18n/zinnia/files/zinnia-0.06-perl.patch b/app-i18n/zinnia/files/zinnia-0.06-perl.patch new file mode 100644 index 000000000000..02d52faf93a7 --- /dev/null +++ b/app-i18n/zinnia/files/zinnia-0.06-perl.patch @@ -0,0 +1,11 @@ +--- a/perl/Makefile.PL ++++ b/perl/Makefile.PL +@@ -4,7 +4,7 @@ + 'CC' => 'c++', + 'LD' => 'c++', + 'INC' => '', +- 'LIBS' => '-lzinnia', ++ 'LIBS' => '-L../.libs -lzinnia', + # 'VERSION' => '0.1', + 'OBJECT' => 'zinnia_wrap.o' + ); diff --git a/app-i18n/zinnia/files/zinnia-0.06-perl_build.patch b/app-i18n/zinnia/files/zinnia-0.06-perl_build.patch deleted file mode 100644 index 4da9e1eeb900..000000000000 --- a/app-i18n/zinnia/files/zinnia-0.06-perl_build.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- /perl/Makefile.PL -+++ /perl/Makefile.PL -@@ -4,7 +4,7 @@ - 'CC' => 'c++', - 'LD' => 'c++', - 'INC' => '', -- 'LIBS' => '-lzinnia', -+ 'LIBS' => '-L../.libs -lzinnia', - # 'VERSION' => '0.1', - 'OBJECT' => 'zinnia_wrap.o' - ); diff --git a/app-i18n/zinnia/zinnia-0.06-r3.ebuild b/app-i18n/zinnia/zinnia-0.06-r3.ebuild index 70d37abf609e..383852add5d2 100644 --- a/app-i18n/zinnia/zinnia-0.06-r3.ebuild +++ b/app-i18n/zinnia/zinnia-0.06-r3.ebuild @@ -1,7 +1,7 @@ -# Copyright 2010-2020 Gentoo Authors +# Copyright 2010-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="6" +EAPI="8" inherit autotools flag-o-matic perl-module toolchain-funcs @@ -15,25 +15,19 @@ KEYWORDS="amd64 ~arm64 ~ppc64 x86" IUSE="perl static-libs" PATCHES=( - "${FILESDIR}/${P}-flags.patch" - "${FILESDIR}/${P}-perl_build.patch" - "${FILESDIR}/${P}-c++-2011.patch" + "${FILESDIR}"/${P}-c++11.patch + "${FILESDIR}"/${P}-flags.patch + "${FILESDIR}"/${P}-perl.patch ) -DOCS=(AUTHORS) +HTML_DOCS=( doc/{index{,-ja}.html,${PN}.css} ) src_prepare() { default - mv configure.in configure.ac || die - sed -e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" -i configure.ac || die - eautoreconf + sed -i "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" configure.in || die - if use perl; then - pushd perl > /dev/null - PATCHES=() - perl-module_src_prepare - popd > /dev/null - fi + mv configure.{in,ac} || die + eautoreconf } src_configure() { @@ -44,8 +38,7 @@ src_compile() { default if use perl; then - pushd perl > /dev/null - + cd perl >/dev/null || die # We need to run this here as otherwise it won't pick up the # just-built -lzinnia and cause the extension to have # undefined symbols. @@ -60,7 +53,7 @@ src_compile() { OPTIMIZE="${CPPFLAGS} ${CXXFLAGS}" \ LDDLFLAGS="-shared" \ OTHERLDFLAGS="${LDFLAGS}" - popd > /dev/null + cd - >/dev/null || die fi } @@ -70,16 +63,12 @@ src_test() { src_install() { default + einstalldocs find "${D}" -name "*.la" -delete || die if use perl; then - pushd perl > /dev/null + cd perl >/dev/null || die perl-module_src_install - popd > /dev/null + cd - >/dev/null || die fi - - ( - docinto html - dodoc doc/*.css doc/*.html - ) } -- cgit v1.2.3