From 8d5dbd847cbc704a6a06405856e94b461011afe3 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 27 Mar 2021 06:06:27 +0000 Subject: gentoo resync : 27.03.2021 --- dev-cpp/Manifest.gz | Bin 10545 -> 10714 bytes dev-cpp/gtkmm/Manifest | 2 +- dev-cpp/gtkmm/gtkmm-3.24.3.ebuild | 2 +- dev-cpp/libmcpp/Manifest | 4 +- dev-cpp/libmcpp/libmcpp-2.7.2-r3.ebuild | 11 +-- dev-cpp/libmcpp/libmcpp-2.7.2_p5.ebuild | 47 ++++++++++++ dev-cpp/notcurses/Manifest | 4 ++ dev-cpp/notcurses/metadata.xml | 22 ++++++ dev-cpp/notcurses/notcurses-2.2.3.ebuild | 50 +++++++++++++ dev-cpp/pangomm/Manifest | 2 + dev-cpp/pangomm/pangomm-2.48.0.ebuild | 48 +++++++++++++ dev-cpp/prometheus-cpp/Manifest | 1 - ...erialization-test-if-locale-is-not-availa.patch | 80 --------------------- dev-cpp/tclap/Manifest | 4 +- dev-cpp/tclap/metadata.xml | 9 +-- dev-cpp/tclap/tclap-1.2.2.ebuild | 6 +- 16 files changed, 193 insertions(+), 99 deletions(-) create mode 100644 dev-cpp/libmcpp/libmcpp-2.7.2_p5.ebuild create mode 100644 dev-cpp/notcurses/Manifest create mode 100644 dev-cpp/notcurses/metadata.xml create mode 100644 dev-cpp/notcurses/notcurses-2.2.3.ebuild create mode 100644 dev-cpp/pangomm/pangomm-2.48.0.ebuild delete mode 100644 dev-cpp/prometheus-cpp/files/prometheus-cpp-0.9.0-core-Skip-serialization-test-if-locale-is-not-availa.patch (limited to 'dev-cpp') diff --git a/dev-cpp/Manifest.gz b/dev-cpp/Manifest.gz index cfe771b56f47..a1bcfcf53b2e 100644 Binary files a/dev-cpp/Manifest.gz and b/dev-cpp/Manifest.gz differ diff --git a/dev-cpp/gtkmm/Manifest b/dev-cpp/gtkmm/Manifest index ac429815bf57..e41b70d8de40 100644 --- a/dev-cpp/gtkmm/Manifest +++ b/dev-cpp/gtkmm/Manifest @@ -3,5 +3,5 @@ DIST gtkmm-3.24.2.tar.xz 13336236 BLAKE2B 93f3a04b8a2f02323bf6a1161c10eaae2ad9c2 DIST gtkmm-3.24.3.tar.xz 13539040 BLAKE2B 24664773ec7b0666575346aa0532e8961fc19d965ef34244ed97707f7e3eb4d1d0f016abf733531269bf3e3201defe31559990e32f4f43faa8d3bb5d1f02fdb7 SHA512 e373807ec245057708655fa5dbf18d5391656a55b008fd6aa0fdc5a56e80d288813c3bbb0093f39aa7679df866a176f1e6b0e842d4d1b18b775a5928eed9fef5 EBUILD gtkmm-2.24.5-r1.ebuild 1536 BLAKE2B a2e3b097ac226e72ca62ee4f66cb6cab334de7422a4c61f45a30898df261d0ee7b7cdce4267ad1e2e1e1410e2eba6773d5c42a7374ba16f43a2bac27607b48a2 SHA512 552d38fbb89a06580a2f1ea7305357198e5d8b329aec1d0b38352f443442d489688d00c702181c30aba2708826a926092604cda8d5200065a792be623920cdf9 EBUILD gtkmm-3.24.2-r1.ebuild 1875 BLAKE2B d90e6f650b5622cf04458f320a61e5500fb3300f9be22799958dbf43dcf8ba0a6a195ed5bf8c9c37e766a8cc7e3c677ff07951993c03f73a5fb6b2d92f29c2ac SHA512 e795ee1cb1c1efda920ee9e6ebf02ec183adec995a02ae2e373c34b1d0dd9baf00a371f879c9a8418c9680955625dafb20ef66feb1c904e1711f4c31ade9bf72 -EBUILD gtkmm-3.24.3.ebuild 1436 BLAKE2B 0739259528d672300049a67ad469b4aa2ff29a03ecd126d507a8129ef9c99e049448a925f9553d0106e46fc562cabaf74abcfc69f869ac30c49bdfcdd7005e69 SHA512 f19504473d14f73b669b5eb12d88c7f9f0b49810d653ed1a45e4709da5b7662bede3e8c2c814d4f2a9e064ff974e863fbe80f4781573d81161b215795da73fac +EBUILD gtkmm-3.24.3.ebuild 1435 BLAKE2B a01b4e8223fc6f96814e75aa8ae9622cd2ffee40093ea973bc943f833f523f4436320edabfd8ceae97ac865eb3076e5d7ebc4f74f3130b55b763aafc52c98b7d SHA512 351c6a1d5c9865f1e841abf911932b50425e8008a9b21e0d541e9b6bbbd4bd04d4698fa5fd4fa5118682a7cd1dc5a5f47ecc02bc3cb77ebb13983c94c04fcd9a MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506 diff --git a/dev-cpp/gtkmm/gtkmm-3.24.3.ebuild b/dev-cpp/gtkmm/gtkmm-3.24.3.ebuild index 654a1c48209a..a1147702594f 100644 --- a/dev-cpp/gtkmm/gtkmm-3.24.3.ebuild +++ b/dev-cpp/gtkmm/gtkmm-3.24.3.ebuild @@ -9,7 +9,7 @@ HOMEPAGE="https://www.gtkmm.org" LICENSE="LGPL-2.1+" SLOT="3.0" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris" IUSE="aqua doc test wayland X" REQUIRED_USE="|| ( aqua wayland X )" 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 +} diff --git a/dev-cpp/notcurses/Manifest b/dev-cpp/notcurses/Manifest new file mode 100644 index 000000000000..2f98f191a346 --- /dev/null +++ b/dev-cpp/notcurses/Manifest @@ -0,0 +1,4 @@ +DIST notcurses-2.2.3.tar.gz 10861361 BLAKE2B e7b487e84b5defbb1208f355c85f7178b05f412c2a746a8bcecb2da7db8df32da563aeb1f1f218014a2ff9803f0984889e4341d59f585add49c944d4707e5cd4 SHA512 9c718a39352cc10e4f4cb24cd7940ccc7ac7ad1f5890f1a87166267b3c24011629464a4720f08c2b8bbf0fab2c5cb9b31fba7a43bc62ae65dff894019adece7d +DIST notcurses-doc-2.2.3.tar.gz 89550 BLAKE2B a42c74f95166e48ecff99a05d66925869a44a44c4faa867cca663d94ee340748417d6560d022fdb90c7761c19285b0c4838b75843a3d26d25182977f68a0d6ce SHA512 b61f829d1ad5f69147a7b4fe139db406d5a26683b55d72251f3e313c17f591ad4e9e868577fbecf86c4ac9959c942e244927fb29a2e44996fadde7946493ccc8 +EBUILD notcurses-2.2.3.ebuild 1139 BLAKE2B b3f88e3e18ce6bdbac48fbc24f701e723015538c5bab4608fc3e114e7f783b5b3e732e9d6c28ff794e964655192af9a77489c48094decdba4d380f21be2bc314 SHA512 f28252268d25f06eb33659340e10f11316989df79bbedbf7793a313a0d9d005fa8e31353f93d9f485342d733c10c3dc2ada1893ed1d28c7163f061bcf5561ce3 +MISC metadata.xml 869 BLAKE2B c5414b2e27b44526c56e9c476d8c5540a3d7b462b70ed6e3e323c0dbee15c704055cc7d17bf270fbb7a6125bfa10a2934c9d56d5c727d73df0c8125ec30671d6 SHA512 f893bc5d9b44d26e178250432be8762524543f0c124c932d535e4f9742924d27a26b065a5d1275dc451f23b0ff72a55a2f5107749021081e7e399617de132f17 diff --git a/dev-cpp/notcurses/metadata.xml b/dev-cpp/notcurses/metadata.xml new file mode 100644 index 000000000000..3fe0567d3e8b --- /dev/null +++ b/dev-cpp/notcurses/metadata.xml @@ -0,0 +1,22 @@ + + + + + dankamongmen@gmail.com + nick black + + + proxy-maint@gentoo.org + Proxy Maintainers + + + Notcurses facilitates the creation of modern TUI programs, + making full use of Unicode and 24-bit TrueColor. It presents + an API similar to that of Curses, and rides atop Terminfo. + + + Notcurses facilita la creación de programas TUI actuales, + haciendo un uso completo de Unicode y color real de 24 bits. + Presenta una API similar a la de Curses y funciona sobre Terminfo. + + diff --git a/dev-cpp/notcurses/notcurses-2.2.3.ebuild b/dev-cpp/notcurses/notcurses-2.2.3.ebuild new file mode 100644 index 000000000000..52303eeff6fe --- /dev/null +++ b/dev-cpp/notcurses/notcurses-2.2.3.ebuild @@ -0,0 +1,50 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +CMAKE_ECLASS="cmake" +inherit cmake-multilib + +DESCRIPTION="Blingful TUIs and character graphics" +HOMEPAGE="https://notcurses.com" +SRC_URI="https://github.com/dankamongmen/notcurses/archive/v${PV}.tar.gz -> ${P}.tar.gz + https://github.com/dankamongmen/notcurses/releases/download/v${PV}/notcurses-doc-${PV}.tar.gz" +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +DEPEND="dev-libs/libunistring + media-video/ffmpeg + >=sys-libs/readline-8.0" +RDEPEND="${DEPEND}" + +src_configure() { + local mycmakeargs=( + -DUSE_DOCTEST=OFF + -DUSE_MULTIMEDIA=ffmpeg + -DUSE_PANDOC=OFF + -DUSE_QRCODEGEN=OFF + -DUSE_STATIC=OFF + ) + cmake-multilib_src_configure +} + +src_compile() { + cmake-multilib_src_compile +} + +src_test() { + multilib_src_test +} + +src_install() { + cmake-multilib_src_install + + # we use this tortured form lest we try, every time we release a + # x.y.1 or x.y.3, to install the source dir as a man page. + # exploit the fact that there's a bijection from html<>man. + for i in ../*.html ; do + doman ../$(basename ${i} .html) + done +} diff --git a/dev-cpp/pangomm/Manifest b/dev-cpp/pangomm/Manifest index 40b155f98e67..19f0e340e28c 100644 --- a/dev-cpp/pangomm/Manifest +++ b/dev-cpp/pangomm/Manifest @@ -1,5 +1,7 @@ DIST pangomm-2.42.1.tar.xz 882508 BLAKE2B 34b6a93d931e1a27c7859e3cc407c714588890122639a61d30d9886bc3d861f11e1fcb97a08b6be8bddcde776d86f8b6c4cdc4a53da245ea1dc81f50d402303c SHA512 46ba375e61dd32e268397ecb8e69364b642ea3d9a6c4d9e3e52500e1e1c9fa0c6aa822c6d5046f49a2fe4d9a872c6c2b354134d39c17370abcfc6a1d752223b0 DIST pangomm-2.42.2.tar.xz 656760 BLAKE2B 8fae779aa78b2337b83759adc7aadec1f61c08c54d892e3cdd05180e2ab032a61faa72c39281fab649bcd08591c5d7ace9ea65b25f76ce17d6f4d96f38900b6a SHA512 5e4826d64c0178527b4df73e901d2fdf5661d41777e189f5e2d4b26577e42689efaccf5a28502246c6b3926571ccd5876cb23d33267b44ace7ee164322c14667 +DIST pangomm-2.48.0.tar.xz 674516 BLAKE2B 58c3e93c6127a14b5bc866b43bff4ab25a1ac1a06813c73e4f2a4d02adad3f51b7ec922f7c6e3d4af518a1f8f31c19de4df0c11b91a10ee61c2e16df8aa025ea SHA512 0c1be5726740669c366214caf8b8b0bca1c7b223aafb2e6ce64f7a5a90d07c62ee509821ac787f3997ae78aa3a3ffd5cff7d33c73bc7ebd7fe642c56689d98a3 EBUILD pangomm-2.42.1-r1.ebuild 927 BLAKE2B 59f19896cf60e1c4296e31d58584ae819ba31044db859b4ba5f4f21c8637091116dcb6eac2ea3fc4372f49e3a0e40211512b0b1c689665bc5c025a2720cd25be SHA512 1c0d1f39152b9c27e67a94544dbf777afbff64bd4d2751d525e60c636b36c9feb8f516ed6c9f7ba7f3187082db2a4f21421f0bcc5c810dd1e6368e63bc26af5e EBUILD pangomm-2.42.2.ebuild 991 BLAKE2B daff32bc87f4d3a0978c22a358e59737c64bed09df58e00b4a87dff6671bb7e94674c11dfd04568ca00bb204b4d3363f19dca569534d627762352749e171b408 SHA512 9171d58dbcc3d0348bb38f8e5938a28cd3265754a56f738257ff26f685569d8c41ec07a02f89ea570e02268194b2536206ef966d03b098499668110dc9c77f33 +EBUILD pangomm-2.48.0.ebuild 1005 BLAKE2B a5e2ed5eeba3809426505d9c017654c7affc840256d2874e8d5e14033a6783fbeed2badcad55cf232d79e1728bbf62edaec153e63ddb2a25b88da0cddc5fa689 SHA512 77df10f6dc25ccd967316aa4879ff57c45c9ab1afe22ea98cd0ed26a8f5857703360874349792612934e34b11c823274274d7697f356f6fce64ab3f38cb8b8c3 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506 diff --git a/dev-cpp/pangomm/pangomm-2.48.0.ebuild b/dev-cpp/pangomm/pangomm-2.48.0.ebuild new file mode 100644 index 000000000000..7a3b8eba6959 --- /dev/null +++ b/dev-cpp/pangomm/pangomm-2.48.0.ebuild @@ -0,0 +1,48 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +inherit gnome.org meson multilib-minimal + +DESCRIPTION="C++ interface for pango" +HOMEPAGE="https://www.gtkmm.org" + +LICENSE="LGPL-2.1+" +SLOT="2.48" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris" +IUSE="doc" + +DEPEND=" + >=dev-cpp/cairomm-1.16.0:1.16[doc?,${MULTILIB_USEDEP}] + >=dev-cpp/glibmm-2.68.0:2.68[doc?,${MULTILIB_USEDEP}] + >=dev-libs/libsigc++-3:3[doc?,${MULTILIB_USEDEP}] + >=x11-libs/pango-1.48.0[${MULTILIB_USEDEP}] +" +RDEPEND="${DEPEND}" +BDEPEND=" + virtual/pkgconfig + doc? ( + app-doc/doxygen[dot] + dev-lang/perl + dev-libs/libxslt + ) +" + +multilib_src_configure() { + local emesonargs=( + -Dbuild-documentation=$(multilib_native_usex doc true false) + ) + meson_src_configure +} + +multilib_src_compile() { + meson_src_compile +} + +multilib_src_install() { + meson_src_install +} + +multilib_src_test() { + meson_src_test +} diff --git a/dev-cpp/prometheus-cpp/Manifest b/dev-cpp/prometheus-cpp/Manifest index 34dcea788437..6a8411785193 100644 --- a/dev-cpp/prometheus-cpp/Manifest +++ b/dev-cpp/prometheus-cpp/Manifest @@ -1,4 +1,3 @@ -AUX prometheus-cpp-0.9.0-core-Skip-serialization-test-if-locale-is-not-availa.patch 2180 BLAKE2B cd864a68def30f4bf64eb56afc2666ebe7e56a645da1df7e143d7874ae36ea8ecc82a2d5f8aeba5939866b67baeb6a457937355d275375c3bd93b1340bf00ac7 SHA512 3f1dbd41a953e897a1e18a97ef239b73ee1a00475d210406ada3b17686ebd52698c125670a217bb2fd75bf43437640426d48d1c5216ed313c2aceee6bc9fed68 DIST prometheus-cpp-0.12.2.tar.gz 55191 BLAKE2B f1430cf6b8ca8272c447e8c2a25af5fb0d515389cb1078f8836a9a1f1ba0e26cc43236e9c147219384df40d601b843219acb95ebc46bb1c2fce6d83a86724182 SHA512 9907658939b7956219c3623bd5997f341f4374fbce2ee606bd1d8df820779ed8dc70658a30aafbb47b9af645205c048270b23e701203e13286bc365094a441d3 EBUILD prometheus-cpp-0.12.2.ebuild 821 BLAKE2B b4a5e9817f4cb65919ad504a6d2bcc53cf41b0cc81bfdda34eaf4b335d6bc9054d7648ebf4a344afc1087239b020f073142994b8ceebc0bf77c9daa1798632e5 SHA512 4377daa3ed659ee16bb0dca9bdce029b5e68650cccce4d4a6eb6b518e8f5bfbf4e08f11779e1a45e0b0c782218b8026b1200302e27459d1b7993f931564760f1 MISC metadata.xml 987 BLAKE2B a3ee76e524e97e6577b2e71d00cd2eb29821f74230d8b8224497565ddf2e80a7358f37a95948caf1dc3a4213f7e96683a54b10836e83a71e6e5caf78d59a8268 SHA512 cfea74c7e5325514dacc13fc86213bc2c6fe758681168099fa1edb5b49503ffa40b83dc10ba6fdcbbbbe502aa064a6445caa7c07c8f1c82fe177dc574dbd75da diff --git a/dev-cpp/prometheus-cpp/files/prometheus-cpp-0.9.0-core-Skip-serialization-test-if-locale-is-not-availa.patch b/dev-cpp/prometheus-cpp/files/prometheus-cpp-0.9.0-core-Skip-serialization-test-if-locale-is-not-availa.patch deleted file mode 100644 index ced0b80e83e9..000000000000 --- a/dev-cpp/prometheus-cpp/files/prometheus-cpp-0.9.0-core-Skip-serialization-test-if-locale-is-not-availa.patch +++ /dev/null @@ -1,80 +0,0 @@ -From bf6e2ce56abe2a710181f0365a21ca2dafd2a8f5 Mon Sep 17 00:00:00 2001 -From: Gregor Jasny -Date: Fri, 13 Mar 2020 13:16:56 +0100 -Subject: [PATCH] core: Skip serialization test if locale is not available - -Closes: #345 ---- - core/tests/raii_locale.h | 15 +++++++++++++++ - core/tests/serializer_test.cc | 21 ++++++++++++++------- - 2 files changed, 29 insertions(+), 7 deletions(-) - create mode 100644 core/tests/raii_locale.h - -diff --git a/core/tests/raii_locale.h b/core/tests/raii_locale.h -new file mode 100644 -index 0000000..592d74f ---- /dev/null -+++ b/core/tests/raii_locale.h -@@ -0,0 +1,15 @@ -+#pragma once -+ -+#include -+ -+class RAIILocale { -+ public: -+ RAIILocale(const char* name) : savedLocale_(std::locale::classic()) { -+ std::locale::global(std::locale(name)); -+ } -+ -+ ~RAIILocale() { std::locale::global(savedLocale_); } -+ -+ private: -+ const std::locale savedLocale_; -+}; -diff --git a/core/tests/serializer_test.cc b/core/tests/serializer_test.cc -index f935a3b..6cb8f0e 100644 ---- a/core/tests/serializer_test.cc -+++ b/core/tests/serializer_test.cc -@@ -1,9 +1,13 @@ - #include "prometheus/counter.h" -+#include "prometheus/detail/future_std.h" - #include "prometheus/family.h" - #include "prometheus/text_serializer.h" - -+#include "raii_locale.h" -+ - #include --#include -+ -+#include - #include - - namespace prometheus { -@@ -25,15 +29,18 @@ class SerializerTest : public testing::Test { - - #ifndef _WIN32 - TEST_F(SerializerTest, shouldSerializeLocaleIndependent) { -- // save and change locale -- const std::locale oldLocale = std::locale::classic(); -- std::locale::global(std::locale("de_DE.UTF-8")); -+ std::unique_ptr localeWithCommaDecimalSeparator; -+ -+ // ignore missing locale and skip test if setup fails -+ try { -+ localeWithCommaDecimalSeparator = -+ detail::make_unique("de_DE.UTF-8"); -+ } catch (std::runtime_error&) { -+ GTEST_SKIP(); -+ } - - const auto serialized = textSerializer.Serialize(collected); - EXPECT_THAT(serialized, testing::HasSubstr("1.0")); -- -- // restore locale -- std::locale::global(oldLocale); - } - #endif - --- -2.28.0 - diff --git a/dev-cpp/tclap/Manifest b/dev-cpp/tclap/Manifest index 9f9e35216ddc..0a0daf13bea6 100644 --- a/dev-cpp/tclap/Manifest +++ b/dev-cpp/tclap/Manifest @@ -1,3 +1,3 @@ DIST tclap-1.2.2.tar.gz 231714 BLAKE2B 94fc3d5253c08a305e5f75f6b4b7ab556e94980193502b64665ff828609cde20f340e3fe18cef12011da07ae2db2c2bb52a08f112d052d74c45be8290d525092 SHA512 516ec17f82a61277922bc8c0ed66973300bf42a738847fbbd2912c6405c34f94a13e47dc964854a5b26a9a9f1f518cce682ca54e769d6016851656c647866107 -EBUILD tclap-1.2.2.ebuild 549 BLAKE2B d3ad6a465e07b217a9254e8b50316e50918fd474d6988f91e70b3ebe5c3b40b5166a5573117adaaf0202edc8facc73519e05bd347074e2f37b53ab8b2869bb40 SHA512 d5971899f95945b3384078777c6b80c0332a1b186af6998ca261fb089ada1ee8fb0a3096b1d7b48761d16117c339bcb04fb505db46ff28be828f9beda0c33c23 -MISC metadata.xml 468 BLAKE2B 7a7cb4e5990c8b35a9393b8206aa4bf0e304918aec4061331b7dc0201c2c5544906e59d53d33f4e55e8839b5b28da2001b4e1cfccf6d944ed91561406f5b99aa SHA512 8dd344d7410b740202f520d8fa40d193860851c355c0285fa84b3c2987573eb0a0fee89074059d03e003c1c986eeff3bcfe4496b3ba9139c7fffd6545674aa89 +EBUILD tclap-1.2.2.ebuild 582 BLAKE2B 79372cd645feea22c5c68a1e6fdd3d4c9b50d5c07c353dc3e7e4bc082779252dff86edc2d72705d53d6d8a3e80d834cd407cdcb5d456d1ac1732c65076a728de SHA512 0a44c717c0ff3039f9233451cd3178351d5204c3d96f7a6f25b325cd8c1ec3a3079b67be6c0f8555cd91fbe6491862f6d6e5d38ff71374ea2a92111a072d5450 +MISC metadata.xml 242 BLAKE2B 82d9a3ad5f6403991bbdd339716e18a462985eaa3980968d67042c7a9541c070363f43924fb9f203a29e73ae2d1023e3b8ab7e307dc381ac5cdb55a588407a0b SHA512 95904a3f7981543557133918ba83a467f03e6839b3248651dc94870f1b8c3788ac50279d59886c54d12328891964c942e1bbd4e1c9d88837643ded5678a10a85 diff --git a/dev-cpp/tclap/metadata.xml b/dev-cpp/tclap/metadata.xml index 9e8ca2faaa6f..71114a4fc927 100644 --- a/dev-cpp/tclap/metadata.xml +++ b/dev-cpp/tclap/metadata.xml @@ -1,14 +1,7 @@ - - gentoo@culot.org - Frederic Culot - - - proxy-maint@gentoo.org - Proxy Maintainers - + tclap diff --git a/dev-cpp/tclap/tclap-1.2.2.ebuild b/dev-cpp/tclap/tclap-1.2.2.ebuild index 1b75faff6e95..82435d7207ef 100644 --- a/dev-cpp/tclap/tclap-1.2.2.ebuild +++ b/dev-cpp/tclap/tclap-1.2.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 2007-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -18,6 +18,10 @@ src_configure() { econf $(use_enable doc doxygen) } +src_test() { + emake -j1 check +} + src_install() { emake DESTDIR="${D}" docdir="${EPREFIX}/usr/share/doc/${PF}/html" install } -- cgit v1.2.3