From 5412d33ab4a79d18c7f1ac30eb8da70a6ee2bc8d Mon Sep 17 00:00:00 2001 From: tastytea Date: Mon, 19 Nov 2018 12:44:30 +0100 Subject: [PATCH] dev-cpp/curlpp: Fixed QA issue with pkg-config file Package-Manager: Portage-2.3.51, Repoman-2.3.11 Manifest-Sign-Key: 3555266864CA6D7FF45AA6E7CFC39497F1B26E07 --- dev-cpp/curlpp/Manifest | 12 ++++---- dev-cpp/curlpp/curlpp-0.8.1-r1.ebuild | 38 ++++++++++++++++++++++++ dev-cpp/curlpp/files/no_static_lib.patch | 37 +++++++++++++++++++++++ dev-cpp/curlpp/metadata.xml | 7 +++++ 4 files changed, 89 insertions(+), 5 deletions(-) create mode 100644 dev-cpp/curlpp/curlpp-0.8.1-r1.ebuild create mode 100644 dev-cpp/curlpp/files/no_static_lib.patch diff --git a/dev-cpp/curlpp/Manifest b/dev-cpp/curlpp/Manifest index 4d7974a..ccd8e95 100644 --- a/dev-cpp/curlpp/Manifest +++ b/dev-cpp/curlpp/Manifest @@ -1,13 +1,15 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 +AUX no_static_lib.patch 2028 BLAKE2B c62b2f5a746c008389421a6fd9cb104ffbbd5f31652fb6b1269d9de2e8b655fa5fae4dad45721e174a22a100eeccd15cd89fb6c445d0110668d1b1ddbbdef2cb SHA512 a9f81c48b945e5813fd6ea290c9a4a2cc0375af3234c027fc9f71568a0c260d1a5778aac0e89f47173be82c8c52ba50c4d9532beba7d5143ab0007037d16e8b6 DIST curlpp-0.8.1.tar.gz 143017 BLAKE2B 7f3911499b42077c9f108b0355005744300383836a1c82dcba80207482b231527482fb17dcd78a7f288903e996afaf49a4478c7cb5c821bf597b26f4450a430b SHA512 a46b47150c0f0f1f0056e08966ce2fefa5e86fc729406e0220fbcf400da5409f05c87b636b13da3c4d4460c1177aedb494b9569bbcd9012326d4d5f59376397e +EBUILD curlpp-0.8.1-r1.ebuild 780 BLAKE2B e9bfc91f0f9f74cbefa4ebbcc8732db78fb75797c603b3d5c4bdd3c2d695c905f76ad3a8980e8ddb82394ae44ce6b81ebb0f298b6c9461cb079b41c1e4e449dc SHA512 f6875fcb6c0156484dade066b24bdf2472c46130c93114105e933e792a27d474ac99114660f4929bf707739ee57e21cdfabc8a04eed7c494a235aa5bcd0e22d5 EBUILD curlpp-0.8.1.ebuild 608 BLAKE2B bcc803602079fcb80654f621409b31819b1ae82fb395cebaa17647c7a70c045381e45bab6504c59b92d14da2c1fa8a65398492ac9dd479fd89142062ccd63dc8 SHA512 cdb79f2a8298d977212534c40e2eae2e88043364ada53838b337ce22155da053850a28429772db9b6f4113614d7743701ca4d6c9f6001d64ce0d05d8df266a6a -MISC metadata.xml 248 BLAKE2B 0f4a45d414249f9410a61d8545ba052db41e3d74516e34bff0ca5547cae55db7eefffb2c23d840c979bdea0b927da36f7a56441cbc6053291d65bd39af2421bd SHA512 0f6384333cf38e52e6a67db43f3a78723d2a0d3446da27e7972f15244d96ae41f0e428d937538d4fa52aa70dc9c92920672d4e237b481dbbdff1d9d8c325b33d +MISC metadata.xml 508 BLAKE2B 63706103fe7335d4a25491b6c0654b825e67011a9b8acc5dbeead8afe72521d674eda9f6fb5c692f09acefb645b836c9beaa2a65fd4d29eab542f63f8f072278 SHA512 fa93e958f0159e6afe5f35bf690d511faca1c6c162157a2c3106518974523b6bd8800478ce9c41a357392de3d933981e2d456b229078512e5c4797d784963a11 -----BEGIN PGP SIGNATURE----- -iHUEAREIAB0WIQQ1VSZoZMptf/RapufPw5SX8bJuBwUCW0zVdAAKCRDPw5SX8bJu -B8bFAP42LuOFYIHHAkaN1mgoqYmd5KLJqv/uMY0aD0mRzPMlmgD7BENG8QkG9DOA -+p7kDgmjM0nNCAdDQTpXc2D75kWsIXE= -=hN+e +iHUEAREIAB0WIQQ1VSZoZMptf/RapufPw5SX8bJuBwUCW/KiHgAKCRDPw5SX8bJu +B5MBAPsHjcTw5ZG1Pc/R/4rrKZMlPk5Cn07Paia9hYSJJk6duQD+LUCZaay3ShLH +zjS6XErSIl6tBup1lJ3wyc0XtBIN08M= +=LMsD -----END PGP SIGNATURE----- diff --git a/dev-cpp/curlpp/curlpp-0.8.1-r1.ebuild b/dev-cpp/curlpp/curlpp-0.8.1-r1.ebuild new file mode 100644 index 0000000..fe7b226 --- /dev/null +++ b/dev-cpp/curlpp/curlpp-0.8.1-r1.ebuild @@ -0,0 +1,38 @@ +# Copyright 2018 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit cmake-utils + +DESCRIPTION="C++ wrapper for libcURL" +HOMEPAGE="http://www.curlpp.org/" +SRC_URI="https://github.com/jpbarrette/curlpp/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~arm" +IUSE="doc examples static-libs" + +RDEPEND=">=net-misc/curl-7.58.0" +DEPEND=">=dev-util/cmake-3.9.6 + ${RDEPEND}" + +src_prepare() { + cmake-utils_src_prepare + sed -i 's/@LDFLAGS@ //' extras/curlpp.pc.in + if ! use static-libs; then + eapply "${FILESDIR}/no_static_lib.patch" + fi +} + +src_install() { + cmake-utils_src_install + dodoc Readme.md doc/AUTHORS doc/TODO + if use doc; then + dodoc doc/guide.pdf + fi + if use examples; then + dodoc -r examples/ + fi +} diff --git a/dev-cpp/curlpp/files/no_static_lib.patch b/dev-cpp/curlpp/files/no_static_lib.patch new file mode 100644 index 0000000..18c0e3c --- /dev/null +++ b/dev-cpp/curlpp/files/no_static_lib.patch @@ -0,0 +1,37 @@ +diff -u a/CMakeLists.txt b/CMakeLists.txt +--- a/CMakeLists.txt 2018-11-19 04:28:50.106323417 +0100 ++++ b/CMakeLists.txt 2018-11-19 04:30:26.045870468 +0100 +@@ -89,7 +89,6 @@ + target_link_libraries(${PROJECT_NAME} ${CURL_LIBRARIES} ${CONAN_LIBS}) + set_target_properties(${PROJECT_NAME} PROPERTIES SOVERSION 1 VERSION 1.0.0) + +-add_library(${PROJECT_NAME}_static STATIC ${HeaderFileList} ${SourceFileList}) + + # Make sure that on unix-platforms shared and static libraries have + # the same root name, but different suffixes. +@@ -97,18 +96,15 @@ + # (solution taken from https://cmake.org/Wiki/CMake_FAQ#How_do_I_make_my_shared_and_static_libraries_have_the_same_root_name.2C_but_different_suffixes.3F) + # + # Making shared and static libraries have the same root name, but different suffixes +-SET_TARGET_PROPERTIES(${PROJECT_NAME}_static PROPERTIES OUTPUT_NAME ${PROJECT_NAME}) + # Now the library target "curlpp_static" will be named "curlpp.lib" with MS tools. + # This conflicts with the "curlpp.lib" import library corresponding to "curlpp.dll", + # so we add a "lib" prefix (which is default on other platforms anyway): +-SET_TARGET_PROPERTIES(${PROJECT_NAME}_static PROPERTIES PREFIX "lib") +-target_link_libraries(${PROJECT_NAME}_static ${CURL_LIBRARIES} ${CONAN_LIBS}) + + # install headers + install(DIRECTORY include/utilspp/ DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/utilspp") + install(DIRECTORY include/curlpp/ DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/curlpp") + +-install(TARGETS ${PROJECT_NAME} ${PROJECT_NAME}_static ++install(TARGETS ${PROJECT_NAME} + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) +Gemeinsame Unterverzeichnisse: a/doc und b/doc. +Gemeinsame Unterverzeichnisse: a/examples und b/examples. +Gemeinsame Unterverzeichnisse: a/extras und b/extras. +Gemeinsame Unterverzeichnisse: a/.git und b/.git. +Gemeinsame Unterverzeichnisse: a/include und b/include. +Gemeinsame Unterverzeichnisse: a/src und b/src. diff --git a/dev-cpp/curlpp/metadata.xml b/dev-cpp/curlpp/metadata.xml index d68ff96..f2b4edf 100644 --- a/dev-cpp/curlpp/metadata.xml +++ b/dev-cpp/curlpp/metadata.xml @@ -5,4 +5,11 @@ gentoo@tastytea.de tastytea + + + Jean-Philippe Barrette-LaPierre + + https://github.com/jpbarrette/curlpp/blob/master/doc/guide.pdf + https://github.com/jpbarrette/curlpp/issues +