From b7b97785ebbb2f11d24d14dab8b81ed274f4ce6a Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 19 Mar 2019 11:37:34 +0000 Subject: gentoo resync : 19.03.2019 --- dev-cpp/Manifest.gz | Bin 9883 -> 9886 bytes dev-cpp/atkmm/Manifest | 4 +- dev-cpp/atkmm/atkmm-2.24.3.ebuild | 34 ----------- dev-cpp/atkmm/atkmm-2.28.0.ebuild | 34 +++++++++++ dev-cpp/catch/Manifest | 4 +- dev-cpp/catch/catch-1.12.2.ebuild | 4 +- .../catch/files/catch-2.2.2-python-automagic.patch | 25 -------- dev-cpp/catch/files/catch-2.2.2-test-python3.patch | 44 -------------- dev-cpp/glibmm/Manifest | 4 +- dev-cpp/glibmm/glibmm-2.56.1.ebuild | 2 +- dev-cpp/glibmm/glibmm-2.58.1.ebuild | 65 ++++++++++++++++++++ dev-cpp/libjson-rpc-cpp/Manifest | 3 - .../libjson-rpc-cpp-1.1.0-r1.ebuild | 67 --------------------- .../libjson-rpc-cpp/libjson-rpc-cpp-1.1.1.ebuild | 67 --------------------- dev-cpp/ms-gsl/Manifest | 2 +- dev-cpp/ms-gsl/ms-gsl-2.0.0.ebuild | 2 +- 16 files changed, 110 insertions(+), 251 deletions(-) delete mode 100644 dev-cpp/atkmm/atkmm-2.24.3.ebuild create mode 100644 dev-cpp/atkmm/atkmm-2.28.0.ebuild delete mode 100644 dev-cpp/catch/files/catch-2.2.2-python-automagic.patch delete mode 100644 dev-cpp/catch/files/catch-2.2.2-test-python3.patch create mode 100644 dev-cpp/glibmm/glibmm-2.58.1.ebuild delete mode 100644 dev-cpp/libjson-rpc-cpp/libjson-rpc-cpp-1.1.0-r1.ebuild delete mode 100644 dev-cpp/libjson-rpc-cpp/libjson-rpc-cpp-1.1.1.ebuild (limited to 'dev-cpp') diff --git a/dev-cpp/Manifest.gz b/dev-cpp/Manifest.gz index 130379f15ca7..9830474f0dba 100644 Binary files a/dev-cpp/Manifest.gz and b/dev-cpp/Manifest.gz differ diff --git a/dev-cpp/atkmm/Manifest b/dev-cpp/atkmm/Manifest index ed312b4690da..1908e2c5b495 100644 --- a/dev-cpp/atkmm/Manifest +++ b/dev-cpp/atkmm/Manifest @@ -1,5 +1,5 @@ DIST atkmm-2.24.2.tar.xz 849784 BLAKE2B 2cd96268cf727de1ebe83428e98f1d21f8dbd1a72ef01be80ec28d169ff0ae9ac375bbbd1a530f3c47b60b49a40e317fe39645d74f6be3c017edcb9735bc0236 SHA512 427714cdf3b10e3f9bc36df09c4b05608d295f5895fb1e079b9bd84afdf7bf1cfdec6794ced7f1e35bd430b76f87792df4ee63c515071a2ea6e3e51e672cdbe2 -DIST atkmm-2.24.3.tar.xz 891868 BLAKE2B 8b7f961ac8b6728efaa6e34e65c11cb2a7e35b6f33392f4384d07cd4157f6f6b4b34513ca16676dc7fe5c906f6ab464d4ad416d1c9db0ea8803c4a0d915e342b SHA512 dc08efcd965b4ac385f73847d065d7cbf5f8e05b8644f49a6d794805a7bd6a9a03ff159c308b9062fe66d8acfc8e8e237654622c6a7cd22fde5a518388290cb6 +DIST atkmm-2.28.0.tar.xz 891904 BLAKE2B 8172effa5f4dc542020b58d7e3d3bea66b0affa98db977e94249dfd8fa6c4fdea88cabb385dcfdb2d79874017c4e648a737413bae021121d1423d62e335d2737 SHA512 8457cff58648c3d3944d6a9fb400062985c70a714856a5d84d4553cb6b1202bdc47aa48c612851fea1cc1b7ab59381116c65d2a22212907e3c4b7090601946bc EBUILD atkmm-2.24.2.ebuild 852 BLAKE2B 26f9d3d5ded68cb0da224ed19cb04771bc148d29b4dc312da97bd2e5c133f90efe086bbe12626b844120a13f131a7c85478e07c90aa292b8c92667e269475ed1 SHA512 17fcb05ffaf5b624a7157b7e08c918818785a05c99a9c8cb76a5128e68d53d197c517a9f93309f17e98562536207c558bb5c72f7cc5984b202bb9dd5e98601db -EBUILD atkmm-2.24.3.ebuild 840 BLAKE2B 572a11d5d7d93c284138650bf70c1abf597904fc22290f6d40289a962d7d53c7090a3fec36abdfa37d723163b73aab56fdfdfd92d82e8497f6a5eb27a5cb06a0 SHA512 d710bc7bf28d3ee6ee47506b0652ce1e4a7a89a8816c8bfe1bf9bb608d429b9a1b80ad1419c60a1b534f77911f76df82d50af9ca6dbfc12d55e6ef242e1d2c4f +EBUILD atkmm-2.28.0.ebuild 840 BLAKE2B b4ebd0b007deef508570e704de4de461fda6513920785df3c340eba7315d9ffade0ef64db0b791e55b65ae8fade3229a51cbfd79715c9b66f1b33e20bdb18e50 SHA512 16e123caece1bb62c268825abf8fb51d3a31410761444937337401735edd13ce5da659a3f940250f378e483548abb593b2a2e98765de26889edf1d433ee7e214 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506 diff --git a/dev-cpp/atkmm/atkmm-2.24.3.ebuild b/dev-cpp/atkmm/atkmm-2.24.3.ebuild deleted file mode 100644 index fe842297e302..000000000000 --- a/dev-cpp/atkmm/atkmm-2.24.3.ebuild +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit gnome2 multilib-minimal - -DESCRIPTION="C++ interface for the ATK library" -HOMEPAGE="https://www.gtkmm.org" - -LICENSE="LGPL-2.1+" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris" -IUSE="doc" - -COMMON_DEPEND=" - >=dev-cpp/glibmm-2.46.2:2[doc?,${MULTILIB_USEDEP}] - >=dev-libs/atk-2.18.0[${MULTILIB_USEDEP}] - >=dev-libs/libsigc++-2.3.2:2[${MULTILIB_USEDEP}] -" -RDEPEND="${COMMON_DEPEND} - !) -+ if(NOT ${PYTHONINTERP_FOUND}) -+ message(FATAL_ERROR "Python not found, but required for running tests!") -+ endif() -+ -+ add_test(NAME ApprovalTests COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/scripts/approvalTests.py $) - set_tests_properties(ApprovalTests PROPERTIES FAIL_REGULAR_EXPRESSION "Results differed") - - if (CATCH_USE_VALGRIND) diff --git a/dev-cpp/catch/files/catch-2.2.2-test-python3.patch b/dev-cpp/catch/files/catch-2.2.2-test-python3.patch deleted file mode 100644 index 0712f1577077..000000000000 --- a/dev-cpp/catch/files/catch-2.2.2-test-python3.patch +++ /dev/null @@ -1,44 +0,0 @@ -From dc6b83bec9bdcc149db08711cc9dfd555a8620fa Mon Sep 17 00:00:00 2001 -From: Tom Hughes -Date: Fri, 6 Apr 2018 13:59:08 +0100 -Subject: [PATCH] Support Python3 in approval tests - ---- - scripts/approvalTests.py | 15 +++++++++++---- - 1 file changed, 11 insertions(+), 4 deletions(-) - -diff --git a/scripts/approvalTests.py b/scripts/approvalTests.py -index a2ab5d5a2..16cc7b7d2 100755 ---- a/scripts/approvalTests.py -+++ b/scripts/approvalTests.py -@@ -72,10 +72,17 @@ - - overallResult = 0 - -+def openFile(file, mode): -+ try: -+ return open(file, mode, encoding='utf-8', errors='surrogateescape') -+ except TypeError: -+ import io -+ return io.open(file, mode, encoding='utf-8', errors='surrogateescape') -+ - def diffFiles(fileA, fileB): -- with open(fileA, 'r') as file: -+ with openFile(fileA, 'r') as file: - aLines = [line.rstrip() for line in file.readlines()] -- with open(fileB, 'r') as file: -+ with openFile(fileB, 'r') as file: - bLines = [line.rstrip() for line in file.readlines()] - - shortenedFilenameA = fileA.rsplit(os.sep, 1)[-1] -@@ -139,8 +146,8 @@ def approve(baseName, args): - subprocess.call(args, stdout=f, stderr=f) - f.close() - -- rawFile = open(rawResultsPath, 'r') -- filteredFile = open(filteredResultsPath, 'w') -+ rawFile = openFile(rawResultsPath, 'r') -+ filteredFile = openFile(filteredResultsPath, 'w') - for line in rawFile: - filteredFile.write(filterLine(line).rstrip() + "\n") - filteredFile.close() diff --git a/dev-cpp/glibmm/Manifest b/dev-cpp/glibmm/Manifest index 37d0f5e9b615..76ebb2de7881 100644 --- a/dev-cpp/glibmm/Manifest +++ b/dev-cpp/glibmm/Manifest @@ -1,5 +1,7 @@ DIST glibmm-2.56.0.tar.xz 6859520 BLAKE2B 8d7f0120de211002d587e6ec0d3750dcdce60abae6506395b318be876d5ed680b1451920063f06d6d9655137d50482a9ba936caa0f6da127bb3855e43b4d877f SHA512 65e577009019e30e340ae5fe6e4c854e5a75551b2eb83ad85403d73eb4e77879783162d4c3c354bc37be0be842f0ddffc1977021a5e0c32985fb596d86929c08 DIST glibmm-2.56.1.tar.xz 6841240 BLAKE2B db0e1402f322fd31138cf4db2fc2fabb6fb9896f226f98bd524fe005f0e3412f6973774571b7ec79a9e3c79f6622b0969a55dc91631cc996906dd1e558ad4fe8 SHA512 fd5ad19c5dcba484573520e1d00b5bbb600ee805ab8cd9c0d985880cc1bcbe67ad31fa9f2b5789b5892eddd6be345e3f308593e5ef021e1cfda132e4235fb735 +DIST glibmm-2.58.1.tar.xz 6778632 BLAKE2B e51e43cb9361147627c2ffc4c232bd8b15d935cc3a20a4fa8d98f5be9c45f7dd635aab69177d033cf65a6e39cee53bcc723be56cc8db966e88b00b5f9cb1f29a SHA512 c1a67412e6de3853557318cd921e6e73874a14ffd3cb51fc158b0d45fb1d5c2560e011b3b0be7f8cf8afee13952e824625d832e5237288b974c2ba20a6f042cb EBUILD glibmm-2.56.0.ebuild 1633 BLAKE2B 18f75726ccc969a8985bc2b04ef257277fb4eb7bde203030e09f3eba1f1a25d96a5d2a4318346c176b9a54c62a00ffadf4f045987f89f4d8cc448677c56311a2 SHA512 0827bac28286463c413d8bce0f25420e467c47f49771ca414fa5f12c357daf420a49c763ad2265ba14ba66a051387990d5f06d9fe6e9c757a1c9325f84c6c496 -EBUILD glibmm-2.56.1.ebuild 1638 BLAKE2B 04379bd537267f58094b03d65fea2713dc83689e5c6cd542f39f06431f08c74828f03116973377282c07da43b0bbc230de6444eab7c2b4b41ffdd846686067ca SHA512 dd20f650dcde5d158bb2aa1068820fae6f4e72a0709ddf1112b236d2db78c2974a7e1fb18bb1db5746e21499f2613eed971f2e680592ac4804f39a87e27c03c6 +EBUILD glibmm-2.56.1.ebuild 1636 BLAKE2B e1b45990cd3dfb1b941f3c4d0f3405339a8880568f4ef7ca0a8c158e24651b423cf26eeca3440586606e61bd2466c0f6b92c81ccbbb84b0c59f8045b3519d5c1 SHA512 39496736a9969841e94512c153aba2222330b660edeec4f0cf446d4c69ab900c8a381a14d36597f4e38da71ec65eec1a77b622c2ef847eabc1863cd149a98883 +EBUILD glibmm-2.58.1.ebuild 1642 BLAKE2B e4b73b9141ac3c353dd3d5b6a6236018af9fc6da61a796a8fc2cb01f97e4c8db1675efb7481d832084765098eea357406c8c7a7e44a899443856e8e5fb854802 SHA512 9d7ed5de34212bf2312c97cf04ce2d0a78436cd031d5a02cd43ca0725cdda9b8f5cfb5ca86aff91dc989c677e6fcbf6608db8d44b6cc46f0df98f95b65852c1e MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506 diff --git a/dev-cpp/glibmm/glibmm-2.56.1.ebuild b/dev-cpp/glibmm/glibmm-2.56.1.ebuild index 09daa5e21a77..fb2d25aec0f1 100644 --- a/dev-cpp/glibmm/glibmm-2.56.1.ebuild +++ b/dev-cpp/glibmm/glibmm-2.56.1.ebuild @@ -9,7 +9,7 @@ HOMEPAGE="https://www.gtkmm.org" LICENSE="LGPL-2.1+ GPL-2+" # GPL-2+ applies only to the build system SLOT="2" -KEYWORDS="~alpha ~amd64 arm ~arm64 hppa ia64 ~mips ~ppc ~ppc64 ~sh sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris" +KEYWORDS="~alpha ~amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris" IUSE="doc debug test" RDEPEND=" diff --git a/dev-cpp/glibmm/glibmm-2.58.1.ebuild b/dev-cpp/glibmm/glibmm-2.58.1.ebuild new file mode 100644 index 000000000000..cedbe733f1d4 --- /dev/null +++ b/dev-cpp/glibmm/glibmm-2.58.1.ebuild @@ -0,0 +1,65 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +inherit gnome2 multilib-minimal + +DESCRIPTION="C++ interface for glib2" +HOMEPAGE="https://www.gtkmm.org" + +LICENSE="LGPL-2.1+ GPL-2+" # GPL-2+ applies only to the build system +SLOT="2" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris" +IUSE="doc debug test" + +RDEPEND=" + >=dev-libs/libsigc++-2.9.1:2[${MULTILIB_USEDEP}] + >=dev-libs/glib-2.55.1:2[${MULTILIB_USEDEP}] +" +DEPEND="${RDEPEND} + virtual/pkgconfig + doc? ( app-doc/doxygen ) +" +# dev-cpp/mm-common needed for eautoreconf + +src_prepare() { + if ! use test; then + # don't waste time building tests + sed 's/^\(SUBDIRS =.*\)tests\(.*\)$/\1\2/' \ + -i Makefile.am Makefile.in || die "sed 1 failed" + fi + + # don't build examples - we want to install example sources, not binaries + sed 's/^\(SUBDIRS =.*\)examples\(.*\)$/\1\2/' \ + -i Makefile.am Makefile.in || die "sed 2 failed" + + gnome2_src_prepare +} + +multilib_src_configure() { + ECONF_SOURCE="${S}" gnome2_src_configure \ + $(use_enable debug debug-refcounting) \ + $(multilib_native_use_enable doc documentation) \ + --enable-deprecated-api +} + +multilib_src_test() { + cd tests + default + + for i in */test; do + ${i} || die "Running tests failed at ${i}" + done +} + +multilib_src_install() { + gnome2_src_install +} + +multilib_src_install_all() { + einstalldocs + + find examples -type d -name '.deps' -exec rm -rf {} \; 2>/dev/null + find examples -type f -name 'Makefile*' -exec rm -f {} \; 2>/dev/null + dodoc -r examples +} diff --git a/dev-cpp/libjson-rpc-cpp/Manifest b/dev-cpp/libjson-rpc-cpp/Manifest index 75a362599911..b8cf14cbbc8b 100644 --- a/dev-cpp/libjson-rpc-cpp/Manifest +++ b/dev-cpp/libjson-rpc-cpp/Manifest @@ -1,7 +1,4 @@ -DIST libjson-rpc-cpp-1.1.0.tar.gz 179442 BLAKE2B cfbfe703d1a3d4ccaf6d4d475a7c1686c8f7afc28b025d6fd3bfebdc41cff2b944e6600e68073c1b7e7c0a2463cbf6e9724cf618c5d481bf7a4600019b529922 SHA512 bf34eedb196b1e214292976036a00e933f8a9b4325441ea2e4ae049a7c818014a68dd9d2f22d01588f5e6d1e9f465c73a133b0fd8282f8cf78a05a493f4c461b DIST libjson-rpc-cpp-1.1.1.tar.gz 179249 BLAKE2B bd8b737f76bceaa1be73d89a1f75472d8eae6f3da57a4da5a5a9eee2a52ba06034bcb4404e6b65368f6be1967c1a8b40f71e3bfbaa58f65b0ac8dced1b3f43af SHA512 64043aee3227262da41b56f6d53e4f8f9a56d3a43b695200020b47fb7eb6e121cf086b6e121c0eccecf381be90d77910d0f4371254d147f33310af4584a7d433 -EBUILD libjson-rpc-cpp-1.1.0-r1.ebuild 1577 BLAKE2B 6126b21e1c7af4a81d8a01be1c5773c6a2aa3c7be05738672b92a886d5f76579390139084b179be2c44812a68af4cc9b67580d5bfc6c257218f30964f8222533 SHA512 0ba7e7f7138cee4cd15b38e32676f41278a50cd83432c559b2a0672ed01486c31d2e5be9d128aec0a5a057173388840cb50ee260355901f972cfbd94264de5c5 EBUILD libjson-rpc-cpp-1.1.1-r1.ebuild 1578 BLAKE2B 3c8940a09c2e38ce6be94e3585e1d2ccf65a84cc3115f9eb29e5da9bdb057626032991f352bc93f7c730916a27487e04c1a5eb398593da9481adf61109b4424c SHA512 6ddad0199299a5fbfb5c5a9b6b1e953734509d405a1d5d3d41c29bb62224a8641cd922ea0af0b2824f622583ba6a843bc96383f5655fbbe21b08ef5887dab533 -EBUILD libjson-rpc-cpp-1.1.1.ebuild 1577 BLAKE2B 6126b21e1c7af4a81d8a01be1c5773c6a2aa3c7be05738672b92a886d5f76579390139084b179be2c44812a68af4cc9b67580d5bfc6c257218f30964f8222533 SHA512 0ba7e7f7138cee4cd15b38e32676f41278a50cd83432c559b2a0672ed01486c31d2e5be9d128aec0a5a057173388840cb50ee260355901f972cfbd94264de5c5 EBUILD libjson-rpc-cpp-9999.ebuild 1578 BLAKE2B 94d3a0d77ee6c007928c0f90b503a7b0ac041c783fdcd87766ae2ba09c4d419906dd06ac0ecdd9b23a86e78295961e3f5f1ca8ba14ed1514ee4d61074885c095 SHA512 c0dab0ba3eff39b3c8af50c562d3bc3e7ee714cd8cc4daaed3df1f78ef4ac373987b3b8c57c363697d0fd11f04add0e4bd810297919ad7eb11c84caa8e19f0b0 MISC metadata.xml 906 BLAKE2B fe2f020896cc35c9c27fe082bf7a844086445b8943690c35de3de091041473b0a211370e335908470faf1bfdf0fb64b4b6aee75dfd527683d173c3e9fc8d9cf9 SHA512 037b5942cdde13abab5f527cdb8fced709b88bbebb754497279b1d60e7c90789115ecc2f579c38111c2acf32a3baf2643b470e55deb9de36bc498e9665091a83 diff --git a/dev-cpp/libjson-rpc-cpp/libjson-rpc-cpp-1.1.0-r1.ebuild b/dev-cpp/libjson-rpc-cpp/libjson-rpc-cpp-1.1.0-r1.ebuild deleted file mode 100644 index 614694270fd9..000000000000 --- a/dev-cpp/libjson-rpc-cpp/libjson-rpc-cpp-1.1.0-r1.ebuild +++ /dev/null @@ -1,67 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit cmake-utils - -DESCRIPTION="JSON-RPC (1.0 & 2.0) framework for C++" -HOMEPAGE="https://github.com/cinemast/libjson-rpc-cpp" -SRC_URI="https://github.com/cinemast/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0/1" -KEYWORDS="~amd64 ~x86" -IUSE="doc +http-client +http-server redis-client redis-server +stubgen test" - -RDEPEND=" - dev-libs/jsoncpp:= - http-client? ( net-misc/curl:= ) - http-server? ( net-libs/libmicrohttpd:= ) - redis-client? ( dev-libs/hiredis:= ) - redis-server? ( dev-libs/hiredis:= ) - stubgen? ( dev-libs/argtable:= )" -DEPEND="${RDEPEND} - doc? ( app-doc/doxygen ) - test? ( dev-cpp/catch:1 )" - -RESTRICT="!test? ( test )" - -src_configure() { - local mycmakeargs=( - -DHTTP_CLIENT=$(usex http-client) - -DHTTP_SERVER=$(usex http-server) - -DREDIS_CLIENT=$(usex redis-client) - -DREDIS_SERVER=$(usex redis-server) - # they have no deps - -DTCP_SOCKET_CLIENT=ON - -DTCP_SOCKET_SERVER=ON - -DUNIX_DOMAIN_SOCKET_CLIENT=ON - -DUNIX_DOMAIN_SOCKET_SERVER=ON - # they are not installed - -DCOMPILE_EXAMPLES=OFF - -DCOMPILE_STUBGEN=$(usex stubgen) - -DCOMPILE_TESTS=$(usex test) - -DCATCH_INCLUDE_DIR="${EPREFIX}/usr/include/catch" - ) - - cmake-utils_src_configure -} - -src_compile() { - cmake-utils_src_compile - - use doc && emake -C "${BUILD_DIR}" doc -} - -src_test() { - # Tests fail randomly when run in parallel - local MAKEOPTS=-j1 - cmake-utils_src_test -} - -src_install() { - cmake-utils_src_install - - use doc && dodoc -r "${BUILD_DIR}"/doc/html -} diff --git a/dev-cpp/libjson-rpc-cpp/libjson-rpc-cpp-1.1.1.ebuild b/dev-cpp/libjson-rpc-cpp/libjson-rpc-cpp-1.1.1.ebuild deleted file mode 100644 index 614694270fd9..000000000000 --- a/dev-cpp/libjson-rpc-cpp/libjson-rpc-cpp-1.1.1.ebuild +++ /dev/null @@ -1,67 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit cmake-utils - -DESCRIPTION="JSON-RPC (1.0 & 2.0) framework for C++" -HOMEPAGE="https://github.com/cinemast/libjson-rpc-cpp" -SRC_URI="https://github.com/cinemast/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0/1" -KEYWORDS="~amd64 ~x86" -IUSE="doc +http-client +http-server redis-client redis-server +stubgen test" - -RDEPEND=" - dev-libs/jsoncpp:= - http-client? ( net-misc/curl:= ) - http-server? ( net-libs/libmicrohttpd:= ) - redis-client? ( dev-libs/hiredis:= ) - redis-server? ( dev-libs/hiredis:= ) - stubgen? ( dev-libs/argtable:= )" -DEPEND="${RDEPEND} - doc? ( app-doc/doxygen ) - test? ( dev-cpp/catch:1 )" - -RESTRICT="!test? ( test )" - -src_configure() { - local mycmakeargs=( - -DHTTP_CLIENT=$(usex http-client) - -DHTTP_SERVER=$(usex http-server) - -DREDIS_CLIENT=$(usex redis-client) - -DREDIS_SERVER=$(usex redis-server) - # they have no deps - -DTCP_SOCKET_CLIENT=ON - -DTCP_SOCKET_SERVER=ON - -DUNIX_DOMAIN_SOCKET_CLIENT=ON - -DUNIX_DOMAIN_SOCKET_SERVER=ON - # they are not installed - -DCOMPILE_EXAMPLES=OFF - -DCOMPILE_STUBGEN=$(usex stubgen) - -DCOMPILE_TESTS=$(usex test) - -DCATCH_INCLUDE_DIR="${EPREFIX}/usr/include/catch" - ) - - cmake-utils_src_configure -} - -src_compile() { - cmake-utils_src_compile - - use doc && emake -C "${BUILD_DIR}" doc -} - -src_test() { - # Tests fail randomly when run in parallel - local MAKEOPTS=-j1 - cmake-utils_src_test -} - -src_install() { - cmake-utils_src_install - - use doc && dodoc -r "${BUILD_DIR}"/doc/html -} diff --git a/dev-cpp/ms-gsl/Manifest b/dev-cpp/ms-gsl/Manifest index 69a964c59862..ff9bfb2c9e58 100644 --- a/dev-cpp/ms-gsl/Manifest +++ b/dev-cpp/ms-gsl/Manifest @@ -3,6 +3,6 @@ AUX ms-gsl-1.0.0-use_system_catch-636828.patch 559 BLAKE2B 899f98f0b3e9b0f04cf0d DIST ms-gsl-1.0.0.tar.gz 58920 BLAKE2B 46b71ec1fe57ec311a53895498c375c2313ed1f2858cd6b67d19d92ef10230707ce14fb757c00c92ea3475d787cda400cc449c34d54a54a3d0123f71b87b11ad SHA512 cde55df9540fd08ca8d29a74b2cff360686aa75b01ee1c48bd9782a2d70d1b6eae712a51eaf9b60453f859e466df00345b0a2893137d16490cea8ee54362f7da DIST ms-gsl-2.0.0.tar.gz 64726 BLAKE2B ab40725aa38af7c5651e22ebf32d4bd9c27a10be2e206fd4c3c0173ad21da262beddef022b7b158653b185cfc3269f2b6e80d99fe65f601ffc3e770b143b03f8 SHA512 7339527222c8a97a94c0bb4038b3d142045ec5d80995e628574ac96f4d9d13c41ad70fbe0d8390586dc0db8d9ea55107dbc95de80f7335eb78ef9d2e7047d726 EBUILD ms-gsl-1.0.0.ebuild 730 BLAKE2B 5aaeb7b07a5f949614256d7cdbc4aa2eade4a5f9ad5ebb729bc13b1df3a43ce5fb13a7d8cc6ba9fb23891f6d70eaeee391ebe7bec2d1c14eacb77aa9b6329004 SHA512 9d5e8ca174656262b9968371a4d0966091c88c95549224b7f35240ae180e3df02f1a1177c8c88fbfeaf05d1ed8e781db3819a4b70ef776762e69582b6b191c55 -EBUILD ms-gsl-2.0.0.ebuild 757 BLAKE2B 5632fb8de56133b6022345f3e90281dcf03f35d8c0e419e69efa8aa8432d5238bd58f03ead6ef910adbec94d2e356caba198751ed55d4ca219a94830666578fc SHA512 ceb5ddac161baf541076a5dd6f58561919ebc55ea247d8d271ece00e17f628a7c92dee763aec400ea2dc2d0c4f4bb59456abf71e421d9b33c8971bb8853db4de +EBUILD ms-gsl-2.0.0.ebuild 756 BLAKE2B 5acdf1f9807c684dc81c7fea023668d6bf752b7e49a3ff38845fce3c404fbe5ebc583b30d644ed56cbd84a09f89a5cd9331d50ed929266588e7281949570a25c SHA512 b5868347431555bc1d864b0a7d8d55d675242b0b051fa3379560e9103e6eaae72e72006da6c5dc5c0856c1f7582ef4f08cf52a1c4e6b64492fadcdeb2ea6e582 EBUILD ms-gsl-9999.ebuild 711 BLAKE2B ff612a5f984d24926a7dbc401db50c817031d470c5bf994f9b5085c77851bc15d16439014931024c42daf75df3f9a3edf3b7e206b7d9197317211409692b8c32 SHA512 3bafae58327c7fe393e49a4cf2b29b8c717fa144df47613d9171d1175187e7c75642a1eb98f9a91087573024157963366facba1c7fd0b0b1924fbf98647e3f0a MISC metadata.xml 533 BLAKE2B 997b40261c13283f190b7fe70b87e9d42b2b05c267afdbfc1de3a7b56bfb968736fd1a1163abc723985919fd201048fc69905cdaa6d6e4a8f938bac42495d13e SHA512 01522dee3ebdbe7e5f533a64859c8f215f8653ab6d7775f1488efa9aa813840ae7c2112cd4865b007feb1a296f74aeac123389881608e169f5d0f417dacd7719 diff --git a/dev-cpp/ms-gsl/ms-gsl-2.0.0.ebuild b/dev-cpp/ms-gsl/ms-gsl-2.0.0.ebuild index 8b5cb2b6670b..8b35d4ea2e67 100644 --- a/dev-cpp/ms-gsl/ms-gsl-2.0.0.ebuild +++ b/dev-cpp/ms-gsl/ms-gsl-2.0.0.ebuild @@ -13,7 +13,7 @@ S="${WORKDIR}/GSL-${PV}" LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 ~x86" IUSE="test" # header only library -- cgit v1.2.3