From 4f2d7949f03e1c198bc888f2d05f421d35c57e21 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 9 Oct 2017 18:53:29 +0100 Subject: reinit the tree, so we can have metadata --- dev-libs/qjson/Manifest | 9 ++ .../qjson/files/qjson-0.9.0-featuresummary.patch | 73 ++++++++++++ .../qjson/files/qjson-0.9.0-gnuinstalldirs.patch | 123 +++++++++++++++++++++ dev-libs/qjson/metadata.xml | 13 +++ dev-libs/qjson/qjson-0.8.1-r1.ebuild | 47 ++++++++ dev-libs/qjson/qjson-0.9.0.ebuild | 49 ++++++++ 6 files changed, 314 insertions(+) create mode 100644 dev-libs/qjson/Manifest create mode 100644 dev-libs/qjson/files/qjson-0.9.0-featuresummary.patch create mode 100644 dev-libs/qjson/files/qjson-0.9.0-gnuinstalldirs.patch create mode 100644 dev-libs/qjson/metadata.xml create mode 100644 dev-libs/qjson/qjson-0.8.1-r1.ebuild create mode 100644 dev-libs/qjson/qjson-0.9.0.ebuild (limited to 'dev-libs/qjson') diff --git a/dev-libs/qjson/Manifest b/dev-libs/qjson/Manifest new file mode 100644 index 000000000000..ee359c43291e --- /dev/null +++ b/dev-libs/qjson/Manifest @@ -0,0 +1,9 @@ +AUX qjson-0.9.0-featuresummary.patch 2491 SHA256 a5f0ffec195ef701a7e6508b80c0237d46b15e29099edbb369129cd0a5b0e551 SHA512 c4899dba9936cafb86dcb3458e60db049f7d766efea8e187b773128fee8c4315d1be5f855a087e32b4d0e8d9d8fbec72f2d904356ec2125e7d222f117ba4afbf WHIRLPOOL 87edf01a56956a9712f9fffe27f0d4378574fcfd8390d429b8c5f9af329bb143103139e24c01ea58e2ac91826941f5c543df18e7b40a7bbfded68b3b76a697e6 +AUX qjson-0.9.0-gnuinstalldirs.patch 4768 SHA256 bd67436fff99e3207efc78cd325a771de4112ba70eb4fd77d7c4e9011d7d93dd SHA512 71d8183fb492667cb0fbf274820fff5a5f1ab698037eb4dec07d5e39d73e12793048e7292cd76bc09e49158046869fc9e96d3fdef390cb0f3e9432c6c52e00c9 WHIRLPOOL bd9e5c825e85a77d416ac2b26343c128180fab6ef05106d40ceb562f67ca02d157570924c6a6f0a19004794f3a2f4a46ac57437f04ac95004b01cb600861edc5 +DIST qjson-0.8.1.tar.bz2 64398 SHA256 cd4db5b956247c4991a9c3e95512da257cd2a6bd011357e363d02300afc814d9 SHA512 03e65bbdf6d397f77319867a03377deb419eac46ad91bc06abb7bc68d8f8f2e490db87d909ce51e065f22e5d201f1f73d57f72e14bc378580dbf40b855f1bc72 WHIRLPOOL 532245b3eaaed901bbf44c1d005b002b010b2b7568142fe1435521e4ed24cb52f76accea9f2a324ed19183c62c2f8bfb0c0a257bf808795fc25faa132766ac32 +DIST qjson-0.9.0.tar.gz 98300 SHA256 e812617477f3c2bb990561767a4cd8b1d3803a52018d4878da302529552610d4 SHA512 ff0674f32abc6c88f9c535a58931f60baafa355655b043009a2574dadb822f10ec25017b78f2911f897a554a34733d7332c94cf4290dec16a631e22070c15e61 WHIRLPOOL 21aa0a2d738054b2a0c040fc491daa9f829e3206d294b25c0448d2f5854c18a2fbec00f0f9829f3571472d43bf43106174687a25a412b17391fe8ff906e7d26d +EBUILD qjson-0.8.1-r1.ebuild 1030 SHA256 5f61a2e59e2309d1be11e1fcb4d4263c369d9d8c9db94b8151e8090d71a06a23 SHA512 86c7e3c2118d0ced19afb020a2ce13b38d0ef6cc38f9b74f96ec63f4a35bd91e62345f069ca64fbdc9108e6d75a2819d015e68a0a89719db1efa0d2f42f8ecf4 WHIRLPOOL a9596b192f95f925e49ca1f862dab3df1bbde9b9c82515b8ed46a7e60e0fc431acfb54c3120fbe7dba9639cd117acd6a5c7482d79748413ca5559b83700be365 +EBUILD qjson-0.9.0.ebuild 1075 SHA256 6313599dc5ec173d87104c2d5fbc160378f9d83fe0561a276547f6094b3bee48 SHA512 08d3387da2387793d36e2d99213926f1151f588f1d4e5361ff0e4ef08638cdbcc5dd7e5b9626c68fefb5fd7672824a5279dd61edf8252ecceae82f58526ee599 WHIRLPOOL 4c8792efb11d9c058cca9a3d8fd8a06f082355dfaeecc08037c8ae0f0b0ce99b3846fa8156ed4f790c09546c3af7fe3d7799fda6f0953caf6cd13be4fcd5fbba +MISC ChangeLog 4102 SHA256 6ad4751ff0ec58a513730bc0a3ca0b6b81adda5f2e25e0710f6f298f23a0ce45 SHA512 0a50e5770b37b8e690ceddc13e0a06deb1e8e22281106472c7504f6c8c93371f199d0feb0333c2004effb6392a4a5376c840fb36c0f6393b9090f8b861ea9120 WHIRLPOOL 8e07145b6eb1eb5895c5415da60ce5951ec06a4d501c43bfb840a29ca41e7be1b06f252373fca9bec989e5d68eaaa6f82ffd8520dc070d4592c81da862835bfb +MISC ChangeLog-2015 4695 SHA256 eae5e5b7f7a85a9d0d06eb3027dce63b549e02a8704d46902bb7925beb43bc91 SHA512 195c4a34944f68e2b1fb31d91f64b6cb3574bb1423fee671ba99c7eb77a5dfe23f40daf25b890fb5e70a6ddee6a73525fcbb4246bb41b33fbf15735e3548b631 WHIRLPOOL 0c79963551f8bc5ec919dee249f1eb083f3dfe73c6204a1b9cc4deeb7159bfa65012aadbe53d2a0798f45a5bf03c4c39fa145c2621fff4e8b80ae2f1b0bd5fcd +MISC metadata.xml 434 SHA256 be3720d6933c27b60fb10de8b76ef5c968a302740e443d7055052def1fcb8689 SHA512 53076f290efbe638220c49c9be70359d0b2d615fc9a2df272df61e2385cb8add39a0a796bdd7e5def048e194f1756747d305ef8863489131297a305bb90460b5 WHIRLPOOL 2530d4cb74f4469e10c8d8d2f48efa63ba032d6cf6dd22dea7a1f338ccb91f67ce20e6a9ed53813db3ec0ddcbe94ea7377e4ce32c795d13ed2acd4d85d624e51 diff --git a/dev-libs/qjson/files/qjson-0.9.0-featuresummary.patch b/dev-libs/qjson/files/qjson-0.9.0-featuresummary.patch new file mode 100644 index 000000000000..6613410fabf5 --- /dev/null +++ b/dev-libs/qjson/files/qjson-0.9.0-featuresummary.patch @@ -0,0 +1,73 @@ +From 7288382029f30b5e6ba7ac91b3b2e5d7f96d239a Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner +Date: Sun, 9 Apr 2017 18:41:15 +0200 +Subject: [PATCH 2/2] Use FeatureSummary and simplify by requiring Qt-4.8 + +--- + CMakeLists.txt | 26 ++++++++++---------------- + 1 file changed, 10 insertions(+), 16 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index d0c44bb..5f1305e 100755 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -12,6 +12,7 @@ if(POLICY CMP0020) + endif() + + include(GNUInstallDirs) ++include(FeatureSummary) + + set(CMAKE_INSTALL_NAME_DIR ${CMAKE_INSTALL_LIBDIR}) + +@@ -42,14 +43,14 @@ SET(FRAMEWORK_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/Library/Frameworks" + # (This will have no effect with CMake < 2.8) + SET(QT_USE_IMPORTED_TARGETS TRUE) + +-option(QT4_BUILD "Force building with Qt4 even if Qt5 is found") ++option(QT4_BUILD "Force building with Qt4 even if Qt5 is found" OFF) + IF (NOT QT4_BUILD) +- FIND_PACKAGE( Qt5Core QUIET ) ++ FIND_PACKAGE( Qt5Core ) ++ELSE() ++ MESSAGE ("Forced build with Qt4") + ENDIF() + + IF (Qt5Core_FOUND) +- MESSAGE ("Qt5 found") +- + INCLUDE_DIRECTORIES(${Qt5Core_INCLUDE_DIRS}) + ADD_DEFINITIONS(${Qt5Core_DEFINITIONS}) + SET(PC_Requires "Qt5Core") +@@ -59,20 +60,11 @@ IF (Qt5Core_FOUND) + # As moc files are generated in the binary dir, tell CMake + # to always look for includes there: + set(CMAKE_INCLUDE_CURRENT_DIR ON) +- set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DQT_USE_QSTRINGBUILDER" ) +- MESSAGE ("Enable QStringBuilder") ++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DQT_USE_QSTRINGBUILDER" ) + ELSE() +- MESSAGE ("Qt5 not found, searching for Qt4") + # Find Qt4 +- FIND_PACKAGE( Qt4 4.5 REQUIRED ) +- # QStringBuilder is supported since Qt 4.8 for both QString and QByteArray +- IF (NOT (${QT_VERSION_MINOR} STRLESS "8")) +- MESSAGE ("Enable QStringBuilder") +- set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DQT_USE_QSTRINGBUILDER" ) +- ELSE() +- MESSAGE ("Disable QStringBuilder") +- ENDIF() +- ++ FIND_PACKAGE( Qt4 4.8 REQUIRED QtCore) ++ set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DQT_USE_QSTRINGBUILDER" ) + # Include the cmake file needed to use qt4 + INCLUDE( ${QT_USE_FILE} ) + SET(PC_Requires "QtCore") +@@ -131,3 +123,5 @@ INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/QJSON${QJSON_SUFFIX}Config.cmake + + ADD_CUSTOM_TARGET(uninstall + "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake") ++ ++FEATURE_SUMMARY(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES) +-- +2.12.2 + diff --git a/dev-libs/qjson/files/qjson-0.9.0-gnuinstalldirs.patch b/dev-libs/qjson/files/qjson-0.9.0-gnuinstalldirs.patch new file mode 100644 index 000000000000..f51c2600129d --- /dev/null +++ b/dev-libs/qjson/files/qjson-0.9.0-gnuinstalldirs.patch @@ -0,0 +1,123 @@ +From bec00c5c1b0a3da65de82e38bdd633ce8f284ec4 Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner +Date: Sun, 9 Apr 2017 18:36:24 +0200 +Subject: [PATCH 1/2] Use GNUInstallDirs + +--- + CMakeLists.txt | 15 +++++---------- + QJSONConfig.cmake.in | 2 +- + QJson.pc.in | 6 +++--- + src/CMakeLists.txt | 12 ++++++------ + 4 files changed, 15 insertions(+), 20 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 2fde79f..d0c44bb 100755 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -11,7 +11,9 @@ if(POLICY CMP0020) + cmake_policy(SET CMP0020 OLD) + endif() + +-set(CMAKE_INSTALL_NAME_DIR ${LIB_INSTALL_DIR}) ++include(GNUInstallDirs) ++ ++set(CMAKE_INSTALL_NAME_DIR ${CMAKE_INSTALL_LIBDIR}) + + IF("${CMAKE_BUILD_TYPE}" MATCHES "^Rel.*") + ADD_DEFINITIONS("-DQT_NO_DEBUG_OUTPUT") +@@ -80,12 +82,7 @@ IF (NOT WIN32) + SET( QT_DONT_USE_QTGUI TRUE ) + ENDIF() + +- +-#add extra search paths for libraries and includes +-SET (LIB_SUFFIX "" CACHE STRING "Define suffix of directory name (32/64)" ) +-SET (LIB_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}" CACHE STRING "Directory where lib will install") +-SET (INCLUDE_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/include" CACHE PATH "The directory the headers are installed in") +-SET (CMAKECONFIG_INSTALL_DIR "${LIB_INSTALL_DIR}/cmake/${CMAKE_PROJECT_NAME}${QJSON_SUFFIX}" CACHE PATH "Directory where to install QJSONConfig.cmake") ++SET (CMAKECONFIG_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}/cmake/${CMAKE_PROJECT_NAME}${QJSON_SUFFIX}" CACHE PATH "Directory where to install QJSONConfig.cmake") + + set(QJSON_LIB_MAJOR_VERSION "0") + set(QJSON_LIB_MINOR_VERSION "9") +@@ -93,15 +90,13 @@ set(QJSON_LIB_PATCH_VERSION "0") + + set(QJSON_LIB_VERSION_STRING "${QJSON_LIB_MAJOR_VERSION}.${QJSON_LIB_MINOR_VERSION}.${QJSON_LIB_PATCH_VERSION}") + +-set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib" ) +- + # pkg-config + IF (NOT WIN32) + CONFIGURE_FILE (${CMAKE_CURRENT_SOURCE_DIR}/QJson.pc.in + ${CMAKE_CURRENT_BINARY_DIR}/QJson${QJSON_SUFFIX}.pc + @ONLY) + INSTALL (FILES ${CMAKE_CURRENT_BINARY_DIR}/QJson${QJSON_SUFFIX}.pc +- DESTINATION ${LIB_INSTALL_DIR}/pkgconfig) ++ DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) + ENDIF (NOT WIN32) + + # Subdirs +diff --git a/QJSONConfig.cmake.in b/QJSONConfig.cmake.in +index 0c4a1e6..22394cb 100644 +--- a/QJSONConfig.cmake.in ++++ b/QJSONConfig.cmake.in +@@ -1,6 +1,6 @@ + GET_FILENAME_COMPONENT(myDir ${CMAKE_CURRENT_LIST_FILE} PATH) + + SET(QJSON_LIBRARIES qjson) +-SET(QJSON_INCLUDE_DIR "@INCLUDE_INSTALL_DIR@") ++SET(QJSON_INCLUDE_DIR "@CMAKE_INSTALL_INCLUDEDIR@") + + include(${myDir}/QJSON@QJSON_SUFFIX@Targets.cmake) +diff --git a/QJson.pc.in b/QJson.pc.in +index 55abc28..4cb3de8 100644 +--- a/QJson.pc.in ++++ b/QJson.pc.in +@@ -1,11 +1,11 @@ + prefix=@CMAKE_INSTALL_PREFIX@ + exec_prefix=${prefix} +-libdir=@LIB_INSTALL_DIR@ +-includedir=@INCLUDE_INSTALL_DIR@ ++libdir=@CMAKE_INSTALL_FULL_LIBDIR@ ++includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@ + + Name: QJson + Description: QJson is a qt-based library that maps JSON data to QVariant objects + Version: @QJSON_LIB_MAJOR_VERSION@.@QJSON_LIB_MINOR_VERSION@.@QJSON_LIB_PATCH_VERSION@ + Requires: @PC_Requires@ + Libs: -L${libdir} -lqjson +-Cflags: -I${includedir} +\ No newline at end of file ++Cflags: -I${includedir} +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 0ae7c40..0e461f7 100755 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -55,19 +55,19 @@ set_target_properties(qjson${QJSON_SUFFIX} PROPERTIES + ) + + INSTALL(TARGETS qjson${QJSON_SUFFIX} EXPORT qjson-export +- LIBRARY DESTINATION ${LIB_INSTALL_DIR} +- RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin +- ARCHIVE DESTINATION ${LIB_INSTALL_DIR} ++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ++ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} ++ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + FRAMEWORK DESTINATION ${FRAMEWORK_INSTALL_DIR} +- PUBLIC_HEADER DESTINATION ${INCLUDE_INSTALL_DIR}/qjson${QJSON_SUFFIX} ++ PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/qjson${QJSON_SUFFIX} + ) + + if(MSVC) + get_target_property(LOCATION qjson LOCATION_DEBUG) + string(REGEX REPLACE "\\.[^.]*$" ".pdb" LOCATION "${LOCATION}") +- install(FILES ${LOCATION} DESTINATION ${CMAKE_INSTALL_PREFIX}/bin CONFIGURATIONS Debug) ++ install(FILES ${LOCATION} DESTINATION ${CMAKE_INSTALL_BINDIR} CONFIGURATIONS Debug) + + get_target_property(LOCATION qjson LOCATION_RELWITHDEBINFO) + string(REGEX REPLACE "\\.[^.]*$" ".pdb" LOCATION "${LOCATION}") +- install(FILES ${LOCATION} DESTINATION ${CMAKE_INSTALL_PREFIX}/bin CONFIGURATIONS RelWithDebInfo) ++ install(FILES ${LOCATION} DESTINATION ${CMAKE_INSTALL_BINDIR} CONFIGURATIONS RelWithDebInfo) + endif(MSVC) +-- +2.12.2 + diff --git a/dev-libs/qjson/metadata.xml b/dev-libs/qjson/metadata.xml new file mode 100644 index 000000000000..7289596d0cf1 --- /dev/null +++ b/dev-libs/qjson/metadata.xml @@ -0,0 +1,13 @@ + + + + + qt@gentoo.org + Gentoo Qt Project + + + flavio/qjson + https://github.com/flavio/qjson/issues + qjson + + diff --git a/dev-libs/qjson/qjson-0.8.1-r1.ebuild b/dev-libs/qjson/qjson-0.8.1-r1.ebuild new file mode 100644 index 000000000000..500f2d60c8e6 --- /dev/null +++ b/dev-libs/qjson/qjson-0.8.1-r1.ebuild @@ -0,0 +1,47 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 + +inherit cmake-multilib multilib qmake-utils + +DESCRIPTION="A library for mapping JSON data to QVariant objects" +HOMEPAGE="http://qjson.sourceforge.net" +SRC_URI="mirror://github/flavio/qjson/${P}.tar.bz2" + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="amd64 arm hppa ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd" +IUSE="debug doc test" + +RDEPEND=">=dev-qt/qtcore-4.8.6:4[${MULTILIB_USEDEP}]" +DEPEND="${RDEPEND} + doc? ( app-doc/doxygen ) + test? ( >=dev-qt/qttest-4.8.6:4[${MULTILIB_USEDEP}] )" + +DOCS=( ChangeLog README.md ) + +multilib_src_configure() { + local mycmakeargs=( + -DQT_QMAKE_EXECUTABLE="$(qt4_get_bindir)/qmake" + $(cmake-utils_use test QJSON_BUILD_TESTS) + ) + + cmake-utils_src_configure +} + +multilib_src_compile() { + cmake-utils_src_compile + + use doc && if is_final_abi; then + cd "${S}"/doc || die + doxygen Doxyfile || die + fi +} + +multilib_src_install_all() { + if use doc; then + HTML_DOCS=( doc/html/ ) + einstalldocs + fi +} diff --git a/dev-libs/qjson/qjson-0.9.0.ebuild b/dev-libs/qjson/qjson-0.9.0.ebuild new file mode 100644 index 000000000000..b7f01765341e --- /dev/null +++ b/dev-libs/qjson/qjson-0.9.0.ebuild @@ -0,0 +1,49 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit cmake-multilib + +DESCRIPTION="Library for mapping JSON data to QVariant objects" +HOMEPAGE="http://qjson.sourceforge.net" +SRC_URI="https://github.com/flavio/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd" +IUSE="debug doc test" + +RDEPEND=" + dev-qt/qtcore:4[${MULTILIB_USEDEP}] +" +DEPEND="${RDEPEND} + doc? ( app-doc/doxygen ) + test? ( dev-qt/qttest:4[${MULTILIB_USEDEP}] ) +" + +DOCS=( ChangeLog README.md ) + +PATCHES=( + "${FILESDIR}/${P}-gnuinstalldirs.patch" + "${FILESDIR}/${P}-featuresummary.patch" +) + +multilib_src_configure() { + local mycmakeargs=( + -DQT4_BUILD=ON + -DQJSON_BUILD_TESTS=$(usex test) + ) + + cmake-utils_src_configure +} + +multilib_src_install_all() { + if use doc && is_final_abi; then + pushd doc > /dev/null || die + doxygen Doxyfile || die "Generating documentation failed" + HTML_DOCS=( doc/html/. ) + popd > /dev/null || die + einstalldocs + fi +} -- cgit v1.2.3