From 9ae756929e9739fe6c7f4aee27d6e311379a0e1a Mon Sep 17 00:00:00 2001 From: tastytea Date: Thu, 27 Dec 2018 21:03:15 +0100 Subject: [PATCH] dev-cpp/mastodon-cpp: Fixed debug useflag. Package-Manager: Portage-2.3.51, Repoman-2.3.11 Manifest-Sign-Key: 3555266864CA6D7FF45AA6E7CFC39497F1B26E07 --- dev-cpp/mastodon-cpp/Manifest | 12 ++++++------ dev-cpp/mastodon-cpp/mastodon-cpp-0.20.0.ebuild | 11 +++++------ dev-cpp/mastodon-cpp/mastodon-cpp-9999.ebuild | 14 ++++++-------- 3 files changed, 17 insertions(+), 20 deletions(-) diff --git a/dev-cpp/mastodon-cpp/Manifest b/dev-cpp/mastodon-cpp/Manifest index f2078d0..8a8c27a 100644 --- a/dev-cpp/mastodon-cpp/Manifest +++ b/dev-cpp/mastodon-cpp/Manifest @@ -4,13 +4,13 @@ Hash: SHA256 DIST mastodon-cpp-0.19.0.tar.gz 57052 BLAKE2B b49dc16bc47faf1db20e63a673691c931eeaf6a33ef223187da5439f685b88d3f7ddca1213981e99e501a00a62fa09abd679f31d8e7ce07e344effe16a856002 SHA512 4edea3e62740dbad809b36528e3ce6c0dceb126085e4ec08763b1aa624fdf40d9eed775864e14c2292de2299b422da5c4d9a70faf3727e2b04df0616bc1c5d64 DIST mastodon-cpp-0.20.0.tar.gz 57397 BLAKE2B 0286771f5bc1a2442284a70553404b26d888e8524b3b6140660fe91295fa932b1a6936f84cc98cff1b306d4eb89c753fd2e1f04e761ab30f0805b86836ac3e50 SHA512 f5cf2e65cb088807c1e0c853ddf1eb5e42ad371349c3177ee660547ae773082afc5c652412d24f9714445390fad3b0e0039cf4d03f23eb3ef53d1c5741a50902 EBUILD mastodon-cpp-0.19.0.ebuild 1328 BLAKE2B ffdd28bbcf83ba8022f7cdac274ef9aba559565e037335bdd73b7063ead09a50f6665b39db1373e2bedaecfbc75ae07cf2138ea98af9ad537178b81453f923d8 SHA512 7367535a7b8b4c38ad445fc21d1298f90a50d078838de3beb5bff1215e44c018a9d8b4037d04ead0edcf5dd77964f333c5230c5400ed1b7787251a1decbd3b0f -EBUILD mastodon-cpp-0.20.0.ebuild 1328 BLAKE2B ffdd28bbcf83ba8022f7cdac274ef9aba559565e037335bdd73b7063ead09a50f6665b39db1373e2bedaecfbc75ae07cf2138ea98af9ad537178b81453f923d8 SHA512 7367535a7b8b4c38ad445fc21d1298f90a50d078838de3beb5bff1215e44c018a9d8b4037d04ead0edcf5dd77964f333c5230c5400ed1b7787251a1decbd3b0f -EBUILD mastodon-cpp-9999.ebuild 1306 BLAKE2B 0b498be36ab2fb16ecfe395648a0f106c7bbf421af791baf631f40a154f1a9e3439313fa871744d2f9eeb461471672834248721dff1b202e256ed95d9ff1b69a SHA512 ff89fb03effda1320894a342025df0895fd1f9517820392a90cef6baa1669f6308d9c857c2c6d4d5184724a698f930fb04ab73ff8b0a6b8895fb3caebb8220d4 +EBUILD mastodon-cpp-0.20.0.ebuild 1271 BLAKE2B 9de3ddbb8989d23821ef3a706cc75d51962b144e5251e1925abe4b8afa3c7d632fef6d6f5278156ddffcd76d41bdb5c5a9cd7dda68903a55ae4b5cdb2a4a5415 SHA512 fe7ffdf65bd51997625b500e25ca6924127eba02d2846d6bba54d1c570a1bef5bf03da96582483dacfaec44bbde229777a7ed038a10faa7a1538310cabc81464 +EBUILD mastodon-cpp-9999.ebuild 1245 BLAKE2B 477f5d5e205b6fcfed2635cd2358e1cf5678c8d648a04c3a7a1601e8442df12363b1204d104adaaee3c87081660c126722f8e3534ff8f1062f38f32d2ab91723 SHA512 91f142e1abb85f2e8621098741393e171c126c3776ad8898c4f8df350aa282cbfbceb30fd1b82acb4f11820d3e2794a16ee3da3d91beb7397fa9a31f94a7fc66 MISC metadata.xml 529 BLAKE2B 0e315bbc4644309a5a843fca3e7c4dadda28982930c592e73201b174fc5626b45d0bcb96dfca7c1085fc059ef454957b728d139ad8a99cbddca5cda6dd431448 SHA512 85bd72c7fb3e173354877cd183a4869e733a90d200f95cf8ecf85a658f9229010298ae8e265cf3d309f022f0b242898da04249933aaca5c12c26eeec8beb71f6 -----BEGIN PGP SIGNATURE----- -iHUEAREIAB0WIQQ1VSZoZMptf/RapufPw5SX8bJuBwUCXAZYPwAKCRDPw5SX8bJu -B9okAP0eqOZwd8/l6GKXy97ciohLkb5kYTU6ioqaig3dEgPsIwD/ZrJAh+42vR8y -CqyTe0tNHO6nFfOog1Y9OLJP+nHv4Wc= -=fu4P +iHUEAREIAB0WIQQ1VSZoZMptf/RapufPw5SX8bJuBwUCXCUwAgAKCRDPw5SX8bJu +B+izAP4xvLp4jEjGfdIzCg/5JREUotVEippd3+OWutgzQChyMQD+IiSrmS4unPLZ +NlgEvTBebFkDvaVjH29sUDaf606UlSM= +=IFYp -----END PGP SIGNATURE----- diff --git a/dev-cpp/mastodon-cpp/mastodon-cpp-0.20.0.ebuild b/dev-cpp/mastodon-cpp/mastodon-cpp-0.20.0.ebuild index 92fa77a..06bf4a9 100644 --- a/dev-cpp/mastodon-cpp/mastodon-cpp-0.20.0.ebuild +++ b/dev-cpp/mastodon-cpp/mastodon-cpp-0.20.0.ebuild @@ -29,11 +29,6 @@ src_configure() { -DWITH_EXAMPLES=NO -DWITH_TESTS=NO ) - if use debug; then - mycmakeargs+=(-DCMAKE_BUILD_TYPE=Debug) - else - mycmakeargs+=(-DCMAKE_BUILD_TYPE=Release) - fi if use static-libs; then mycmakeargs+=(-DWITH_STATIC=YES) fi @@ -44,7 +39,11 @@ src_configure() { # We won't let cmake handle the documentation, because it would install the # examples, no matter if we want them. src_compile() { - cmake-utils_src_compile + if use debug; then + cmake-utils_src_compile DEBUG=1 + else + utils_src_compile + fi if use doc; then ./build_doc.sh diff --git a/dev-cpp/mastodon-cpp/mastodon-cpp-9999.ebuild b/dev-cpp/mastodon-cpp/mastodon-cpp-9999.ebuild index 75dcd0d..8a303cd 100644 --- a/dev-cpp/mastodon-cpp/mastodon-cpp-9999.ebuild +++ b/dev-cpp/mastodon-cpp/mastodon-cpp-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -27,12 +27,6 @@ src_configure() { -DWITH_EXAMPLES=NO -DWITH_TESTS=NO ) - if use debug; then - mycmakeargs+=(-DCMAKE_BUILD_TYPE=Debug) - else - mycmakeargs+=(-DCMAKE_BUILD_TYPE=Release) - fi - if use static-libs; then mycmakeargs+=(-DWITH_STATIC=YES) fi @@ -43,7 +37,11 @@ src_configure() { # We can not let cmake handle the documentation, because it would end up in # doc/mastodon-cpp-${PROJECT_VERSION} instead of -9999 src_compile() { - cmake-utils_src_compile + if use debug; then + cmake-utils_src_compile DEBUG=1 + else + utils_src_compile + fi if use doc; then ./build_doc.sh